10 files changed, 18 insertions, 21 deletions
diff --git a/scripting/source/provider/ActiveMSPList.cxx b/scripting/source/provider/ActiveMSPList.cxx
index 281b1e6c3811..2b1595ee0840 100644
--- a/scripting/source/provider/ActiveMSPList.cxx
+++ b/scripting/source/provider/ActiveMSPList.cxx
@@ -19,7 +19,6 @@
 
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <util/MiscUtils.hxx>
 
diff --git a/scripting/source/provider/ActiveMSPList.hxx b/scripting/source/provider/ActiveMSPList.hxx
index 93e4bc8f87d0..e19f8904eee5 100644
--- a/scripting/source/provider/ActiveMSPList.hxx
+++ b/scripting/source/provider/ActiveMSPList.hxx
@@ -21,7 +21,7 @@
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
@@ -51,7 +51,7 @@ typedef std::unordered_map< OUString,
 
 class NonDocMSPCreator;
 
-class ActiveMSPList : public ::cppu::WeakImplHelper1< css::lang::XEventListener  >
+class ActiveMSPList : public ::cppu::WeakImplHelper< css::lang::XEventListener  >
 {
 
 public:
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index e173f45c8dd1..1dfe7d3c9631 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -22,7 +22,7 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/mediadescriptor.hxx>
 
@@ -51,7 +51,7 @@ using namespace ::sf_misc;
 namespace browsenodefactory
 {
 class BrowseNodeAggregator :
-    public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+    public ::cppu::WeakImplHelper< browse::XBrowseNode >
 {
 private:
     OUString m_Name;
@@ -172,7 +172,7 @@ struct alphaSort
     }
 };
 class LocationBrowseNode :
-    public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+    public ::cppu::WeakImplHelper< browse::XBrowseNode >
 {
 private:
     BrowseNodeAggregatorHash* m_hBNA;
@@ -370,7 +370,7 @@ struct alphaSortForBNodes
     }
 };
 
-typedef ::cppu::WeakImplHelper1< browse::XBrowseNode > t_BrowseNodeBase;
+typedef ::cppu::WeakImplHelper< browse::XBrowseNode > t_BrowseNodeBase;
 class DefaultBrowseNode :
     public t_BrowseNodeBase
 {
@@ -529,7 +529,7 @@ public:
 };
 
 class DefaultRootBrowseNode :
-    public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+    public ::cppu::WeakImplHelper< browse::XBrowseNode >
 {
 
 private:
@@ -596,7 +596,7 @@ public:
 
 
 class SelectorBrowseNode :
-    public ::cppu::WeakImplHelper1< browse::XBrowseNode >
+    public ::cppu::WeakImplHelper< browse::XBrowseNode >
 {
 private:
     Reference< XComponentContext > m_xComponentContext;
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.hxx b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
index 35dd242b79ab..74cb3021042f 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.hxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SCRIPTING_SOURCE_PROVIDER_BROWSENODEFACTORYIMPL_HXX
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -36,7 +36,7 @@ namespace browsenodefactory
 {
 
 class BrowseNodeFactoryImpl :
-    public ::cppu::WeakImplHelper2 <
+    public ::cppu::WeakImplHelper <
         css::script::browse::XBrowseNodeFactory,
         css::lang::XServiceInfo >
 {
diff --git a/scripting/source/provider/MasterScriptProvider.hxx b/scripting/source/provider/MasterScriptProvider.hxx
index 47fa67939213..ef69111d5f43 100644
--- a/scripting/source/provider/MasterScriptProvider.hxx
+++ b/scripting/source/provider/MasterScriptProvider.hxx
@@ -22,7 +22,7 @@
 
 #include <rtl/ustring.hxx>
 
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -39,7 +39,7 @@
 namespace func_provider
 {
 
- typedef ::cppu::WeakImplHelper5<
+ typedef ::cppu::WeakImplHelper<
      css::script::provider::XScriptProvider,
      css::script::browse::XBrowseNode, css::lang::XServiceInfo,
      css::lang::XInitialization,
diff --git a/scripting/source/provider/MasterScriptProviderFactory.cxx b/scripting/source/provider/MasterScriptProviderFactory.cxx
index 4a676709e89a..d2d4493c0d35 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.cxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
diff --git a/scripting/source/provider/MasterScriptProviderFactory.hxx b/scripting/source/provider/MasterScriptProviderFactory.hxx
index a732a8438670..ff3ac813c06d 100644
--- a/scripting/source/provider/MasterScriptProviderFactory.hxx
+++ b/scripting/source/provider/MasterScriptProviderFactory.hxx
@@ -22,7 +22,7 @@
 
 #include "rtl/ustring.hxx"
 #include "rtl/ref.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -38,7 +38,7 @@ namespace func_provider
 {
 
 class MasterScriptProviderFactory :
-    public ::cppu::WeakImplHelper2 <
+    public ::cppu::WeakImplHelper <
         css::script::provider::XScriptProviderFactory,
         css::lang::XServiceInfo >
 {
diff --git a/scripting/source/provider/ProviderCache.hxx b/scripting/source/provider/ProviderCache.hxx
index b3658876fd81..3a07daa83b02 100644
--- a/scripting/source/provider/ProviderCache.hxx
+++ b/scripting/source/provider/ProviderCache.hxx
@@ -22,7 +22,6 @@
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
diff --git a/scripting/source/provider/ScriptImpl.hxx b/scripting/source/provider/ScriptImpl.hxx
index 3a53d62137fc..7f3a508ffcd9 100644
--- a/scripting/source/provider/ScriptImpl.hxx
+++ b/scripting/source/provider/ScriptImpl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SCRIPTING_SOURCE_PROVIDER_SCRIPTIMPL_HXX
 #define INCLUDED_SCRIPTING_SOURCE_PROVIDER_SCRIPTIMPL_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -36,7 +36,7 @@ namespace func_provider
 {
 
 class ScriptImpl :
-            public ::cppu::WeakImplHelper1 < ::drafts::com::sun::star::script::framework::provider::XScript >
+            public ::cppu::WeakImplHelper < ::drafts::com::sun::star::script::framework::provider::XScript >
 {
 
 public:
diff --git a/scripting/source/provider/URIHelper.hxx b/scripting/source/provider/URIHelper.hxx
index e4162e82ca14..47a629ea112e 100644
--- a/scripting/source/provider/URIHelper.hxx
+++ b/scripting/source/provider/URIHelper.hxx
@@ -29,13 +29,13 @@
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace func_provider
 {
 
 class ScriptingFrameworkURIHelper :
-    public ::cppu::WeakImplHelper3<
+    public ::cppu::WeakImplHelper<
         css::script::provider::XScriptURIHelper,
         css::lang::XServiceInfo,
         css::lang::XInitialization >