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

[Maxim Monastirsky]

 dbaccess/source/ui/app/AppDetailPageHelper.cxx |    2 +-
 svx/source/tbxctrls/bulletsnumbering.cxx       |   17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

New commits:
commit f9601b9232589bbb704f10073bf9b1516af5a923
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun May 28 15:45:15 2017 +0300

    This should be ToolBoxItemBits::DROPDOWNONLY
    
    as there is no select handler registered here.
    
    Change-Id: Ide822efe2bacbe791d950883f18e029b26517c6b

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index f259e609b701..e09ee6dde5ef 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -197,7 +197,7 @@ OAppDetailPageHelper::OAppDetailPageHelper(vcl::Window* _pParent,OAppBorderWindo
     m_aTBPreview->SetOutStyle(TOOLBOX_STYLE_FLAT);
     m_aTBPreview->InsertItem(SID_DB_APP_DISABLE_PREVIEW,
                              vcl::CommandInfoProvider::GetLabelForCommand(".uno:DBDisablePreview", "com.sun.star.sdb.OfficeDatabaseDocument"),
-                             ToolBoxItemBits::LEFT|ToolBoxItemBits::DROPDOWN|ToolBoxItemBits::AUTOSIZE|ToolBoxItemBits::RADIOCHECK);
+                             ToolBoxItemBits::LEFT|ToolBoxItemBits::DROPDOWNONLY|ToolBoxItemBits::AUTOSIZE|ToolBoxItemBits::RADIOCHECK);
     m_aTBPreview->SetHelpId(HID_APP_VIEW_PREVIEW_CB);
     m_aTBPreview->SetDropdownClickHdl( LINK( this, OAppDetailPageHelper, OnDropdownClickHdl ) );
     m_aTBPreview->Enable();
commit bd3975dbd9e76905adfa97bf2a32973951ca6d75
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Jul 30 16:48:47 2017 +0300

    Remove duplicate code
    
    The base class has now the same code since 9f61005dd9c4b
    ("tdf#109309 Currency dropdown is misplaced under Wayland").
    
    Change-Id: Id0380ea10711a46c125c1f2ba6be82f21830bd9f

diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 03d4258ae2e8..1ca937bed72d 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -48,9 +48,6 @@ public:
     explicit NumberingToolBoxControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
     virtual VclPtr<vcl::Window> createPopupWindow( vcl::Window* pParent ) override;
 
-    // XStatusListener
-    virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& rEvent ) override;
-
     // XInitialization
     virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
 
@@ -201,20 +198,6 @@ VclPtr<vcl::Window> NumberingToolBoxControl::createPopupWindow( vcl::Window* pPa
     return VclPtr<NumberingPopup>::Create( *this, pParent, mePageType );
 }
 
-
-void SAL_CALL NumberingToolBoxControl::statusChanged( const css::frame::FeatureStateEvent& rEvent )
-{
-    ToolBox* pToolBox = nullptr;
-    sal_uInt16 nId = 0;
-    if ( getToolboxId( nId, &pToolBox ) )
-    {
-        pToolBox->EnableItem( nId, rEvent.IsEnabled );
-        bool bChecked;
-        if ( rEvent.State >>= bChecked )
-            pToolBox->CheckItem( nId, bChecked );
-    }
-}
-
 void SAL_CALL NumberingToolBoxControl::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
 {
     svt::PopupWindowController::initialize( aArguments );