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

[David Tardon]

 cui/source/options/cfgchart.cxx  |    6 ------
 cui/source/tabpages/numpages.cxx |    2 --
 cui/source/tabpages/tpcolor.cxx  |   16 +++-------------
 3 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit fe6790df853047716e87f9ffffc7e434f64a0ed5
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 17 09:46:42 2011 +0100

    WaE: unused variable

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 8a1d589..062a860 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1786,7 +1786,6 @@ IMPL_LINK( SvxNumOptionsTabPage, AllLevelHdl_Impl, NumericField*, pBox )
 IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
 {
     String sSelectStyle;
-    sal_Int16 eOldType;
     BOOL bShowOrient = FALSE;
     BOOL bBmp = FALSE;
     String aEmptyStr;
@@ -1796,7 +1795,6 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
         if(nActNumLvl & nMask)
         {
             SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
-            eOldType = aNumFmt.GetNumberingType();
             // PAGEDESC gibt es nicht
             USHORT nNumType = (USHORT)(ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos());
             aNumFmt.SetNumberingType((sal_Int16)nNumType);
commit e6251896d2bfe140e441f9acd7abfcfc3ca5abc5
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 17 09:40:22 2011 +0100

    WaE: unused variable

diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index b95f3cd..984e97f 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -453,10 +453,8 @@ IMPL_LINK( SvxColorTabPage, ModifiedHdl_Impl, void *, EMPTYARG )
 IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG )
 {
     Window *pWindow = this;
-    bool bEnabled;
     while( pWindow )
     {
-        bEnabled = pWindow->IsEnabled();
         pWindow = pWindow->GetParent();
     }
 
commit 062f686b2292c5a7121156735c87690d76a639a9
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 17 09:40:14 2011 +0100

    WaE: unused variable

diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 3da79d2..b95f3cd 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -1161,17 +1161,9 @@ void SvxColorTabPage::FillValueSet_Impl( ValueSet& rVs )
 
 void SvxColorTabPage::RgbToCmyk_Impl( Color& rColor, USHORT& rK )
 {
-    USHORT nColor1, nColor2, nColor3;
-    USHORT nProzent; // nur temporaer !!!
-
-    nColor1 = 255 - rColor.GetRed();
-    nProzent = ColorToPercent_Impl( nColor1 );
-
-    nColor2 = 255 - rColor.GetGreen();
-    nProzent = ColorToPercent_Impl( nColor2 );
-
-    nColor3 = 255 - rColor.GetBlue();
-    nProzent = ColorToPercent_Impl( nColor3 );
+    USHORT const nColor1 = 255 - rColor.GetRed();
+    USHORT const nColor2 = 255 - rColor.GetGreen();
+    USHORT const nColor3 = 255 - rColor.GetBlue();
 
     rK = Min( Min( nColor1, nColor2 ), nColor3 );
 
commit 6aaddb126fec8bc8a2cf3932b463464146dee87d
Author: David Tardon <dtardon at redhat.com>
Date:   Thu Feb 17 09:21:43 2011 +0100

    WaE: unused variable

diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index f9dfae2..4d2cd38 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -91,13 +91,7 @@ void SvxChartColorTable::replace( size_t _nIndex, const XColorEntry & _rEntry )
     DBG_ASSERT( _nIndex <= m_aColorEntries.size(),
                 "SvxChartColorTable::replace invalid index" );
 
-    Color aCol1 = m_aColorEntries[ _nIndex ].GetColor(), aCol2;
     m_aColorEntries[ _nIndex ] = _rEntry;
-    aCol2 = m_aColorEntries[ _nIndex ].GetColor();
-    if ( aCol2 != const_cast< XColorEntry& >( _rEntry ).GetColor() )
-    {
-        DBG_ERRORFILE( "wrong color" );
-    }
 }
 
 void SvxChartColorTable::useDefault()