[Libreoffice-commits] .: basctl/source cui/source

Caolán McNamara caolan at kemper.freedesktop.org
Wed Jan 26 01:28:36 PST 2011


 basctl/source/basicide/localizationmgr.cxx |    1 +
 cui/source/tabpages/numfmt.cxx             |   11 +----------
 2 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit cea69b77976783d1991ce9deae20db6bac2eb7fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 26 09:22:02 2011 +0000

    WaE: gcc 4.6.0 various warnings

diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 4ff1d64..c5eeaa9 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -749,6 +749,7 @@ void LocalizationMgr::handleRemoveLocales( Sequence< Locale > aLocaleSeq )
 
     DBG_ASSERT( bConsistant,
         "LocalizationMgr::handleRemoveLocales(): sequence contains unsupported locales" );
+    (void)bConsistant;
 }
 
 void LocalizationMgr::handleSetDefaultLocale( Locale aLocale )
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index a2454b7..2ec19a2 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -963,18 +963,10 @@ void SvxNumberFormatTabPage::UpdateOptions_Impl( BOOL bCheckCatChange /*= FALSE*
     USHORT	nZeroes				= 0;
     BOOL	bNegRed				= FALSE;
     BOOL	bThousand			= FALSE;
-    short	nTmpCatPos;
     USHORT	nCurrencyPos		=aLbCurrency.GetSelectEntryPos();
 
     if(bOneAreaFlag)
-    {
-        nTmpCatPos=nFixedCategory;
         nCurCategory=nFixedCategory;
-    }
-    else
-    {
-        nTmpCatPos=nCurCategory;
-    }
 
 
     pNumFmtShell->GetOptions( theFormat,
@@ -1782,7 +1774,6 @@ void SvxNumberFormatTabPage::FillCurrencyBox()
     SvStringsDtor	aList;
     NfShCurrencyEntries rEntries;
     XubString*		pEntry = NULL;
-    USHORT	nPos=0;
     USHORT	nSelPos=0;
 
     pNumFmtShell->GetCurrencySymbols( aList, &nSelPos);
@@ -1790,7 +1781,7 @@ void SvxNumberFormatTabPage::FillCurrencyBox()
     for(USHORT i=1;i<aList.Count();i++)
     {
         pEntry=aList[i];
-        nPos=aLbCurrency.InsertEntry( *pEntry);
+        aLbCurrency.InsertEntry( *pEntry);
     }
     aLbCurrency.SelectEntryPos(nSelPos);
 }


More information about the Libreoffice-commits mailing list