summaryrefslogtreecommitdiff
path: root/transex3/inc
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-03-06 11:33:58 +0000
committerKurt Zenker <kz@openoffice.org>2008-03-06 11:33:58 +0000
commit6137794a2f977a962862a53eb19cdfc4f2d71cf4 (patch)
tree31552fdce0db2d3e0721016ca43d661fae53c65a /transex3/inc
parent9c80128592d816cb13e48bf95d1d1cf3839ca5bf (diff)
INTEGRATION: CWS layout_DEV300 (1.8.68); FILE MERGED
2008/02/11 15:33:48 jcn 1.8.68.1: Initial import into layout cws.
Diffstat (limited to 'transex3/inc')
-rw-r--r--transex3/inc/helpmerge.hxx9
1 files changed, 5 insertions, 4 deletions
diff --git a/transex3/inc/helpmerge.hxx b/transex3/inc/helpmerge.hxx
index 5c92019332e4..08eedadf1957 100644
--- a/transex3/inc/helpmerge.hxx
+++ b/transex3/inc/helpmerge.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: helpmerge.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: vg $ $Date: 2006-11-22 10:43:33 $
+ * last change: $Author: kz $ $Date: 2008-03-06 12:33:58 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -53,7 +53,7 @@ private:
/// Copy fallback language String (ENUS,DE) into position of the numeric language iso code
/// @PRECOND 0 < langIdx_in < MAX_IDX
- void FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in );
+ static void FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in );
/// Debugmethod, prints the content of the map to stdout
static void Dump( LangHashMap* rElem_in , const ByteString sKey_in );
@@ -69,7 +69,8 @@ public:
/// Method creates/append a SDF file with the content of a parsed XML file
/// @PRECOND rHelpFile is valid
- bool CreateSDF( const ByteString &rSDFFile_in, const ByteString &rPrj_in, const ByteString &rRoot_in );
+ static bool CreateSDF( const ByteString &rSDFFile_in, const ByteString &rPrj_in, const ByteString &rRoot_in,
+ const ByteString &sHelpFile, XMLFile *pXmlFile, const ByteString &rGsi1 );
static void parse_languages( std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile );