[Libreoffice-commits] core.git: include/ucbhelper

[Jochen Nitschke]

 include/ucbhelper/activedatasink.hxx         |    4 ++--
 include/ucbhelper/activedatastreamer.hxx     |    4 ++--
 include/ucbhelper/commandenvironment.hxx     |    4 ++--
 include/ucbhelper/fd_inputstream.hxx         |    4 ++--
 include/ucbhelper/interceptedinteraction.hxx |    4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit ad1f2e699ac3c2b9c3cea7d2d3589fbc3749fc0a
Author: Jochen Nitschke <j.nitschke+logerrit at ok.de>
Date:   Tue Dec 6 17:40:04 2016 +0100

    tdf#88206 replace cppu::WeakImplHelper* in ucbhelper
    
    Change-Id: Iaa48400372ad5a927914c5c93d21f4871ebf5c78
    Reviewed-on: https://gerrit.libreoffice.org/31690
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx
index 3e6c3ba..fda23bd 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <ucbhelper/ucbhelperdllapi.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace ucbhelper
 {
@@ -34,7 +34,7 @@ namespace ucbhelper
   */
 
 class UCBHELPER_DLLPUBLIC ActiveDataSink :
-        public cppu::WeakImplHelper1< css::io::XActiveDataSink >
+        public cppu::WeakImplHelper< css::io::XActiveDataSink >
 {
     css::uno::Reference< css::io::XInputStream > m_xStream;
 
diff --git a/include/ucbhelper/activedatastreamer.hxx b/include/ucbhelper/activedatastreamer.hxx
index 4516c3b..618aaf7 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_UCBHELPER_ACTIVEDATASTREAMER_HXX
 
 #include <com/sun/star/io/XActiveDataStreamer.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace ucbhelper
 {
@@ -34,7 +34,7 @@ namespace ucbhelper
   */
 
 class ActiveDataStreamer :
-        public cppu::WeakImplHelper1< css::io::XActiveDataStreamer >
+        public cppu::WeakImplHelper< css::io::XActiveDataStreamer >
 {
     css::uno::Reference< css::io::XStream > m_xStream;
 
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx
index dff68b1..c11e448 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <ucbhelper/ucbhelperdllapi.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <memory>
 
 namespace ucbhelper
@@ -35,7 +35,7 @@ struct CommandEnvironment_Impl;
   * be used to supply environments to commands executed by UCB contents.
   */
 class UCBHELPER_DLLPUBLIC CommandEnvironment :
-            public cppu::WeakImplHelper1< css::ucb::XCommandEnvironment >
+            public cppu::WeakImplHelper< css::ucb::XCommandEnvironment >
 {
     std::unique_ptr<CommandEnvironment_Impl> m_pImpl;
 
diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx
index b0b12e6..a80d661 100644
--- a/include/ucbhelper/fd_inputstream.hxx
+++ b/include/ucbhelper/fd_inputstream.hxx
@@ -25,14 +25,14 @@
 #include <osl/file.h>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
 #include <ucbhelper/ucbhelperdllapi.h>
 
 namespace ucbhelper
 {
-    typedef ::cppu::WeakImplHelper2<
+    typedef cppu::WeakImplHelper<
         css::io::XInputStream,
         css::io::XSeekable > FdInputStream_Base;
 
diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx
index 72d6bd3..6a723f5 100644
--- a/include/ucbhelper/interceptedinteraction.hxx
+++ b/include/ucbhelper/interceptedinteraction.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 
 #include <com/sun/star/task/XInteractionRequest.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ucbhelper/ucbhelperdllapi.h>
 
 
@@ -40,7 +40,7 @@ namespace ucbhelper{
               only
             - or as base class if interactions must be modified.
  */
-class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper1< css::task::XInteractionHandler >
+class UCBHELPER_DLLPUBLIC InterceptedInteraction : public ::cppu::WeakImplHelper< css::task::XInteractionHandler >
 {
 
     // types