summaryrefslogtreecommitdiff
path: root/transex3/inc
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2004-08-30 16:28:25 +0000
committerKurt Zenker <kz@openoffice.org>2004-08-30 16:28:25 +0000
commit6dfc525765e214a7c99b0f16303bc6a6c536f304 (patch)
treeb0f23b5ef61fed6c7009cbbeff062bee36ba281a /transex3/inc
parentc87a7a611a1413df4175a0b65ced1ba3f56e427e (diff)
INTEGRATION: CWS help2 (1.7.12); FILE MERGED
2004/07/13 16:50:01 ihi 1.7.12.4: #104752# Forced Language switch 2004/07/07 17:21:31 ihi 1.7.12.3: RESYNC: (1.7-1.8); FILE MERGED 2004/05/18 16:34:44 ihi 1.7.12.2: cvs fix 2004/05/18 16:32:57 ihi 1.7.12.1: Assertion log fix / mergebuild join
Diffstat (limited to 'transex3/inc')
-rw-r--r--transex3/inc/export.hxx14
1 files changed, 9 insertions, 5 deletions
diff --git a/transex3/inc/export.hxx b/transex3/inc/export.hxx
index 30e4246bf209..41b8d2829d45 100644
--- a/transex3/inc/export.hxx
+++ b/transex3/inc/export.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: export.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: hjs $ $Date: 2004-06-25 12:39:13 $
+ * last change: $Author: kz $ $Date: 2004-08-30 17:28:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -307,12 +307,15 @@ private:
public:
ParserQueue* pParseQueue; // public ?
-
- static ByteString sLanguages;
+ static ByteString sLanguages; // public ?
+ static ByteString sForcedLanguages; // public ?
static ByteString sIsoCode99;
static void InitLanguages( bool bMergeMode = false );
+ static void InitForcedLanguages( bool bMergeMode = false );
static std::vector<ByteString> GetLanguages();
+ static std::vector<ByteString> GetForcedLanguages();
+
static void SetLanguages( std::vector<ByteString> val );
static USHORT GetLangIndex( USHORT nLangId );
static CharSet GetCharSet( USHORT nLangId );
@@ -332,9 +335,9 @@ public:
static BOOL ConvertLineEnds( ByteString sSource, ByteString sDestination );
static ByteString GetNativeFile( ByteString sSource );
static DirEntry GetTempFile();
-
private:
static std::vector<ByteString> aLanguages;
+ static std::vector<ByteString> aForcedLanguages;
BOOL CreateRefIds( ResData *pResData ) { /* Dummy !!! */ return TRUE; }
BOOL ListExists( ResData *pResData, USHORT nLst );
@@ -345,6 +348,7 @@ private:
ByteString FullId(); // creates cur. GID
+ void UnmergeUTF8( ByteString& sOrig );
void InsertListEntry( const ByteString &rText, const ByteString &rLine );
void CleanValue( ByteString &rValue );
ByteString GetText( const ByteString &rSource, USHORT nToken );