[Libreoffice-commits] core.git: cui/source cui/uiconfig

[Rishabh Kumar]

 cui/source/inc/cuitabarea.hxx     |    9 ---------
 cui/source/tabpages/tppattern.cxx |    9 ---------
 cui/uiconfig/ui/patterntabpage.ui |    8 ++++----
 3 files changed, 4 insertions(+), 22 deletions(-)

New commits:
commit a2c09913d87127230cfc6944dc7454088f966165
Author: Rishabh Kumar <kris.kr296 at gmail.com>
Date:   Fri Jul 1 19:49:32 2016 +0530

    Remove unused controls in Pattern tab
    
    Change-Id: Ie53dbbe652413c1ce098d1690d68ae8acc491ca4
    Reviewed-on: https://gerrit.libreoffice.org/26858
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Rishabh Kumar <kris.kr296 at yahoo.in>

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 397f3bc..f0eee65 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -630,15 +630,6 @@ public:
     void    SetPtrnChgd( ChangeType* pIn ) { m_pnPatternListState = pIn; }
     void    SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
     void    ChangeColor_Impl();
-    /** Return a label that is associated with the given control.  This
-        label is used to the determine the name for the control.
-        @param pLabeled
-            The control for which to return a label.
-        @return
-            Return a label control that provides a name for the specified
-            control.
-    */
-    virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabeled ) const override;
 };
 
 /************************************************************************/
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index f28bc53..3080d33 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -864,13 +864,4 @@ void SvxPatternTabPage::PointChanged( vcl::Window* pWindow, RECT_POINT )
     }
 }
 
-
-vcl::Window* SvxPatternTabPage::GetParentLabeledBy( const vcl::Window* pLabeled ) const
-{
-    if (pLabeled == m_pLbPatterns)
-        return m_pLbPatternsHidden.get();
-    else
-        return SvxTabPage::GetParentLabeledBy (pLabeled);
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/patterntabpage.ui b/cui/uiconfig/ui/patterntabpage.ui
index 8f6cc5f..26db14c 100644
--- a/cui/uiconfig/ui/patterntabpage.ui
+++ b/cui/uiconfig/ui/patterntabpage.ui
@@ -246,8 +246,8 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Load Bitmap List</property>
-                            <property name="tooltip_text" translatable="yes">Load Bitmap List</property>
+                            <property name="tooltip_markup" translatable="yes">Load Pattern List</property>
+                            <property name="tooltip_text" translatable="yes">Load Pattern List</property>
                             <property name="halign">center</property>
                             <property name="hexpand">True</property>
                             <property name="image">image1</property>
@@ -265,8 +265,8 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
-                            <property name="tooltip_markup" translatable="yes">Save Bitmap List</property>
-                            <property name="tooltip_text" translatable="yes">Save Bitmap List</property>
+                            <property name="tooltip_markup" translatable="yes">Save Pattern List</property>
+                            <property name="tooltip_text" translatable="yes">Save Pattern List</property>
                             <property name="halign">center</property>
                             <property name="hexpand">True</property>
                             <property name="image">image2</property>