[Libreoffice-commits] core.git: ucb/source

Takeshi Abe tabe at fixedpoint.jp
Wed Sep 9 01:14:41 PDT 2015 

 ucb/source/core/FileAccess.cxx                      |    6 +++---
 ucb/source/core/cmdenv.hxx                          |    4 ++--
 ucb/source/core/identify.hxx                        |    4 ++--
 ucb/source/core/provprox.hxx                        |    4 ++--
 ucb/source/core/ucbcmds.cxx                         |    8 ++++----
 ucb/source/core/ucbprops.hxx                        |    4 ++--
 ucb/source/core/ucbstore.cxx                        |    4 ++--
 ucb/source/core/ucbstore.hxx                        |    9 ++++-----
 ucb/source/sorter/sortdynres.hxx                    |    9 ++++-----
 ucb/source/sorter/sortresult.cxx                    |    4 ++--
 ucb/source/ucp/expand/ucpexpand.cxx                 |    4 ++--
 ucb/source/ucp/file/filinsreq.hxx                   |    8 ++++----
 ucb/source/ucp/file/filprp.hxx                      |    4 ++--
 ucb/source/ucp/file/filrow.hxx                      |    4 ++--
 ucb/source/ucp/file/filstr.hxx                      |    4 ++--
 ucb/source/ucp/file/prov.hxx                        |    4 ++--
 ucb/source/ucp/ftp/ftpintreq.hxx                    |    8 ++++----
 ucb/source/ucp/tdoc/tdoc_docmgr.hxx                 |    6 +++---
 ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx |    4 ++--
 ucb/source/ucp/tdoc/tdoc_stgelems.hxx               |    9 ++++-----
 ucb/source/ucp/webdav/webdavresponseparser.cxx      |    2 +-
 21 files changed, 55 insertions(+), 58 deletions(-)

New commits:
commit 5cce78f9a52050e15a63761bd8af36075b1a8945
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed Sep 9 12:25:25 2015 +0900

    ucb: tdf#88206 replace cppu::WeakImplHelper* etc.
    
    with the variadic variants.
    
    Change-Id: I0e4c7e26af86806e75bb75b7eb6c70b57e1c9514
    Reviewed-on: https://gerrit.libreoffice.org/18427
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx
index 47e86f2..b746f7a 100644
--- a/ucb/source/core/FileAccess.cxx
+++ b/ucb/source/core/FileAccess.cxx
@@ -132,7 +132,7 @@ public:
 
 // Implementation XActiveDataSink
 
