diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-05 17:21:22 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-05 17:21:22 +0100 |
commit | 3bf543f12d7dc350ef43d65ac9defb4f500e29ec (patch) | |
tree | a770b05cfdf535e9235149f0c288af028e04882b /sw | |
parent | cd246c13bfe5174b4e967856503bda290309beaa (diff) |
Remove uses of deprecated salhelper/refobj.hxx
Change-Id: Ibf4a2ed99024568b2d370b22919e3a25c43c6fbf
Diffstat (limited to 'sw')
-rw-r--r-- | sw/Library_swui.mk | 1 | ||||
-rw-r--r-- | sw/source/uibase/dbui/maildispatcher.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/imaildsplistener.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/inc/maildispatcher.hxx | 4 |
4 files changed, 7 insertions, 4 deletions
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk index f32e182a9c76..d9fb3f756a65 100644 --- a/sw/Library_swui.mk +++ b/sw/Library_swui.mk @@ -55,6 +55,7 @@ $(eval $(call gb_Library_use_libraries,swui,\ i18nutil \ msfilter \ sal \ + salhelper \ sfx \ sot \ svl \ diff --git a/sw/source/uibase/dbui/maildispatcher.cxx b/sw/source/uibase/dbui/maildispatcher.cxx index 4bd4f174d410..6fd88f64923b 100644 --- a/sw/source/uibase/dbui/maildispatcher.cxx +++ b/sw/source/uibase/dbui/maildispatcher.cxx @@ -22,6 +22,8 @@ #include <algorithm> +#include <osl/diagnose.h> + using namespace ::com::sun::star; typedef std::list< ::rtl::Reference<IMailDispatcherListener> > MailDispatcherListenerContainer_t; diff --git a/sw/source/uibase/inc/imaildsplistener.hxx b/sw/source/uibase/inc/imaildsplistener.hxx index b8e51ddb6d19..8c7f04c7c219 100644 --- a/sw/source/uibase/inc/imaildsplistener.hxx +++ b/sw/source/uibase/inc/imaildsplistener.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_IMAILDSPLISTENER_HXX #include <com/sun/star/mail/XMailMessage.hpp> -#include <salhelper/refobj.hxx> +#include <salhelper/simplereferenceobject.hxx> class MailDispatcher; @@ -33,7 +33,7 @@ class MailDispatcher; @see MailDispatcher */ -class IMailDispatcherListener : public ::salhelper::ReferenceObject +class IMailDispatcherListener : public salhelper::SimpleReferenceObject { public: /** diff --git a/sw/source/uibase/inc/maildispatcher.hxx b/sw/source/uibase/inc/maildispatcher.hxx index 7ebb1ec1f8f9..597273496683 100644 --- a/sw/source/uibase/inc/maildispatcher.hxx +++ b/sw/source/uibase/inc/maildispatcher.hxx @@ -25,7 +25,7 @@ #include <osl/thread.hxx> #include <osl/conditn.hxx> #include <rtl/ref.hxx> -#include <salhelper/refobj.hxx> +#include <salhelper/simplereferenceobject.hxx> #include <list> @@ -41,7 +41,7 @@ class IMailDispatcherListener; thread should create an own instance of this class. */ class SW_DLLPUBLIC MailDispatcher - : public ::salhelper::ReferenceObject + : public salhelper::SimpleReferenceObject , private ::osl::Thread { public: |