[Libreoffice-commits] core.git: sw/inc sw/qa sw/source

Takeshi Abe tabe at fixedpoint.jp
Wed Sep 9 01:15:52 PDT 2015 

 sw/inc/pch/precompiled_sw.hxx                |    3 ++-
 sw/inc/pch/precompiled_swui.hxx              |    1 +
 sw/inc/pch/precompiled_vbaswobj.hxx          |    1 +
 sw/inc/unodraw.hxx                           |    1 -
 sw/inc/unoparagraph.hxx                      |    4 ++--
 sw/qa/core/filters-test.cxx                  |    2 --
 sw/source/core/inc/unobookmark.hxx           |    2 +-
 sw/source/core/inc/unometa.hxx               |    7 +++----
 sw/source/core/inc/unosection.hxx            |    4 ++--
 sw/source/ui/vba/vbaaddins.cxx               |    1 -
 sw/source/ui/vba/vbaapplication.hxx          |    4 ++--
 sw/source/ui/vba/vbaborders.hxx              |    1 -
 sw/source/ui/vba/vbadialog.hxx               |    4 ++--
 sw/source/ui/vba/vbadialogs.hxx              |    4 ++--
 sw/source/ui/vba/vbadocument.hxx             |    3 ++-
 sw/source/ui/vba/vbadocuments.cxx            |    3 ---
 sw/source/ui/vba/vbadocuments.hxx            |    3 ++-
 sw/source/ui/vba/vbafont.hxx                 |    3 ++-
 sw/source/ui/vba/vbaglobals.hxx              |    4 ++--
 sw/source/ui/vba/vbapagesetup.hxx            |    4 ++--
 sw/source/ui/vba/vbawindow.hxx               |    4 ++--
 sw/source/uibase/app/swmodul1.cxx            |    1 -
 sw/source/uibase/uno/SwXDocumentSettings.hxx |    1 -
 23 files changed, 30 insertions(+), 35 deletions(-)

New commits:
commit 7805e7a95437d12f5081237e0e4a064ef53c032a
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Tue Sep 8 08:51:30 2015 +0900

    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 at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index c60047c..0ace20a 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 473c61c..8ee8cc4 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 4021e27..fbdfc6f 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 ce894a9..35d9a6d 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 e0a2f18..a3fbfa3 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 077a95e..2da7a32 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 2310689..22bf7de 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 26699b3..029999d 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 bfca3ad..3c0fea4 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 29ae1c5..da6716d 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 71a29a6..cf49edc 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 764b889..020aec2 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 d07a030..3cb546f 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 486a547..981101e 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 e27b377..a00c5f3 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 67cd737..7f2973d 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 9025c10..80ddaf0 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 2021b78..0b2fc34 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 0272508..376a1a9 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 abac682..d1cffb2 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 7ac5908..4263cfb 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 d6aaa23..945c181 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 20f3041..f7688b0 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;

More information about the Libreoffice-commits mailing list