[Libreoffice-commits] core.git: extras/source solenv/bin solenv/gbuild vcl/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Mar 22 08:48:30 UTC 2019


 extras/source/glade/libreoffice-catalog.xml.in |    3 ---
 solenv/bin/native-code.py                      |    1 -
 solenv/gbuild/UIConfig.mk                      |    2 +-
 vcl/source/control/button.cxx                  |    5 -----
 4 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 1a06e2cd02a28ba1ac43bc44704cead1650f1df5
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Mar 21 17:47:04 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Mar 22 09:47:58 2019 +0100

    SmallButton unused
    
    since...
    
    commit 57ca02a7486090f1dd63977bb8fb351f9bf9a7f3
    Date:   Wed Apr 18 00:04:09 2018 +0200
    
        NB Impress tabbed toolbar big update
    
    Change-Id: I7c59d5388138166851c24d1494dc3293a32f8330
    Reviewed-on: https://gerrit.libreoffice.org/69537
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 41c1d9425d24..56970ed760c8 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -480,9 +480,6 @@
     <glade-widget-class title="Slide Transition Pane" name="sdlo-SlideTransitionBox"
                         generic-name="ShowText" parent="GtkToolButton"
                         icon-name="widget-gtk-toolbutton"/>
-    <glade-widget-class title="Button with small padding" name="vcllo-SmallButton"
-                        generic-name="SmallButton" parent="GtkButton"
-                        icon-name="widget-gtk-button"/>
     <glade-widget-class title="Horizontal box hiding children depending on its priorities" name="sfxlo-PriorityHBox"
                         generic-name="PriorityHBox" parent="GtkBox"
                         icon-name="widget-gtk-box"/>
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index a52d8e138a19..0a47b8c38061 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -486,7 +486,6 @@ custom_widgets = [
     'ShowNupOrderWindow',
     'SidebarDialControl',
     'SidebarToolBox',
-    'SmallButton',
     'SpacingListBox',
     'StatusBar',
     'StructListBox',
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk
index 1b9c61fd80b6..cd0b48680eb5 100644
--- a/solenv/gbuild/UIConfig.mk
+++ b/solenv/gbuild/UIConfig.mk
@@ -144,7 +144,7 @@ gb_UIConfig_gla11y_PARAMETERS += --widgets-needlabel +foruilo-RefEdit
 # These are storage, containers, or preview
 gb_UIConfig_gla11y_PARAMETERS += --widgets-suffixignored +ValueSet,HBox,VBox,ToolBox,Preview,PreviewWin,PreviewWindow,PrevWindow
 # These are buttons, thus already contain their label (but an image is not enough)
-gb_UIConfig_gla11y_PARAMETERS += --widgets-button +vcllo-SmallButton,chartcontrollerlo-LightButton,svtlo-ManagedMenuButton
+gb_UIConfig_gla11y_PARAMETERS += --widgets-button +chartcontrollerlo-LightButton,svtlo-ManagedMenuButton
 
 # All new warnings should be fatal except a few kinds which could be only doubtful
 gb_UIConfig_gla11y_PARAMETERS += --fatal-all --not-fatal-type duplicate-mnemonic --not-fatal-type labelled-by-and-mnemonic --not-fatal-type orphan-label
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index f2b7849b30cc..471bc1420b10 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -3827,9 +3827,4 @@ void DisclosureButton::KeyInput( const KeyEvent& rKEvt )
         CheckBox::KeyInput( rKEvt );
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void makeSmallButton(VclPtr<vcl::Window> & rRet, VclPtr<vcl::Window> & pParent, VclBuilder::stringmap &)
-{
-    rRet = VclPtr<PushButton>::Create(pParent, WB_CLIPCHILDREN|WB_CENTER|WB_VCENTER|WB_FLATBUTTON|WB_SMALLSTYLE);
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list