[Libreoffice-commits] core.git: 4 commits - include/svx svx/source

[Tor Lillqvist]

 include/svx/sidebar/ColorControl.hxx          |    1 -
 svx/source/sidebar/line/LinePropertyPanel.cxx |   23 -----------------------
 svx/source/sidebar/text/TextPropertyPanel.cxx |    8 --------
 svx/source/sidebar/tools/ColorControl.cxx     |    3 +--
 4 files changed, 1 insertion(+), 34 deletions(-)

New commits:
commit 08a7b542533d8de0a8fde5c2e836070b3c5592a3
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon May 20 14:27:36 2013 +0300

    WaE: unused parameter 'pBindings'
    
    Change-Id: I4569c83fad5974d95f667e6ddd40648e4951e10f

diff --git a/svx/source/sidebar/tools/ColorControl.cxx b/svx/source/sidebar/tools/ColorControl.cxx
index a943d2e..ba43c0f 100644
--- a/svx/source/sidebar/tools/ColorControl.cxx
+++ b/svx/source/sidebar/tools/ColorControl.cxx
@@ -85,7 +85,7 @@ namespace {
 
 ColorControl::ColorControl (
     Window* pParent,
-    SfxBindings* pBindings,
+    SfxBindings* /* pBindings */,
     const ResId& rControlResId,
     const ResId& rValueSetResId,
     const ::boost::function<Color(void)>& rNoColorGetter,
commit a6e8a1def65ea8f12662c3e295590d6cc59ea4a8
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon May 20 14:26:18 2013 +0300

    WaE: private field 'mpBindings' is not used
    
    Change-Id: I58cb45ac54b54f9c0f65640dfad05185b2c01b16

diff --git a/include/svx/sidebar/ColorControl.hxx b/include/svx/sidebar/ColorControl.hxx
index 606a906..6f8faf7 100644
--- a/include/svx/sidebar/ColorControl.hxx
+++ b/include/svx/sidebar/ColorControl.hxx
@@ -69,7 +69,6 @@ public:
         const bool bAvl);
 
 private:
-    SfxBindings* mpBindings;
     SvxColorValueSet maVSColor;
     FloatingWindow* mpFloatingWindow;
     const String msNoColorString;
diff --git a/svx/source/sidebar/tools/ColorControl.cxx b/svx/source/sidebar/tools/ColorControl.cxx
index 3a517b9..a943d2e 100644
--- a/svx/source/sidebar/tools/ColorControl.cxx
+++ b/svx/source/sidebar/tools/ColorControl.cxx
@@ -93,7 +93,6 @@ ColorControl::ColorControl (
     FloatingWindow* pFloatingWindow,
     const ResId* pNoColorStringResId) // const sal_uInt32 nNoColorStringResId)
     : PopupControl(pParent, rControlResId),
-      mpBindings(pBindings),
       maVSColor(this, rValueSetResId),
       mpFloatingWindow(pFloatingWindow),
       msNoColorString(
commit 061030bb26cf17daffaf384b2de0a7446ba172f5
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon May 20 14:24:43 2013 +0300

    WaE: unused function 'GetItemId_Impl_line'
    
    Change-Id: Icc8ff462995491d153532eeb0218c2cac480511e

diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 071f4ec..915d48b 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -60,29 +60,6 @@ using ::sfx2::sidebar::Theme;
 #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
 
 namespace {
-    short GetItemId_Impl_line( ValueSet& rValueSet, const Color& rCol )
-    {
-        if(rCol == COL_AUTO)
-            return 0;
-
-        bool    bFound = false;
-        sal_uInt16 nCount = rValueSet.GetItemCount();
-        sal_uInt16  n      = 1;
-
-        while ( !bFound && n <= nCount )
-        {
-            Color aValCol = rValueSet.GetItemColor(n);
-
-            bFound = (   aValCol.GetRed()   == rCol.GetRed()
-                && aValCol.GetGreen() == rCol.GetGreen()
-                && aValCol.GetBlue()  == rCol.GetBlue() );
-
-            if ( !bFound )
-                n++;
-        }
-        return bFound ? n : -1;
-    }
-
     void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const XLineEndList& rList)
     {
         const sal_uInt32 nCount(rList.Count());
commit f160e4935c474a5293b3d3c11b3d538efb4767a0
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon May 20 14:23:54 2013 +0300

    WaE: unused function 'GetAutomaticColor'
    
    Change-Id: I247d8e0fbfa8c050806a08d2e387d9bc761de534

diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 53ec527..6547db6 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -80,14 +80,6 @@ PopupControl* TextPropertyPanel::CreateUnderlinePopupControl (PopupContainer* pP
     return new TextUnderlineControl(pParent, *this, mpBindings);
 }
 
-namespace
-{
-    Color GetAutomaticColor(void)
-    {
-        return COL_AUTO;
-    }
-} // end of anonymous namespace
-
 long TextPropertyPanel::GetSelFontSize()
 {
     long nH = 240;