WaE and build errors with OSL_DEBUG_LEVEL == 2

6 files changed, 14 insertions, 10 deletions

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
index a74c62db2d5c..f0b9d64859f9 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/cpp2uno.cxx
@@ -435,7 +435,7 @@ unsigned char * codeSnippet( unsigned char * code,
 #if OSL_DEBUG_LEVEL > 1
     fprintf(stderr,
             "==> codeSnippet, functionIndex=%d%s, vtableOffset=%d\n",
-            nFunctionIndex), (bHasHiddenParam ? "|0x80000000":""), nVtableOffset);
+            nFunctionIndex, (bHasHiddenParam ? "|0x80000000":""), nVtableOffset);
 #endif
 
     return code + codeSnippetSize;
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 6152e4cd8d98..d043b888df83 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -249,12 +249,15 @@ get_md5hash( rtl_uString *pText )
     sal_uInt32 md5_key_len = 0;
     sal_uInt8* md5_buf = NULL;
     sal_uInt32 i = 0;
+#if OSL_DEBUG_LEVEL > 1
+    rtl_String *pOut;
+#endif
 
     if ( !pText )
         return NULL;
 
 #if OSL_DEBUG_LEVEL > 1
-    rtl_String *pOut = ustr_to_str( pText );
+    pOut = ustr_to_str( pText );
     fprintf (stderr, "Generate pipe md5 for '%s'\n", pOut->buffer);
     rtl_string_release( pOut );
 #endif
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 892e88f7fa75..d70338fe5615 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -692,8 +692,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
         }
 #endif
 #if OSL_DEBUG_LEVEL >= 2
-        JFW_TRACE2(OString("VM option: ") + OString(options[n].optionString) +
-                   OString("\n"));
+        JFW_TRACE2("VM option: " << options[n].optionString << "\n");
 #endif
         ++n;
     }
diff --git a/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
index 3f5e03a0b5b7..2d5f747ee0e0 100644
--- a/rsc/source/rscpp/cpp4.c
+++ b/rsc/source/rscpp/cpp4.c
@@ -26,6 +26,7 @@
  *
  ************************************************************************/
 
+#include        <sal/types.h>
 #include        <stdio.h>
 #include        <ctype.h>
 #include        "cppdef.h"
@@ -622,7 +623,7 @@ void dumpparm(char* why)
 {
         register int    i;
 
-    fprintf( pCppOut, "dump of %d parameters (%d bytes total) %s\n",
+    fprintf( pCppOut, "dump of %d parameters (%" SAL_PRI_SIZET "u bytes total) %s\n",
             nargs, parmp - parm, why);
         for (i = 0; i < nargs; i++) {
         fprintf( pCppOut, "parm[%d] (%d) = \"%s\"\n",
diff --git a/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
index cb628ba4c04d..0fb51d75c42f 100644
--- a/rsc/source/rscpp/cpp6.c
+++ b/rsc/source/rscpp/cpp6.c
@@ -26,6 +26,7 @@
  *
  ************************************************************************/
 
+#include        <sal/types.h>
 #include        <stdio.h>
 #include        <ctype.h>
 #include        <string.h>
@@ -667,7 +668,7 @@ void dumpdef(char *why)
         fprintf( pCppOut, "CPP symbol table dump %s\n", why);
         for (syp = symtab; syp < &symtab[SBSIZE]; syp++) {
             if ((dp = *syp) != (DEFBUF *) NULL) {
-                fprintf( pCppOut, "symtab[%d]\n", (syp - symtab));
+                fprintf( pCppOut, "symtab[%" SAL_PRI_PTRDIFFT "d]\n", (syp - symtab));
                 do {
                     dumpadef((char *) NULL, dp);
                 } while ((dp = dp->link) != (DEFBUF *) NULL);
diff --git a/vcl/generic/fontmanager/fontcache.cxx b/vcl/generic/fontmanager/fontcache.cxx
index 6b1551e1e4e0..12767f9822e8 100644
--- a/vcl/generic/fontmanager/fontcache.cxx
+++ b/vcl/generic/fontmanager/fontcache.cxx
@@ -116,7 +116,7 @@ void FontCache::flush()
     if( ! (aStream.IsOpen() && aStream.IsWritable()) )
     {
 #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "FontCache::flush: opening cache file %s failed\n", ByteString( m_aCacheFile, osl_getThreadTextEncoding() ).GetBuffer() );
+        fprintf( stderr, "FontCache::flush: opening cache file %s failed\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
 #endif
         return;
     }
@@ -131,7 +131,7 @@ void FontCache::flush()
     {
         const FontDirMap& rDir( dir_it->second.m_aEntries );
 
-        ByteString aDirectory( rManager.getDirectory( dir_it->first ) );
+        rtl::OString aDirectory(rManager.getDirectory(dir_it->first));
         rtl::OStringBuffer aLine(
             RTL_CONSTASCII_STRINGPARAM("FontCacheDirectory:"));
         aLine.append(dir_it->second.m_nTimestamp);
@@ -259,7 +259,7 @@ void FontCache::read()
     if( ! aStream.IsOpen() )
     {
 #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "FontCache::read: opening cache file %s failed\n", ByteString( m_aCacheFile, osl_getThreadTextEncoding() ).GetBuffer() );
+        fprintf( stderr, "FontCache::read: opening cache file %s failed\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
 #endif
         return;
     }
@@ -270,7 +270,7 @@ void FontCache::read()
     if( !aLine.Equals( CACHE_MAGIC ) )
     {
         #if OSL_DEBUG_LEVEL >1
-        fprintf( stderr, "FontCache::read: cache file %s fails magic test\n", ByteString( m_aCacheFile, osl_getThreadTextEncoding() ).GetBuffer() );
+        fprintf( stderr, "FontCache::read: cache file %s fails magic test\n", rtl::OUStringToOString(m_aCacheFile, osl_getThreadTextEncoding()).getStr() );
         #endif
         return;
     }