-class OActiveDataSink : public cppu::WeakImplHelper1< XActiveDataSink >
+class OActiveDataSink : public cppu::WeakImplHelper< XActiveDataSink >
 {
     Reference< XInputStream > mxStream;
 
@@ -147,7 +147,7 @@ public:
 
 // Implementation XActiveDataStreamer
 
-class OActiveDataStreamer : public cppu::WeakImplHelper1< XActiveDataStreamer >
+class OActiveDataStreamer : public cppu::WeakImplHelper< XActiveDataStreamer >
 {
     Reference< XStream > mxStream;
 
@@ -162,7 +162,7 @@ public:
 
 // Implementation XCommandEnvironment
 
-class OCommandEnvironment : public cppu::WeakImplHelper1< XCommandEnvironment >
+class OCommandEnvironment : public cppu::WeakImplHelper< XCommandEnvironment >
 {
     Reference< XInteractionHandler > mxInteraction;
 
diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx
index b9234cf..1e80457 100644
--- a/ucb/source/core/cmdenv.hxx
+++ b/ucb/source/core/cmdenv.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_UCB_SOURCE_CORE_CMDENV_HXX
 #define INCLUDED_UCB_SOURCE_CORE_CMDENV_HXX
 
-#include "cppuhelper/implbase3.hxx"
+#include <cppuhelper/implbase.hxx>
 
 #include "com/sun/star/lang/XInitialization.hpp"
 #include "com/sun/star/lang/XServiceInfo.hpp"
@@ -30,7 +30,7 @@
 namespace ucb_cmdenv {
 
 class UcbCommandEnvironment :
-        public cppu::WeakImplHelper3< com::sun::star::lang::XInitialization,
+        public cppu::WeakImplHelper< com::sun::star::lang::XInitialization,
                                       com::sun::star::lang::XServiceInfo,
                                       com::sun::star::ucb::XCommandEnvironment >
 {
diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index 375d2c9..a17742e 100644
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
@@ -22,10 +22,10 @@
 
 #include <com/sun/star/ucb/XContentIdentifier.hpp>
 #include <rtl/ustrbuf.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
-class ContentIdentifier : public cppu::WeakImplHelper1 <
+class ContentIdentifier : public cppu::WeakImplHelper <
     css::ucb::XContentIdentifier >
 {
 public:
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 03ab40f..b4a3d5f 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/ucb/XContentProviderSupplier.hpp>
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/macros.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 
@@ -39,7 +39,7 @@
 
 
 
-class UcbContentProviderProxyFactory : public cppu::WeakImplHelper2 <
+class UcbContentProviderProxyFactory : public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::ucb::XContentProviderFactory >
 {
diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx
index 0669335..cfdebc8 100644
--- a/ucb/source/core/ucbcmds.cxx
+++ b/ucb/source/core/ucbcmds.cxx
@@ -19,7 +19,7 @@
 
 #include <osl/diagnose.h>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
@@ -94,7 +94,7 @@ struct TransferCommandContext
 
 
 class InteractionHandlerProxy :
-    public cppu::WeakImplHelper1< task::XInteractionHandler >
+    public cppu::WeakImplHelper< task::XInteractionHandler >
 {
     uno::Reference< task::XInteractionHandler > m_xOrig;
 
@@ -167,7 +167,7 @@ void SAL_CALL InteractionHandlerProxy::handle(
 
 
 
-class ActiveDataSink : public cppu::WeakImplHelper1< io::XActiveDataSink >
+class ActiveDataSink : public cppu::WeakImplHelper< io::XActiveDataSink >
 {
     uno::Reference< io::XInputStream > m_xStream;
 
@@ -204,7 +204,7 @@ uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream()
 
 
 class CommandProcessorInfo :
-    public cppu::WeakImplHelper1< ucb::XCommandInfo >
+    public cppu::WeakImplHelper< ucb::XCommandInfo >
 {
     uno::Sequence< ucb::CommandInfo > * m_pInfo;
 
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 7be4e70..fd71b1f 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/macros.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 
@@ -38,7 +38,7 @@
 
 
 
-class UcbPropertiesManager : public cppu::WeakImplHelper2 <
+class UcbPropertiesManager : public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::beans::XPropertySetInfo >
 {
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index 6eabac2..d746e6d 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/util/XChangesBatch.hpp>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "ucbstore.hxx"
 
 using namespace com::sun::star::beans;
@@ -109,7 +109,7 @@ typedef std::unordered_map
 PropertySetMap_Impl;
 
 // class PropertySetInfo_Impl
-class PropertySetInfo_Impl : public cppu::WeakImplHelper1 < XPropertySetInfo >
+class PropertySetInfo_Impl : public cppu::WeakImplHelper < XPropertySetInfo >
 {
     Reference< XComponentContext >    m_xContext;
     Sequence< Property >*             m_pProps;
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 78e94bb..6a56d1e 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -35,8 +35,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/macros.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 #define STORE_SERVICE_NAME          "com.sun.star.ucb.Store"
@@ -47,7 +46,7 @@
 
 struct UcbStore_Impl;
 
-class UcbStore : public cppu::WeakImplHelper3 <
+class UcbStore : public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::ucb::XPropertySetRegistryFactory,
     css::lang::XInitialization >
@@ -99,7 +98,7 @@ public:
 struct PropertySetRegistry_Impl;
 class PersistentPropertySet;
 
-class PropertySetRegistry : public cppu::WeakImplHelper3 <
+class PropertySetRegistry : public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::ucb::XPropertySetRegistry,
     css::container::XNameAccess >
@@ -181,7 +180,7 @@ public:
 
 struct PersistentPropertySet_Impl;
 
-class PersistentPropertySet : public cppu::WeakImplHelper7 <
+class PersistentPropertySet : public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::lang::XComponent,
     css::ucb::XPersistentPropertySet,
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index 718719f..4aa86e6 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -27,8 +27,7 @@
 #include <com/sun/star/ucb/ListenerAlreadySetException.hpp>
 #include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "sortresult.hxx"
 
 
@@ -41,7 +40,7 @@ namespace cppu {
 
 class SortedDynamicResultSetListener;
 
-class SortedDynamicResultSet: public cppu::WeakImplHelper2 <
+class SortedDynamicResultSet: public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::ucb::XDynamicResultSet >
 {
@@ -133,7 +132,7 @@ public:
         throw( css::uno::RuntimeException );
 };
 
-class SortedDynamicResultSetListener: public cppu::WeakImplHelper1 <
+class SortedDynamicResultSetListener: public cppu::WeakImplHelper <
     css::ucb::XDynamicResultSetListener >
 {
     SortedDynamicResultSet  *mpOwner;
@@ -161,7 +160,7 @@ public:
 
 
 
-class SortedDynamicResultSetFactory: public cppu::WeakImplHelper2 <
+class SortedDynamicResultSetFactory: public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::ucb::XSortedDynamicResultSetFactory >
 {
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index b7edf0e..d318bf9 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/ucb/ListActionType.hpp>
 #include <com/sun/star/ucb/XAnyCompare.hpp>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
@@ -92,7 +92,7 @@ struct SortListData
 
 
 
-class SRSPropertySetInfo : public cppu::WeakImplHelper1 <
+class SRSPropertySetInfo : public cppu::WeakImplHelper <
     XPropertySetInfo >
 {
     Property    maProps[2];
diff --git a/ucb/source/ucp/expand/ucpexpand.cxx b/ucb/source/ucp/expand/ucpexpand.cxx
index 6feebd6..2ea5701 100644
--- a/ucb/source/ucp/expand/ucpexpand.cxx
+++ b/ucb/source/ucp/expand/ucpexpand.cxx
@@ -20,7 +20,7 @@
 
 #include "rtl/uri.hxx"
 #include "osl/mutex.hxx"
-#include "cppuhelper/compbase2.hxx"
+#include <cppuhelper/compbase.hxx>
 #include "cppuhelper/factory.hxx"
 #include "cppuhelper/implementationentry.hxx"
 #include <cppuhelper/supportsservice.hxx>
@@ -47,7 +47,7 @@ struct MutexHolder
     mutable ::osl::Mutex m_mutex;
 };
 
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
     lang::XServiceInfo, ucb::XContentProvider > t_impl_helper;
 
 
diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx
index fced106..8f6ad6b 100644
--- a/ucb/source/ucp/file/filinsreq.hxx
+++ b/ucb/source/ucp/file/filinsreq.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/task/XInteractionAbort.hpp>
 #include <com/sun/star/ucb/XInteractionSupplyName.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace fileaccess {
@@ -35,7 +35,7 @@ namespace fileaccess {
     class shell;
 
 
-class XInteractionSupplyNameImpl : public cppu::WeakImplHelper1<
+class XInteractionSupplyNameImpl : public cppu::WeakImplHelper<
     css::ucb::XInteractionSupplyName >
     {
     public:
@@ -75,7 +75,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper1<
 
 
 
-    class XInteractionAbortImpl : public cppu::WeakImplHelper1<
+    class XInteractionAbortImpl : public cppu::WeakImplHelper<
         css::task::XInteractionAbort >
     {
     public:
@@ -104,7 +104,7 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper1<
 
 
 
-    class XInteractionRequestImpl : public cppu::WeakImplHelper1<
+    class XInteractionRequestImpl : public cppu::WeakImplHelper<
         css::task::XInteractionRequest >
     {
     public:
diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx
index 29f29b8..7b79665 100644
--- a/ucb/source/ucp/file/filprp.hxx
+++ b/ucb/source/ucp/file/filprp.hxx
@@ -21,14 +21,14 @@
 
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/ucb/XContentProvider.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace fileaccess {
 
     class shell;
 
-class XPropertySetInfo_impl : public cppu::WeakImplHelper1<
+class XPropertySetInfo_impl : public cppu::WeakImplHelper<
     css::beans::XPropertySetInfo >
     {
     public:
diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index 1807661..a2cec70 100644
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.hxx
@@ -22,13 +22,13 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
 #include <com/sun/star/ucb/XContentProvider.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace fileaccess {
 
     class shell;
 
-    class XRow_impl: public cppu::WeakImplHelper1<
+    class XRow_impl: public cppu::WeakImplHelper<
         css::sdbc::XRow >
     {
     public:
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index 6b10d18..5b04f1f 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/io/XStream.hpp>
 #include "com/sun/star/io/XAsyncOutputMonitor.hpp"
 #include <com/sun/star/ucb/XContentProvider.hpp>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "filrec.hxx"
 
@@ -38,7 +38,7 @@ namespace fileaccess {
     // forward:
     class shell;
 
-class XStream_impl :  public cppu::WeakImplHelper6<
+class XStream_impl :  public cppu::WeakImplHelper<
     css::io::XStream,
     css::io::XSeekable,
     css::io::XInputStream,
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index bc5389f..9c1d5b5 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/ucb/XFileIdentifierConverter.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 
 // FileProvider
 
@@ -48,7 +48,7 @@ namespace fileaccess {
     class BaseContent;
     class shell;
 
-    class FileProvider: public cppu::WeakImplHelper6 <
+    class FileProvider: public cppu::WeakImplHelper <
         css::lang::XServiceInfo,
         css::lang::XInitialization,
         css::ucb::XContentProvider,
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index 80f9765..ce8d8fa 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
@@ -28,12 +28,12 @@
 #include <com/sun/star/task/XInteractionDisapprove.hpp>
 #include <com/sun/star/task/XInteractionApprove.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace ftp {
 
-    class XInteractionApproveImpl : public cppu::WeakImplHelper1 <
+    class XInteractionApproveImpl : public cppu::WeakImplHelper <
         css::task::XInteractionApprove >
     {
     public:
@@ -54,7 +54,7 @@ namespace ftp {
 
 
 
-    class XInteractionDisapproveImpl : public cppu::WeakImplHelper1 <
+    class XInteractionDisapproveImpl : public cppu::WeakImplHelper <
         css::task::XInteractionDisapprove >
     {
     public:
@@ -71,7 +71,7 @@ namespace ftp {
 
 
 
-    class XInteractionRequestImpl : public cppu::WeakImplHelper1<
+    class XInteractionRequestImpl : public cppu::WeakImplHelper<
         css::task::XInteractionRequest >
     {
     public:
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index 544ed99..25009ef 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -25,7 +25,7 @@
 #include <rtl/ref.hxx>
 #include "osl/mutex.hxx"
 
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
 
 #include "com/sun/star/document/XDocumentEventListener.hpp"
 #include "com/sun/star/embed/XStorage.hpp"
@@ -83,10 +83,10 @@ namespace tdoc_ucp {
 
 
     class OfficeDocumentsManager :
-        public cppu::WeakImplHelper1< com::sun::star::document::XDocumentEventListener >
+        public cppu::WeakImplHelper< com::sun::star::document::XDocumentEventListener >
     {
         class OfficeDocumentsCloseListener :
-           public cppu::WeakImplHelper1< com::sun::star::util::XCloseListener >
+           public cppu::WeakImplHelper< com::sun::star::util::XCloseListener >
 
         {
         public:
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
index 0712eeb..63a4111 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
@@ -24,12 +24,12 @@
 #include "com/sun/star/lang/XSingleServiceFactory.hpp"
 #include "com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp"
 
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
 
 namespace tdoc_ucp {
 
 class DocumentContentFactory :
-        public cppu::WeakImplHelper2<
+        public cppu::WeakImplHelper<
             com::sun::star::frame::XTransientDocumentsDocumentContentFactory,
             com::sun::star::lang::XServiceInfo >
 {
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index 3bb99a6..dcf8dd1 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -25,8 +25,7 @@
 #include "osl/mutex.hxx"
 #include "rtl/ref.hxx"
 
-#include "cppuhelper/implbase2.hxx"
-#include "cppuhelper/implbase5.hxx"
+#include <cppuhelper/implbase.hxx>
 
 #include "com/sun/star/embed/XStorage.hpp"
 #include "com/sun/star/embed/XTransactedObject.hpp"
@@ -72,7 +71,7 @@ private:
 
 
 typedef
-    cppu::WeakImplHelper2<
+    cppu::WeakImplHelper<
         com::sun::star::embed::XStorage,
         com::sun::star::embed::XTransactedObject > StorageUNOBase;
 
@@ -307,7 +306,7 @@ private:
 
 
 typedef
-    cppu::WeakImplHelper2<
+    cppu::WeakImplHelper<
         com::sun::star::io::XOutputStream,
         com::sun::star::lang::XComponent > OutputStreamUNOBase;
 
@@ -386,7 +385,7 @@ private:
 
 
 
-typedef cppu::WeakImplHelper5< com::sun::star::io::XStream,
+typedef cppu::WeakImplHelper< com::sun::star::io::XStream,
                                com::sun::star::io::XOutputStream,
                                com::sun::star::io::XTruncate,
                                com::sun::star::io::XInputStream,
diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx
index deadf5a..fd36a86 100644
--- a/ucb/source/ucp/webdav/webdavresponseparser.cxx
+++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx
@@ -19,7 +19,7 @@
 
 #include "webdavresponseparser.hxx"
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <comphelper/processfactory.hxx>

More information about the Libreoffice-commits mailing list