From dbcae337ee8edcdae2c1c5c8248515e14d6e2830 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Fri, 25 Jun 2004 11:40:06 +0000
Subject: INTEGRATION: CWS mergebuild (1.1.88); FILE MERGED 2004/05/12 12:04:07
 ihi 1.1.88.1: ISO code update / Support for xrm files

---
 transex3/inc/xrmmerge.hxx | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'transex3')

diff --git a/transex3/inc/xrmmerge.hxx b/transex3/inc/xrmmerge.hxx
index f25577b496e2..a377e9f17237 100644
--- a/transex3/inc/xrmmerge.hxx
+++ b/transex3/inc/xrmmerge.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: xrmmerge.hxx,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: nf $ $Date: 2001-08-23 11:45:29 $
+ *  last change: $Author: hjs $ $Date: 2004-06-25 12:40:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,7 @@ private:
     ByteString sCurrentOpenTag;
     ByteString sCurrentCloseTag;
     ByteString sCurrentText;
+    std::vector<ByteString> aLanguages;
 
 protected:
     ByteString GetAttribute( const ByteString &rToken, const ByteString &rAttribute );
@@ -117,6 +118,8 @@ public:
 
 class XRMResOutputParser : public XRMResParser
 {
+private:
+    std::vector<ByteString> aLanguages;
 protected:
     SvFileStream *pOutputStream;
 public:
@@ -134,6 +137,7 @@ private:
     ResData *pResData;
     ByteString sPrj;
     ByteString sPath;
+    std::vector<ByteString> aLanguages;
 
 protected:
     virtual void WorkOnText(
@@ -163,6 +167,7 @@ class XRMResMerge : public XRMResOutputParser
 private:
     MergeDataFile *pMergeDataFile;
     ResData *pResData;
+    std::vector<ByteString> aLanguages;
 
 protected:
     virtual void WorkOnText(
-- 
cgit