diff options
author | Oliver Bolte <obo@openoffice.org> | 2006-03-29 12:24:57 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2006-03-29 12:24:57 +0000 |
commit | 638a06d0179c912958460a6b591880f4405e3709 (patch) | |
tree | 03a40bb313c2f8d87fe9d2b84770cd06a465aa59 /transex3/inc | |
parent | 662ae06f899f0cf13768899562aff59200bed98d (diff) |
INTEGRATION: CWS hc2opti (1.4.12); FILE MERGED
2006/02/24 17:10:21 ihi 1.4.12.1: #i55666# hc2 build speedup
Diffstat (limited to 'transex3/inc')
-rw-r--r-- | transex3/inc/cfgmerge.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/transex3/inc/cfgmerge.hxx b/transex3/inc/cfgmerge.hxx index f192b34bc02b..9d89b5ae0d48 100644 --- a/transex3/inc/cfgmerge.hxx +++ b/transex3/inc/cfgmerge.hxx @@ -4,9 +4,9 @@ * * $RCSfile: cfgmerge.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-09 14:54:49 $ + * last change: $Author: obo $ $Date: 2006-03-29 13:24:57 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -207,6 +207,7 @@ private: MergeDataFile *pMergeDataFile; std::vector<ByteString> aLanguages; ResData *pResData; + ByteString sFilename; BOOL bGerman; BOOL bEnglish; @@ -225,7 +226,7 @@ public: CfgMerge( const ByteString &rMergeSource, const ByteString &rOutputFile, - BOOL bErrorLog + BOOL bErrorLog , ByteString &rFilename ); virtual ~CfgMerge(); }; |