stoc: tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants.

Change-Id: I34fe287036ca9b8e5edcb121ba70d9a93ab05276
Reviewed-on: https://gerrit.libreoffice.org/18338
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

5 files changed, 13 insertions, 16 deletions

diff --git a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
index c84cacb52810..d4112ca8267c 100644
--- a/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
+++ b/stoc/source/uriproc/ExternalUriReferenceTranslator.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uri/XExternalUriReferenceTranslator.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/thread.h>
@@ -41,7 +41,7 @@
 namespace {
 
 class Translator:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::uri::XExternalUriReferenceTranslator>,
     private boost::noncopyable
 {
diff --git a/stoc/source/uriproc/UriReferenceFactory.cxx b/stoc/source/uriproc/UriReferenceFactory.cxx
index 9ac0b4c3ecf9..225963e74261 100644
--- a/stoc/source/uriproc/UriReferenceFactory.cxx
+++ b/stoc/source/uriproc/UriReferenceFactory.cxx
@@ -40,8 +40,7 @@
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XUriSchemeParser.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/character.hxx>
@@ -94,7 +93,7 @@ sal_Int32 parseScheme(OUString const & uriReference) {
 }
 
 class UriReference:
-    public cppu::WeakImplHelper1<css::uri::XUriReference>,
+    public cppu::WeakImplHelper<css::uri::XUriReference>,
     private boost::noncopyable
 {
 public:
@@ -258,7 +257,7 @@ void processSegments(
 }
 
 class Factory:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::uri::XUriReferenceFactory>,
     private boost::noncopyable
 {
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
index 0157f78bb7f9..5ae682e198ce 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx
@@ -33,8 +33,7 @@
 #include <com/sun/star/uri/XUriSchemeParser.hpp>
 #include <com/sun/star/uri/XVndSunStarExpandUrlReference.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/diagnose.h>
@@ -57,7 +56,7 @@ bool parseSchemeSpecificPart(OUString const & part) {
 }
 
 class UrlReference:
-    public ::cppu::WeakImplHelper1<css::uri::XVndSunStarExpandUrlReference>,
+    public ::cppu::WeakImplHelper<css::uri::XVndSunStarExpandUrlReference>,
     private boost::noncopyable
 {
 public:
@@ -152,7 +151,7 @@ OUString UrlReference::expand(
 }
 
 class Parser:
-    public ::cppu::WeakImplHelper2<
+    public ::cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
     private boost::noncopyable
 {
diff --git a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
index 631e6ef589e4..7eff7b344f4c 100644
--- a/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
+++ b/stoc/source/uriproc/UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx
@@ -30,8 +30,7 @@
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/XUriSchemeParser.hpp>
 #include <com/sun/star/uri/XVndSunStarScriptUrlReference.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <osl/mutex.hxx>
@@ -189,7 +188,7 @@ bool parseSchemeSpecificPart(OUString const & part) {
 }
 
 class UrlReference:
-    public cppu::WeakImplHelper1<css::uri::XVndSunStarScriptUrlReference>,
+    public cppu::WeakImplHelper<css::uri::XVndSunStarScriptUrlReference>,
     private boost::noncopyable
 {
 public:
@@ -374,7 +373,7 @@ sal_Int32 UrlReference::findParameter(OUString const & key) {
 }
 
 class Parser:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::uri::XUriSchemeParser>,
     private boost::noncopyable
 {
diff --git a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
index 7c37e9ce95b8..ae12f72be000 100644
--- a/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
+++ b/stoc/source/uriproc/VndSunStarPkgUrlReferenceFactory.cxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/uri/XUriReference.hpp>
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XVndSunStarPkgUrlReferenceFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/string.h>
@@ -44,7 +44,7 @@
 namespace {
 
 class Factory:
-    public cppu::WeakImplHelper2<
+    public cppu::WeakImplHelper<
         css::lang::XServiceInfo, css::uri::XVndSunStarPkgUrlReferenceFactory>,
     private boost::noncopyable
 {