diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-06-19 23:58:53 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-06-19 22:50:41 +0000 |
| commit | c5cc05f29020b9e0a77743112d1ab9f8b70cfcf6 (patch) | |
| tree | b1a0e1c742d8fc745d6cef5fd2f4163a76bdfefe /framework | |
| parent | 1a567c9286d82c46f51d7d30322e86fcf40468d6 (diff) | |
Try to fix the crashreport with SaveToolbarController::modified
No idea how one managed to trigger this. The only way I see is
to add the save button to one of the custom shapes dropdowns.
The ToolBox there has mpData->mbWillUsePopupMode set to true,
which causes ToolBarManager to call the update method of the
controller twice. update registers additional modify listener
each time, but there is only one "remove listener" call in
dispose.
Change-Id: I2a1d6e02f6d8b6bc847fb7694fffa6e85b1f5604
(cherry picked from commit 1771e2b2753af2c078b575c44e788ee70500bbca)
Reviewed-on: https://gerrit.libreoffice.org/26487
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/popuptoolbarcontroller.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 5d7b6d8f91ca..fa088a256cb9 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -329,9 +329,6 @@ public: // XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; - // XUpdatable - virtual void SAL_CALL update() throw ( css::uno::RuntimeException, std::exception ) override; - // XSubToolbarController // Ugly HACK to cause ToolBarManager ask our controller for updated image, in case of icon theme change. virtual sal_Bool SAL_CALL opensSubToolbar() throw ( css::uno::RuntimeException, std::exception ) override; @@ -393,12 +390,6 @@ void SaveToolbarController::initialize( const css::uno::Sequence< css::uno::Any else // Simple save button, without the dropdown. pToolBox->SetItemBits( nId, pToolBox->GetItemBits( nId ) & ~ ToolBoxItemBits::DROPDOWN ); -} - -void SaveToolbarController::update() - throw ( css::uno::RuntimeException, std::exception ) -{ - PopupMenuToolbarController::update(); if ( m_xModifiable.is() ) { |