summaryrefslogtreecommitdiff
path: root/transex3/inc
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2006-03-29 12:25:44 +0000
committerOliver Bolte <obo@openoffice.org>2006-03-29 12:25:44 +0000
commit4793d23c4afdea42eade35366836cc841686a3c9 (patch)
tree83f9f6c7af97122e0d4d4659fc17a43856646249 /transex3/inc
parent9b9b546ff9e75e9188667286ccce600f8ffad3aa (diff)
INTEGRATION: CWS hc2opti (1.3.12); FILE MERGED
2006/02/24 17:10:21 ihi 1.3.12.1: #i55666# hc2 build speedup
Diffstat (limited to 'transex3/inc')
-rw-r--r--transex3/inc/xrmmerge.hxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/transex3/inc/xrmmerge.hxx b/transex3/inc/xrmmerge.hxx
index e8986a14c78a..48c25c5fd2f4 100644
--- a/transex3/inc/xrmmerge.hxx
+++ b/transex3/inc/xrmmerge.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: xrmmerge.hxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 14:58:25 $
+ * last change: $Author: obo $ $Date: 2006-03-29 13:25:44 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -142,6 +142,7 @@ private:
MergeDataFile *pMergeDataFile;
ResData *pResData;
std::vector<ByteString> aLanguages;
+ ByteString sFilename;
protected:
virtual void WorkOnText(
@@ -157,7 +158,7 @@ public:
XRMResMerge(
const ByteString &rMergeSource,
const ByteString &rOutputFile,
- BOOL bErrorLog
+ BOOL bErrorLog , ByteString &rFilename
);
virtual ~XRMResMerge();
};