diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-05-28 22:09:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-24 11:25:35 +0100 |
| commit | 2f3e79ee907f6e483d8886984f262fd1763adccc (patch) | |
| tree | 2a72b3f05442e4da25a4eaa5feca5ec08f1f4ba0 /framework/inc | |
| parent | 6b6ebeeaf94e1db3c90cfe3921ea6c956570a0c5 (diff) | |
Resolves: #i122401# framework::NewToolbarController needs...
early initialization of its PopupMenu
(cherry picked from commit 5149ad822bb66cca9561b7c181c6c2279affc29a)
Conflicts:
framework/inc/uielement/popuptoolbarcontroller.hxx
framework/source/uielement/popuptoolbarcontroller.cxx
Change-Id: I619fe7b86a19b146079792a73a50d23682d04a3c
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/uielement/popuptoolbarcontroller.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/framework/inc/uielement/popuptoolbarcontroller.hxx b/framework/inc/uielement/popuptoolbarcontroller.hxx index f8e8bf951ebd..56f32513dc59 100644 --- a/framework/inc/uielement/popuptoolbarcontroller.hxx +++ b/framework/inc/uielement/popuptoolbarcontroller.hxx @@ -77,6 +77,7 @@ namespace framework DECLARE_XSERVICEINFO private: void functionExecuted( const OUString &rCommand ); + void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& rEvent ) throw ( ::com::sun::star::uno::RuntimeException ); void SAL_CALL execute( sal_Int16 KeyModifier ) throw (::com::sun::star::uno::RuntimeException); void setItemImage( const OUString &rCommand ); |