diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2014-09-15 22:52:40 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-10-14 15:27:45 +0200 |
| commit | 43b7ca972b19d05656ddb2600be3885c5522f27b (patch) | |
| tree | 3b3f01fb900e2d66fd1d2254fb0a0c04c5ea2804 /sd | |
| parent | a487710490e361b739f197449829def9cbbd3645 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.cxx | 16 | ||||
| -rw-r--r-- | sd/source/ui/controller/slidelayoutcontroller.hxx | 4 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 34a5e2b69412..59868ffb5aa9 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 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; |