[Libreoffice-commits] core.git: extensions/source sw/Library_swui.mk sw/source vcl/osx

[Stephan Bergmann]

 extensions/source/update/check/updatecheck.hxx    |    1 -
 extensions/source/update/check/updatecheckjob.cxx |    1 +
 sw/Library_swui.mk                                |    1 +
 sw/source/uibase/dbui/maildispatcher.cxx          |    2 ++
 sw/source/uibase/inc/imaildsplistener.hxx         |    4 ++--
 sw/source/uibase/inc/maildispatcher.hxx           |    4 ++--
 vcl/osx/a11yfocuslistener.cxx                     |    2 --
 7 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 3bf543f12d7dc350ef43d65ac9defb4f500e29ec
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 5 17:21:22 2015 +0100

    Remove uses of deprecated salhelper/refobj.hxx
    
    Change-Id: Ibf4a2ed99024568b2d370b22919e3a25c43c6fbf

diff --git a/extensions/source/update/check/updatecheck.hxx b/extensions/source/update/check/updatecheck.hxx
index bf27bb4..64eefb2 100644
--- a/extensions/source/update/check/updatecheck.hxx
+++ b/extensions/source/update/check/updatecheck.hxx
@@ -28,7 +28,6 @@
 #include <osl/conditn.hxx>
 #include <osl/thread.hxx>
 #include <rtl/instance.hxx>
-#include <salhelper/refobj.hxx>
 
 #include "updateinfo.hxx"
 #include "updatecheckconfiglistener.hxx"
diff --git a/extensions/source/update/check/updatecheckjob.cxx b/extensions/source/update/check/updatecheckjob.cxx
index db3ac9a..1be1d20 100644
--- a/extensions/source/update/check/updatecheckjob.cxx
+++ b/extensions/source/update/check/updatecheckjob.cxx
@@ -28,6 +28,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
+#include <osl/diagnose.h>
 
 #include "com/sun/star/frame/Desktop.hpp"
 #include "com/sun/star/frame/XTerminateListener.hpp"
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index f32e182..d9fb3f7 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 4bd4f17..6fd88f6 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 b8e51dd..8c7f04c7 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 7ebb1ec1..5972734 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:
diff --git a/vcl/osx/a11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx
index 398a5a2..ea593f2 100644
--- a/vcl/osx/a11yfocuslistener.cxx
+++ b/vcl/osx/a11yfocuslistener.cxx
@@ -17,8 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <salhelper/refobj.hxx>
-
 #include "osx/a11yfocustracker.hxx"
 #include "osx/a11yfactory.h"