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

with the variadic variants.

Change-Id: I6acff50f23bcbac58c689caf2a7f07dbd5404e57
Reviewed-on: https://gerrit.libreoffice.org/17734
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>

62 files changed, 124 insertions, 130 deletions

diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index ce5aa6881d32..90e279a91616 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/image.hxx>
 #include <framework/fwedllapi.h>
 
@@ -31,7 +31,7 @@ namespace framework
 {
 
 class FWE_DLLPUBLIC ImageWrapper :
-                     public ::cppu::WeakImplHelper2< ::com::sun::star::awt::XBitmap,
+                     public ::cppu::WeakImplHelper< ::com::sun::star::awt::XBitmap,
                                                     ::com::sun::star::lang::XUnoTunnel >
 {
     public:
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index 07de83d63867..ea97658ec1a0 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -31,7 +31,7 @@
 #include <rtl/ustring.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/accel.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
@@ -43,7 +43,7 @@ namespace framework
 class BmkMenu;
 class AddonMenu;
 class AddonPopupMenu;
-class MenuManager : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
+class MenuManager : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
 {
     public:
         MenuManager(
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index e8e9d0567927..3080ed48e49b 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/frame/DispatchResultState.hpp>
 
 #include <boost/scoped_ptr.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/evntpost.hxx>
 #include <vcl/vclptr.hxx>
 
@@ -55,7 +55,7 @@ namespace framework{
                     or some other menu entries. Or we terminate the whole application in case this backing mode should not
                     be used.
  */
-class CloseDispatcher : public  ::cppu::WeakImplHelper2<
+class CloseDispatcher : public  ::cppu::WeakImplHelper<
                                     css::frame::XNotifyingDispatch,             // => XDispatch
                                     css::frame::XDispatchInformationProvider >
 {
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index 0dd129a2e1be..851b0217ef87 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -30,7 +30,7 @@
 
 #include <cppuhelper/weakref.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/svapp.hxx>
 
 namespace framework{
@@ -38,7 +38,7 @@ namespace framework{
 /*-************************************************************************************************************
     @short          a helper to merge dispatch information of different sources together.
 *//*-*************************************************************************************************************/
-class DispatchInformationProvider : public  ::cppu::WeakImplHelper1< css::frame::XDispatchInformationProvider >
+class DispatchInformationProvider : public  ::cppu::WeakImplHelper< css::frame::XDispatchInformationProvider >
 {
 
     // member
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index dadcfd3a3db2..4b2eb036e9b1 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
 namespace framework{
@@ -76,7 +76,7 @@ enum EDispatchHelper
 */
 class DispatchProvider  :   private TransactionBase                     ,
                             // interfaces
-                            public  ::cppu::WeakImplHelper1< css::frame::XDispatchProvider >
+                            public  ::cppu::WeakImplHelper< css::frame::XDispatchProvider >
 {
     /* member */
     private:
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index e032017d280c..e2a9ad9dd021 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/frame/DispatchDescriptor.hpp>
 
 #include <tools/wldcrd.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
 #include <deque>
@@ -47,7 +47,7 @@ namespace framework{
     @attention  Don't use this class as direct member - use it dynamicly. Do not derive from this class.
                 We hold a weakreference to our owner not to our superclass.
  */
-class InterceptionHelper : public  ::cppu::WeakImplHelper3<
+class InterceptionHelper : public  ::cppu::WeakImplHelper<
                                      css::frame::XDispatchProvider,
                                      css::frame::XDispatchProviderInterception,
                                      css::lang::XEventListener >
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index 189e109ed41d..e4a1c8238326 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework{
 
@@ -49,7 +49,7 @@ namespace framework{
 
     @devstatus      ready to use
 */
-class MailToDispatcher : public  ::cppu::WeakImplHelper3<
+class MailToDispatcher : public  ::cppu::WeakImplHelper<
                                      css::lang::XServiceInfo,
                                      css::frame::XDispatchProvider,
                                      css::frame::XNotifyingDispatch> // => XDispatch
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 633874b13f1e..16c19049214c 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -41,7 +41,7 @@
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
@@ -64,7 +64,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
 
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
-class MenuDispatcher   :        public  ::cppu::WeakImplHelper2<
+class MenuDispatcher   :        public  ::cppu::WeakImplHelper<
                                             css::frame::XDispatch           ,
                                             css::frame::XFrameActionListener >
 {
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 999c2ddb06c3..d1992402e6a5 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/util/URL.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework{
 
@@ -51,7 +51,7 @@ namespace framework{
     @devstatus      ready
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class Oxt_Handler  :    public  ::cppu::WeakImplHelper3<
+class Oxt_Handler  :    public  ::cppu::WeakImplHelper<
                                     css::lang::XServiceInfo,
                                     css::frame::XNotifyingDispatch, // => XDispatch
                                     css::document::XExtendedFilterDetection >
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index d21632619f82..40f92145adce 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -43,7 +43,7 @@
 #include <com/sun/star/uri/XUriReferenceFactory.hpp>
 #include <com/sun/star/uri/XUriReference.hpp>
 
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
@@ -66,7 +66,7 @@ typedef cppu::OMultiTypeInterfaceContainerHelperVar<OUString>
 
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
-class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper5<
+class PopupMenuDispatcher :     public  ::cppu::WeakImplHelper<
                                            css::lang::XServiceInfo,
                                            css::frame::XDispatchProvider,
                                            css::frame::XDispatch,
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index e84049ab138d..ffb77bb2f4e1 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework{
 
@@ -53,7 +53,7 @@ namespace framework{
 
     @devstatus      ready to use
 */
-class ServiceHandler : public  ::cppu::WeakImplHelper3<
+class ServiceHandler : public  ::cppu::WeakImplHelper<
                                    css::lang::XServiceInfo       ,
                                    css::frame::XDispatchProvider ,
                                    css::frame::XNotifyingDispatch > // => XDispatch
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 979f79491234..84589df7875d 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/frame/DispatchResultState.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/evntpost.hxx>
 
 namespace framework{
@@ -45,7 +45,7 @@ namespace framework{
 /**
     @short          helper to handle all URLs related to the StartModule
  */
-class StartModuleDispatcher : public  ::cppu::WeakImplHelper2<
+class StartModuleDispatcher : public  ::cppu::WeakImplHelper<
                                          css::frame::XNotifyingDispatch,             // => XDispatch
                                          css::frame::XDispatchInformationProvider >
 {
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index b4517e918e8f..f8ec78c153fe 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework{
 
@@ -51,7 +51,7 @@ namespace framework{
 
     @devstatus      ready to use
 */
-class SystemExec :     public  ::cppu::WeakImplHelper3<
+class SystemExec :     public  ::cppu::WeakImplHelper<
                                    css::lang::XServiceInfo       ,
                                    css::frame::XDispatchProvider ,
                                    css::frame::XNotifyingDispatch > // => XDispatch
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index cfc547cbe6b6..abc232016068 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -28,12 +28,12 @@
 #include <com/sun/star/ui/XDockingAreaAcceptor.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
 namespace framework{
 
-class DockingAreaDefaultAcceptor    :   public ::cppu::WeakImplHelper1< ::com::sun::star::ui::XDockingAreaAcceptor >
+class DockingAreaDefaultAcceptor    :   public ::cppu::WeakImplHelper< ::com::sun::star::ui::XDockingAreaAcceptor >
 {
     public:
 
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 7f45aa6d8a6e..414ab4601959 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ui/XContextChangeEventListener.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <i18nlangtag/lang.h>
 #include <svl/languageoptions.hxx>
@@ -150,7 +150,7 @@ FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
 //OriginalListener owns the Broadcaster which "owns" the WeakContainerListener
 //which forwards the events to the OriginalListener without taking ownership of
 //it.
-class WeakContainerListener : public ::cppu::WeakImplHelper1<com::sun::star::container::XContainerListener>
+class WeakContainerListener : public ::cppu::WeakImplHelper<com::sun::star::container::XContainerListener>
 {
     private:
         com::sun::star::uno::WeakReference<com::sun::star::container::XContainerListener> mxOwner;
@@ -205,7 +205,7 @@ class WeakContainerListener : public ::cppu::WeakImplHelper1<com::sun::star::con
         }
 };
 
-class WeakChangesListener : public ::cppu::WeakImplHelper1<com::sun::star::util::XChangesListener>
+class WeakChangesListener : public ::cppu::WeakImplHelper<com::sun::star::util::XChangesListener>
 {
     private:
         com::sun::star::uno::WeakReference<com::sun::star::util::XChangesListener> mxOwner;
@@ -242,7 +242,7 @@ class WeakChangesListener : public ::cppu::WeakImplHelper1<com::sun::star::util:
         }
 };
 
-class WeakEventListener : public ::cppu::WeakImplHelper1<com::sun::star::lang::XEventListener>
+class WeakEventListener : public ::cppu::WeakImplHelper<com::sun::star::lang::XEventListener>
 {
     private:
         com::sun::star::uno::WeakReference<com::sun::star::lang::XEventListener> mxOwner;
@@ -269,7 +269,7 @@ class WeakEventListener : public ::cppu::WeakImplHelper1<com::sun::star::lang::X
         }
 };
 
-class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star::document::XDocumentEventListener>
+class WeakDocumentEventListener : public ::cppu::WeakImplHelper<com::sun::star::document::XDocumentEventListener>
 {
     private:
         com::sun::star::uno::WeakReference<com::sun::star::document::XDocumentEventListener> mxOwner;
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index baa2d39ad0a0..7bd96b1e09d4 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
 namespace framework{
@@ -54,7 +54,7 @@ namespace framework{
     @devstatus      ready to use
 *//*-*************************************************************************************************************/
 
-class OComponentAccess  :   public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumerationAccess >
+class OComponentAccess  :   public ::cppu::WeakImplHelper< ::com::sun::star::container::XEnumerationAccess >
 {
 
     //  public methods
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index e1e5078314dc..05b64892b63f 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework{
 
@@ -50,7 +50,7 @@ namespace framework{
     @threadsafe     yes
 *//*-*************************************************************************************************************/
 
-class OComponentEnumeration :   public ::cppu::WeakImplHelper2< ::com::sun::star::container::XEnumeration,::com::sun::star::lang::XEventListener >
+class OComponentEnumeration :   public ::cppu::WeakImplHelper< ::com::sun::star::container::XEnumeration,::com::sun::star::lang::XEventListener >
 {
 
     //  public methods
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 67b7e57c6284..9f177c467a4f 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/frame/XFrames.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
 namespace framework{
@@ -54,7 +54,7 @@ namespace framework{
 
     @devstatus      deprecated
 *//*-*************************************************************************************************************/
-class OFrames   :   public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XFrames >
+class OFrames   :   public ::cppu::WeakImplHelper< ::com::sun::star::frame::XFrames >
 {
     public:
 
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 13dc1e1bc141..c3f77085db6e 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <unotools/moduleoptions.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework{
 
@@ -52,7 +52,7 @@ namespace framework{
     @devstatus      ready
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class PersistentWindowState :   public  ::cppu::WeakImplHelper2<
+class PersistentWindowState :   public  ::cppu::WeakImplHelper<
                                            css::lang::XInitialization,
                                            css::frame::XFrameActionListener > // => XEventListener
 {
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index 6043cf2a2071..032d2440ad80 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/task/XStatusIndicator.hpp>
 
 // include all others
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
 namespace framework{
@@ -52,7 +52,7 @@ namespace framework{
     @devstatus      ready to use
     @threadsafe     yes
 */
-class StatusIndicator : public  ::cppu::WeakImplHelper1< css::task::XStatusIndicator >
+class StatusIndicator : public  ::cppu::WeakImplHelper< css::task::XStatusIndicator >
 {
 
     // member
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 7e6981ff1fe7..d8d3838c8aa3 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -49,7 +49,7 @@
 
 #include <cppuhelper/supportsservice.hxx>
 #include <vcl/status.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/thread.hxx>
 
 namespace framework{
@@ -139,7 +139,7 @@ typedef ::std::vector< IndicatorInfo > IndicatorStack;
     @devstatus      ready to use
     @threadsafe     yes
  */
-class StatusIndicatorFactory : public  ::cppu::WeakImplHelper4<
+class StatusIndicatorFactory : public  ::cppu::WeakImplHelper<
                                              css::lang::XServiceInfo
                                            , css::lang::XInitialization
                                            , css::task::XStatusIndicatorFactory
diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index a9feec641e63..6bea1abe15a8 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework{
 
@@ -46,7 +46,7 @@ namespace framework{
     @devstatus      draft
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class TagWindowAsModified :   public  ::cppu::WeakImplHelper3<
+class TagWindowAsModified :   public  ::cppu::WeakImplHelper<
                                           css::lang::XInitialization,
                                           css::frame::XFrameActionListener, // => XEventListener
                                           css::util::XModifyListener >       // => XEventListener
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index c53628f71dd6..7dd4944e5f08 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/frame/XTitleChangeListener.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <unotools/moduleoptions.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustrbuf.hxx>
 
 namespace framework{
@@ -42,7 +42,7 @@ namespace framework{
     @devstatus      draft
     @threadsafe     yes
 *//*-*************************************************************************************************************/
-class TitleBarUpdate : public  ::cppu::WeakImplHelper3<
+class TitleBarUpdate : public  ::cppu::WeakImplHelper<
                                    css::lang::XInitialization
                                  , css::frame::XTitleChangeListener // => XEventListener
                                  , css::frame::XFrameActionListener > // => XEventListener
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 970317f90a45..6ce61ee7f8ba 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -37,12 +37,12 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework
 {
 
-typedef ::cppu::WeakImplHelper6<
+typedef ::cppu::WeakImplHelper<
            ::com::sun::star::ui::XUIElement,
            ::com::sun::star::ui::XUIElementSettings,
            ::com::sun::star::lang::XInitialization,
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index a672a9f6b07f..dca1cfb2b115 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -33,12 +33,12 @@
 #include <rtl/ustring.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework
 {
 
-typedef ::cppu::WeakImplHelper4<
+typedef ::cppu::WeakImplHelper<
            ::com::sun::star::ui::XUIElement,
            ::com::sun::star::lang::XInitialization,
            ::com::sun::star::lang::XComponent,
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index c5e115567a5e..3d4f86d0305c 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -28,14 +28,14 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/status.hxx>
 
 namespace framework {
 
 // declaration
 
-class VCLStatusIndicator : public  ::cppu::WeakImplHelper1< css::task::XStatusIndicator >
+class VCLStatusIndicator : public  ::cppu::WeakImplHelper< css::task::XStatusIndicator >
 {
 
     // member
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index 5f084fd66511..540f72730eeb 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/task/XInteractionRequest.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework{
 
@@ -42,7 +42,7 @@ namespace framework{
                     - InteractiveAugmentedIOException
                 All other requests will be aborted.
  */
-class QuietInteraction : public  ::cppu::WeakImplHelper1<
+class QuietInteraction : public  ::cppu::WeakImplHelper<
                                     css::task::XInteractionHandler >
 {
     // member
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index 45a8f97973e3..ff98d63a4198 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -24,7 +24,7 @@
 #include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/task/XJob.hpp>
@@ -41,7 +41,7 @@ namespace framework{
 
     @author as96863
  */
-class HelpOnStartup : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::lang::XEventListener,::com::sun::star::task::XJob >
+class HelpOnStartup : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,::com::sun::star::lang::XEventListener,::com::sun::star::task::XJob >
 {
 
     // member
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 7f01fec6a0b5..8ed4a48ac202 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/util/XCloseListener.hpp>
 #include <com/sun/star/frame/DispatchResultEvent.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/conditn.hxx>
 #include <rtl/ustring.hxx>
 
@@ -49,7 +49,7 @@ namespace framework{
             synchronously or asynchronous, control its lifetime
             and differe between jobs with and without configuration.
  */
-class Job : public  ::cppu::WeakImplHelper3<
+class Job : public  ::cppu::WeakImplHelper<
                         css::task::XJobListener
                       , css::frame::XTerminateListener
                       , css::util::XCloseListener >
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 2412edcecb7f..1610cd02f254 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -24,7 +24,7 @@
 #include <macros/xtypeprovider.hxx>
 #include <macros/xserviceinfo.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/task/XJob.hpp>
@@ -45,7 +45,7 @@ namespace framework{
 
     @author as96863
  */
-class ShellJob : public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo,::com::sun::star::task::XJob >
+class ShellJob : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,::com::sun::star::task::XJob >
 {
 
     // member
diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx
index 55820ecfb8fd..166ab64edfef 100644
--- a/framework/inc/pch/precompiled_fwe.hxx
+++ b/framework/inc/pch/precompiled_fwe.hxx
@@ -59,7 +59,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/proptypehlp.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/framework/inc/pch/precompiled_fwi.hxx b/framework/inc/pch/precompiled_fwi.hxx
index 8d21c91869e2..d33de5789b9a 100644
--- a/framework/inc/pch/precompiled_fwi.hxx
+++ b/framework/inc/pch/precompiled_fwi.hxx
@@ -31,7 +31,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/config.h>
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx
index 7b4c36e616cc..8919ad829f78 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -279,16 +279,10 @@
 #include <config_folders.h>
 #include <config_orcus.h>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
-#include <cppuhelper/compbase3.hxx>
-#include <cppuhelper/compbase4.hxx>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/proptypehlp.hxx>
diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx
index 533ca06fee4b..9bb5ac56ba53 100644
--- a/framework/inc/pch/precompiled_fwl.hxx
+++ b/framework/inc/pch/precompiled_fwl.hxx
@@ -63,7 +63,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <i18nlangtag/mslangid.hxx>
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index abe2c91ab627..143d882844e8 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -41,12 +41,12 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework{
 
 class DispatchRecorder
-    : public  ::cppu::WeakImplHelper3<
+    : public  ::cppu::WeakImplHelper<
                 css::lang::XServiceInfo
               , css::frame::XDispatchRecorder
               , css::container::XIndexReplace >
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index 88ad6b6b7f8c..e924fa234e4d 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework{
 
@@ -44,7 +44,7 @@ namespace framework{
 
     @threadsafe     yes
  */
-class DispatchRecorderSupplier  :   public  ::cppu::WeakImplHelper2<
+class DispatchRecorderSupplier  :   public  ::cppu::WeakImplHelper<
                                                 css::lang::XServiceInfo             ,
                                                 css::frame::XDispatchRecorderSupplier >
 {
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 40d349ceefab..dc3d4d70053b 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <comphelper/numberedcollection.hxx>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <unotools/cmdoptions.hxx>
 
@@ -88,7 +88,7 @@ enum ELoadState
     @devstatus  ready to use
     @threadsafe yes
 *//*-*************************************************************************************************************/
-typedef cppu::WeakComponentImplHelper6<
+typedef cppu::WeakComponentImplHelper<
            css::lang::XServiceInfo              ,
            css::frame::XDesktop2                ,
            css::frame::XTasksSupplier           ,
diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index 3210bf1ccf43..34e31faa8aca 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/frame/XDispatchResultListener.hpp>
 #include <com/sun/star/frame/DispatchResultEvent.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/conditn.hxx>
 
 namespace framework{
@@ -45,7 +45,7 @@ namespace framework{
                 All these steps are done inside one method call here.
 */
 
-class DispatchHelper : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener >
+class DispatchHelper : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener >
 {
 
     // member
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index a015ee280398..d1e042d956bb 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -49,7 +49,7 @@
 
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/propshlp.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/propertycontainer.hxx>
@@ -67,7 +67,7 @@ namespace framework
     {
         class InfoHelperBuilder;
     }
-    typedef ::cppu::WeakImplHelper3 <   ::com::sun::star::lang::XServiceInfo
+    typedef ::cppu::WeakImplHelper <   ::com::sun::star::lang::XServiceInfo
                                     ,   ::com::sun::star::frame::XLayoutManager2
                                     ,   ::com::sun::star::awt::XWindowListener
                                     >   LayoutManager_Base;
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index 3c0ca9927718..6b397c3a9e7b 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -28,7 +28,7 @@
 
 #include <com/sun/star/util/XStringMapping.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 //  namespaces
 
@@ -44,7 +44,7 @@ namespace framework{
     @devstatus      deprecated
 *//*-*************************************************************************************************************/
 
-class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper2< ::com::sun::star::util::XStringMapping, css::lang::XServiceInfo>
+class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringMapping, css::lang::XServiceInfo>
 {
 
     //  public methods
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index 8ba08a7b3b89..a0a2e6c9f762 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -29,12 +29,12 @@
 #include <com/sun/star/util/XStringAbbreviation.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework
 {
 
-class UriAbbreviation:    public ::cppu::WeakImplHelper2< ::com::sun::star::util::XStringAbbreviation, css::lang::XServiceInfo>
+class UriAbbreviation:    public ::cppu::WeakImplHelper< ::com::sun::star::util::XStringAbbreviation, css::lang::XServiceInfo>
 {
 public:
     explicit UriAbbreviation(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index 483356a39bda..8d42f64b7101 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -34,13 +34,13 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/XToolkit2.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
 
-class TabWinFactory :  public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XSingleComponentFactory, com::sun::star::lang::XServiceInfo>
+class TabWinFactory :  public ::cppu::WeakImplHelper< ::com::sun::star::lang::XSingleComponentFactory, com::sun::star::lang::XServiceInfo>
 {
     public:
         TabWinFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index 305d977f5dce..1e200c66a859 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -24,11 +24,11 @@
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace framework
 {
-    class GraphicNameAccess : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XNameAccess >
+    class GraphicNameAccess : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess >
     {
         public:
             GraphicNameAccess();
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 1a5ee6d91144..44b2e119ce3a 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ustring.hxx>
@@ -48,7 +48,7 @@
 namespace framework
 {
     class ImageManagerImpl;
-    class ImageManager :    public ::cppu::WeakImplHelper2< ::com::sun::star::ui::XImageManager, css::lang::XServiceInfo>
+    class ImageManager :    public ::cppu::WeakImplHelper< ::com::sun::star::ui::XImageManager, css::lang::XServiceInfo>
     {
         public:
             ImageManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx
index ab6e9c2184d6..86e0671fa0ac 100644
--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -38,7 +38,7 @@
 #include <com/sun/star/ui/ConfigurationEvent.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <rtl/ustring.hxx>
 
@@ -53,7 +53,7 @@ namespace framework
 {
     class ImageManagerImpl;
 
-    class ModuleImageManager :    public ::cppu::WeakImplHelper1< ::com::sun::star::ui::XImageManager>
+    class ModuleImageManager :    public ::cppu::WeakImplHelper< ::com::sun::star::ui::XImageManager>
     {
         public:
             ModuleImageManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index f91729b7acac..80df091a5c78 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propshlp.hxx>
 
 #include <vector>
@@ -44,7 +44,7 @@ namespace framework
 
 class RootItemContainer;
 class ItemContainer;
-class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper4<
+class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper<
                                                     css::container::XIndexAccess,
                                                     css::lang::XUnoTunnel       ,
                                                     css::beans::XFastPropertySet,
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 5fde1b4a9618..bf64c9eaa48e 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -30,7 +30,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <vector>
 #include <fwidllapi.h>
@@ -38,7 +38,7 @@
 namespace framework
 {
 class ConstItemContainer;
-class FWI_DLLPUBLIC ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun::star::container::XIndexContainer>
+class FWI_DLLPUBLIC ItemContainer :   public ::cppu::WeakImplHelper< ::com::sun::star::container::XIndexContainer>
 {
     friend class ConstItemContainer;
 
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 11490a7f5a29..a785f6519b68 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -34,7 +34,7 @@
 
 #include <rtl/ustring.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propshlp.hxx>
 
 #include <vector>
@@ -44,7 +44,7 @@ namespace framework
 {
 class ConstItemContainer;
 
-typedef ::cppu::WeakImplHelper3<
+typedef ::cppu::WeakImplHelper<
             css::container::XIndexContainer,
             css::lang::XSingleComponentFactory,
             css::lang::XUnoTunnel > RootItemContainer_BASE;
diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx
index e05cd37ded3c..fe86779b6493 100644
--- a/framework/inc/uielement/statusbaritem.hxx
+++ b/framework/inc/uielement/statusbaritem.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARITEM_HXX
 
 #include <com/sun/star/ui/XStatusbarItem.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <vcl/vclptr.hxx>
 
@@ -31,7 +31,7 @@ namespace framework
 
 struct AddonStatusbarItemData;
 
-typedef cppu::WeakComponentImplHelper1< com::sun::star::ui::XStatusbarItem > StatusbarItem_Base;
+typedef cppu::WeakComponentImplHelper< com::sun::star::ui::XStatusbarItem > StatusbarItem_Base;
 
 class StatusbarItem : protected cppu::BaseMutex,
                       public StatusbarItem_Base
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index 2167b0cc9e3d..0159a6687f55 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <vcl/status.hxx>
 #include <vcl/vclptr.hxx>
@@ -44,7 +44,7 @@ namespace framework
 {
 
 class FrameworkStatusBar;
-class StatusBarManager : public ::cppu::WeakImplHelper3<
+class StatusBarManager : public ::cppu::WeakImplHelper<
                                    css::frame::XFrameActionListener,
                                    css::lang::XComponent,
                                    css::ui::XUIConfigurationListener >
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index 02a54b7bdc73..9eb9535b16f8 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -29,14 +29,14 @@
 #include <com/sun/star/lang/XComponent.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <vector>
 
 namespace framework
 {
 
-class StatusIndicatorInterfaceWrapper :   public ::cppu::WeakImplHelper1< ::com::sun::star::task::XStatusIndicator>
+class StatusIndicatorInterfaceWrapper :   public ::cppu::WeakImplHelper< ::com::sun::star::task::XStatusIndicator>
 {
     public:
         StatusIndicatorInterfaceWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rStatusIndicatorImpl );
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 9fc9803ad897..9a43da9b143c 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -45,7 +45,7 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
 #include <tools/link.hxx>
@@ -60,7 +60,7 @@ class ToolBox;
 namespace framework
 {
 
-typedef ::cppu::WeakImplHelper4<
+typedef ::cppu::WeakImplHelper<
            ::com::sun::star::frame::XFrameActionListener,
            ::com::sun::star::frame::XStatusListener,
            ::com::sun::star::lang::XComponent,
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index 00fe3fcaba7f..9aa7a6a7a926 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -28,13 +28,13 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-typedef ::cppu::WeakComponentImplHelper2< com::sun::star::lang::XServiceInfo,
+typedef ::cppu::WeakComponentImplHelper< com::sun::star::lang::XServiceInfo,
         com::sun::star::container::XNameAccess > UICommandDescription_BASE;
 
 class UICommandDescription : private cppu::BaseMutex,
diff --git a/framework/inc/uifactory/configurationaccessfactorymanager.hxx b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
index b704d7e0f703..da81951eadfb 100644
--- a/framework/inc/uifactory/configurationaccessfactorymanager.hxx
+++ b/framework/inc/uifactory/configurationaccessfactorymanager.hxx
@@ -28,14 +28,14 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 
 #include <unordered_map>
 
 namespace framework {
 
-    class ConfigurationAccess_FactoryManager : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener>
+    class ConfigurationAccess_FactoryManager : public ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener>
 {
     public:
                       ConfigurationAccess_FactoryManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>& rxContext, const OUString& _sRoot );
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index a913129431d2..842a481a6f38 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XMultiComponentFactory.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 #include <unordered_map>
 
@@ -43,7 +43,7 @@ namespace framework
 //  Configuration access class for PopupMenuControllerFactory implementation
 
 class ConfigurationAccess_ControllerFactory : // interfaces
-                                                    public  ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener>
+                                                    public  ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener>
 {
 public:
                     ConfigurationAccess_ControllerFactory( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext, const OUString& _sRoot );
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index da1e73493a09..abb000400945 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -26,13 +26,13 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <toolkit/awt/vclxmenu.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework
 {
-typedef ::cppu::WeakImplHelper2<
+typedef ::cppu::WeakImplHelper<
     css::lang::XServiceInfo,
     css::ui::XUIElementFactory> MenuBarFactory_BASE;
 
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index 0fb8bfe51cd4..07c468578952 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -30,12 +30,12 @@
 #include <com/sun/star/xml/sax/XLocator.hpp>
 
 #include <salhelper/singletonref.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 
 namespace framework{
 
-class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper1< css::xml::sax::XDocumentHandler >
+class AcceleratorConfigurationReader : public ::cppu::WeakImplHelper< css::xml::sax::XDocumentHandler >
 {
 
     // const, types
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index abc52a3461b3..2b7e7c37d69f 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -26,7 +26,7 @@
 
 #include <xml/imagesconfiguration.hxx>
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <unordered_map>
 #include <stdtypes.h>
@@ -35,7 +35,7 @@ namespace framework{
 
 // Hash code function for using in all hash maps of follow implementation.
 
-class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
+class OReadImagesDocumentHandler : public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         enum Image_XML_Entry
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index 0c049063fcef..c4cd80d30842 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -28,14 +28,14 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <framework/fwedllapi.h>
 
 namespace framework{
 
 class FWE_DLLPUBLIC ReadMenuDocumentHandlerBase :
-                                    public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
+                                    public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         ReadMenuDocumentHandlerBase();
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index b6764f2fdd9c..35de8d8e6d92 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -24,7 +24,7 @@
 #include <xml/xmlnamespaces.hxx>
 #include <rtl/ustring.hxx>
 #include <vcl/menu.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <stack>
 #include <framework/fwedllapi.h>
@@ -33,7 +33,7 @@ namespace framework
 {
 
 class FWE_DLLPUBLIC SaxNamespaceFilter :
-                           public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
+                           public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         SaxNamespaceFilter( ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >& rSax1DocumentHandler );
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index 579c33c379c5..0c5cb63bbd82 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <unordered_map>
 #include <stdtypes.h>
@@ -36,7 +36,7 @@ namespace framework{
 // Hash code function for using in all hash maps of follow implementation.
 
 class FWE_DLLPUBLIC OReadStatusBarDocumentHandler :
-                                        public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
+                                        public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         enum StatusBar_XML_Entry
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 493527b39733..c91ff36f4cfc 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 
 #include <rtl/ustring.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <stdtypes.h>
 #include <framework/fwedllapi.h>
 
@@ -35,7 +35,7 @@ namespace framework{
 // Hash code function for using in all hash maps of follow implementation.
 
 class FWE_DLLPUBLIC OReadToolBoxDocumentHandler :
-                                    public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XDocumentHandler >
+                                    public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler >
 {
     public:
         enum ToolBox_XML_Entry