diff options
Diffstat (limited to 'l10ntools/source/export.cxx')
| -rw-r--r-- | l10ntools/source/export.cxx | 31 |
1 files changed, 3 insertions, 28 deletions
diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx index 3d69d84f238f..1dabc8d02290 100644 --- a/l10ntools/source/export.cxx +++ b/l10ntools/source/export.cxx @@ -180,7 +180,6 @@ Export::Export(const OString &rOutput) nList( LIST_NON ), nListIndex( 0 ), nListLevel( 0 ), - bSkipFile( false ), bMergeMode( false ), bError( sal_False ), bReadOver( sal_False ), @@ -205,7 +204,6 @@ Export::Export( nList( LIST_NON ), nListIndex( 0 ), nListLevel( 0 ), - bSkipFile( false ), bMergeMode( sal_True ), sMergeSrc( rMergeSource ), bError( sal_False ), @@ -304,14 +302,6 @@ int Export::Execute( int nToken, const char * pToken ) WriteToMerged( sOrig , false ); return 0; } - // #define NO_LOCALIZE_EXPORT - if( bSkipFile ){ - if ( bMergeMode ) { - WriteToMerged( sOrig , false ); - } - return 1; - } - if ( bDefine ) { if (( nToken != EMPTYLINE ) && ( nToken != LEVELDOWN ) && ( nToken != LEVELUP )) { @@ -361,24 +351,9 @@ int Export::Execute( int nToken, const char * pToken ) switch ( nToken ) { case NORMDEFINE: - sToken = sToken.replace('\r', ' ').replace('\t', ' '); - for (;;) { - sal_Int32 n = 0; - sToken = sToken.replaceFirst(" ", " ", &n); - if (n == -1) { - break; - } - } - if( sToken.equalsIgnoreAsciiCase("#define NO_LOCALIZE_EXPORT") ){ - bSkipFile = true; - return 0; - } - if ( bMergeMode ) - WriteToMerged( sOrig , false ); - - return 0; - - + if ( bMergeMode ) + WriteToMerged( sOrig , false ); + return 0; case RSCDEFINE: bDefine = sal_True; // res. defined in macro |