CWS-TOOLING: integrate CWS os2port04

2008-11-27 13:22:38 +0100 ydario  r264480 : #i96439#: fix build for unix platforms.
2008-11-26 18:32:42 +0100 ydario  r264433 : #i96439#: os2 systemshell code (dummy code).
2008-11-26 16:33:48 +0100 ydario  r264421 : #i96439#: vcl fix for pdf export of truetype fonts.
2008-11-26 15:04:44 +0100 ydario  r264399 : #i96439#: build macros fix scripts, gcc specific flags.
2008-11-26 15:00:15 +0100 ydario  r264398 : #i96439#: vcl source code updates.
2008-11-26 13:21:37 +0100 ydario  r264378 : #i96439#: os2 build system fixes.
2008-11-26 13:20:27 +0100 ydario  r264377 : #i96439#: configuration and build macros updates.
2008-11-26 13:16:35 +0100 ydario  r264375 : #i96439#: new launcher code, build system updates.
2008-11-26 13:12:49 +0100 ydario  r264373 : #i96439#: use OSL endian macro.
2008-11-26 12:54:50 +0100 ydario  r264371 : #i96439#: os2 build system fixes.
2008-11-26 12:30:46 +0100 ydario  r264367 : #i96439#: os2 build system fixes.
2008-11-26 12:09:33 +0100 ydario  r264365 : #i96439#: _Export is a reserved keyword under gcc for os2.
2008-11-26 12:08:12 +0100 ydario  r264364 : #i96439#: new libpath handling.
2008-11-26 11:57:51 +0100 ydario  r264363 : #i96439#: use C call, generates proper stabs; fix rtti names.

9 files changed, 13 insertions, 13 deletions

diff --git a/transex3/source/gsicheck.cxx b/transex3/source/gsicheck.cxx
index cb8ded314d8a..99183602f951 100644
--- a/transex3/source/gsicheck.cxx
+++ b/transex3/source/gsicheck.cxx
@@ -444,7 +444,7 @@ BOOL GSIBlock::IsUTF8( const ByteString &aTestee, BOOL bFixTags, USHORT &nErrorP
             }
         }
 
-        ByteString aDelimiter( String( sal_Unicode(0x2016) ), RTL_TEXTENCODING_UTF8 );
+        ByteString aDelimiter( (String)String( sal_Unicode(0x2016) ), RTL_TEXTENCODING_UTF8 );
 
         if ( aID.Equals( aDelimiter, 6, aDelimiter.Len() ) )
         {   // New KeyId     6 Letters, digits and spechial chars followed by delimiter
@@ -780,7 +780,7 @@ void Help()
 }
 
 /*****************************************************************************/
-#if defined( UNX )
+#if defined(UNX) || defined(OS2)
 int main( int argc, char *argv[] )
 #else
 int _cdecl main( int argc, char *argv[] )
diff --git a/transex3/source/gsiconv.cxx b/transex3/source/gsiconv.cxx
index 67eb6215335c..f6dea76ebb51 100644
--- a/transex3/source/gsiconv.cxx
+++ b/transex3/source/gsiconv.cxx
@@ -201,7 +201,7 @@ void Help()
 }
 
 /*****************************************************************************/
-#if defined( UNX )
+#if defined(UNX) || defined(OS2)
 int main( int argc, char *argv[] )
 #else
 int _cdecl main( int argc, char *argv[] )
diff --git a/transex3/source/helpex.cxx b/transex3/source/helpex.cxx
index bb7362914b72..f4a1589b530e 100644
--- a/transex3/source/helpex.cxx
+++ b/transex3/source/helpex.cxx
@@ -210,7 +210,7 @@ void Help()
 /*****************************************************************************/
 #ifndef TESTDRIVER
 
-#if defined( UNX )
+#if defined(UNX) || defined(OS2)
 int main( int argc, char *argv[] )
 #else
 int _cdecl main( int argc, char *argv[] )
diff --git a/transex3/source/helpmerge.cxx b/transex3/source/helpmerge.cxx
index 27ee6b2d047a..8aafc692f14c 100644
--- a/transex3/source/helpmerge.cxx
+++ b/transex3/source/helpmerge.cxx
@@ -493,7 +493,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
 
     if( !Export::CopyFile( sTempFile , sTempFileCopy ) )
     {
-#ifdef UNX
+#if defined(UNX) || defined(OS2)
         sleep( 3 );
 #else
         Sleep( 3 );
@@ -512,7 +512,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
         remove( sTargetFile.GetBuffer() );
     }
     int rc;
