9 files changed, 16 insertions, 18 deletions
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 5686ec15f40b..761224663a99 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -20,7 +20,7 @@
 #include "sal/config.h"
 
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <tools/debug.hxx>
 
@@ -47,7 +47,7 @@ SalSession::~SalSession()
 
 class VCLSession:
     private cppu::BaseMutex,
-    public cppu::WeakComponentImplHelper1 < XSessionManagerClient >
+    public cppu::WeakComponentImplHelper < XSessionManagerClient >
 {
     struct Listener
     {
@@ -92,7 +92,7 @@ public:
 };
 
 VCLSession::VCLSession()
-        : cppu::WeakComponentImplHelper1< XSessionManagerClient >( m_aMutex ),
+        : cppu::WeakComponentImplHelper< XSessionManagerClient >( m_aMutex ),
           m_xSession( ImplGetSVData()->mpDefInst->CreateSalSession() ),
           m_bInteractionRequested( false ),
           m_bInteractionGranted( false ),
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index ca815a2f3103..56b2908e266d 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -27,7 +27,6 @@
 #include <tools/debug.hxx>
 #include <tools/resary.hxx>
 #include <tools/gen.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include <uno/current_context.hxx>
 
 #include "vcl/configsettings.hxx"
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index b5aca4281ae9..7a00b0e2467d 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.cxx
@@ -78,7 +78,7 @@
 #include "com/sun/star/lang/XComponent.hpp"
 #include "com/sun/star/frame/Desktop.hpp"
 
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
 #include "uno/current_context.hxx"
 
 #include "opengl/zone.hxx"
@@ -213,7 +213,7 @@ static Application *        pOwnSvApp = NULL;
 // Exception handler. pExceptionHandler != NULL => VCL already inited
 static oslSignalHandler pExceptionHandler = NULL;
 
-class DesktopEnvironmentContext: public cppu::WeakImplHelper1< com::sun::star::uno::XCurrentContext >
+class DesktopEnvironmentContext: public cppu::WeakImplHelper< com::sun::star::uno::XCurrentContext >
 {
 public:
     explicit DesktopEnvironmentContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx)
@@ -312,7 +312,7 @@ namespace
   a bundled extension is registered/deregistered during startup, forcing exit
   while the app is still in splash screen.)
  */
-class VCLUnoWrapperDeleter : public cppu::WeakImplHelper1<com::sun::star::lang::XEventListener>
+class VCLUnoWrapperDeleter : public cppu::WeakImplHelper<com::sun::star::lang::XEventListener>
 {
     virtual void SAL_CALL disposing(lang::EventObject const& rSource) throw(uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
diff --git a/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 53c90cab4c77..312ffa221c36 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.cxx
@@ -40,8 +40,7 @@
 #include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
 #include "com/sun/star/datatransfer/dnd/DNDConstants.hpp"
 
-#include "cppuhelper/compbase.hxx"
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace com::sun::star;
diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx
index 997cc56ea614..45480f4be204 100644
--- a/vcl/source/filter/graphicfilter.cxx
+++ b/vcl/source/filter/graphicfilter.cxx
@@ -23,7 +23,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <ucbhelper/content.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/zcodec.hxx>
 #include <tools/fract.hxx>
@@ -88,7 +88,7 @@ static ::osl::Mutex& getListMutex()
     return s_aListProtection;
 }
 
-class ImpFilterOutputStream : public ::cppu::WeakImplHelper1< css::io::XOutputStream >
+class ImpFilterOutputStream : public ::cppu::WeakImplHelper< css::io::XOutputStream >
 {
 protected:
 
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 32335133db75..9fdd688273af 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -36,7 +36,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/random.hxx>
 #include <comphelper/string.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <o3tl/numeric.hxx>
 #include <osl/file.hxx>
@@ -8238,7 +8238,7 @@ void PDFWriterImpl::sortWidgets()
 
 namespace vcl {
 class PDFStreamIf :
-        public cppu::WeakImplHelper1< com::sun::star::io::XOutputStream >
+        public cppu::WeakImplHelper< com::sun::star::io::XOutputStream >
 {
     PDFWriterImpl*  m_pWriter;
     bool            m_bWrite;
diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx
index 95f07fa94855..6a1d1b62c025 100644
--- a/vcl/source/gdi/pdfwriter_impl2.cxx
+++ b/vcl/source/gdi/pdfwriter_impl2.cxx
@@ -39,7 +39,7 @@
 #include "com/sun/star/graphic/GraphicProvider.hpp"
 #include "com/sun/star/graphic/XGraphicProvider.hpp"
 
-#include "cppuhelper/implbase1.hxx"
+#include <cppuhelper/implbase.hxx>
 
 #include <rtl/digest.h>
 #include <memory>
@@ -1068,7 +1068,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa
    is not sufficient, since an rtl MD5 digest cannot be created in an arbitrary state
    which would be needed in PDFWriterImpl::computeEncryptionKey.
 */
-class EncHashTransporter : public cppu::WeakImplHelper1 < com::sun::star::beans::XMaterialHolder >
+class EncHashTransporter : public cppu::WeakImplHelper < com::sun::star::beans::XMaterialHolder >
 {
     rtlDigest                   maUDigest;
     sal_IntPtr                  maID;
diff --git a/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index f8dbf63ad841..4c8ee6674727 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <com/sun/star/geometry/RealSize2D.hpp>
 #include <com/sun/star/geometry/RealPoint2D.hpp>
@@ -417,7 +417,7 @@ namespace vcl
 
         namespace
         {
-            class StandardColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XColorSpace >
+            class StandardColorSpace : public cppu::WeakImplHelper< com::sun::star::rendering::XColorSpace >
             {
             private:
                 uno::Sequence< sal_Int8 > m_aComponentTags;
diff --git a/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index 54b9939a8ed5..24503c49fdde 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star::datatransfer;
 using namespace ::com::sun::star::datatransfer::dnd;
 
 DNDListenerContainer::DNDListenerContainer( sal_Int8 nDefaultActions )
-    : WeakComponentImplHelper4< XDragGestureRecognizer, XDropTargetDragContext, XDropTargetDropContext, XDropTarget >(GetMutex())
+    : WeakComponentImplHelper< XDragGestureRecognizer, XDropTargetDragContext, XDropTargetDropContext, XDropTarget >(GetMutex())
 {
     m_bActive = true;
     m_nDefaultActions = nDefaultActions;