tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants, for filter. Change-Id: I30dcd7cfb3e484034f6cceceb1ff7cd9d3f4b7a6 Reviewed-on: https://gerrit.libreoffice.org/17585 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
author: Takeshi Abe <tabe@fixedpoint.jp> 2015-08-08 10:53:34 +0900
committer: Noel Grandin <noelgrandin@gmail.com> 2015-08-11 07:06:51 +0000
commit: 678bb5135bf99a295c38060aa003e81a8c3b435a (patch)
tree: 678f5221dc2cc1bf29c7e11e917139c6566679c6
parent: 0b0fb87fbac36ef9fbf3dfeac0f1372617f4b3e4 (diff)
35 files changed, 66 insertions, 74 deletions
diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
index f9945eac8952..a424c989c148 100644
--- a/filter/qa/cppunit/xslt-test.cxx
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 #include <com/sun/star/xml/xslt/XSLTTransformer.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <test/bootstrapfixture.hxx>
 
@@ -51,7 +51,7 @@ public:
     CPPUNIT_TEST_SUITE_END();
 };
 
-struct Listener : public ::cppu::WeakImplHelper1<io::XStreamListener>
+struct Listener : public ::cppu::WeakImplHelper<io::XStreamListener>
 {
     bool m_bDone;
 
diff --git a/filter/source/config/cache/basecontainer.hxx b/filter/source/config/cache/basecontainer.hxx
index 2e385423c4f1..cf42c4042729 100644
--- a/filter/source/config/cache/basecontainer.hxx
+++ b/filter/source/config/cache/basecontainer.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/util/XFlushable.hpp>
 #include <cppuhelper/interfacecontainer.h>
 #include <salhelper/singletonref.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <rtl/ustring.hxx>
 
@@ -54,7 +54,7 @@ namespace filter{
                 ctor as first!
  */
 class BaseContainer : public BaseLock
-                    , public ::cppu::WeakImplHelper4< css::lang::XServiceInfo         ,
+                    , public ::cppu::WeakImplHelper< css::lang::XServiceInfo         ,
                                                       css::container::XNameContainer  , // => XNameReplace => XNameAccess => XElementAccess
                                                       css::container::XContainerQuery ,
                                                       css::util::XFlushable           >
@@ -114,7 +114,7 @@ class BaseContainer : public BaseLock
         /** @short  standard ctor.
 
             @descr  Because mostly this class is used as base class for own service
-                    implementations in combination with a ImplInheritanceHelper2 template ...
+                    implementations in combination with a ImplInheritanceHelper template ...
                     there is no way to provide some initializing data through the ctor :-(
                     This base class will be created inside its default ctor and must be
                     initialized with its needed parameters explicitly by calling: "init()".
@@ -134,7 +134,7 @@ class BaseContainer : public BaseLock
         /** @short  initialize this generic intsnace with some specialized values
                     from our derived object.
 
-            @descr  Because an outside class must use ImplInheritanceHelper2 template to
+            @descr  Because an outside class must use ImplInheritanceHelper template to
                     use us a base class ... and there is no way to pass such initializing
                     parameters through a required default ctor ... we must be initialized
                     by this special method. Of course this method must be called first before
diff --git a/filter/source/config/cache/cacheupdatelistener.hxx b/filter/source/config/cache/cacheupdatelistener.hxx
index a6b2e7410110..4429a246f8a4 100644
--- a/filter/source/config/cache/cacheupdatelistener.hxx
+++ b/filter/source/config/cache/cacheupdatelistener.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/util/XChangesListener.hpp>
 #include <salhelper/singletonref.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace filter{
@@ -37,7 +37,7 @@ namespace filter{
                 wa changed by other processes.
  */
 class CacheUpdateListener : public BaseLock // must be the first one to guarantee right initialized mutex member!
-                          , public ::cppu::WeakImplHelper1< css::util::XChangesListener >
+                          , public ::cppu::WeakImplHelper< css::util::XChangesListener >
 {
 
     // member
diff --git a/filter/source/config/cache/configflush.hxx b/filter/source/config/cache/configflush.hxx
index a4583d01685b..730671d79266 100644
--- a/filter/source/config/cache/configflush.hxx
+++ b/filter/source/config/cache/configflush.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace filter{
@@ -40,7 +40,7 @@ namespace filter{
                 type/filter configuration will be changed at runtime.
  */
 class ConfigFlush : public BaseLock
-                  , public ::cppu::WeakImplHelper2<
+                  , public ::cppu::WeakImplHelper<
                                                     css::util::XRefreshable,
                                                     css::lang::XServiceInfo
                                                   >
diff --git a/filter/source/config/cache/contenthandlerfactory.hxx b/filter/source/config/cache/contenthandlerfactory.hxx
index d5261e6249de..ee7d2b28f0ad 100644
--- a/filter/source/config/cache/contenthandlerfactory.hxx
+++ b/filter/source/config/cache/contenthandlerfactory.hxx
@@ -23,7 +23,7 @@
 #include "basecontainer.hxx"
 #include <com/sun/star/frame/XLoaderFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace filter{
@@ -34,7 +34,7 @@ namespace filter{
 
 /** @short      implements the service <type scope="com.sun.star.document">ContentHandlerFactory</type>.
  */
-class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer                   ,
+class ContentHandlerFactory : public ::cppu::ImplInheritanceHelper< BaseContainer                   ,
                                                                      css::frame::XLoaderFactory >
 {
 
diff --git a/filter/source/config/cache/filterfactory.hxx b/filter/source/config/cache/filterfactory.hxx
index 5aefbc58d76c..9adeb638677b 100644
--- a/filter/source/config/cache/filterfactory.hxx
+++ b/filter/source/config/cache/filterfactory.hxx
@@ -24,7 +24,7 @@
 #include "querytokenizer.hxx"
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace filter{
@@ -35,7 +35,7 @@ namespace filter{
 
 /** @short      implements the service <type scope="com.sun.star.document">FilterFactory</type>.
  */
-class FilterFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer                   ,
+class FilterFactory : public ::cppu::ImplInheritanceHelper< BaseContainer                   ,
                                                              css::lang::XMultiServiceFactory >
 {
 
diff --git a/filter/source/config/cache/frameloaderfactory.hxx b/filter/source/config/cache/frameloaderfactory.hxx
index 1a72081d8cc4..71553ca743df 100644
--- a/filter/source/config/cache/frameloaderfactory.hxx
+++ b/filter/source/config/cache/frameloaderfactory.hxx
@@ -23,7 +23,7 @@
 #include "basecontainer.hxx"
 #include <com/sun/star/frame/XLoaderFactory.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace filter{
@@ -34,7 +34,7 @@ namespace filter{
 
 /** @short      implements the service <type scope="com.sun.star.document">FrameLoaderFactory</type>.
  */
-class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper1< BaseContainer                   ,
+class FrameLoaderFactory : public ::cppu::ImplInheritanceHelper< BaseContainer                   ,
                                                                   css::frame::XLoaderFactory >
 {
 
diff --git a/filter/source/config/cache/typedetection.hxx b/filter/source/config/cache/typedetection.hxx
index d9c6a63ba02e..f433a796ec64 100644
--- a/filter/source/config/cache/typedetection.hxx
+++ b/filter/source/config/cache/typedetection.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <unotools/mediadescriptor.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace filter{ namespace config {
@@ -34,7 +34,7 @@ namespace filter{ namespace config {
 
 /** @short      implements the service <type scope="com.sun.star.document">TypeDetection</type>.
  */
-class TypeDetection : public ::cppu::ImplInheritanceHelper1< BaseContainer                 ,
+class TypeDetection : public ::cppu::ImplInheritanceHelper< BaseContainer                 ,
                                                              css::document::XTypeDetection >
 {
 
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index f443cd6f0ee2..7d18c2054729 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -35,8 +35,7 @@
 #include <com/sun/star/frame/XController.hdl>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
@@ -63,7 +62,7 @@ using ::com::sun::star::frame::XModel;
 
 namespace swf {
 
-class OslOutputStreamWrapper : public ::cppu::WeakImplHelper1<com::sun::star::io::XOutputStream>
+class OslOutputStreamWrapper : public ::cppu::WeakImplHelper<com::sun::star::io::XOutputStream>
 {
     osl::File   mrFile;
 
@@ -138,7 +137,7 @@ void SAL_CALL OslOutputStreamWrapper::closeOutput(  ) throw (::com::sun::star::i
 
 
 
-class FlashExportFilter : public cppu::WeakImplHelper4
+class FlashExportFilter : public cppu::WeakImplHelper
 <
     com::sun::star::document::XFilter,
     com::sun::star::document::XExporter,
diff --git a/filter/source/graphic/GraphicExportDialog.hxx b/filter/source/graphic/GraphicExportDialog.hxx
index 8c1028cd2e1e..c383bad1c0b0 100644
--- a/filter/source/graphic/GraphicExportDialog.hxx
+++ b/filter/source/graphic/GraphicExportDialog.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FILTER_SOURCE_GRAPHIC_GRAPHICEXPORTDIALOG_HXX
 
 #include <tools/fldunit.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/lang/XInitialization.hpp>
@@ -34,7 +34,7 @@ using namespace css::uno;
 using namespace css::beans;
 using namespace css::lang;
 
-class GraphicExportDialog : public cppu::WeakImplHelper4
+class GraphicExportDialog : public cppu::WeakImplHelper
 <
     document::XExporter,
     ui::dialogs::XExecutableDialog,
diff --git a/filter/source/graphic/GraphicExportFilter.hxx b/filter/source/graphic/GraphicExportFilter.hxx
index 2dfd2f8d7b6e..5f349a792517 100644
--- a/filter/source/graphic/GraphicExportFilter.hxx
+++ b/filter/source/graphic/GraphicExportFilter.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/processfactory.hxx>
 
 using namespace css;
@@ -38,7 +38,7 @@ using namespace css::beans;
 using namespace css::document;
 
 class GraphicExportFilter :
-    public cppu::WeakImplHelper3 < XFilter, XExporter, XInitialization >
+    public cppu::WeakImplHelper < XFilter, XExporter, XInitialization >
 {
     Reference<XComponent>               mxDocument;
     Reference<XComponentContext>        mxContext;
diff --git a/filter/source/pdf/pdfdialog.hxx b/filter/source/pdf/pdfdialog.hxx
index a450b4f4c1af..0c4a547d4f48 100644
--- a/filter/source/pdf/pdfdialog.hxx
+++ b/filter/source/pdf/pdfdialog.hxx
@@ -23,7 +23,7 @@
 #include "pdffilter.hxx"
 #include <svtools/genericunodialog.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 // - PDFDialog -
@@ -31,7 +31,7 @@
 
 namespace vcl { class Window; }
 
-typedef ::cppu::ImplInheritanceHelper2  <
+typedef ::cppu::ImplInheritanceHelper  <
                                              ::svt::OGenericUnoDialog,
                                              XPropertyAccess,
                                              XExporter
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index 7c065a4d6d51..45938fb10fc5 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -68,7 +68,7 @@
 
 #include "unotools/configmgr.hxx"
 #include "cppuhelper/exc_hlp.hxx"
-#include "cppuhelper/compbase1.hxx"
+#include <cppuhelper/compbase.hxx>
 #include "cppuhelper/basemutex.hxx"
 
 #include "com/sun/star/lang/XServiceInfo.hpp"
@@ -943,7 +943,7 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >&
 namespace
 {
 
-typedef cppu::WeakComponentImplHelper1< task::XInteractionRequest > PDFErrorRequestBase;
+typedef cppu::WeakComponentImplHelper< task::XInteractionRequest > PDFErrorRequestBase;
 
 class PDFErrorRequest : private cppu::BaseMutex,
                         public PDFErrorRequestBase
diff --git a/filter/source/pdf/pdffilter.hxx b/filter/source/pdf/pdffilter.hxx
index c4b28faedc82..0884d5bce1f8 100644
--- a/filter/source/pdf/pdffilter.hxx
+++ b/filter/source/pdf/pdffilter.hxx
@@ -26,10 +26,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <comphelper/property.hxx>
@@ -55,7 +52,7 @@ using namespace ::com::sun::star::io;
 // - PDFFilter -
 
 
-class PDFFilter : public cppu::WeakImplHelper4 < XFilter,
+class PDFFilter : public cppu::WeakImplHelper < XFilter,
                                                  XExporter,
                                                  XInitialization,
                                                  XServiceInfo >
diff --git a/filter/source/pdf/pdfinteract.hxx b/filter/source/pdf/pdfinteract.hxx
index fc4d852a656d..3f1664f56140 100644
--- a/filter/source/pdf/pdfinteract.hxx
+++ b/filter/source/pdf/pdfinteract.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_FILTER_SOURCE_PDF_PDFINTERACT_HXX
 
 #include "com/sun/star/lang/XServiceInfo.hpp"
-#include "cppuhelper/implbase2.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/task/XInteractionHandler2.hpp"
 
@@ -33,7 +33,7 @@ using namespace ::com::sun::star::lang;
 // - PDFFilter -
 
 
-class PDFInteractionHandler : public cppu::WeakImplHelper2 < task::XInteractionHandler2,
+class PDFInteractionHandler : public cppu::WeakImplHelper < task::XInteractionHandler2,
                                                              XServiceInfo >
 {
 protected:
diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx
index 1092032a64f3..f45b607d799b 100644
--- a/filter/source/placeware/filter.cxx
+++ b/filter/source/placeware/filter.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/processfactory.hxx>
@@ -41,7 +41,7 @@ namespace pwp {
 
 
 
-class PlaceWareExportFilter : public cppu::WeakImplHelper4
+class PlaceWareExportFilter : public cppu::WeakImplHelper
 <
     com::sun::star::document::XFilter,
     com::sun::star::document::XExporter,
diff --git a/filter/source/storagefilterdetect/filterdetect.hxx b/filter/source/storagefilterdetect/filterdetect.hxx
index 06a9aa2cea7b..69f0a8e49405 100644
--- a/filter/source/storagefilterdetect/filterdetect.hxx
+++ b/filter/source/storagefilterdetect/filterdetect.hxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
-class StorageFilterDetect : public cppu::WeakImplHelper3<
+class StorageFilterDetect : public cppu::WeakImplHelper<
     com::sun::star::document::XExtendedFilterDetection,
     com::sun::star::lang::XInitialization,
     com::sun::star::lang::XServiceInfo>
diff --git a/filter/source/svg/svgfilter.hxx b/filter/source/svg/svgfilter.hxx
index b0fc550295af..3dfebdda8c1c 100644
--- a/filter/source/svg/svgfilter.hxx
+++ b/filter/source/svg/svgfilter.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
@@ -193,7 +193,7 @@ class SVGFontExport;
 class SVGActionWriter;
 class EditFieldInfo;
 
-class SVGFilter : public cppu::WeakImplHelper4 < XFilter,
+class SVGFilter : public cppu::WeakImplHelper < XFilter,
                                                  XImporter,
                                                  XExporter,
                                                  XExtendedFilterDetection >
diff --git a/filter/source/svg/svgwriter.hxx b/filter/source/svg/svgwriter.hxx
index 8bc74912d0b8..33828a7b87d9 100644
--- a/filter/source/svg/svgwriter.hxx
+++ b/filter/source/svg/svgwriter.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX
 #define INCLUDED_FILTER_SOURCE_SVG_SVGWRITER_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/stream.hxx>
 #include <vcl/gdimtf.hxx>
@@ -373,7 +373,7 @@ public:
                                            const GDIMetaFile* pTextEmbeddedBitmapMtf = NULL );
 };
 
-class SVGWriter : public cppu::WeakImplHelper1< XSVGWriter >
+class SVGWriter : public cppu::WeakImplHelper< XSVGWriter >
 {
 private:
     Reference< XComponentContext >                      mxContext;
diff --git a/filter/source/svg/test/odfserializer.cxx b/filter/source/svg/test/odfserializer.cxx
index 6ab67b8b1804..65385c28b9e1 100644
--- a/filter/source/svg/test/odfserializer.cxx
+++ b/filter/source/svg/test/odfserializer.cxx
@@ -20,7 +20,7 @@
 #include "odfserializer.hxx"
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <boost/noncopyable.hpp>
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
 namespace svgi
 {
 
-typedef ::cppu::WeakComponentImplHelper1<
+typedef ::cppu::WeakComponentImplHelper<
     com::sun::star::xml::sax::XDocumentHandler> ODFSerializerBase;
 
 class ODFSerializer : private cppu::BaseMutex,
diff --git a/filter/source/svg/test/svg2odf.cxx b/filter/source/svg/test/svg2odf.cxx
index bb16644f4c39..2fe00cf42657 100644
--- a/filter/source/svg/test/svg2odf.cxx
+++ b/filter/source/svg/test/svg2odf.cxx
@@ -25,7 +25,7 @@
 #include <osl/process.h>
 #include <rtl/bootstrap.hxx>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/bootstrap.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/oslfile2streamwrap.hxx>
@@ -34,7 +34,7 @@ using namespace ::com::sun::star;
 
 namespace
 {
-    class OutputWrap : public cppu::WeakImplHelper1<
+    class OutputWrap : public cppu::WeakImplHelper<
         io::XOutputStream>
     {
         osl::File maFile;
diff --git a/filter/source/t602/t602filter.hxx b/filter/source/t602/t602filter.hxx
index 307d92f8b278..4a4ca759abcb 100644
--- a/filter/source/t602/t602filter.hxx
+++ b/filter/source/t602/t602filter.hxx
@@ -30,8 +30,7 @@
 #include <com/sun/star/lang/XLocalizable.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <xmloff/attrlist.hxx>
 #include <tools/resmgr.hxx>
 
@@ -90,7 +89,7 @@ struct inistruct
         };
 };
 
-class T602ImportFilterDialog : public cppu::WeakImplHelper4 <
+class T602ImportFilterDialog : public cppu::WeakImplHelper <
         com::sun::star::ui::dialogs::XExecutableDialog,
         com::sun::star::lang::XLocalizable,
         com::sun::star::lang::XServiceInfo,
@@ -144,7 +143,7 @@ public:
 };
 
 
-class T602ImportFilter : public cppu::WeakImplHelper5 <
+class T602ImportFilter : public cppu::WeakImplHelper <
     com::sun::star::document::XFilter,
     com::sun::star::document::XImporter,
     com::sun::star::document::XExtendedFilterDetection,
diff --git a/filter/source/textfilterdetect/filterdetect.hxx b/filter/source/textfilterdetect/filterdetect.hxx
index 670be2d418b3..bfa3ca5440f4 100644
--- a/filter/source/textfilterdetect/filterdetect.hxx
+++ b/filter/source/textfilterdetect/filterdetect.hxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
-class PlainTextFilterDetect : public cppu::WeakImplHelper3<
+class PlainTextFilterDetect : public cppu::WeakImplHelper<
     com::sun::star::document::XExtendedFilterDetection,
     com::sun::star::lang::XInitialization,
     com::sun::star::lang::XServiceInfo>
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
index 8e358776fe13..f295afe92a89 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 
@@ -42,7 +42,7 @@ enum FilterType
  * setSourceDocument or setTargetDocument determines which Impl function the filter
  * member calls */
 
-class XmlFilterAdaptor : public cppu::WeakImplHelper5
+class XmlFilterAdaptor : public cppu::WeakImplHelper
 <
     com::sun::star::document::XFilter,
     com::sun::star::document::XExporter,
diff --git a/filter/source/xmlfilteradaptor/streamwrap.hxx b/filter/source/xmlfilteradaptor/streamwrap.hxx
index 0b578de78d26..efc2703b78d6 100644
--- a/filter/source/xmlfilteradaptor/streamwrap.hxx
+++ b/filter/source/xmlfilteradaptor/streamwrap.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/io/XOutputStream.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XSeekable.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace osl
 {
@@ -35,7 +35,7 @@ namespace foo
 
 //= OOutputStreamWrapper
 
-typedef ::cppu::WeakImplHelper1<css::io::XOutputStream> OutputStreamWrapper_Base;
+typedef ::cppu::WeakImplHelper<css::io::XOutputStream> OutputStreamWrapper_Base;
     // needed for some compilers
 class OOutputStreamWrapper : public OutputStreamWrapper_Base
 {
diff --git a/filter/source/xmlfilterdetect/filterdetect.hxx b/filter/source/xmlfilterdetect/filterdetect.hxx
index 3baa39f2908d..301684e78a4b 100644
--- a/filter/source/xmlfilterdetect/filterdetect.hxx
+++ b/filter/source/xmlfilterdetect/filterdetect.hxx
@@ -23,13 +23,13 @@
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
 } } } }
 
-class FilterDetect : public cppu::WeakImplHelper3 <
+class FilterDetect : public cppu::WeakImplHelper <
     css::document::XExtendedFilterDetection,
     css::lang::XInitialization,
     css::lang::XServiceInfo
diff --git a/filter/source/xsltdialog/typedetectionimport.hxx b/filter/source/xsltdialog/typedetectionimport.hxx
index 2a0a269dde20..10a53e2ff4b0 100644
--- a/filter/source/xsltdialog/typedetectionimport.hxx
+++ b/filter/source/xsltdialog/typedetectionimport.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
 #include "xmlfilterjar.hxx"
@@ -58,7 +58,7 @@ struct Node
 
 typedef std::vector< Node* > NodeVector;
 
-class TypeDetectionImporter : public cppu::WeakImplHelper1 < com::sun::star::xml::sax::XDocumentHandler >
+class TypeDetectionImporter : public cppu::WeakImplHelper < com::sun::star::xml::sax::XDocumentHandler >
 {
 public:
     TypeDetectionImporter();
diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index d24b9b48869c..5e403c302b87 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 2563cadada86..34990328a91c 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -68,7 +68,7 @@ using namespace com::sun::star::xml;
 using namespace com::sun::star::xml::sax;
 
 
-class GlobalEventListenerImpl : public ::cppu::WeakImplHelper1< com::sun::star::document::XDocumentEventListener >
+class GlobalEventListenerImpl : public ::cppu::WeakImplHelper< com::sun::star::document::XDocumentEventListener >
 {
 public:
     GlobalEventListenerImpl( XMLFilterTestDialog* pDialog );
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index d6eafdaf2e3f..167d17604600 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -28,7 +28,6 @@
 #include <libexslt/exslt.h>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase4.hxx>
 
 #include <osl/module.h>
 #include <osl/file.hxx>
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.hxx b/filter/source/xsltfilter/LibXSLTTransformer.hxx
index 5f849cd092ca..89822344d7c5 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.hxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.hxx
@@ -20,7 +20,7 @@
 #include <libxml/xpathInternals.h>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <rtl/ref.hxx>
 
@@ -63,7 +63,7 @@ namespace XSLT
      *
      * See Reader below.
      */
-    class LibXSLTTransformer : public WeakImplHelper1<com::sun::star::xml::xslt::XXSLTTransformer>
+    class LibXSLTTransformer : public WeakImplHelper<com::sun::star::xml::xslt::XXSLTTransformer>
     {
     private:
         static const char* const PARAM_SOURCE_URL;
diff --git a/filter/source/xsltfilter/OleHandler.hxx b/filter/source/xsltfilter/OleHandler.hxx
index d1d9ad8acea8..8a25db85bdfa 100644
--- a/filter/source/xsltfilter/OleHandler.hxx
+++ b/filter/source/xsltfilter/OleHandler.hxx
@@ -24,7 +24,6 @@
 #include <libxslt/variables.h>
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase4.hxx>
 #include <osl/module.h>
 #include <osl/file.hxx>
 #include <osl/process.h>
diff --git a/filter/source/xsltfilter/XSLTFilter.cxx b/filter/source/xsltfilter/XSLTFilter.cxx
index 85ebe5585f1a..95a514c4ee69 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -19,7 +19,7 @@
 
 
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <sax/tools/documenthandleradapter.hxx>
 
@@ -97,7 +97,7 @@ namespace XSLT
      * supporting service from an extension for a specific filter; the
      * service must support com.sun.star.xml.xslt.XSLT2Transformer.
      */
-    class XSLTFilter : public WeakImplHelper4<XImportFilter, XExportFilter,
+    class XSLTFilter : public WeakImplHelper<XImportFilter, XExportFilter,
             XStreamListener, ExtendedDocumentHandlerAdapter>
     {
     private:
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx
index 028e9a5c7e07..8d3704e3a5d8 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -20,7 +20,6 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
-#include <cppuhelper/implbase1.hxx>
 
 class TBCHeader;
 
diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx
index 5eef1fc40f8c..2e1da6fc9005 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX
 
 #include <sfx2/objsh.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/script/vba/XVBAMacroResolver.hpp>
@@ -51,7 +51,7 @@ MSFILTER_DLLPUBLIC ::com::sun::star::awt::KeyEvent parseKeyEvent( const OUString
 MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxDoc, const ::com::sun::star::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
 
-typedef ::cppu::WeakImplHelper3<
+typedef ::cppu::WeakImplHelper<
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::lang::XInitialization,
     ::com::sun::star::script::vba::XVBAMacroResolver > VBAMacroResolverBase;
author	Takeshi Abe <tabe@fixedpoint.jp>	2015-08-08 10:53:34 +0900
committer	Noel Grandin <noelgrandin@gmail.com>	2015-08-11 07:06:51 +0000
commit	678bb5135bf99a295c38060aa003e81a8c3b435a (patch)
tree	678f5221dc2cc1bf29c7e11e917139c6566679c6
parent	0b0fb87fbac36ef9fbf3dfeac0f1372617f4b3e4 (diff)