-#ifdef UNX
+#if defined(UNX) || defined(OS2)
     rc = rename( sTempFile.GetBuffer() , sTargetFile.GetBuffer() );
 #else
     rc = MoveFileEx( sTempFile.GetBuffer() , sTargetFile.GetBuffer(), MOVEFILE_REPLACE_EXISTING );
@@ -528,7 +528,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
 //    if( aFS.GetSize() < 1 )
 //#endif
     {
-#ifdef UNX
+#if defined(UNX) || defined(OS2)
         sleep( 3 );
 #else
         Sleep( 3 );
@@ -538,7 +538,7 @@ bool HelpParser::MergeSingleFile( XMLFile* file , MergeDataFile& aMergeDataFile
         {
             remove( sTargetFile.GetBuffer() );
         }
-#ifdef UNX
+#if defined(UNX) || defined(OS2)
         rc = rename( sTempFileCopy.GetBuffer() , sTargetFile.GetBuffer() );
 #else
         rc = MoveFileEx( sTempFileCopy.GetBuffer() , sTargetFile.GetBuffer() , MOVEFILE_REPLACE_EXISTING );
diff --git a/transex3/source/lngex.cxx b/transex3/source/lngex.cxx
index a73afb09d59c..53c97de6e045 100644
--- a/transex3/source/lngex.cxx
+++ b/transex3/source/lngex.cxx
@@ -191,7 +191,7 @@ void Help()
 }
 
 /*****************************************************************************/
-#if defined( UNX )
+#if defined(UNX) || defined(OS2)
 int main( int argc, char *argv[] )
 #else
 int _cdecl main( int argc, char *argv[] )
diff --git a/transex3/source/localize.cxx b/transex3/source/localize.cxx
index c03c885b0c51..1d7e17c7df7c 100644
--- a/transex3/source/localize.cxx
+++ b/transex3/source/localize.cxx
@@ -835,7 +835,7 @@ BOOL CheckLanguages( ByteString &rLanguages )
 }
 
 /*****************************************************************************/
-#if defined( UNX )
+#if defined(UNX) || defined(OS2)
 int main( int argc, char *argv[] )
 #else
 int _cdecl main( int argc, char *argv[] )
diff --git a/transex3/source/txtconv.cxx b/transex3/source/txtconv.cxx
index a497a925b56e..2f442b80a83d 100644
--- a/transex3/source/txtconv.cxx
+++ b/transex3/source/txtconv.cxx
@@ -70,7 +70,7 @@ void Help()
 }
 
 /*****************************************************************************/
-#if defined( UNX )
+#if defined(UNX) || defined(OS2)
 int main( int argc, char *argv[] )
 #else
 int _cdecl main( int argc, char *argv[] )
diff --git a/transex3/source/xgfconv.cxx b/transex3/source/xgfconv.cxx
index 21b2ae484e17..76ea1a2906a8 100644
--- a/transex3/source/xgfconv.cxx
+++ b/transex3/source/xgfconv.cxx
@@ -7,7 +7,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_transex3.hxx"
-#if defined( UNX )
+#if defined(UNX) || defined(OS2)
 int main( int argc, char *argv[] )
 #else
 int _cdecl main( int argc, char *argv[] )
diff --git a/transex3/source/xmlparse.cxx b/transex3/source/xmlparse.cxx
index 61fada5b0d3e..eefcfc9b3de6 100644
--- a/transex3/source/xmlparse.cxx
+++ b/transex3/source/xmlparse.cxx
@@ -278,7 +278,7 @@ BOOL XMLFile::Write( ByteString &aFilename )
             if( !aFStream )     // From time to time the stream can not be opened the first time on NFS volumes,
             {                   // I wasn't able to track this down. I think this is an NFS issue .....
                 //cerr << "ERROR: - helpex - Can't write to tempfile " << aFilename.GetBuffer() << " No#" << x << "\n";
-#ifdef UNX
+#if defined(UNX) || defined(OS2)
                 sleep( 3 );
 #else
                 Sleep( 3 );