summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-04-25 10:30:16 +0300
committerMaxim Monastirsky <momonasmon@gmail.com>2016-04-27 22:20:22 +0300
commite4ae5e2d4049765f65f8b5560216f3ffded19903 (patch)
treed518565bf81bd862dba8961b4c850c2f318b4e35 /framework
parentf5cd030ee0d15ae0519d68b8675773ce0b223a36 (diff)
SubToolBarController: Use initialize to change tb bits
update is called so late that the dropdown addition is noticeable by the user. Change-Id: I36d76770125f927a851caef010e81f12f40d4405
Diffstat (limited to 'framework')
-rw-r--r--framework/source/uielement/subtoolbarcontroller.cxx12
1 files changed, 6 insertions, 6 deletions
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;