[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sd/source

[Maxim Monastirsky]

 sd/source/ui/controller/slidelayoutcontroller.cxx |   16 ++++++++++++++++
 sd/source/ui/controller/slidelayoutcontroller.hxx |    4 ++++
 2 files changed, 20 insertions(+)

New commits:
commit d5dcbd6cb2cd1f8d11428bed88730f7f513784a7
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Mon Sep 15 22:52:40 2014 +0300

    fdo#83619 Retain dropdown part after customization
    
    (cherry picked from commit 99ace739828f9d79a2f9b04ef066b90d77f77bc4)
    
    Conflicts:
    	sd/source/ui/controller/slidelayoutcontroller.cxx
    
    Change-Id: I84c33e5b646ba43b9cad1d9ed106e7ead911e5c0
    Reviewed-on: https://gerrit.libreoffice.org/11466
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 34a5e2b..59868ff 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -370,6 +370,22 @@ SlideLayoutController::SlideLayoutController( const Reference< uno::XComponentCo
 
 
 
+void SAL_CALL SlideLayoutController::initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception )
+{
+    svt::PopupWindowController::initialize( aArguments );
+
+    ToolBox* pToolBox = 0;
+    sal_uInt16 nId = 0;
+    if ( getToolboxId( nId, &pToolBox ) )
+    {
+        if ( mbInsertPage )
+            pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | TIB_DROPDOWN );
+        else
+            pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) | TIB_DROPDOWNONLY );
+    }
+}
+
 ::Window* SlideLayoutController::createPopupWindow( ::Window* pParent )
 {
     return new sd::LayoutToolbarMenu( *this, m_xFrame, pParent, mbInsertPage );
diff --git a/sd/source/ui/controller/slidelayoutcontroller.hxx b/sd/source/ui/controller/slidelayoutcontroller.hxx
index 71e2bb3..3c6e91b 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.hxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.hxx
@@ -34,6 +34,10 @@ public:
 
     virtual ::Window* createPopupWindow( ::Window* pParent ) SAL_OVERRIDE;
 
+    // XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+        throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;