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

Caolán McNamara caolanm at redhat.com
Thu Oct 6 20:12:14 UTC 2016


 include/svx/sidebar/ValueSetWithTextControl.hxx      |    5 ----
 svx/source/sidebar/tools/ValueSetWithTextControl.cxx |   21 ++-----------------
 2 files changed, 3 insertions(+), 23 deletions(-)

New commits:
commit 3d75fde3fce0924f41d562bc07268d8b66079abd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 6 20:57:21 2016 +0100

    no ValueSetWithTextControls are loaded from src files
    
    Change-Id: If19daf643a9dfcebe57d5d4860f1f4282b39e5fa

diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index 755fcc4..aa745ba 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -47,11 +47,6 @@ public:
         TextText
     };
 
-    ValueSetWithTextControl(
-        const ControlType eControlType,
-        vcl::Window* pParent,
-        const ResId& rResId);
-
     ValueSetWithTextControl(Window* pParent, WinBits nBits);
 
     // add item for control type IMAGE_TEXT
diff --git a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
index 72a9d65..a9b1fc6 100644
--- a/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
+++ b/svx/source/sidebar/tools/ValueSetWithTextControl.cxx
@@ -30,26 +30,13 @@
 
 namespace svx { namespace sidebar {
 
-ValueSetWithTextControl::ValueSetWithTextControl(
-    const ControlType eControlType,
-    vcl::Window* pParent,
-    const ResId& rResId)
-    : ValueSet( pParent, rResId )
-    , meControlType( eControlType )
-    , maItems()
+ValueSetWithTextControl::ValueSetWithTextControl(Window* pParent, WinBits nBits)
+    : ValueSet( pParent, nBits )
+    , meControlType( svx::sidebar::ValueSetWithTextControl::ControlType::TextText )
 {
     SetColCount();
 }
 
-ValueSetWithTextControl::ValueSetWithTextControl(
-    Window* pParent,
-    WinBits nBits)
-    : ValueSet( pParent, nBits )
-    , meControlType( svx::sidebar::ValueSetWithTextControl::ControlType::TextText )
-    {
-        SetColCount();
-    }
-
 void ValueSetWithTextControl::AddItem(
     const Image& rItemImage,
     const OUString& rItemText,
@@ -80,7 +67,6 @@ void ValueSetWithTextControl::AddItem(
                     (pItemHelpText != nullptr) ? *pItemHelpText : rItemText );
 }
 
-
 void ValueSetWithTextControl::AddItem(
     const OUString& rItemText,
     const OUString& rItemText2 )
@@ -100,7 +86,6 @@ void ValueSetWithTextControl::AddItem(
     SetItemText( maItems.size(), rItemText );
 }
 
-
 void ValueSetWithTextControl::UserDraw( const UserDrawEvent& rUDEvt )
 {
     const Rectangle aRect = rUDEvt.GetRect();


More information about the Libreoffice-commits mailing list