4 files changed, 19 insertions, 16 deletions
diff --git a/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index c889001735fe..818e2066c221 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.cxx
@@ -69,14 +69,15 @@ ERRTYPE& ERRTYPE::operator = ( const ERRTYPE & rError )
 |*    Letzte Aenderung  MM 06.05.91
 |*
 *************************************************************************/
-void RscError::StdOut( const char * pStr )
+void RscError::StdOut( const char * pStr, const RscVerbosity _verbosityLevel )
 {
-#ifndef WIN
-    if( pStr ){
-        printf( "%s", pStr );
-        fflush( stdout );
+    if ( m_verbosity >= _verbosityLevel )
+    {
+        if( pStr ){
+            printf( "%s", pStr );
+            fflush( stdout );
+        }
     }
-#endif
 }
 
 /*************************************************************************
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index c95f1adc7b52..75f558398bb5 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.cxx
@@ -67,7 +67,7 @@ void RscTypCont::SETCONST( RscConst * pClass, const char * szString, UINT32 nVal
 void RscTypCont::SETCONST( RscConst * pClass, Atom nName, UINT32 nVal )
 {
 #if OSL_DEBUG_LEVEL > 2
-    fprintf( stderr, "setconst hash: %d\n", nName );
+    fprintf( stderr, "setconst hash: %u\n", (unsigned int)nName );
 #endif
     pClass->SetConstant( aNmTb.Put( nName,
                          CONSTNAME, nVal ), nVal );
@@ -106,9 +106,9 @@ void RscLangEnum::Init( RscNameTable& rNames )
     {
 #if OSL_DEBUG_LEVEL > 2
         fprintf( stderr, "ISO Language in : %d %d %s\n",
-                 nIndex,
-                 pLangEntry->meLang,
-                 MsLangId::convertLanguageToIsoByteString( pLangEntry->meLang ).GetBuffer() );
+                 (int)nIndex,
+                 pLangEntry->mnLang,
+                 MsLangId::convertLanguageToIsoByteString( pLangEntry->mnLang ).getStr() );
 #endif
         aLang = pLangEntry->maLangStr;
         aCountry = pLangEntry->maCountry;
@@ -118,7 +118,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
             if ( ! GetLangId( aLang ))
                 ULong_Iso_map[ aLang ] = mnLangId;
 #if OSL_DEBUG_LEVEL > 2
-            fprintf( stderr, "ISO Language out: %s 0x%hx\n", aLang.GetBuffer(), mnLangId );
+            fprintf( stderr, "ISO Language out: %s 0x%lx\n", aLang.GetBuffer(), mnLangId );
 #endif
             mnLangId++;
         }
@@ -128,7 +128,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
             if ( ! GetLangId( aLang ))
                 ULong_Iso_map[ aLang ] = mnLangId;
 #if OSL_DEBUG_LEVEL > 2
-            fprintf( stderr, "ISO Language out: %s 0x%hx", aLang.GetBuffer(), mnLangId );
+            fprintf( stderr, "ISO Language out: %s 0x%lx", aLang.GetBuffer(), mnLangId );
 #endif
             mnLangId++;
             aLang += csep;
@@ -137,7 +137,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
             if ( ! GetLangId( aLang ))
                 ULong_Iso_map[ aLang ] = mnLangId;
 #if OSL_DEBUG_LEVEL > 2
-            fprintf( stderr, " %s 0x%hx\n", aLang.GetBuffer(), mnLangId );
+            fprintf( stderr, " %s 0x%lx\n", aLang.GetBuffer(), mnLangId );
 #endif
             mnLangId++;
 // hack - survive "x-no-translate"
@@ -167,7 +167,7 @@ void RscLangEnum::Init( RscNameTable& rNames )
                 if ( ! GetLangId( aIsoToken ))
                     ULong_Iso_map[ aIsoToken ] = mnLangId;
 #if OSL_DEBUG_LEVEL > 2
-                fprintf( stderr, "Env ISO Language out: %s 0x%hx\n", aIsoToken.GetBuffer(), mnLangId );
+                fprintf( stderr, "Env ISO Language out: %s 0x%lx\n", aIsoToken.GetBuffer(), mnLangId );
 #endif
                 mnLangId++;
             }
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index e69094064754..9ae58087a335 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -1449,6 +1449,9 @@ RscTop * RscTypCont::InitClassNumericFormatter( RscTop * pSuper )
     nId = aNmTb.Put( "Value", VARNAME );
     pClassNumeric->SetVariable( nId, &aIdLong, NULL,
                                 0, NUMERICFORMATTER_VALUE );
+    nId = aNmTb.Put( "NoThousandSep", VARNAME );
+    pClassNumeric->SetVariable( nId, &aBool, NULL,
+                                0, NUMERICFORMATTER_NOTHOUSANDSEP );
 
     return pClassNumeric;
 }
@@ -1633,7 +1636,6 @@ RscTop * RscTypCont::InitClassNumericField( RscTop * pSuper )
     nId = aNmTb.Put( "SpinSize", VARNAME );
     pClassNumericField->SetVariable( nId, &aIdLong, NULL,
                                                                         0, NUMERICFIELD_SPINSIZE  );
-
     return pClassNumericField;
 }
 
diff --git a/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx
index 93628f381bec..8da3de9bf2b3 100644
--- a/rsc/source/parser/rscyacc.cxx
+++ b/rsc/source/parser/rscyacc.cxx
@@ -190,7 +190,7 @@ BOOL DoClassHeader( RSCHEADER * pHeader, BOOL bMember )
 
             ObjNode * pNode = new ObjNode( aName1, S.Top().pData,
                                            pFI->GetFileIndex() );
-            pTC->pEH->StdOut( "." );
+            pTC->pEH->StdOut( ".", RscVerbosityVerbose );
 
             if( !aName1.IsId() )
                 pTC->pEH->Error( ERR_IDEXPECTED, pHeader->pClass, aName1 );