diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-03 09:57:13 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-23 10:05:43 +0200 |
| commit | 18a5f8a2b1cd47deb7f8dbe4ae777955b16523e2 (patch) | |
| tree | de40cd8dff994b1d181912cf6309fd0f7a4fa5d6 /framework | |
| parent | fe4e2689f6b0c4312f9b227c4aa1ca770c5690bd (diff) | |
Convert framework::StatusBarManager to WeakImplHelper
Change-Id: I25cc72536d8832d93d6832591bdba25ac0654ee3
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/statusbarmanager.hxx | 18 | ||||
| -rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 20 |
2 files changed, 7 insertions, 31 deletions
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index b469ad7574c3..35a01a5b3764 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <rtl/ustring.hxx> -#include <cppuhelper/weak.hxx> +#include <cppuhelper/implbase3.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <vcl/status.hxx> #include <map> @@ -44,12 +44,12 @@ namespace framework { class FrameworkStatusBar; -class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener , - public ::com::sun::star::lang::XComponent , - public ::com::sun::star::lang::XTypeProvider , - public ::com::sun::star::ui::XUIConfigurationListener, - public ThreadHelpBase , - public ::cppu::OWeakObject +class StatusBarManager : public ThreadHelpBase, + public ::cppu::WeakImplHelper3< + css::frame::XFrameActionListener, + css::lang::XComponent, + css::ui::XUIConfigurationListener > + { friend class FrameworkStatusBar; @@ -60,10 +60,6 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener StatusBar* pStatusBar ); virtual ~StatusBarManager(); - // XInterface, XTypeProvider, XServiceInfo - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER - StatusBar* GetStatusBar() const; // XFrameActionListener diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 12a56d083f13..d7d140ad2cf4 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -130,25 +130,6 @@ static sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle ) } } -//***************************************************************************************************************** -// XInterface, XTypeProvider, XServiceInfo -//***************************************************************************************************************** -DEFINE_XINTERFACE_5 ( StatusBarManager , - ::cppu::OWeakObject , - DIRECT_INTERFACE( lang::XTypeProvider ), - DIRECT_INTERFACE( lang::XComponent ), - DIRECT_INTERFACE( frame::XFrameActionListener ), - DIRECT_INTERFACE( css::ui::XUIConfigurationListener ), - DERIVED_INTERFACE( lang::XEventListener, frame::XFrameActionListener ) - ) - -DEFINE_XTYPEPROVIDER_5 ( StatusBarManager , - lang::XTypeProvider , - lang::XComponent , - css::ui::XUIConfigurationListener , - frame::XFrameActionListener , - lang::XEventListener - ) StatusBarManager::StatusBarManager( const uno::Reference< uno::XComponentContext >& rxContext, @@ -156,7 +137,6 @@ StatusBarManager::StatusBarManager( const OUString& rResourceName, StatusBar* pStatusBar ) : ThreadHelpBase( &Application::GetSolarMutex() ), - OWeakObject(), m_bDisposed( sal_False ), m_bFrameActionRegistered( sal_False ), m_bUpdateControllers( sal_False ), |