diff options
author | Andras Timar <atimar@suse.com> | 2011-09-20 10:22:08 +0200 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2011-09-20 10:23:32 +0200 |
commit | e0dc7d906b3bcd505c1c256f630fed774c5e5424 (patch) | |
tree | 51be33ce66c9d44b442f9332de239f38ce1045a8 | |
parent | remove unused MAX_LANGUAGES definition (diff) | |
download | core-e0dc7d906b3bcd505c1c256f630fed774c5e5424.tar.gz core-e0dc7d906b3bcd505c1c256f630fed774c5e5424.zip |
remove obsolete command line switches -UTF8 and -NOUTF8
-rw-r--r-- | l10ntools/source/cfgmerge.cxx | 8 | ||||
-rw-r--r-- | l10ntools/source/export.cxx | 11 | ||||
-rw-r--r-- | l10ntools/source/helpex.cxx | 13 | ||||
-rw-r--r-- | l10ntools/source/lngex.cxx | 9 | ||||
-rw-r--r-- | l10ntools/source/localize.cxx | 10 | ||||
-rw-r--r-- | l10ntools/source/xrmmerge.cxx | 9 |
6 files changed, 10 insertions, 50 deletions
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx index 8a499143e232..1fc568eaac94 100644 --- a/l10ntools/source/cfgmerge.cxx +++ b/l10ntools/source/cfgmerge.cxx @@ -113,14 +113,6 @@ extern char *GetOutputFile( int argc, char* argv[]) nState = STATE_ERRORLOG; bErrorLog = sal_False; } - else if ( sSwitch == "-UTF8" ) { - nState = STATE_UTF8; - bUTF8 = sal_True; - } - else if ( sSwitch == "-NOUTF8" ) { - nState = STATE_UTF8; - bUTF8 = sal_False; - } else if ( sSwitch == "-F" ) { nState = STATE_FORCE; bForce = sal_True; diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index b1670e23a7db..d31ed2b16c67 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -55,8 +55,7 @@ Export *pExport = 0L; #define STATE_ERRORLOG 0x0007 #define STATE_BREAKHELP 0x0008 #define STATE_UNMERGE 0x0009 -#define STATE_UTF8 0x000A -#define STATE_LANGUAGES 0X000B +#define STATE_LANGUAGES 0X000A // set of global variables typedef ::std::vector< ByteString* > FileList; @@ -138,14 +137,6 @@ extern char *GetOutputFile( int argc, char* argv[]) bUnmerge = sal_True; bMergeMode = sal_True; } - else if ( sSwitch.ToUpperAscii() == "-UTF8" ) { - nState = STATE_UTF8; - bUTF8 = sal_True; - } - else if ( sSwitch.ToUpperAscii() == "-NOUTF8" ) { - nState = STATE_UTF8; - bUTF8 = sal_False; - } else if ( sSwitch == "-l" || sSwitch == "-L" ) { nState = STATE_LANGUAGES; } diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index b6a019934fa9..20b5e3f380b9 100644 --- a/l10ntools/source/helpex.cxx +++ b/l10ntools/source/helpex.cxx @@ -44,9 +44,8 @@ #define STATE_ERRORLOG 0x0007 #define STATE_BREAKHELP 0x0008 #define STATE_UNMERGE 0x0009 -#define STATE_UTF8 0x000A -#define STATE_LANGUAGES 0x000B -#define STATE_FORCE_LANGUAGES 0x000C +#define STATE_LANGUAGES 0x000A +#define STATE_FORCE_LANGUAGES 0x000B #define STATE_OUTPUTX 0xfe #define STATE_OUTPUTY 0xff @@ -110,14 +109,6 @@ sal_Bool ParseCommandLine( int argc, char* argv[]) nState = STATE_ERRORLOG; bErrorLog = sal_False; } - else if ( ByteString( argv[ i ]).ToUpperAscii() == "-UTF8" ) { - nState = STATE_UTF8; - bUTF8 = sal_True; - } - else if ( ByteString( argv[ i ]).ToUpperAscii() == "-NOUTF8" ) { - nState = STATE_UTF8; - bUTF8 = sal_False; - } else if ( ByteString( argv[ i ]).ToUpperAscii() == "-L" ) { nState = STATE_LANGUAGES; } diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index f9c286f43b25..1f70e20a3749 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -43,9 +43,8 @@ #define STATE_ERRORLOG 0x0007 #define STATE_BREAKHELP 0x0008 #define STATE_UNMERGE 0x0009 -#define STATE_UTF8 0x000A -#define STATE_ULF 0x000B -#define STATE_LANGUAGES 0x000C +#define STATE_ULF 0x000A +#define STATE_LANGUAGES 0x000B // set of global variables ByteString sInputFile; @@ -98,10 +97,6 @@ sal_Bool ParseCommandLine( int argc, char* argv[]) nState = STATE_ERRORLOG; bErrorLog = sal_False; } - else if ( sSwitch == "-UTF8" ) { - nState = STATE_UTF8; - bUTF8 = sal_True; - } else if ( sSwitch == "-L" ) { nState = STATE_LANGUAGES; } diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index c8a8d340cbf0..9dde5cb0988d 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -53,12 +53,12 @@ namespace transex3 // const char *ExeTable[][5] = { - { "src", "transex3", " -UTF8 -e", "negative", "noiso" }, - { "hrc", "transex3", " -UTF8 -e", "positive", "noiso" }, + { "src", "transex3", " -e", "negative", "noiso" }, + { "hrc", "transex3", " -e", "positive", "noiso" }, { "ulf", "ulfex", " -e", "negative", "noiso" }, - { "xcd", "cfgex", "-UTF8 -e", "negative", "iso" }, - { "xcu", "cfgex", "-UTF8 -e", "negative", "iso" }, - { "xrm", "xrmex", "-UTF8 -e", "negative", "iso" }, + { "xcd", "cfgex", " -e", "negative", "iso" }, + { "xcu", "cfgex", " -e", "negative", "iso" }, + { "xrm", "xrmex", " -e", "negative", "iso" }, { "xhp", "helpex", " -e", "negative", "noiso" }, { "NULL", "NULL", "NULL", "NULL", "NULL" } }; diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx index 80e5979ad12f..586223a86ef4 100644 --- a/l10ntools/source/xrmmerge.cxx +++ b/l10ntools/source/xrmmerge.cxx @@ -52,7 +52,6 @@ extern "C" { int YYWarning( char * ); } #define STATE_ROOT 0x0005 #define STATE_MERGESRC 0x0006 #define STATE_ERRORLOG 0x0007 -#define STATE_UTF8 0x000B #define STATE_LANGUAGES 0x000C // set of global variables @@ -109,14 +108,6 @@ extern char *GetOutputFile( int argc, char* argv[]) nState = STATE_ERRORLOG; bErrorLog = sal_False; } - else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-UTF8" ) { - nState = STATE_UTF8; - bUTF8 = sal_True; - } - else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-NOUTF8" ) { - nState = STATE_UTF8; - bUTF8 = sal_False; - } else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-L" ) { nState = STATE_LANGUAGES; } |