WaE: gcc 4.6.0 various warnings

svl/source/items/style.cxx

@@ -826,6 +826,7 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p )
 
 void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p )
 {
+#if OSL_DEBUG_LEVEL > 0
     DBG_ASSERT( p, "svl::SfxStyleSheetBasePool::Insert(), no stylesheet?" );
 
     SfxStyleSheetIterator aIter(this, p->GetFamily(), p->GetMask());
@@ -836,6 +837,7 @@ void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p )
         pOld = aIter.Find( p->GetParent() );
         DBG_ASSERT( pOld, "svl::SfxStyleSheetBasePool::Insert(), Parent not found!" );
     }
+#endif
     aStyles.push_back( rtl::Reference< SfxStyleSheetBase >( p ) );
     Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *p ) );
 }

svl/source/misc/filenotation.cxx

@@ -124,6 +124,7 @@ namespace svt
         }
 
         OSL_ENSURE( bSuccess, "OFileNotation::OFileNotation: could not detect the format!" );
+        (void)bSuccess;
     }
 
     //---------------------------------------------------------------------

svl/source/numbers/zforlist.cxx

@@ -426,7 +426,7 @@ void SvNumberFormatter::ReplaceSystemCL( LanguageType eOldLanguage )
         // a duplicate. Also won't mix up any LastInsertKey.
         ChangeIntl( eOldLanguage );
         LanguageType eLge = eOldLanguage;   // ConvertMode changes this
-        BOOL bCheck = FALSE;
+        bool bCheck = false;
         SvNumberformat* pNewEntry = new SvNumberformat( aString, pFormatScanner,
             pStringScanner, nCheckPos, eLge );
         if ( nCheckPos != 0 )
@@ -442,9 +442,10 @@ void SvNumberFormatter::ReplaceSystemCL( LanguageType eOldLanguage )
             if ( !aFTable.Insert( nKey, pNewEntry ) )
                 delete pNewEntry;
             else
-                bCheck = TRUE;
+                bCheck = true;
         }
         DBG_ASSERT( bCheck, "SvNumberFormatter::ReplaceSystemCL: couldn't convert" );
+        (void)bCheck;
 
         delete pOldEntry;
     }
@@ -1376,7 +1377,8 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultFormat( short nType )
                     nDefaultFormat = CLOffset + ZF_STANDARD;
             }
         }
-        aDefaultFormatKeys.Insert( nSearch, (void*) nDefaultFormat );
+        sal_uIntPtr nFormat = nDefaultFormat;
+        aDefaultFormatKeys.Insert( nSearch, (void*) nFormat );
     }
     return nDefaultFormat;
 }
@@ -3265,8 +3267,9 @@ sal_uInt32 SvNumberFormatter::ImpGetDefaultCurrencyFormat()
                     pEntry->SetStandard();
             }
         }
+        sal_uIntPtr nFormat = nDefaultCurrencyFormat;
         aDefaultFormatKeys.Insert( CLOffset + ZF_STANDARD_CURRENCY,
-            (void*) nDefaultCurrencyFormat );
+            (void*) nFormat );
     }
     return nDefaultCurrencyFormat;
 }

svl/source/numbers/zforscan.cxx

@@ -1545,7 +1545,6 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
         case NUMBERFORMAT_SCIENTIFIC:
         case NUMBERFORMAT_FRACTION:
         {
-            sal_Unicode cThousandFill = ' ';
             while (i < nAnzStrings)
             {
                 // TODO: rechecking eScannedType is unnecessary.
@@ -1743,10 +1742,7 @@ xub_StrLen ImpSvNumberformatScan::FinalScan( String& rString, String& rComment )
                                 {
                                     nPos = nPos + sStrArray[i].Len();
                                     if (!bThousand)                 // only once
-                                    {
                                         bThousand = TRUE;
-                                        cThousandFill = sStrArray[i+1].GetChar(0);
-                                    }
                                     // Eat it, will be reinserted at proper
                                     // grouping positions further down.
                                     nTypeArray[i] = NF_SYMBOLTYPE_EMPTY;