[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - framework/source

[Maxim Monastirsky]

 framework/source/uielement/popuptoolbarcontroller.cxx |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit c5cc05f29020b9e0a77743112d1ab9f8b70cfcf6
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Sun Jun 19 23:58:53 2016 +0300

    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 at libreoffice.org>
    Reviewed-by: Maxim Monastirsky <momonasmon at gmail.com>

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx
index 5d7b6d8..fa088a2 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() )
     {