8 files changed, 16 insertions, 16 deletions
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index 0349ebdc6f17..3b17dee8a02f 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/xml/Attribute.hpp>
 #include <com/sun/star/xml/FastAttribute.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <sax/saxdllapi.h>
 
 #include <map>
@@ -70,7 +70,7 @@ class SAX_DLLPUBLIC FastTokenHandlerBase
                          const char *pStr, size_t nLength );
 };
 
-class SAX_DLLPUBLIC FastAttributeList : public ::cppu::WeakImplHelper1< css::xml::sax::XFastAttributeList >
+class SAX_DLLPUBLIC FastAttributeList : public cppu::WeakImplHelper< css::xml::sax::XFastAttributeList >
 {
 public:
     FastAttributeList( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& xTokenHandler,
diff --git a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
index 5a90419adf29..57354bbe15ec 100644
--- a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
+++ b/include/xmloff/XMLEmbeddedObjectExportFilter.hxx
@@ -23,9 +23,9 @@
 #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
-class XMLEmbeddedObjectExportFilter : public ::cppu::WeakImplHelper3<
+class XMLEmbeddedObjectExportFilter : public cppu::WeakImplHelper<
              css::xml::sax::XExtendedDocumentHandler,
              css::lang::XServiceInfo,
              css::lang::XInitialization>
diff --git a/include/xmloff/fasttokenhandler.hxx b/include/xmloff/fasttokenhandler.hxx
index ec6ac79073b3..92ce6e199a21 100644
--- a/include/xmloff/fasttokenhandler.hxx
+++ b/include/xmloff/fasttokenhandler.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_XMLOFF_FASTTOKENHANDLER_HXX
 
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <sax/fastattribs.hxx>
 #include <xmloff/token/tokens.hxx>
 #include <rtl/instance.hxx>
@@ -59,7 +59,7 @@ private:
 
 struct StaticTokenMap : public rtl::Static< TokenMap, StaticTokenMap > {};
 
-class XMLOFF_DLLPUBLIC FastTokenHandler : public cppu::WeakImplHelper1<
+class XMLOFF_DLLPUBLIC FastTokenHandler : public cppu::WeakImplHelper<
     css::xml::sax::XFastTokenHandler >,
     public sax_fastparser::FastTokenHandlerBase
 {
diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx
index 29022f44f12c..96a1ded32f68 100644
--- a/include/xmloff/xmlexp.hxx
+++ b/include/xmloff/xmlexp.hxx
@@ -57,7 +57,7 @@
 
 #include <xmloff/XMLPageExport.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <tools/fldunit.hxx>
 
 #include <list>
@@ -108,7 +108,7 @@ namespace o3tl
     template<> struct typed_flags<SvXMLExportFlags> : is_typed_flags<SvXMLExportFlags, 0x8fff> {};
 }
 
-class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6<
+class XMLOFF_DLLPUBLIC SvXMLExport : public cppu::WeakImplHelper<
              css::document::XFilter,
              css::lang::XServiceInfo,
              css::document::XExporter,
diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx
index 6d2411219d6b..d7a1cafdfcc0 100644
--- a/include/xmloff/xmlictxt.hxx
+++ b/include/xmloff/xmlictxt.hxx
@@ -27,14 +27,14 @@
 #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
 #include <tools/ref.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <memory>
 
 class SvXMLNamespaceMap;
 class SvXMLImport;
 
-class XMLOFF_DLLPUBLIC SvXMLImportContext : public ::cppu::WeakImplHelper1< ::css::xml::sax::XFastContextHandler >
+class XMLOFF_DLLPUBLIC SvXMLImportContext : public cppu::WeakImplHelper< css::xml::sax::XFastContextHandler >
 {
     friend class SvXMLImport;
 
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index f4ed9fd40b30..e4b7cd5da8b2 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -50,7 +50,7 @@
 #include <xmloff/shapeimport.hxx>
 #include <xmloff/SchXMLImportHelper.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <xmloff/formlayerimport.hxx>
 #include <comphelper/attributelist.hxx>
 
@@ -136,7 +136,7 @@ public:
 };
 
 
-class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper8<
+class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper<
              css::xml::sax::XExtendedDocumentHandler,
              css::xml::sax::XFastDocumentHandler,
              css::lang::XServiceInfo,
diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx
index 7cb181332713..684163f71cf1 100644
--- a/include/xmloff/xmlmetae.hxx
+++ b/include/xmloff/xmlmetae.hxx
@@ -24,7 +24,7 @@
 #include <xmloff/dllapi.h>
 #include <sal/types.h>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <xmloff/xmltoken.hxx>
 
 #include <vector>
@@ -46,7 +46,7 @@ class SvXMLExport;
     office:meta must <em>not</em> be written.
     </p>
  */
-class XMLOFF_DLLPUBLIC SvXMLMetaExport : public ::cppu::WeakImplHelper1<
+class XMLOFF_DLLPUBLIC SvXMLMetaExport : public cppu::WeakImplHelper<
                 css::xml::sax::XDocumentHandler >
 {
 private:
diff --git a/include/xmlscript/xml_helper.hxx b/include/xmlscript/xml_helper.hxx
index 59129f19984c..0e05bb3b6a19 100644
--- a/include/xmlscript/xml_helper.hxx
+++ b/include/xmlscript/xml_helper.hxx
@@ -21,7 +21,7 @@
 
 #include <vector>
 #include <rtl/byteseq.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
@@ -39,7 +39,7 @@ namespace xmlscript
 
 
 class XMLSCRIPT_DLLPUBLIC XMLElement
-    : public ::cppu::WeakImplHelper1< css::xml::sax::XAttributeList >
+    : public cppu::WeakImplHelper< css::xml::sax::XAttributeList >
 {
 public:
     inline XMLElement( OUString const & name )