diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-06 12:29:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-21 14:01:17 +0100 |
| commit | cfaac477e2a23880310070690beb3222b1c8227c (patch) | |
| tree | c5678e2606d73d548392174109df695b35fc053b /framework/inc/uielement/statusbarmanager.hxx | |
| parent | 1768904fd908e940a210e101c99a58ca1f7e3f27 (diff) | |
Related: #i121442# support status bar merging and StatusbarControllers
framework refactoring and new code to support status bar merging and UNO
StatusbarControllers
(cherry picked from commit 0b3a77478cf2cfd245a87bc528f851e959a2e6c7)
Conflicts:
framework/source/uielement/statusbarmanager.cxx
framework/source/uielement/toolbarmerger.cxx
Change-Id: I334a220ff27bb365e98a0ebd8bc6e55d65e76d64
Diffstat (limited to 'framework/inc/uielement/statusbarmanager.hxx')
| -rw-r--r-- | framework/inc/uielement/statusbarmanager.hxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index 4c88c968bea0..26cc183dfddd 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -39,6 +39,7 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <vcl/status.hxx> +#include <map> namespace framework { @@ -103,7 +104,7 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener void MouseButton( const MouseEvent& rMEvt ,sal_Bool ( SAL_CALL ::com::sun::star::frame::XStatusbarController::*_pMethod )(const ::com::sun::star::awt::MouseEvent&)); protected: - typedef std::vector< ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > StatusBarControllerVector; + typedef std::map< sal_uInt16, ::com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener > > StatusBarControllerMap; sal_Bool m_bDisposed : 1, m_bFrameActionRegistered : 1, @@ -114,7 +115,7 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener OUString m_aResourceName; com::sun::star::uno::Reference< com::sun::star::frame::XFrame > m_xFrame; com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels; - StatusBarControllerVector m_aControllerVector; + StatusBarControllerMap m_aControllerMap; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerRegistration > m_xStatusbarControllerRegistration; |