tdf#88206 replace cppu::WeakImplHelper* in svtools and svx

and remove unused implbase*.hxx and compbase*.hxx includes

Change-Id: Iedf6b6dce09b5baf714a1b3394bb7fb3526cca82
Reviewed-on: https://gerrit.libreoffice.org/31594Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

include/svtools/accessibleruler.hxx

@@ -36,7 +36,6 @@
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/compbase5.hxx>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/implbase5.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <vcl/vclptr.hxx>
 

include/svtools/cliplistener.hxx

@@ -22,14 +22,14 @@
 
 #include <svtools/svtdllapi.h>
 #include <tools/link.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
 
 namespace vcl { class Window; }
 
 class TransferableDataHelper;
 
-class SVT_DLLPUBLIC TransferableClipboardListener : public ::cppu::WeakImplHelper1<
+class SVT_DLLPUBLIC TransferableClipboardListener : public cppu::WeakImplHelper<
                             css::datatransfer::clipboard::XClipboardListener >
 {
     Link<TransferableDataHelper*,void>  aLink;

include/svtools/dialogclosedlistener.hxx

@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_DIALOGCLOSEDLISTENER_HXX
 
 #include <svtools/svtdllapi.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp>
 #include <tools/link.hxx>
 
@@ -36,7 +36,7 @@ namespace svt
         C++ class to implement a css::ui::dialogs::XDialogClosedListener
     */
     class SVT_DLLPUBLIC DialogClosedListener :
-        public ::cppu::WeakImplHelper1< css::ui::dialogs::XDialogClosedListener >
+        public cppu::WeakImplHelper< css::ui::dialogs::XDialogClosedListener >
     {
     private:
         /**

include/svtools/genericunodialog.hxx

@@ -31,7 +31,7 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/NotInitializedException.hpp>
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/propshlp.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/uno3.hxx>
@@ -56,10 +56,9 @@ namespace svt
 #define     UNODIALOG_PROPERTY_PARENT       "ParentWindow"
 
 
-    typedef ::cppu::WeakImplHelper3 <   css::ui::dialogs::XExecutableDialog
-                                    ,   css::lang::XServiceInfo
-                                    ,   css::lang::XInitialization
-                                    >   OGenericUnoDialogBase;
+    typedef cppu::WeakImplHelper< css::ui::dialogs::XExecutableDialog,
+                                  css::lang::XServiceInfo,
+                                  css::lang::XInitialization > OGenericUnoDialogBase;
 
     /** abstract base class for implementing UNO objects representing dialogs (com.sun.star.awt::XDialog)
     */

include/svtools/openfiledroptargetlistener.hxx

@@ -25,7 +25,7 @@
 #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <sot/exchange.hxx>
 
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star { namespace uno {
 
 /** DropTargetListener that takes care of opening a file when it is dropped in the frame.
 */
-class SVT_DLLPUBLIC OpenFileDropTargetListener : public ::cppu::WeakImplHelper1< css::datatransfer::dnd::XDropTargetListener >
+class SVT_DLLPUBLIC OpenFileDropTargetListener : public cppu::WeakImplHelper< css::datatransfer::dnd::XDropTargetListener >
 {
     private:
         /// uno service manager to create necessary services

include/svtools/popupmenucontrollerbase.hxx

@@ -37,7 +37,7 @@
 #include <com/sun/star/util/XURLTransformer.hpp>
 
 #include <toolkit/awt/vclxmenu.hxx>
-#include <cppuhelper/compbase7.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/weak.hxx>
 #include <rtl/ustring.hxx>
@@ -46,7 +46,7 @@ namespace svt
 {
     struct PopupMenuControllerBaseDispatchInfo;
 
-    typedef ::cppu::WeakComponentImplHelper7<
+    typedef cppu::WeakComponentImplHelper<
                         css::lang::XServiceInfo            ,
                         css::frame::XPopupMenuController ,
                         css::lang::XInitialization         ,

include/svtools/toolboxcontroller.hxx

@@ -30,7 +30,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/proparrhlp.hxx>
@@ -46,7 +46,7 @@ class ToolBox;
 namespace svt
 {
 
-typedef cppu::WeakImplHelper5<
+typedef cppu::WeakImplHelper<
         css::frame::XStatusListener, css::frame::XToolbarController,
         css::lang::XInitialization, css::util::XUpdatable,
         css::lang::XComponent >

include/svtools/transfer.hxx

@@ -27,8 +27,7 @@
 #include <tools/ref.hxx>
 #include <sot/formats.hxx>
 #include <sot/exchange.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/datatransfer/XTransferable2.hpp>
@@ -122,7 +121,7 @@ struct ExecuteDropEvent
         mbDefault( false ) {}
 };
 
-class SVT_DLLPUBLIC TransferableHelper : public ::cppu::WeakImplHelper4< css::datatransfer::XTransferable2,
+class SVT_DLLPUBLIC TransferableHelper : public cppu::WeakImplHelper< css::datatransfer::XTransferable2,
                                                            css::datatransfer::clipboard::XClipboardOwner,
                                                            css::datatransfer::dnd::XDragSourceListener,
                                                            css::lang::XUnoTunnel >
@@ -130,7 +129,7 @@ class SVT_DLLPUBLIC TransferableHelper : public ::cppu::WeakImplHelper4< css::da
 private:
 
     // nested class to implement the XTerminateListener interface
-    class TerminateListener : public ::cppu::WeakImplHelper1< css::frame::XTerminateListener >
+    class TerminateListener : public cppu::WeakImplHelper< css::frame::XTerminateListener >
     {
     private:
 
@@ -370,7 +369,7 @@ class SVT_DLLPUBLIC DragSourceHelper
 private:
 
     // nested class to implement the XDragGestureListener interface
-    class DragGestureListener : public ::cppu::WeakImplHelper1< css::datatransfer::dnd::XDragGestureListener >
+    class DragGestureListener : public cppu::WeakImplHelper< css::datatransfer::dnd::XDragGestureListener >
     {
     private:
 
@@ -416,7 +415,7 @@ class SVT_DLLPUBLIC DropTargetHelper
 private:
 
     // nested class to implement the XDropTargetListener interface
-    class DropTargetListener : public ::cppu::WeakImplHelper1< css::datatransfer::dnd::XDropTargetListener >
+    class DropTargetListener : public cppu::WeakImplHelper< css::datatransfer::dnd::XDropTargetListener >
     {
     private:
 

include/svtools/unoevent.hxx

@@ -23,7 +23,7 @@
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class SvxMacroTableDtor;
 class SvxMacroItem;
@@ -54,7 +54,7 @@ struct SvEventDescription
  * All details of how to actually get and set SvxMacroItem(s) have to
  * be supplied by the base class.
  */
-class SVT_DLLPUBLIC SvBaseEventDescriptor : public cppu::WeakImplHelper2
+class SVT_DLLPUBLIC SvBaseEventDescriptor : public cppu::WeakImplHelper
 <
     css::container::XNameReplace,
     css::lang::XServiceInfo

include/svx/SmartTagMgr.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_SMARTTAGMGR_HXX
 #define INCLUDED_SVX_SMARTTAGMGR_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/util/XModifyListener.hpp>
@@ -81,7 +81,7 @@ struct ActionReference
     This class organizes the available smarttag libraries and provides access functions
     to these libraries. The smart tag manager is a singleton.
 */
-class SVX_DLLPUBLIC SmartTagMgr : public cppu::WeakImplHelper2< css::util::XModifyListener,
+class SVX_DLLPUBLIC SmartTagMgr : public cppu::WeakImplHelper< css::util::XModifyListener,
                                                                 css::util::XChangesListener >
 {
 private:

include/svx/fmsrcimp.hxx

@@ -29,7 +29,7 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/collatorwrapper.hxx>
@@ -64,7 +64,7 @@ struct FmSearchProgress
  * class FmRecordCountListener - utility class for FmSearchEngine, listens at a certain cursor and provides
  *                               the differences in RecordCount
  */
-class SAL_WARN_UNUSED FmRecordCountListener : public ::cppu::WeakImplHelper1< css::beans::XPropertyChangeListener>
+class SAL_WARN_UNUSED FmRecordCountListener : public cppu::WeakImplHelper< css::beans::XPropertyChangeListener >
 {
 // attribute
     Link<sal_Int32,void>     m_lnkWhoWantsToKnow;

include/svx/fmtools.hxx

@@ -67,7 +67,7 @@
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/stl_types.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <set>
 
@@ -169,7 +169,7 @@ protected:
     void setAdapter(FmXDisposeMultiplexer* pAdapter);
 };
 
-class SAL_WARN_UNUSED FmXDisposeMultiplexer : public ::cppu::WeakImplHelper1< css::lang::XEventListener>
+class SAL_WARN_UNUSED FmXDisposeMultiplexer : public cppu::WeakImplHelper< css::lang::XEventListener >
 {
     css::uno::Reference< css::lang::XComponent>       m_xObject;
     FmXDisposeListener* m_pListener;

include/svx/sidebar/SelectionChangeHandler.hxx

@@ -25,7 +25,7 @@
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
 #include <functional>
@@ -36,7 +36,7 @@ class SdrMarkView;
 namespace svx { namespace sidebar {
 
 namespace {
-    typedef ::cppu::WeakComponentImplHelper1 <
+    typedef cppu::WeakComponentImplHelper<
         css::view::XSelectionChangeListener
         > SelectionChangeHandlerInterfaceBase;
 }

include/svx/svdpagv.hxx

@@ -21,7 +21,6 @@
 #define INCLUDED_SVX_SVDPAGV_HXX
 
 #include <com/sun/star/awt/XControlContainer.hpp>
-#include <cppuhelper/implbase4.hxx>
 #include <rtl/ustring.hxx>
 #include <svl/lstner.hxx>
 #include <svx/svdhlpln.hxx>
@@ -29,7 +28,6 @@
 #include <svx/svdtypes.hxx>
 #include <svx/svxdllapi.h>
 
-#include <cppuhelper/implbase3.hxx>
 #include <vector>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 

include/svx/unopool.hxx

@@ -21,8 +21,9 @@
 #define INCLUDED_SVX_UNOPOOL_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
 #include <comphelper/propertysethelper.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/weakagg.hxx>
 #include <svx/svxdllapi.h>
 
 class SdrModel;

include/svx/xmleohlp.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_XMLEOHLP_HXX
 #define INCLUDED_SVX_XMLEOHLP_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <osl/mutex.hxx>
 #include <map>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -41,7 +41,7 @@ class OutputStorageWrapper_Impl;
 
 
 class SVX_DLLPUBLIC SvXMLEmbeddedObjectHelper :
-    public ::cppu::WeakComponentImplHelper2< css::document::XEmbeddedObjectResolver, css::container::XNameAccess >
+    public cppu::WeakComponentImplHelper< css::document::XEmbeddedObjectResolver, css::container::XNameAccess >
 {
     typedef ::std::map< OUString, OutputStorageWrapper_Impl* > SvXMLEmbeddedObjectHelper_Impl;
 private:

include/svx/xmlgrhlp.hxx

@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_XMLGRHLP_HXX
 #define INCLUDED_SVX_XMLGRHLP_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <osl/mutex.hxx>
 #include <svtools/grfmgr.hxx>
 #include <vector>
@@ -42,7 +42,7 @@ struct SvxGraphicHelperStream_Impl
     css::uno::Reference < css::io::XStream > xStream;
 };
 
-class SVX_DLLPUBLIC SvXMLGraphicHelper : public ::cppu::WeakComponentImplHelper2<   css::document::XGraphicObjectResolver,
+class SVX_DLLPUBLIC SvXMLGraphicHelper : public cppu::WeakComponentImplHelper< css::document::XGraphicObjectResolver,
                                                                     css::document::XBinaryStreamResolver >
 {
 private:

svx/source/inc/gridcell.hxx

@@ -42,7 +42,6 @@
 #include <comphelper/propmultiplex.hxx>
 #include <comphelper/interfacecontainer2.hxx>
 #include <cppuhelper/component.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <tools/diagnose_ex.h>
 

svx/source/xml/xmleohlp.cxx

@@ -122,7 +122,7 @@ void SAL_CALL OutputStorageWrapper_Impl::closeOutput()
 }
 
 SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() :
-    WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ),
+    WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ),
     maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ),
     maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ),
     mpDocPersist( nullptr ),
@@ -132,7 +132,7 @@ SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper() :
 }
 
 SvXMLEmbeddedObjectHelper::SvXMLEmbeddedObjectHelper( ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ) :
-    WeakComponentImplHelper2< XEmbeddedObjectResolver, XNameAccess >( maMutex ),
+    WeakComponentImplHelper< XEmbeddedObjectResolver, XNameAccess >( maMutex ),
     maReplacementGraphicsContainerStorageName( XML_CONTAINERSTORAGE_NAME ),
     maReplacementGraphicsContainerStorageName60( XML_CONTAINERSTORAGE_NAME_60 ),
     mpDocPersist( nullptr ),

svx/source/xml/xmlgrhlp.cxx

@@ -345,14 +345,14 @@ const GraphicObject& SvXMLGraphicOutputStream::GetGraphicObject()
 }
 
 SvXMLGraphicHelper::SvXMLGraphicHelper( SvXMLGraphicHelperMode eCreateMode ) :
-    ::cppu::WeakComponentImplHelper2< css::document::XGraphicObjectResolver,
+    cppu::WeakComponentImplHelper< css::document::XGraphicObjectResolver,
                                       css::document::XBinaryStreamResolver >( maMutex )
 {
     Init( nullptr, eCreateMode, false );
 }
 
 SvXMLGraphicHelper::SvXMLGraphicHelper()
-    : ::cppu::WeakComponentImplHelper2< css::document::XGraphicObjectResolver,
+    : cppu::WeakComponentImplHelper< css::document::XGraphicObjectResolver,
                                       css::document::XBinaryStreamResolver >( maMutex )
     , meCreateMode(SvXMLGraphicHelperMode::Read)
     , mbDirect(false)