l10ntools/inc/xmlparse.hxx | 1 -
l10ntools/source/cfgmerge.cxx | 12 ------------
l10ntools/source/export.cxx | 11 +----------
l10ntools/source/export2.cxx | 1 -
l10ntools/source/helpex.cxx | 13 ++-----------
l10ntools/source/lngex.cxx | 9 ++-------
l10ntools/source/localize.cxx | 10 +++++-----
l10ntools/source/xrmlex.l | 1 -
l10ntools/source/xrmmerge.cxx | 13 -------------
9 files changed, 10 insertions(+), 61 deletions(-)
New commits:
commit e0dc7d906b3bcd505c1c256f630fed774c5e5424
Author: Andras Timar <ati...@suse.com>
Date: Tue Sep 20 10:22:08 2011 +0200
remove obsolete command line switches -UTF8 and -NOUTF8
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 8a49914..1fc568e 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 b1670e2..d31ed2b 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 b6a0199..20b5e3f 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 f9c286f..1f70e20 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 c8a8d34..9dde5cb 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 80e5979..586223a 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;
}
commit 1536203ed26199b340a04e8f0a30c6a904ba8d1d
Author: Andras Timar <ati...@suse.com>
Date: Tue Sep 20 09:53:44 2011 +0200
remove unused MAX_LANGUAGES definition
diff --git a/l10ntools/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 97e56df..b2603c0 100644
--- a/l10ntools/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.hxx
@@ -60,7 +60,6 @@ using namespace std;
#define XML_NODE_TYPE_DATA 0x003
#define XML_NODE_TYPE_COMMENT 0x004
#define XML_NODE_TYPE_DEFAULT 0x005
-#define MAX_LANGUAGES 99
//-------------------------------------------------------------------------
commit 883988e3e49885aff5c7885c1334711c0c952e2f
Author: Andras Timar <ati...@suse.com>
Date: Tue Sep 20 09:50:10 2011 +0200
remove obsolete command line switch -ISO99
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 047839c..8a49914 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -50,7 +50,6 @@ extern "C" { int YYWarning( char * ); }
#define STATE_ERRORLOG 0x0007
#define STATE_UTF8 0x0008
#define STATE_LANGUAGES 0X0009
-#define STATE_ISOCODE99 0x000A
#define STATE_FORCE 0x000B
// set of global variables
@@ -129,9 +128,6 @@ extern char *GetOutputFile( int argc, char* argv[])
else if ( sSwitch == "-L" ) {
nState = STATE_LANGUAGES;
}
- else if ( sSwitch.ToUpperAscii() == "-ISO99" ) {
- nState = STATE_ISOCODE99;
- }
else {
switch ( nState ) {
case STATE_NON: {
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx
index 1494787..64379d4 100644
--- a/l10ntools/source/export2.cxx
+++ b/l10ntools/source/export2.cxx
@@ -94,7 +94,6 @@ ResData::~ResData()
/*****************************************************************************/
ByteString Export::sLanguages;
ByteString Export::sForcedLanguages;
-//ByteString Export::sIsoCode99;
/*****************************************************************************/
void Export::DumpExportList( ByteString& sListName , ExportList& aList ){
diff --git a/l10ntools/source/xrmlex.l b/l10ntools/source/xrmlex.l
index 034812c..29b2081 100644
--- a/l10ntools/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -197,7 +197,6 @@ main( int argc, char* argv[])
fprintf( stdout, " f1, f2,... are also elements of
(de,en-US,es...)\n" );
fprintf( stdout, " Example: -L en-US,es=de\n" );
fprintf( stdout, " Restriction to es and en-US, de
will be fallback for 99\n" );
-// fprintf( stdout, " -ISO99: IsoCode is the full qualified ISO
language code for language 99" );
return 1;
}
pFile = GetXrmFile();
diff --git a/l10ntools/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index 436c373..80e5979 100644
--- a/l10ntools/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.cxx
@@ -54,7 +54,6 @@ extern "C" { int YYWarning( char * ); }
#define STATE_ERRORLOG 0x0007
#define STATE_UTF8 0x000B
#define STATE_LANGUAGES 0x000C
-#define STATE_ISOCODE99 0x000D
// set of global variables
sal_Bool bEnableExport;
@@ -121,9 +120,6 @@ extern char *GetOutputFile( int argc, char* argv[])
else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-L" ) {
nState = STATE_LANGUAGES;
}
- else if ( ByteString( argv[ i ] ).ToUpperAscii() == "-ISO99" ) {
- nState = STATE_ISOCODE99;
- }
else {
switch ( nState ) {
case STATE_NON: {
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
