summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2014-09-15 22:52:40 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2014-09-15 23:01:51 +0300
commit99ace739828f9d79a2f9b04ef066b90d77f77bc4 (patch)
tree2569e6b073acb6ae9732f983078c0d31767acba0 /sd
parentea846caaa16a036cb4dfaf96262203a6eeaea7f1 (diff)
fdo#83619 Retain dropdown part after customization
Change-Id: I84c33e5b646ba43b9cad1d9ed106e7ead911e5c0
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.cxx16
-rw-r--r--sd/source/ui/controller/slidelayoutcontroller.hxx4
2 files changed, 20 insertions, 0 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 790b7af599a5..a086e5061fad 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -339,6 +339,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 71e2bb3df1ff..3c6e91be113b 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;