diff options
author | Douglas Mencken <dougmencken@gmail.com> | 2015-10-04 22:19:14 -0400 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-10-06 12:13:54 +0000 |
commit | 85b1f91779cd90eb1c7808909c2721239fc51dd1 (patch) | |
tree | 21ca582dc9435d15304a9ea80170482cf0c18bfb /sw | |
parent | 8e7a2a62d1bd14ea629b4cbbdccd0c9b9b14a6e5 (diff) |
vba: convert to variadic InheritedHelperInterfaceImpl&WeakImpl etc
Variadic templates ~-i.e. templates, which can take an arbitrary
number of arguments of any type-~ is new C++11 feature
note that uno::Reference and cppu::UnoType can only take one parameter
thus leave XNamedObjectCollectionHelper non-variadic in vbacollectionimpl.hxx
Change-Id: I22e60fa050ee31d39ae8bb7cac06cf243c4587b1
Reviewed-on: https://gerrit.libreoffice.org/19145
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
36 files changed, 36 insertions, 62 deletions
diff --git a/sw/source/ui/vba/vbaaddin.hxx b/sw/source/ui/vba/vbaaddin.hxx index 2573ee0c583a..3c4180d587b0 100644 --- a/sw/source/ui/vba/vbaaddin.hxx +++ b/sw/source/ui/vba/vbaaddin.hxx @@ -21,9 +21,8 @@ #include <ooo/vba/word/XAddin.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XAddin > SwVbaAddin_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XAddin > SwVbaAddin_BASE; class SwVbaAddin : public SwVbaAddin_BASE { diff --git a/sw/source/ui/vba/vbaapplication.hxx b/sw/source/ui/vba/vbaapplication.hxx index cf49edc3a3a5..6b67c816b7f1 100644 --- a/sw/source/ui/vba/vbaapplication.hxx +++ b/sw/source/ui/vba/vbaapplication.hxx @@ -30,7 +30,7 @@ #include <vbahelper/vbaapplicationbase.hxx> #include <cppuhelper/implbase.hxx> -//typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XApplication > SwVbaApplication_BASE; +//typedef InheritedHelperInterfaceWeakImpl< 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/vbaautotextentry.hxx b/sw/source/ui/vba/vbaautotextentry.hxx index 5df2d9b18230..c753c995a20e 100644 --- a/sw/source/ui/vba/vbaautotextentry.hxx +++ b/sw/source/ui/vba/vbaautotextentry.hxx @@ -23,11 +23,10 @@ #include <ooo/vba/word/XAutoTextEntries.hpp> #include <ooo/vba/word/XAutoTextEntry.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/word/XRange.hpp> #include <com/sun/star/text/XAutoTextEntry.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XAutoTextEntry > SwVbaAutoTextEntry_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XAutoTextEntry > SwVbaAutoTextEntry_BASE; class SwVbaAutoTextEntry : public SwVbaAutoTextEntry_BASE { diff --git a/sw/source/ui/vba/vbabookmark.hxx b/sw/source/ui/vba/vbabookmark.hxx index 38fa40c37d00..a1065d5ade99 100644 --- a/sw/source/ui/vba/vbabookmark.hxx +++ b/sw/source/ui/vba/vbabookmark.hxx @@ -21,11 +21,10 @@ #include <ooo/vba/word/XBookmark.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XBookmarksSupplier.hpp> #include <com/sun/star/text/XTextContent.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XBookmark > SwVbaBookmark_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XBookmark > SwVbaBookmark_BASE; class SwVbaBookmark : public SwVbaBookmark_BASE { diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx index 292018648459..29f75238621f 100644 --- a/sw/source/ui/vba/vbaborders.cxx +++ b/sw/source/ui/vba/vbaborders.cxx @@ -32,7 +32,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; typedef ::cppu::WeakImplHelper<container::XIndexAccess > RangeBorders_Base; -typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base; +typedef InheritedHelperInterfaceWeakImpl<word::XBorder > SwVbaBorder_Base; // #TODO sort these indexes to match the order in which Word iterates over the // borders, the enumeration will match the order in this list diff --git a/sw/source/ui/vba/vbacell.hxx b/sw/source/ui/vba/vbacell.hxx index 633d732a8e62..a71b2dc54bbc 100644 --- a/sw/source/ui/vba/vbacell.hxx +++ b/sw/source/ui/vba/vbacell.hxx @@ -21,10 +21,9 @@ #include <ooo/vba/word/XCell.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextTable.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XCell > SwVbaCell_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XCell > SwVbaCell_BASE; class SwVbaCell : public SwVbaCell_BASE { diff --git a/sw/source/ui/vba/vbacheckbox.hxx b/sw/source/ui/vba/vbacheckbox.hxx index e59c31feae0d..68d5ed93b489 100644 --- a/sw/source/ui/vba/vbacheckbox.hxx +++ b/sw/source/ui/vba/vbacheckbox.hxx @@ -20,11 +20,10 @@ #define INCLUDED_SW_SOURCE_UI_VBA_VBACHECKBOX_HXX #include <ooo/vba/word/XCheckBox.hpp> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XFormField.hpp> #include <vbahelper/vbahelperinterface.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XCheckBox > SwVbaCheckBox_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XCheckBox > SwVbaCheckBox_BASE; class SwVbaCheckBox : public SwVbaCheckBox_BASE { diff --git a/sw/source/ui/vba/vbacolumn.hxx b/sw/source/ui/vba/vbacolumn.hxx index 26aadabd9062..75c5ec2388c5 100644 --- a/sw/source/ui/vba/vbacolumn.hxx +++ b/sw/source/ui/vba/vbacolumn.hxx @@ -21,12 +21,11 @@ #include <ooo/vba/word/XColumn.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/table/XTableColumns.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XColumn > SwVbaColumn_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XColumn > SwVbaColumn_BASE; class SwVbaColumn : public SwVbaColumn_BASE { diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx index ba87cee454f4..3089499527ec 100644 --- a/sw/source/ui/vba/vbadocumentproperties.cxx +++ b/sw/source/ui/vba/vbadocumentproperties.cxx @@ -439,7 +439,7 @@ public: MSOIndexToOODocPropInfo& getDocPropInfoMap() { return m_docPropInfoMap; } }; -typedef InheritedHelperInterfaceImpl1< ooo::vba::XDocumentProperty > SwVbaDocumentProperty_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::XDocumentProperty > SwVbaDocumentProperty_BASE; class SwVbaBuiltInDocumentProperty : public SwVbaDocumentProperty_BASE { diff --git a/sw/source/ui/vba/vbafield.hxx b/sw/source/ui/vba/vbafield.hxx index f20893fdc71b..991e97f88cbc 100644 --- a/sw/source/ui/vba/vbafield.hxx +++ b/sw/source/ui/vba/vbafield.hxx @@ -25,7 +25,7 @@ #include <ooo/vba/word/XFields.hpp> #include <vbahelper/vbacollectionimpl.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XField > SwVbaField_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XField > SwVbaField_BASE; class SwVbaField : public SwVbaField_BASE { diff --git a/sw/source/ui/vba/vbafind.hxx b/sw/source/ui/vba/vbafind.hxx index f2ff6bbbc141..ff7a8ef7d8ac 100644 --- a/sw/source/ui/vba/vbafind.hxx +++ b/sw/source/ui/vba/vbafind.hxx @@ -21,7 +21,6 @@ #include <ooo/vba/word/XFind.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/util/XReplaceable.hpp> #include <com/sun/star/util/XPropertyReplace.hpp> @@ -29,7 +28,7 @@ #include <com/sun/star/text/XTextCursor.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XFind > SwVbaFind_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XFind > SwVbaFind_BASE; class SwVbaFind : public SwVbaFind_BASE { diff --git a/sw/source/ui/vba/vbaframe.hxx b/sw/source/ui/vba/vbaframe.hxx index 6b4c125dc1e5..1936d3d0a7b9 100644 --- a/sw/source/ui/vba/vbaframe.hxx +++ b/sw/source/ui/vba/vbaframe.hxx @@ -21,10 +21,9 @@ #include <ooo/vba/word/XFrame.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextFrame.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XFrame > SwVbaFrame_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XFrame > SwVbaFrame_BASE; class SwVbaFrame : public SwVbaFrame_BASE { diff --git a/sw/source/ui/vba/vbaheaderfooter.hxx b/sw/source/ui/vba/vbaheaderfooter.hxx index 382f7bfb31d1..6a51f4b38b03 100644 --- a/sw/source/ui/vba/vbaheaderfooter.hxx +++ b/sw/source/ui/vba/vbaheaderfooter.hxx @@ -22,9 +22,8 @@ #include <ooo/vba/word/XHeaderFooter.hpp> #include <ooo/vba/word/XRange.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XHeaderFooter > SwVbaHeaderFooter_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XHeaderFooter > SwVbaHeaderFooter_BASE; class SwVbaHeaderFooter : public SwVbaHeaderFooter_BASE { diff --git a/sw/source/ui/vba/vbalistformat.hxx b/sw/source/ui/vba/vbalistformat.hxx index cb021f1774a4..a3d73502bdc5 100644 --- a/sw/source/ui/vba/vbalistformat.hxx +++ b/sw/source/ui/vba/vbalistformat.hxx @@ -22,11 +22,10 @@ #include <ooo/vba/word/XListFormat.hpp> #include <ooo/vba/word/XListTemplate.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextRange.hpp> #include "vbalisthelper.hxx" -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListFormat > SwVbaListFormat_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XListFormat > SwVbaListFormat_BASE; class SwVbaListFormat : public SwVbaListFormat_BASE { diff --git a/sw/source/ui/vba/vbalistgallery.hxx b/sw/source/ui/vba/vbalistgallery.hxx index 9b821fce4d21..a7707fcb5d79 100644 --- a/sw/source/ui/vba/vbalistgallery.hxx +++ b/sw/source/ui/vba/vbalistgallery.hxx @@ -21,10 +21,9 @@ #include <ooo/vba/word/XListGallery.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextDocument.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListGallery > SwVbaListGallery_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XListGallery > SwVbaListGallery_BASE; class SwVbaListGallery : public SwVbaListGallery_BASE { diff --git a/sw/source/ui/vba/vbalistlevel.hxx b/sw/source/ui/vba/vbalistlevel.hxx index eabe9b743f95..35c6fdb5e347 100644 --- a/sw/source/ui/vba/vbalistlevel.hxx +++ b/sw/source/ui/vba/vbalistlevel.hxx @@ -21,11 +21,10 @@ #include <ooo/vba/word/XListLevel.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextDocument.hpp> #include "vbalisthelper.hxx" -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListLevel > SwVbaListLevel_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XListLevel > SwVbaListLevel_BASE; class SwVbaListLevel : public SwVbaListLevel_BASE { diff --git a/sw/source/ui/vba/vbalisttemplate.hxx b/sw/source/ui/vba/vbalisttemplate.hxx index dc37c68bf84b..309546739fe9 100644 --- a/sw/source/ui/vba/vbalisttemplate.hxx +++ b/sw/source/ui/vba/vbalisttemplate.hxx @@ -21,11 +21,10 @@ #include <ooo/vba/word/XListTemplate.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextDocument.hpp> #include "vbalisthelper.hxx" -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XListTemplate > SwVbaListTemplate_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XListTemplate > SwVbaListTemplate_BASE; class SwVbaListTemplate : public SwVbaListTemplate_BASE { diff --git a/sw/source/ui/vba/vbaoptions.hxx b/sw/source/ui/vba/vbaoptions.hxx index 9d51520c5c88..68a32a5e090e 100644 --- a/sw/source/ui/vba/vbaoptions.hxx +++ b/sw/source/ui/vba/vbaoptions.hxx @@ -21,11 +21,10 @@ #include <ooo/vba/word/XOptions.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <vbahelper/vbapropvalue.hxx> #include <comphelper/processfactory.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XOptions > SwVbaOptions_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XOptions > SwVbaOptions_BASE; class SwVbaOptions : public SwVbaOptions_BASE, public PropListener diff --git a/sw/source/ui/vba/vbapane.hxx b/sw/source/ui/vba/vbapane.hxx index 6c248a7b0989..6ec4a180eb98 100644 --- a/sw/source/ui/vba/vbapane.hxx +++ b/sw/source/ui/vba/vbapane.hxx @@ -21,9 +21,8 @@ #include <ooo/vba/word/XPane.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XPane > SwVbaPane_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XPane > SwVbaPane_BASE; class SwVbaPane : public SwVbaPane_BASE { diff --git a/sw/source/ui/vba/vbaparagraph.hxx b/sw/source/ui/vba/vbaparagraph.hxx index f136343a1640..713c4213cb13 100644 --- a/sw/source/ui/vba/vbaparagraph.hxx +++ b/sw/source/ui/vba/vbaparagraph.hxx @@ -23,11 +23,10 @@ #include <ooo/vba/word/XParagraphs.hpp> #include <ooo/vba/word/XParagraph.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/text/XTextDocument.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XParagraph > SwVbaParagraph_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XParagraph > SwVbaParagraph_BASE; class SwVbaParagraph : public SwVbaParagraph_BASE { diff --git a/sw/source/ui/vba/vbaparagraphformat.hxx b/sw/source/ui/vba/vbaparagraphformat.hxx index eb799f7810f8..229b3336ff18 100644 --- a/sw/source/ui/vba/vbaparagraphformat.hxx +++ b/sw/source/ui/vba/vbaparagraphformat.hxx @@ -21,11 +21,10 @@ #include <ooo/vba/word/XParagraphFormat.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/style/LineSpacing.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XParagraphFormat > SwVbaParagraphFormat_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XParagraphFormat > SwVbaParagraphFormat_BASE; class SwVbaParagraphFormat : public SwVbaParagraphFormat_BASE { diff --git a/sw/source/ui/vba/vbarange.hxx b/sw/source/ui/vba/vbarange.hxx index e1e2344a8feb..8174ced2928e 100644 --- a/sw/source/ui/vba/vbarange.hxx +++ b/sw/source/ui/vba/vbarange.hxx @@ -23,14 +23,13 @@ #include <ooo/vba/word/XParagraphFormat.hpp> #include <ooo/vba/word/XFont.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <ooo/vba/word/XStyle.hpp> #include <ooo/vba/word/XListFormat.hpp> #include "wordvbahelper.hxx" -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XRange > SwVbaRange_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XRange > SwVbaRange_BASE; class SwVbaRange : public SwVbaRange_BASE { diff --git a/sw/source/ui/vba/vbareplacement.hxx b/sw/source/ui/vba/vbareplacement.hxx index 804733859b11..07bacb192413 100644 --- a/sw/source/ui/vba/vbareplacement.hxx +++ b/sw/source/ui/vba/vbareplacement.hxx @@ -21,10 +21,9 @@ #include <ooo/vba/word/XReplacement.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/util/XPropertyReplace.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XReplacement > SwVbaReplacement_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XReplacement > SwVbaReplacement_BASE; class SwVbaReplacement : public SwVbaReplacement_BASE { diff --git a/sw/source/ui/vba/vbarevision.hxx b/sw/source/ui/vba/vbarevision.hxx index 249f4eb6037e..02d23bbb3a9c 100644 --- a/sw/source/ui/vba/vbarevision.hxx +++ b/sw/source/ui/vba/vbarevision.hxx @@ -21,9 +21,8 @@ #include <ooo/vba/word/XRevision.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XRevision > SwVbaRevision_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XRevision > SwVbaRevision_BASE; class SwVbaRevision : public SwVbaRevision_BASE { diff --git a/sw/source/ui/vba/vbarow.hxx b/sw/source/ui/vba/vbarow.hxx index 1a54abc46038..d268db275865 100644 --- a/sw/source/ui/vba/vbarow.hxx +++ b/sw/source/ui/vba/vbarow.hxx @@ -21,11 +21,10 @@ #include <ooo/vba/word/XRow.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/table/XTableRows.hpp> #include <com/sun/star/text/XTextTable.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XRow > SwVbaRow_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XRow > SwVbaRow_BASE; class SwVbaRow : public SwVbaRow_BASE { diff --git a/sw/source/ui/vba/vbasection.hxx b/sw/source/ui/vba/vbasection.hxx index d761f2ef51b4..0d66fecea2cf 100644 --- a/sw/source/ui/vba/vbasection.hxx +++ b/sw/source/ui/vba/vbasection.hxx @@ -21,9 +21,8 @@ #include <ooo/vba/word/XSection.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSection > SwVbaSection_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XSection > SwVbaSection_BASE; class SwVbaSection : public SwVbaSection_BASE { diff --git a/sw/source/ui/vba/vbaselection.hxx b/sw/source/ui/vba/vbaselection.hxx index 14cf63059346..abfb9e77d791 100644 --- a/sw/source/ui/vba/vbaselection.hxx +++ b/sw/source/ui/vba/vbaselection.hxx @@ -31,7 +31,7 @@ #include <ooo/vba/word/XHeaderFooter.hpp> #include "wordvbahelper.hxx" -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSelection > SwVbaSelection_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XSelection > SwVbaSelection_BASE; class SwVbaSelection : public SwVbaSelection_BASE { diff --git a/sw/source/ui/vba/vbastyle.hxx b/sw/source/ui/vba/vbastyle.hxx index 36541ee6015d..a4865956447b 100644 --- a/sw/source/ui/vba/vbastyle.hxx +++ b/sw/source/ui/vba/vbastyle.hxx @@ -27,7 +27,7 @@ #include <ooo/vba/word/XFont.hpp> #include <ooo/vba/word/XListTemplate.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XStyle > SwVbaStyle_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XStyle > SwVbaStyle_BASE; class SwVbaStyle : public SwVbaStyle_BASE { diff --git a/sw/source/ui/vba/vbasystem.hxx b/sw/source/ui/vba/vbasystem.hxx index f32534f54997..bab6ad5f5835 100644 --- a/sw/source/ui/vba/vbasystem.hxx +++ b/sw/source/ui/vba/vbasystem.hxx @@ -21,10 +21,9 @@ #include <ooo/vba/word/XSystem.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <vbahelper/vbapropvalue.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XSystem > SwVbaSystem_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XSystem > SwVbaSystem_BASE; class PrivateProfileStringListener : public PropListener { diff --git a/sw/source/ui/vba/vbatable.hxx b/sw/source/ui/vba/vbatable.hxx index ed2d6d2ac59c..90e778af942a 100644 --- a/sw/source/ui/vba/vbatable.hxx +++ b/sw/source/ui/vba/vbatable.hxx @@ -25,7 +25,7 @@ #include <ooo/vba/word/XRange.hpp> #include <ooo/vba/word/XTable.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XTable > SwVbaTable_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTable > SwVbaTable_BASE; class SwVbaTable : public SwVbaTable_BASE { diff --git a/sw/source/ui/vba/vbatableofcontents.hxx b/sw/source/ui/vba/vbatableofcontents.hxx index ad34983c58fd..d15deb2544ca 100644 --- a/sw/source/ui/vba/vbatableofcontents.hxx +++ b/sw/source/ui/vba/vbatableofcontents.hxx @@ -21,11 +21,10 @@ #include <ooo/vba/word/XTableOfContents.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/text/XDocumentIndex.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XTableOfContents > SwVbaTableOfContents_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTableOfContents > SwVbaTableOfContents_BASE; class SwVbaTableOfContents : public SwVbaTableOfContents_BASE { diff --git a/sw/source/ui/vba/vbatabstop.hxx b/sw/source/ui/vba/vbatabstop.hxx index ea722af2d16e..48d87dadbe51 100644 --- a/sw/source/ui/vba/vbatabstop.hxx +++ b/sw/source/ui/vba/vbatabstop.hxx @@ -21,10 +21,9 @@ #include <ooo/vba/word/XTabStop.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/style/TabStop.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XTabStop > SwVbaTabStop_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTabStop > SwVbaTabStop_BASE; class SwVbaTabStop : public SwVbaTabStop_BASE { diff --git a/sw/source/ui/vba/vbatemplate.hxx b/sw/source/ui/vba/vbatemplate.hxx index 8678f44a1a4d..6d8ca14b88bf 100644 --- a/sw/source/ui/vba/vbatemplate.hxx +++ b/sw/source/ui/vba/vbatemplate.hxx @@ -22,7 +22,7 @@ #include <ooo/vba/word/XTemplate.hpp> #include <vbahelper/vbahelperinterface.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XTemplate > SwVbaTemplate_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XTemplate > SwVbaTemplate_BASE; class SwVbaTemplate : public SwVbaTemplate_BASE { diff --git a/sw/source/ui/vba/vbavariable.hxx b/sw/source/ui/vba/vbavariable.hxx index fa7469010634..4a7cb454eb67 100644 --- a/sw/source/ui/vba/vbavariable.hxx +++ b/sw/source/ui/vba/vbavariable.hxx @@ -21,10 +21,9 @@ #include <ooo/vba/word/XVariable.hpp> #include <vbahelper/vbahelperinterface.hxx> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/beans/XPropertyAccess.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XVariable > SwVbaVariable_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XVariable > SwVbaVariable_BASE; class SwVbaVariable : public SwVbaVariable_BASE { diff --git a/sw/source/ui/vba/vbaview.hxx b/sw/source/ui/vba/vbaview.hxx index 91ab688b6517..30f29b961585 100644 --- a/sw/source/ui/vba/vbaview.hxx +++ b/sw/source/ui/vba/vbaview.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/text/XText.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XView > SwVbaView_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XView > SwVbaView_BASE; class SwVbaView : public SwVbaView_BASE { diff --git a/sw/source/ui/vba/vbawrapformat.hxx b/sw/source/ui/vba/vbawrapformat.hxx index 14a701d3f21d..2d925f1d20b5 100644 --- a/sw/source/ui/vba/vbawrapformat.hxx +++ b/sw/source/ui/vba/vbawrapformat.hxx @@ -23,7 +23,7 @@ #include <ooo/vba/word/XWrapFormat.hpp> #include <vbahelper/vbahelperinterface.hxx> -typedef InheritedHelperInterfaceImpl1< ooo::vba::word::XWrapFormat > SwVbaWrapFormat_BASE; +typedef InheritedHelperInterfaceWeakImpl< ooo::vba::word::XWrapFormat > SwVbaWrapFormat_BASE; class SwVbaWrapFormat : public SwVbaWrapFormat_BASE { |