From e4ae5e2d4049765f65f8b5560216f3ffded19903 Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Mon, 25 Apr 2016 10:30:16 +0300 Subject: SubToolBarController: Use initialize to change tb bits update is called so late that the dropdown addition is noticeable by the user. Change-Id: I36d76770125f927a851caef010e81f12f40d4405 --- framework/source/uielement/subtoolbarcontroller.cxx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'framework') diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index b3585dfe489c..3681678515bb 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -50,6 +50,9 @@ public: explicit SubToolBarController( const css::uno::Sequence< css::uno::Any >& rxArgs ); virtual ~SubToolBarController(); + // XInitialization + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) override; + // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; @@ -75,9 +78,6 @@ public: // XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& e ) throw ( css::uno::RuntimeException, std::exception ) override; - // XUpdatable - virtual void SAL_CALL update() throw ( css::uno::RuntimeException, std::exception ) override; - // XComponent virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) override; @@ -407,10 +407,10 @@ void SubToolBarController::disposing( const css::lang::EventObject& e ) svt::ToolboxController::disposing( e ); } -void SubToolBarController::update() - throw ( css::uno::RuntimeException, std::exception ) +void SubToolBarController::initialize( const css::uno::Sequence< css::uno::Any >& rxArgs ) + throw ( css::uno::Exception, css::uno::RuntimeException, std::exception ) { - svt::ToolboxController::update(); + svt::ToolboxController::initialize( rxArgs ); ToolBox* pToolBox = nullptr; sal_uInt16 nId = 0; -- cgit