diff options
| author | Noel Grandin <noel@peralex.com> | 2013-07-15 13:47:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-07-23 10:05:45 +0200 |
| commit | 9dbb8db06d7c5620fec586a87237b3e07dfd0fb3 (patch) | |
| tree | e4c036185e7913e35c074d7a47364b24552eb347 /framework/inc/helper/titlebarupdate.hxx | |
| parent | 5e184fd2173481601e7ee2f24029ad0a4c9d7da9 (diff) | |
Convert the easy cases in framework to WeakImplHelper
Change-Id: I6547c4aee2aa4d15ad516a6a45002b81b7a8ac13
Diffstat (limited to 'framework/inc/helper/titlebarupdate.hxx')
| -rw-r--r-- | framework/inc/helper/titlebarupdate.hxx | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index 7dfc262c641f..de3cb8b2cf63 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -21,33 +21,19 @@ #define __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_ #include <threadhelp/threadhelpbase.hxx> - #include <macros/debug.hxx> - #include <macros/xinterface.hxx> - #include <macros/xtypeprovider.hxx> - #include <general.h> - #include <com/sun/star/uno/XComponentContext.hpp> - #include <com/sun/star/lang/XInitialization.hpp> - #include <com/sun/star/frame/XFrame.hpp> - #include <com/sun/star/frame/XTitle.hpp> - #include <com/sun/star/frame/XFrameActionListener.hpp> - #include <com/sun/star/frame/XTitleChangeListener.hpp> - #include <com/sun/star/lang/XEventListener.hpp> - #include <unotools/moduleoptions.hxx> - -#include <cppuhelper/weak.hxx> - +#include <cppuhelper/implbase3.hxx> #include <rtl/ustrbuf.hxx> namespace framework{ @@ -58,14 +44,13 @@ namespace framework{ @devstatus draft @threadsafe yes *//*-*************************************************************************************************************/ -class TitleBarUpdate : // interfaces - public css::lang::XTypeProvider - , public css::lang::XInitialization - , public css::frame::XTitleChangeListener // => XEventListener - , public css::frame::XFrameActionListener // => XEventListener - // baseclasses (order necessary for right initialization!) - , private ThreadHelpBase - , public ::cppu::OWeakObject +class TitleBarUpdate : // baseclasses (order necessary for right initialization!) + private ThreadHelpBase + // interfaces + , public ::cppu::WeakImplHelper3< + css::lang::XInitialization + , css::frame::XTitleChangeListener // => XEventListener + , css::frame::XFrameActionListener > // => XEventListener { //________________________________ // structs, types @@ -105,8 +90,6 @@ class TitleBarUpdate : // interfaces //____________________________ // XInterface, XTypeProvider - FWK_DECLARE_XINTERFACE - FWK_DECLARE_XTYPEPROVIDER //____________________________ // XInitialization |