diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-08 08:51:30 +0900 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-09 08:15:30 +0000 |
commit | 7805e7a95437d12f5081237e0e4a064ef53c032a (patch) | |
tree | e0e835596758b441af82f7709810a641e060cbc9 /sw | |
parent | 5cce78f9a52050e15a63761bd8af36075b1a8945 (diff) |
sw: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I1c423f98fba55c1ac5c3bd9a4e81ebd7eb6604b4
Reviewed-on: https://gerrit.libreoffice.org/18393
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 3 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_swui.hxx | 1 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_vbaswobj.hxx | 1 | ||||
-rw-r--r-- | sw/inc/unodraw.hxx | 1 | ||||
-rw-r--r-- | sw/inc/unoparagraph.hxx | 4 | ||||
-rw-r--r-- | sw/qa/core/filters-test.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/unobookmark.hxx | 2 | ||||
-rw-r--r-- | sw/source/core/inc/unometa.hxx | 7 | ||||
-rw-r--r-- | sw/source/core/inc/unosection.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaaddins.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaapplication.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaborders.hxx | 1 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadialog.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadialogs.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadocument.hxx | 3 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadocuments.cxx | 3 | ||||
-rw-r--r-- | sw/source/ui/vba/vbadocuments.hxx | 3 | ||||
-rw-r--r-- | sw/source/ui/vba/vbafont.hxx | 3 | ||||
-rw-r--r-- | sw/source/ui/vba/vbaglobals.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbapagesetup.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/vba/vbawindow.hxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/app/swmodul1.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/uno/SwXDocumentSettings.hxx | 1 |
23 files changed, 30 insertions, 35 deletions
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index c60047cc04bf..0ace20ad75fb 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -471,10 +471,11 @@ #include <config_options.h> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/bootstrap.hxx> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/component_context.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implementationentry.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 473c61c9abd3..8ee8cc4820ea 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -103,6 +103,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/string.hxx> #include <config_folders.h> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <ctype.h> #include <editeng/acorrcfg.hxx> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 4021e27302df..fbdfc6f31e42 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -109,6 +109,7 @@ #include <comphelper/string.hxx> #include <comphelper/unwrapargs.hxx> #include <cppuhelper/bootstrap.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase3.hxx> diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index ce894a9687b7..35d9a6d8aaac 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/drawing/XShapes.hpp> -#include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase6.hxx> #include <com/sun/star/container/XEnumerationAccess.hpp> diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx index e0a2f18d85da..a3fbfa33afab 100644 --- a/sw/inc/unoparagraph.hxx +++ b/sw/inc/unoparagraph.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/text/XTextRange.hpp> -#include <cppuhelper/implbase10.hxx> +#include <cppuhelper/implbase.hxx> #include <sfx2/Metadatable.hxx> @@ -47,7 +47,7 @@ class SwTextNode; class SwTable; class SwXText; -typedef ::cppu::ImplInheritanceHelper10 +typedef ::cppu::ImplInheritanceHelper < ::sfx2::MetadatableMixin , ::com::sun::star::lang::XUnoTunnel , ::com::sun::star::lang::XServiceInfo diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx index 077a95e10ea6..2da7a324ad6e 100644 --- a/sw/qa/core/filters-test.cxx +++ b/sw/qa/core/filters-test.cxx @@ -10,8 +10,6 @@ #include <unotest/filters-test.hxx> #include <test/bootstrapfixture.hxx> -#include <cppuhelper/implbase1.hxx> - #include <comphelper/processfactory.hxx> #include <sfx2/app.hxx> diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 2310689f00b3..22bf7de4b6bc 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -219,7 +219,7 @@ class SwXFieldmarkParameters ::sw::mark::IFieldmark::parameter_map_t* getCoreParameters() throw (::com::sun::star::uno::RuntimeException); }; -typedef cppu::ImplInheritanceHelper1< SwXBookmark, +typedef cppu::ImplInheritanceHelper< SwXBookmark, ::com::sun::star::text::XFormField > SwXFieldmark_Base; class SwXFieldmark diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx index 26699b3cf175..029999d61444 100644 --- a/sw/source/core/inc/unometa.hxx +++ b/sw/source/core/inc/unometa.hxx @@ -30,8 +30,7 @@ #include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/text/XTextField.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> #include <sfx2/Metadatable.hxx> #include <boost/noncopyable.hpp> @@ -49,7 +48,7 @@ namespace sw { class Meta; } -typedef ::cppu::ImplInheritanceHelper6 +typedef ::cppu::ImplInheritanceHelper < ::sfx2::MetadatableMixin , ::com::sun::star::lang::XUnoTunnel , ::com::sun::star::lang::XServiceInfo @@ -234,7 +233,7 @@ public: }; -typedef ::cppu::ImplInheritanceHelper2 +typedef ::cppu::ImplInheritanceHelper < SwXMeta , ::com::sun::star::beans::XPropertySet , ::com::sun::star::text::XTextField diff --git a/sw/source/core/inc/unosection.hxx b/sw/source/core/inc/unosection.hxx index bfca3adfa9bc..3c0fea4cecc0 100644 --- a/sw/source/core/inc/unosection.hxx +++ b/sw/source/core/inc/unosection.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/text/XTextSection.hpp> -#include <cppuhelper/implbase7.hxx> +#include <cppuhelper/implbase.hxx> #include <sfx2/Metadatable.hxx> @@ -39,7 +39,7 @@ class SwSectionFormat; struct SwTextSectionProperties_Impl; -typedef ::cppu::ImplInheritanceHelper7 +typedef ::cppu::ImplInheritanceHelper < ::sfx2::MetadatableMixin , ::com::sun::star::lang::XUnoTunnel , ::com::sun::star::lang::XServiceInfo diff --git a/sw/source/ui/vba/vbaaddins.cxx b/sw/source/ui/vba/vbaaddins.cxx index 29ae1c5eeb27..da6716df4760 100644 --- a/sw/source/ui/vba/vbaaddins.cxx +++ b/sw/source/ui/vba/vbaaddins.cxx @@ -18,7 +18,6 @@ */ #include "vbaaddins.hxx" #include "vbaaddin.hxx" -#include <cppuhelper/implbase3.hxx> #include <unotools/pathoptions.hxx> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index 71a29a6121f2..cf49edc3a3a5 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -28,10 +28,10 @@ #include <ooo/vba/word/XAddins.hpp> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbaapplicationbase.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> //typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XApplication > SwVbaApplication_BASE; -typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ooo::vba::word::XApplication > SwVbaApplication_BASE; +typedef cppu::ImplInheritanceHelper< VbaApplicationBase, ooo::vba::word::XApplication > SwVbaApplication_BASE; class SwVbaApplication : public SwVbaApplication_BASE { diff --git a/sw/source/ui/vba/vbaborders.hxx b/sw/source/ui/vba/vbaborders.hxx index 764b889274e4..020aec2549f5 100644 --- a/sw/source/ui/vba/vbaborders.hxx +++ b/sw/source/ui/vba/vbaborders.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBABORDERS_HXX #define INCLUDED_SW_SOURCE_UI_VBA_VBABORDERS_HXX -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/word/XBorders.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/table/XCellRange.hpp> diff --git a/sw/source/ui/vba/vbadialog.hxx b/sw/source/ui/vba/vbadialog.hxx index d07a0308c125..3cb546fefc5a 100644 --- a/sw/source/ui/vba/vbadialog.hxx +++ b/sw/source/ui/vba/vbadialog.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBADIALOG_HXX #define INCLUDED_SW_SOURCE_UI_VBA_VBADIALOG_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/word/XDialog.hpp> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbadialogbase.hxx> -typedef cppu::ImplInheritanceHelper1< VbaDialogBase, ov::word::XDialog > SwVbaDialog_BASE; +typedef cppu::ImplInheritanceHelper< VbaDialogBase, ov::word::XDialog > SwVbaDialog_BASE; class SwVbaDialog : public SwVbaDialog_BASE { diff --git a/sw/source/ui/vba/vbadialogs.hxx b/sw/source/ui/vba/vbadialogs.hxx index 486a547b769f..981101e856e0 100644 --- a/sw/source/ui/vba/vbadialogs.hxx +++ b/sw/source/ui/vba/vbadialogs.hxx @@ -24,9 +24,9 @@ #include <ooo/vba/XCollection.hpp> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbadialogsbase.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::word::XDialogs > SwVbaDialogs_BASE; +typedef cppu::ImplInheritanceHelper< VbaDialogsBase, ov::word::XDialogs > SwVbaDialogs_BASE; class SwVbaDialogs : public SwVbaDialogs_BASE { diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx index e27b37771095..a00c5f3320ba 100644 --- a/sw/source/ui/vba/vbadocument.hxx +++ b/sw/source/ui/vba/vbadocument.hxx @@ -23,8 +23,9 @@ #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbadocumentbase.hxx> #include <com/sun/star/text/XTextDocument.hpp> +#include <cppuhelper/implbase.hxx> -typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ooo::vba::word::XDocument > SwVbaDocument_BASE; +typedef cppu::ImplInheritanceHelper< VbaDocumentBase, ooo::vba::word::XDocument > SwVbaDocument_BASE; class SwVbaDocument : public SwVbaDocument_BASE { diff --git a/sw/source/ui/vba/vbadocuments.cxx b/sw/source/ui/vba/vbadocuments.cxx index 67cd7374d4c2..7f2973dc0196 100644 --- a/sw/source/ui/vba/vbadocuments.cxx +++ b/sw/source/ui/vba/vbadocuments.cxx @@ -18,9 +18,6 @@ */ #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase3.hxx> - #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> diff --git a/sw/source/ui/vba/vbadocuments.hxx b/sw/source/ui/vba/vbadocuments.hxx index 9025c1013448..80ddaf0f9d49 100644 --- a/sw/source/ui/vba/vbadocuments.hxx +++ b/sw/source/ui/vba/vbadocuments.hxx @@ -23,9 +23,10 @@ #include <ooo/vba/word/XDocuments.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <vbahelper/vbadocumentsbase.hxx> +#include <cppuhelper/implbase.hxx> #include "wordvbahelper.hxx" -typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::word::XDocuments > SwVbaDocuments_BASE; +typedef cppu::ImplInheritanceHelper< VbaDocumentsBase, ov::word::XDocuments > SwVbaDocuments_BASE; class SwVbaDocuments : public SwVbaDocuments_BASE { diff --git a/sw/source/ui/vba/vbafont.hxx b/sw/source/ui/vba/vbafont.hxx index 2021b7820a93..0b2fc34916ad 100644 --- a/sw/source/ui/vba/vbafont.hxx +++ b/sw/source/ui/vba/vbafont.hxx @@ -22,8 +22,9 @@ #include <vbahelper/vbafontbase.hxx> #include <ooo/vba/word/XFont.hpp> +#include <cppuhelper/implbase.hxx> -typedef cppu::ImplInheritanceHelper1< VbaFontBase, ov::word::XFont > SwVbaFont_BASE; +typedef cppu::ImplInheritanceHelper< VbaFontBase, ov::word::XFont > SwVbaFont_BASE; class SwVbaFont : public SwVbaFont_BASE { diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 0272508913dd..376a1a9a90ef 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -27,11 +27,11 @@ #include <ooo/vba/word/XSystem.hpp> #include <ooo/vba/word/XOptions.hpp> #include <ooo/vba/word/XSelection.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbaglobalbase.hxx> -typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE; +typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::word::XGlobals > SwVbaGlobals_BASE; class SwVbaGlobals : public SwVbaGlobals_BASE { diff --git a/sw/source/ui/vba/vbapagesetup.hxx b/sw/source/ui/vba/vbapagesetup.hxx index abac682b4321..d1cffb20429c 100644 --- a/sw/source/ui/vba/vbapagesetup.hxx +++ b/sw/source/ui/vba/vbapagesetup.hxx @@ -19,14 +19,14 @@ #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBAPAGESETUP_HXX #define INCLUDED_SW_SOURCE_UI_VBA_VBAPAGESETUP_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/word/XPageSetup.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbapagesetupbase.hxx> -typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ooo::vba::word::XPageSetup > SwVbaPageSetup_BASE; +typedef cppu::ImplInheritanceHelper< VbaPageSetupBase, ooo::vba::word::XPageSetup > SwVbaPageSetup_BASE; class SwVbaPageSetup : public SwVbaPageSetup_BASE { diff --git a/sw/source/ui/vba/vbawindow.hxx b/sw/source/ui/vba/vbawindow.hxx index 7ac5908aff3d..4263cfbdd6b4 100644 --- a/sw/source/ui/vba/vbawindow.hxx +++ b/sw/source/ui/vba/vbawindow.hxx @@ -18,14 +18,14 @@ */ #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBAWINDOW_HXX #define INCLUDED_SW_SOURCE_UI_VBA_VBAWINDOW_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/word/XWindow.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbawindowbase.hxx> -typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::word::XWindow > WindowImpl_BASE; +typedef cppu::ImplInheritanceHelper< VbaWindowBase, ov::word::XWindow > WindowImpl_BASE; class SwVbaWindow : public WindowImpl_BASE { diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index d6aaa2385e81..945c181bdc41 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -27,7 +27,6 @@ #include <cppuhelper/weak.hxx> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -#include <cppuhelper/implbase1.hxx> #include <svx/dataaccessdescriptor.hxx> #include <editeng/wghtitem.hxx> #include <editeng/postitem.hxx> diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx index 20f30410f8ae..f7688b0b5512 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.hxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/weak.hxx> -#include <cppuhelper/implbase5.hxx> class SwXTextDocument; class SwDocShell; |