diff options
Diffstat (limited to 'l10ntools')
-rw-r--r-- | l10ntools/source/export2.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/filter/merge/makefile.mk | 2 | ||||
-rw-r--r-- | l10ntools/source/gsicheck.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/gsiconv.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/help/HelpLinker.cxx | 4 | ||||
-rw-r--r-- | l10ntools/source/helpex.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/helpmerge.cxx | 8 | ||||
-rw-r--r-- | l10ntools/source/lngex.cxx | 2 | ||||
-rw-r--r-- | l10ntools/source/localize.cxx | 6 | ||||
-rw-r--r-- | l10ntools/source/tagtest.cxx | 3 | ||||
-rw-r--r-- | l10ntools/source/xgfconv.cxx | 2 |
11 files changed, 14 insertions, 21 deletions
diff --git a/l10ntools/source/export2.cxx b/l10ntools/source/export2.cxx index 5659123304c8..6e6a6d118323 100644 --- a/l10ntools/source/export2.cxx +++ b/l10ntools/source/export2.cxx @@ -690,7 +690,7 @@ DirEntry Export::GetTempFile() String sDecodedStr = INetURLObject::decode( strTmp , '%' , eMechanism ); ByteString sTmp( sDecodedStr , RTL_TEXTENCODING_UTF8 ); -#if defined(WNT) || defined(OS2) +#if defined(WNT) sTmp.SearchAndReplace("file:///",""); sTmp.SearchAndReplaceAll('/','\\'); #else diff --git a/l10ntools/source/filter/merge/makefile.mk b/l10ntools/source/filter/merge/makefile.mk index b66e5b27e6a1..8ef73debd743 100644 --- a/l10ntools/source/filter/merge/makefile.mk +++ b/l10ntools/source/filter/merge/makefile.mk @@ -65,7 +65,7 @@ JARCOMPRESS = TRUE .INCLUDE : target.mk -.IF "$(SOLAR_JAVA)" != "" || "$(GUI)"=="OS2" +.IF "$(SOLAR_JAVA)" != "" ALLTAR : $(OWNCOPY) .IF "$(JARTARGETN)" != "" diff --git a/l10ntools/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx index 7c5c0b9bef40..89fb66775d54 100644 --- a/l10ntools/source/gsicheck.cxx +++ b/l10ntools/source/gsicheck.cxx @@ -775,7 +775,7 @@ void Help() } /*****************************************************************************/ -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) diff --git a/l10ntools/source/gsiconv.cxx b/l10ntools/source/gsiconv.cxx index 7fd345b6e3aa..06d203d1fb21 100644 --- a/l10ntools/source/gsiconv.cxx +++ b/l10ntools/source/gsiconv.cxx @@ -199,7 +199,7 @@ void Help() } /*****************************************************************************/ -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) diff --git a/l10ntools/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx index 4bcdef565e90..81a96ce37899 100644 --- a/l10ntools/source/help/HelpLinker.cxx +++ b/l10ntools/source/help/HelpLinker.cxx @@ -486,10 +486,8 @@ void HelpLinker::link() throw( HelpProcessingException ) if( !bExtensionMode ) { -#ifndef OS2 // YD @TODO@ crashes libc runtime :-( std::cout << "Making " << outputFile.native_file_string() << " from " << helpFiles.size() << " input files" << std::endl; -#endif } // here we start our loop over the hzip files. @@ -1060,9 +1058,7 @@ int main(int argc, char**argv) exit(1); } sal_uInt32 endtime = osl_getGlobalTimer(); -#ifndef OS2 // YD @TODO@ crashes libc runtime :-( std::cout << "time taken was " << (endtime-starttime)/1000.0 << " seconds" << std::endl; -#endif return 0; } diff --git a/l10ntools/source/helpex.cxx b/l10ntools/source/helpex.cxx index 74d183185cfa..e67f9793b899 100644 --- a/l10ntools/source/helpex.cxx +++ b/l10ntools/source/helpex.cxx @@ -201,7 +201,7 @@ void Help() /*****************************************************************************/ #ifndef TESTDRIVER -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx index a0032bc2558b..1905b7a9b2be 100644 --- a/l10ntools/source/helpmerge.cxx +++ b/l10ntools/source/helpmerge.cxx @@ -470,7 +470,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile if( !Export::CopyFile( sTempFile , sTempFileCopy ) ) { -#if defined(UNX) || defined(OS2) +#if defined(UNX) sleep( 3 ); #else Sleep( 3 ); @@ -488,7 +488,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile remove( sTargetFile.GetBuffer() ); } int rc; -#if defined(UNX) || defined(OS2) +#if defined(UNX) rc = rename( sTempFile.GetBuffer() , sTargetFile.GetBuffer() ); #else rc = MoveFileEx( sTempFile.GetBuffer() , sTargetFile.GetBuffer(), MOVEFILE_REPLACE_EXISTING ); @@ -504,7 +504,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile // if( aFS.GetSize() < 1 ) //#endif { -#if defined(UNX) || defined(OS2) +#if defined(UNX) sleep( 3 ); #else Sleep( 3 ); @@ -514,7 +514,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile { remove( sTargetFile.GetBuffer() ); } -#if defined(UNX) || defined(OS2) +#if defined(UNX) rc = rename( sTempFileCopy.GetBuffer() , sTargetFile.GetBuffer() ); #else rc = MoveFileEx( sTempFileCopy.GetBuffer() , sTargetFile.GetBuffer() , MOVEFILE_REPLACE_EXISTING ); diff --git a/l10ntools/source/lngex.cxx b/l10ntools/source/lngex.cxx index 723b54d21e01..f9c286f43b25 100644 --- a/l10ntools/source/lngex.cxx +++ b/l10ntools/source/lngex.cxx @@ -171,7 +171,7 @@ void Help() } /*****************************************************************************/ -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index fd49cadf256f..c6c38aa1850f 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -346,7 +346,7 @@ void SourceTreeLocalizer::WorkOnFile( ByteString sTempFile( aTemp.GetFull(), RTL_TEXTENCODING_ASCII_US ); ByteString sDel; -#if defined(WNT) || defined(OS2) +#if defined(WNT) sDel=ByteString("\\"); #else sDel=ByteString("/"); @@ -355,7 +355,7 @@ void SourceTreeLocalizer::WorkOnFile( ByteString sPath2( Export::GetEnv("INPATH") ); ByteString sPath3( "bin" ); ByteString sExecutable( sPath1 ); -#if defined(WNT) || defined(OS2) +#if defined(WNT) sExecutable.SearchAndReplaceAll( "/", sDel ); #endif sExecutable += sDel ; @@ -876,7 +876,7 @@ sal_Bool CheckLanguages( ByteString &rLanguages ) } /*****************************************************************************/ -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) diff --git a/l10ntools/source/tagtest.cxx b/l10ntools/source/tagtest.cxx index 65bd70a32ef4..c3706aa4cd30 100644 --- a/l10ntools/source/tagtest.cxx +++ b/l10ntools/source/tagtest.cxx @@ -953,7 +953,6 @@ void TokenParser::Paragraph() Paragraph(); } break; - case TAG_OS2: case TAG_WIN: case TAG_UNIX: case TAG_MAC: //... @@ -1016,7 +1015,6 @@ void TokenParser::PfCase() CaseEnd(); } break; - case TAG_OS2: case TAG_WIN: case TAG_UNIX: case TAG_MAC: //First (PfBegin) @@ -1035,7 +1033,6 @@ void TokenParser::PfCaseBegin() { switch ( aTag.nId ) { - case TAG_OS2: case TAG_WIN: case TAG_UNIX: case TAG_MAC: diff --git a/l10ntools/source/xgfconv.cxx b/l10ntools/source/xgfconv.cxx index 211ea3cad402..82d928b33008 100644 --- a/l10ntools/source/xgfconv.cxx +++ b/l10ntools/source/xgfconv.cxx @@ -8,7 +8,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_l10ntools.hxx" -#if defined(UNX) || defined(OS2) +#if defined(UNX) int main( int argc, char *argv[] ) #else int _cdecl main( int argc, char *argv[] ) |