[Libreoffice-commits] core.git: sw/inc sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Apr 6 13:23:34 PDT 2015
sw/inc/dlelstnr.hxx | 4 ++--
sw/inc/finalthreadmanager.hxx | 4 ++--
sw/inc/unobaseclass.hxx | 4 ++--
sw/inc/unochart.hxx | 13 +++++--------
sw/inc/unocoll.hxx | 13 +++++--------
sw/inc/unofieldcoll.hxx | 4 ++--
sw/inc/unoframe.hxx | 14 ++++++--------
sw/inc/unoredline.hxx | 2 +-
sw/inc/unoredlines.hxx | 2 +-
sw/inc/unosrch.hxx | 4 ++--
sw/inc/unostyle.hxx | 16 ++++++++--------
sw/inc/unotbl.hxx | 20 ++++++++------------
sw/inc/unotextbodyhf.hxx | 3 ++-
sw/inc/unotextrange.hxx | 7 +++----
sw/source/core/access/acccontext.hxx | 4 ++--
sw/source/core/access/acchyperlink.hxx | 4 ++--
sw/source/core/access/accmap.cxx | 4 ++--
sw/source/core/access/accnotexthyperlink.hxx | 4 ++--
sw/source/core/docnode/cancellablejob.hxx | 4 ++--
sw/source/core/inc/SwXMLBlockImport.hxx | 5 +++--
sw/source/core/inc/SwXTextDefaults.hxx | 4 ++--
sw/source/core/inc/dumpfilter.hxx | 4 ++--
sw/source/core/inc/unobookmark.hxx | 6 +++---
sw/source/core/inc/unofield.hxx | 10 ++++------
sw/source/core/inc/unoflatpara.hxx | 7 +++----
sw/source/core/inc/unofootnote.hxx | 4 ++--
sw/source/core/inc/unoidx.hxx | 7 +++----
sw/source/core/inc/unoparaframeenum.hxx | 4 ++--
sw/source/core/inc/unoport.hxx | 7 +++----
sw/source/core/inc/unorefmark.hxx | 4 ++--
sw/source/core/inc/unotextmarkup.hxx | 7 +++----
sw/source/core/ole/ndole.cxx | 5 ++---
sw/source/core/unocore/unocoll.cxx | 7 ++++---
sw/source/core/unocore/unoevent.cxx | 1 -
sw/source/core/unocore/unoidx.cxx | 5 +++--
sw/source/filter/html/htmlform.cxx | 3 ++-
sw/source/ui/envelp/mailmrge.cxx | 4 ++--
sw/source/ui/uno/swdetect.hxx | 4 ++--
sw/source/ui/vba/vbabookmarks.cxx | 4 ++--
sw/source/ui/vba/vbaborders.cxx | 4 ++--
sw/source/ui/vba/vbacells.cxx | 3 ++-
sw/source/ui/vba/vbadocumentproperties.cxx | 7 +++----
sw/source/ui/vba/vbafield.cxx | 5 +++--
sw/source/ui/vba/vbaframes.cxx | 3 ++-
sw/source/ui/vba/vbaheadersfooters.cxx | 3 ++-
sw/source/ui/vba/vbapalette.cxx | 4 ++--
sw/source/ui/vba/vbapanes.cxx | 3 ++-
sw/source/ui/vba/vbaparagraph.cxx | 3 ++-
sw/source/ui/vba/vbarevisions.cxx | 6 +++---
sw/source/ui/vba/vbasections.cxx | 5 +++--
sw/source/ui/vba/vbastyles.cxx | 4 ++--
sw/source/ui/vba/vbatables.cxx | 5 +++--
sw/source/ui/vba/vbatablesofcontents.cxx | 3 ++-
sw/source/ui/vba/vbatabstops.cxx | 3 ++-
sw/source/uibase/config/StoredChapterNumbering.cxx | 4 ++--
sw/source/uibase/dbui/dbmgr.cxx | 3 ++-
sw/source/uibase/dbui/dbtree.cxx | 4 ++--
sw/source/uibase/docvw/srcedtw.cxx | 4 ++--
sw/source/uibase/inc/SwXFilterOptions.hxx | 4 ++--
sw/source/uibase/inc/mailmergehelper.hxx | 6 +++---
sw/source/uibase/inc/uivwimp.hxx | 6 +++---
sw/source/uibase/inc/unoatxt.hxx | 10 ++++------
sw/source/uibase/inc/unodispatch.hxx | 7 +++----
sw/source/uibase/inc/unomailmerge.hxx | 4 ++--
sw/source/uibase/inc/unomod.hxx | 5 ++---
sw/source/uibase/inc/unotxvw.hxx | 4 ++--
sw/source/uibase/uno/unomailmerge.cxx | 3 ++-
sw/source/uibase/uno/unomodule.hxx | 4 ++--
68 files changed, 176 insertions(+), 185 deletions(-)
New commits:
commit 403fa5ec2a9a3459f8e62aadf451626386fdd9dc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Apr 6 18:44:54 2015 +0200
sw: use variadic cppu::WeakImplHelper
Change-Id: I2c03ffad8d935bad126c19a8647c924af5a9bce5
Reviewed-on: https://gerrit.libreoffice.org/15174
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 74e5db3..3eabac8 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp>
#include <com/sun/star/frame/XDesktop2.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
namespace com { namespace sun { namespace star {
namespace linguistic2 {
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star {
properties) were made.
*/
class SwLinguServiceEventListener :
- public cppu::WeakImplHelper2
+ public cppu::WeakImplHelper
<
com::sun::star::linguistic2::XLinguServiceEventListener,
com::sun::star::frame::XTerminateListener
diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx
index babeba5..770434e 100644
--- a/sw/inc/finalthreadmanager.hxx
+++ b/sw/inc/finalthreadmanager.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/util/XJobManager.hpp>
#include <com/sun/star/frame/XTerminateListener2.hpp>
@@ -34,7 +34,7 @@ class CancelJobsThread;
class TerminateOfficeThread;
class SwPauseThreadStarting;
-class FinalThreadManager : public ::cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
+class FinalThreadManager : public ::cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo,
com::sun::star::util::XJobManager,
com::sun::star::frame::XTerminateListener2 >
{
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index cfd503e..8db9f33 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -23,13 +23,13 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XEnumeration.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
class SfxPoolItem;
class SwClient;
class SwDoc;
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::container::XEnumeration
>
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 7b95c37..7c85f9b 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -42,10 +42,7 @@
#include <com/sun/star/chart/ChartDataRowSource.hpp>
#include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase6.hxx>
-#include <cppuhelper/implbase10.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <tools/link.hxx>
@@ -94,7 +91,7 @@ public:
void Disconnect();
};
-typedef cppu::WeakImplHelper4
+typedef cppu::WeakImplHelper
<
::com::sun::star::chart2::data::XDataProvider,
::com::sun::star::chart2::data::XRangeXMLConversion,
@@ -207,7 +204,7 @@ public:
void AddRowCols( const SwTable &rTable, const SwSelBoxes& rBoxes, sal_uInt16 nLines, bool bBehind );
};
-typedef cppu::WeakImplHelper2
+typedef cppu::WeakImplHelper
<
::com::sun::star::chart2::data::XDataSource,
::com::sun::star::lang::XServiceInfo
@@ -237,7 +234,7 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
-typedef cppu::WeakImplHelper10
+typedef cppu::WeakImplHelper
<
::com::sun::star::chart2::data::XDataSequence,
::com::sun::star::chart2::data::XTextualDataSequence,
@@ -355,7 +352,7 @@ public:
bool ExtendTo( bool bExtendCol, sal_Int32 nFirstNew, sal_Int32 nCount );
};
-typedef cppu::WeakImplHelper4
+typedef cppu::WeakImplHelper
<
::com::sun::star::chart2::data::XLabeledDataSequence2,
::com::sun::star::lang::XServiceInfo,
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index ee43c98..bb3cd7c 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -25,10 +25,7 @@
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
#include <IMark.hxx>
#include <unobaseclass.hxx>
#include "swdllapi.h"
@@ -260,7 +257,7 @@ public:
};
typedef
-cppu::WeakImplHelper3
+cppu::WeakImplHelper
<
::com::sun::star::container::XNameAccess,
::com::sun::star::container::XIndexAccess,
@@ -297,7 +294,7 @@ public:
};
typedef
-cppu::WeakImplHelper4
+cppu::WeakImplHelper
<
::com::sun::star::container::XEnumerationAccess,
::com::sun::star::container::XNameAccess,
@@ -438,7 +435,7 @@ class SwXBookmarks : public SwCollectionBaseClass,
};
-class SwXNumberingRulesCollection : public cppu::WeakImplHelper1
+class SwXNumberingRulesCollection : public cppu::WeakImplHelper
<
::com::sun::star::container::XIndexAccess
>,
@@ -460,7 +457,7 @@ public:
};
typedef
-cppu::WeakImplHelper2
+cppu::WeakImplHelper
<
::com::sun::star::container::XIndexAccess,
::com::sun::star::lang::XServiceInfo
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index 65345c2..1d1fbb1 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -28,7 +28,7 @@
class SwFieldType;
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::container::XNameAccess
, ::com::sun::star::lang::XServiceInfo
> SwXTextFieldMasters_Base;
@@ -74,7 +74,7 @@ public:
};
-typedef ::cppu::WeakImplHelper3
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::container::XEnumerationAccess
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::util::XRefreshable
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index edea72c..6434a34 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -29,9 +29,7 @@
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <sfx2/objsh.hxx>
@@ -45,7 +43,7 @@ class SwFmt;
class SwFlyFrmFmt;
class BaseFrameProperties_Impl;
-class SwXFrame : public cppu::WeakImplHelper6
+class SwXFrame : public cppu::WeakImplHelper
<
::com::sun::star::lang::XServiceInfo,
::com::sun::star::beans::XPropertySet,
@@ -158,7 +156,7 @@ public:
static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrmFmt &rFmt);
};
-typedef cppu::WeakImplHelper3
+typedef cppu::WeakImplHelper
<
::com::sun::star::text::XTextFrame,
::com::sun::star::container::XEnumerationAccess,
@@ -241,7 +239,7 @@ public:
void SAL_CALL operator delete( void * ) throw();
};
-typedef cppu::WeakImplHelper2
+typedef cppu::WeakImplHelper
<
::com::sun::star::text::XTextContent,
::com::sun::star::document::XEventsSupplier
@@ -292,7 +290,7 @@ public:
};
class SwOLENode;
-typedef cppu::WeakImplHelper3
+typedef cppu::WeakImplHelper
<
::com::sun::star::text::XTextContent,
::com::sun::star::document::XEmbeddedObjectSupplier2,
@@ -351,7 +349,7 @@ public:
void SAL_CALL operator delete( void * ) throw();
};
-class SwXOLEListener : public cppu::WeakImplHelper1
+class SwXOLEListener : public cppu::WeakImplHelper
<
::com::sun::star::util::XModifyListener
>,
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 355f170..23e2dfe 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -59,7 +59,7 @@ public:
};
typedef
-cppu::WeakImplHelper1
+cppu::WeakImplHelper
<
::com::sun::star::container::XEnumerationAccess
>
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index 8d096d5..5977517 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.hxx
@@ -30,7 +30,7 @@ namespace com{ namespace sun{ namespace star{
}
}}}
typedef
-cppu::WeakImplHelper3
+cppu::WeakImplHelper
<
::com::sun::star::container::XIndexAccess,
::com::sun::star::container::XEnumerationAccess,
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index 71f6943..b614822 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -22,7 +22,7 @@
#include <com/sun/star/util/XPropertyReplace.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ustring.hxx>
class SfxItemPropertySet;
@@ -34,7 +34,7 @@ namespace com{namespace sun{namespace star{namespace util{
struct SearchOptions;
}}}}
-class SwXTextSearch : public cppu::WeakImplHelper3
+class SwXTextSearch : public cppu::WeakImplHelper
<
::com::sun::star::util::XPropertyReplace,
::com::sun::star::lang::XServiceInfo,
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index be8c04b..3a81d05 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -31,7 +31,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/XMultiPropertyStates.hpp>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <calbck.hxx>
@@ -51,7 +51,7 @@ class IStyleAccess;
class SfxItemSet;
typedef std::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
-class SwXStyleFamilies : public cppu::WeakImplHelper4
+class SwXStyleFamilies : public cppu::WeakImplHelper
<
::com::sun::star::container::XIndexAccess,
::com::sun::star::container::XNameAccess,
@@ -98,7 +98,7 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
-class SwXStyleFamily : public cppu::WeakImplHelper4
+class SwXStyleFamily : public cppu::WeakImplHelper
<
::com::sun::star::container::XNameContainer,
::com::sun::star::lang::XServiceInfo,
@@ -152,7 +152,7 @@ public:
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
-class SwXStyle : public cppu::WeakImplHelper7
+class SwXStyle : public cppu::WeakImplHelper
<
::com::sun::star::style::XStyle,
::com::sun::star::beans::XPropertySet,
@@ -323,7 +323,7 @@ public:
// access to all automatic style families
class SwXAutoStyles :
- public cppu::WeakImplHelper1< ::com::sun::star::style::XAutoStyles >,
+ public cppu::WeakImplHelper< ::com::sun::star::style::XAutoStyles >,
public SwUnoCollection
{
SwDocShell *pDocShell;
@@ -352,7 +352,7 @@ public:
};
// access to a family of automatic styles (character or paragraph or ...)
-class SwXAutoStyleFamily : public cppu::WeakImplHelper1< com::sun::star::style::XAutoStyleFamily >,
+class SwXAutoStyleFamily : public cppu::WeakImplHelper< com::sun::star::style::XAutoStyleFamily >,
public SwClient
{
SwDocShell *pDocShell;
@@ -377,7 +377,7 @@ public:
};
-class SwXAutoStylesEnumerator : public cppu::WeakImplHelper1< ::com::sun::star::container::XEnumeration >,
+class SwXAutoStylesEnumerator : public cppu::WeakImplHelper< ::com::sun::star::container::XEnumeration >,
public SwClient
{
SwAutoStylesEnumImpl *pImpl;
@@ -393,7 +393,7 @@ protected:
};
// an automatic style
-class SwXAutoStyle : public cppu::WeakImplHelper3
+class SwXAutoStyle : public cppu::WeakImplHelper
<
::com::sun::star::beans::XPropertySet,
::com::sun::star::beans::XPropertyState,
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index ce6048e..3313b47 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -32,11 +32,7 @@
#include <com/sun/star/sheet/XCellRangeData.hpp>
#include <com/sun/star/table/XAutoFormattable.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase7.hxx>
-#include <cppuhelper/implbase10.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.h>
#include <comphelper/uno3.hxx>
@@ -57,7 +53,7 @@ class SwChartDataProvider;
class SwFrmFmt;
typedef
-cppu::WeakImplHelper4
+cppu::WeakImplHelper
<
::com::sun::star::table::XCell,
::com::sun::star::lang::XServiceInfo,
@@ -158,7 +154,7 @@ public:
SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
};
-class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper2
+class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
<
::com::sun::star::beans::XPropertySet,
::com::sun::star::lang::XServiceInfo
@@ -205,7 +201,7 @@ public:
static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
};
-typedef cppu::WeakImplHelper3<
+typedef cppu::WeakImplHelper<
::com::sun::star::text::XTextTableCursor,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::beans::XPropertySet
@@ -293,7 +289,7 @@ struct SwRangeDescriptor
};
class SwTableProperties_Impl;
-class SwXTextTable : public cppu::WeakImplHelper10
+class SwXTextTable : public cppu::WeakImplHelper
<
::com::sun::star::text::XTextTable,
::com::sun::star::lang::XServiceInfo,
@@ -442,7 +438,7 @@ public:
SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
};
-class SwXCellRange : public cppu::WeakImplHelper7
+class SwXCellRange : public cppu::WeakImplHelper
<
::com::sun::star::table::XCellRange,
::com::sun::star::lang::XServiceInfo,
@@ -557,7 +553,7 @@ public:
};
-class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper2
+class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper
<
::com::sun::star::table::XTableRows,
::com::sun::star::lang::XServiceInfo
@@ -599,7 +595,7 @@ public:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
};
-class SwXTableColumns : public cppu::WeakImplHelper2
+class SwXTableColumns : public cppu::WeakImplHelper
<
::com::sun::star::table::XTableColumns,
::com::sun::star::lang::XServiceInfo
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index 9907fd7..7166228 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -24,6 +24,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase2.hxx>
#include <unotext.hxx>
@@ -108,7 +109,7 @@ public:
};
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::container::XEnumerationAccess
> SwXHeadFootText_Base;
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index 5ca871a5..312b68e 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -30,8 +30,7 @@
#include <com/sun/star/text/XTextRange.hpp>
#include <com/sun/star/text/XRedline.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
#include <pam.hxx>
#include <unobaseclass.hxx>
@@ -70,7 +69,7 @@ namespace sw {
} // namespace sw
-typedef ::cppu::WeakImplHelper8
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::lang::XUnoTunnel
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::beans::XPropertySet
@@ -258,7 +257,7 @@ public:
};
-typedef ::cppu::WeakImplHelper3
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::lang::XUnoTunnel
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::container::XIndexAccess
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 4763f18..81dd2d0 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
namespace vcl { class Window; }
@@ -44,7 +44,7 @@ namespace accessibility {
const sal_Char sAccessibleServiceName[] = "com.sun.star.accessibility.Accessible";
class SwAccessibleContext :
- public ::cppu::WeakImplHelper5<
+ public ::cppu::WeakImplHelper<
::com::sun::star::accessibility::XAccessible,
::com::sun::star::accessibility::XAccessibleContext,
::com::sun::star::accessibility::XAccessibleComponent,
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index 2c68c77..ba71c62 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -22,14 +22,14 @@
#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
#include <rtl/ref.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <fmtinfmt.hxx>
class SwAccessibleParagraph;
class SwTxtAttr;
class SwAccessibleHyperlink :
- public ::cppu::WeakImplHelper1<
+ public ::cppu::WeakImplHelper<
::com::sun::star::accessibility::XAccessibleHyperlink >
{
friend class SwAccessibleParagraph;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index e68f741..af55bef 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -59,7 +59,7 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <pagepreviewlayout.hxx>
#include <dcontact.hxx>
#include <svx/unoapi.hxx>
@@ -118,7 +118,7 @@ public:
};
class SwDrawModellListener_Impl : public SfxListener,
- public ::cppu::WeakImplHelper1< document::XEventBroadcaster >
+ public ::cppu::WeakImplHelper< document::XEventBroadcaster >
{
mutable ::osl::Mutex maListenerMutex;
::cppu::OInterfaceContainerHelper maEventListeners;
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index 4ebeebf..0dae5fe 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -21,7 +21,7 @@
#include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <fmtinfmt.hxx>
#include <frame.hxx>
#include <layfrm.hxx>
@@ -29,7 +29,7 @@
#include "accnotextframe.hxx"
class SwAccessibleNoTextHyperlink :
- public ::cppu::WeakImplHelper1<
+ public ::cppu::WeakImplHelper<
::com::sun::star::accessibility::XAccessibleHyperlink >
{
friend class SwAccessibleNoTextFrame;
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index 8796fd4..4d11272 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -21,14 +21,14 @@
#define INCLUDED_SW_SOURCE_CORE_DOCNODE_CANCELLABLEJOB_HXX
#include <sal/config.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/util/XCancellable.hpp>
#include <rtl/ref.hxx>
class ObservableThread;
-class CancellableJob : public ::cppu::WeakImplHelper1<com::sun::star::util::XCancellable>
+class CancellableJob : public ::cppu::WeakImplHelper<com::sun::star::util::XCancellable>
{
public:
explicit CancellableJob( const ::rtl::Reference< ObservableThread >& rThread );
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index aa6ea1a..faa8c98 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -26,6 +26,7 @@
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <sax/fastattribs.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace css::xml::sax;
using namespace xmloff::token;
@@ -93,7 +94,7 @@ enum SwXMLTextBlockToken : sal_Int32
};
class SwXMLTextBlockTokenHandler : public
- cppu::WeakImplHelper1< css::xml::sax::XFastTokenHandler >,
+ cppu::WeakImplHelper< css::xml::sax::XFastTokenHandler >,
public sax_fastparser::FastTokenHandlerBase
{
public:
@@ -122,7 +123,7 @@ enum SwXMLBlockListToken : sal_Int32
};
class SwXMLBlockListTokenHandler : public
- cppu::WeakImplHelper1< css::xml::sax::XFastTokenHandler >,
+ cppu::WeakImplHelper< css::xml::sax::XFastTokenHandler >,
public sax_fastparser::FastTokenHandlerBase
{
public:
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index 296e211..632f606 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXTEXTDEFAULTS_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_SWXTEXTDEFAULTS_HXX
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -27,7 +27,7 @@
class SwDoc;
-class SwXTextDefaults : public cppu::WeakImplHelper3
+class SwXTextDefaults : public cppu::WeakImplHelper
<
com::sun::star::beans::XPropertyState,
com::sun::star::beans::XPropertySet,
diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx
index e15967b..f13dc85 100644
--- a/sw/source/core/inc/dumpfilter.hxx
+++ b/sw/source/core/inc/dumpfilter.hxx
@@ -14,7 +14,7 @@
#include <com/sun/star/document/XExporter.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
namespace sw {
@@ -22,7 +22,7 @@ namespace sw {
document as XML. This filter should be mostly be used for testing
purpose.
*/
- class LayoutDumpFilter : public cppu::WeakImplHelper4
+ class LayoutDumpFilter : public cppu::WeakImplHelper
<
com::sun::star::document::XFilter,
com::sun::star::document::XExporter,
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx
index c3ca1d6..4ad8446 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/text/XTextContent.hpp>
#include <com/sun/star/text/XFormField.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <sfx2/Metadatable.hxx>
@@ -36,7 +36,7 @@
class SwDoc;
-typedef ::cppu::ImplInheritanceHelper5
+typedef ::cppu::ImplInheritanceHelper
< ::sfx2::MetadatableMixin
, ::com::sun::star::lang::XUnoTunnel
, ::com::sun::star::lang::XServiceInfo
@@ -191,7 +191,7 @@ public:
};
class SwXFieldmarkParameters
- : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XNameContainer>
+ : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer>
, private SwClient
{
public:
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 78415a4..3b30ee1 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -26,9 +26,7 @@
#include <com/sun/star/util/XUpdatable.hpp>
#include <com/sun/star/text/XDependentTextField.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <unobaseclass.hxx>
@@ -39,7 +37,7 @@ class SwField;
class SwSetExpField;
class SwTextAPIObject;
-typedef ::cppu::WeakImplHelper4
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::beans::XPropertySet
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::lang::XUnoTunnel
@@ -151,7 +149,7 @@ public:
};
-typedef ::cppu::WeakImplHelper5
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::text::XDependentTextField
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::beans::XPropertySet
@@ -288,7 +286,7 @@ public:
};
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::container::XEnumeration
, ::com::sun::star::lang::XServiceInfo
> SwXFieldEnumeration_Base;
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 98c8578..2472439 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -44,7 +43,7 @@ namespace com { namespace sun { namespace star { namespace text {
class SwTxtNode;
class SwDoc;
-typedef ::cppu::ImplInheritanceHelper3
+typedef ::cppu::ImplInheritanceHelper
< SwXTextMarkup
, css::beans::XPropertySet
, css::text::XFlatParagraph
@@ -141,7 +140,7 @@ private:
};
class SwXFlatParagraphIterator:
- public ::cppu::WeakImplHelper1
+ public ::cppu::WeakImplHelper
<
css::text::XFlatParagraphIterator
>,
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index c974096..fdf9cf9 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -27,7 +27,7 @@
#include <com/sun/star/text/XTextContent.hpp>
#include <com/sun/star/text/XFootnote.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <unotext.hxx>
@@ -35,7 +35,7 @@ class SwDoc;
class SwModify;
class SwFmtFtn;
-typedef ::cppu::WeakImplHelper5
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::lang::XUnoTunnel
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::beans::XPropertySet
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index ed3b524..fb0f948 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.hxx
@@ -27,8 +27,7 @@
#include <com/sun/star/text/XDocumentIndexMark.hpp>
#include <com/sun/star/text/XDocumentIndex.hpp>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <sfx2/Metadatable.hxx>
@@ -40,7 +39,7 @@ class SwTOXBaseSection;
class SwTOXMark;
class SwTOXType;
-typedef ::cppu::ImplInheritanceHelper6
+typedef ::cppu::ImplInheritanceHelper
< ::sfx2::MetadatableMixin
, ::com::sun::star::lang::XUnoTunnel
, ::com::sun::star::lang::XServiceInfo
@@ -193,7 +192,7 @@ public:
};
-typedef ::cppu::WeakImplHelper4
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::lang::XUnoTunnel
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::beans::XPropertySet
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index a8d2233..bdbf125 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/text/XTextContent.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <unobaseclass.hxx>
@@ -66,7 +66,7 @@ enum ParaFrameMode
PARAFRAME_PORTION_TEXTRANGE,
};
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::container::XEnumeration
> SwXParaFrameEnumeration_Base;
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 2403002..9a82ca0 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -35,8 +35,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase8.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <svl/itemprop.hxx>
@@ -78,7 +77,7 @@ enum SwTextPortionType
PORTION_ANNOTATION_END
};
-class SwXTextPortion : public cppu::WeakImplHelper8
+class SwXTextPortion : public cppu::WeakImplHelper
<
::com::sun::star::beans::XTolerantMultiPropertySet,
::com::sun::star::beans::XMultiPropertySet,
@@ -244,7 +243,7 @@ public:
};
class SwXTextPortionEnumeration
- : public ::cppu::WeakImplHelper3
+ : public ::cppu::WeakImplHelper
< ::com::sun::star::container::XEnumeration
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::lang::XUnoTunnel
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index 73d8d41..6874d93 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/text/XTextContent.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
#include <unobaseclass.hxx>
@@ -34,7 +34,7 @@ class SwDoc;
class SwModify;
class SwFmtRefMark;
-typedef ::cppu::WeakImplHelper5
+typedef ::cppu::WeakImplHelper
< ::com::sun::star::lang::XUnoTunnel
, ::com::sun::star::lang::XServiceInfo
, ::com::sun::star::beans::XPropertySet
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index c57fd33..e7d8a0e 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -20,8 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOTEXTMARKUP_HXX
#define INCLUDED_SW_SOURCE_CORE_INC_UNOTEXTMARKUP_HXX
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/text/XTextMarkup.hpp>
#include <com/sun/star/text/XMultiTextMarkup.hpp>
@@ -45,7 +44,7 @@ class SfxPoolItem;
/** Implementation of the css::text::XTextMarkup interface
*/
class SwXTextMarkup
- : public ::cppu::WeakImplHelper2
+ : public ::cppu::WeakImplHelper
< ::com::sun::star::text::XTextMarkup
, ::com::sun::star::text::XMultiTextMarkup
>
@@ -83,7 +82,7 @@ protected:
/** Implementation of the ::com::sun::star::container::XStringKeyMap interface
*/
class SwXStringKeyMap:
- public ::cppu::WeakImplHelper1<
+ public ::cppu::WeakImplHelper<
::com::sun::star::container::XStringKeyMap>
{
public:
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index f87ec85..d6bbe2e 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -28,9 +28,8 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/document/XEventBroadcaster.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase2.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <hintids.hxx>
#include <sfx2/docfile.hxx>
@@ -87,7 +86,7 @@ public:
SwOLELRUCache* pOLELRU_Cache = 0;
-class SwOLEListener_Impl : public ::cppu::WeakImplHelper1< embed::XStateChangeListener >
+class SwOLEListener_Impl : public ::cppu::WeakImplHelper< embed::XStateChangeListener >
{
SwOLEObj* mpObj;
public:
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 396b32a..1d1554d 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -83,6 +83,7 @@
#include <basic/basmgr.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::document;
@@ -93,7 +94,7 @@ using namespace ::com::sun::star::lang;
#if HAVE_FEATURE_SCRIPTING
-class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
+class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper< document::XCodeNameQuery >
{
SwDocShell* mpDocShell;
OUString msThisDocumentCodeName;
@@ -176,7 +177,7 @@ public:
typedef std::unordered_map< OUString, OUString, OUStringHash > StringHashMap;
-class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer >
+class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper< container::XNameContainer >
{
StringHashMap mTemplateToProject;
public:
@@ -238,7 +239,7 @@ public:
};
-class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
+class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper< container::XNameAccess >
{
SwDocShell* mpDocShell;
public:
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index 97b62ec..eb84c07 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -39,7 +39,6 @@ using ::com::sun::star::lang::IllegalArgumentException;
using ::com::sun::star::lang::WrappedTargetException;
using ::com::sun::star::lang::XServiceInfo;
using ::com::sun::star::beans::PropertyValue;
-using ::cppu::WeakImplHelper2;
// tables of allowed events for specific objects
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index f2d4e23..bd498a3 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -60,6 +60,7 @@
#include <SwStyleNameMapper.hxx>
#include <comphelper/servicehelper.hxx>
#include <comphelper/string.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::com::sun::star;
@@ -178,7 +179,7 @@ lcl_ConvertTOUNameToUserName(OUString& rTmp)
}
}
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
< lang::XServiceInfo
, container::XIndexReplace
> SwXDocumentIndexStyleAccess_Base;
@@ -223,7 +224,7 @@ public:
};
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
< lang::XServiceInfo
, container::XIndexReplace
> SwXDocumentIndexTokenAccess_Base;
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 0aa1764..b256f8a 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -41,6 +41,7 @@
#include <editeng/crossedoutitem.hxx>
#include <svx/svdouno.hxx>
#include <svx/fmglob.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/form/ListSourceType.hpp>
#include <com/sun/star/form/FormButtonType.hpp>
#include <com/sun/star/form/FormSubmitEncoding.hpp>
@@ -359,7 +360,7 @@ const uno::Reference< script::XEventAttacherManager >&
}
class SwHTMLImageWatcher :
- public cppu::WeakImplHelper2< awt::XImageConsumer, XEventListener >
+ public cppu::WeakImplHelper< awt::XImageConsumer, XEventListener >
{
uno::Reference< drawing::XShape > xShape; // das control
uno::Reference< XImageProducerSupplier > xSrc;
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index f2ed24d..00da816 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -56,7 +56,7 @@
#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <unomid.h>
@@ -83,7 +83,7 @@ struct SwMailMergeDlg_Impl
uno::Reference<XSelectionSupplier> xSelSupp;
};
-class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper1
+class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper
<
view::XSelectionChangeListener
>
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index d213862..0d1f2bb 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/document/XExtendedFilterDetection.hpp>
#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.h>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -51,7 +51,7 @@ namespace com
class SfxMedium;
class SfxFilter;
-class SwFilterDetect : public ::cppu::WeakImplHelper2< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
+class SwFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
{
public:
SwFilterDetect();
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 8e8e65f..305c12f 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -25,7 +25,7 @@
#include <ooo/vba/word/WdBookmarkSortBy.hpp>
#include "vbarange.hxx"
#include "wordvbahelper.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
@@ -46,7 +46,7 @@ public:
};
// Bookmarks use case-insensitive name lookup in MS Word.
-typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > BookmarkCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess > BookmarkCollectionHelper_BASE;
class BookmarkCollectionHelper : public BookmarkCollectionHelper_BASE
{
private:
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index 6d5eaf8..4571ee7 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -21,7 +21,7 @@
#include <ooo/vba/word/WdBorderType.hpp>
#include <ooo/vba/word/WdLineStyle.hpp>
#include <sal/macros.h>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/table/TableBorder.hpp>
#include <com/sun/star/table/ShadowFormat.hpp>
@@ -31,7 +31,7 @@
using namespace ::com::sun::star;
using namespace ::ooo::vba;
-typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base;
+typedef ::cppu::WeakImplHelper<container::XIndexAccess > RangeBorders_Base;
typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base;
// #TODO sort these indexes to match the order in which Word iterates over the
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index 0f8ba16f..710f30d 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -21,11 +21,12 @@
#include "wordvbahelper.hxx"
#include "vbatablehelper.hxx"
#include "vbarow.hxx"
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > CellCollectionHelper_Base;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > CellCollectionHelper_Base;
class CellsEnumWrapper : public EnumerationHelper_BASE
{
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 860d839..3b2394b 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "vbadocumentproperties.hxx"
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
@@ -632,14 +631,14 @@ SwVbaBuiltInDocumentProperty::getServiceNames()
}
return aServiceNames;
}
-typedef ::cppu::WeakImplHelper3< com::sun::star::container::XIndexAccess
+typedef ::cppu::WeakImplHelper< com::sun::star::container::XIndexAccess
,com::sun::star::container::XNameAccess
,com::sun::star::container::XEnumerationAccess
> PropertiesImpl_BASE;
typedef std::unordered_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps;
-typedef ::cppu::WeakImplHelper1< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE;
class DocPropEnumeration : public DocPropEnumeration_BASE
{
DocProps mDocProps;
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 0011ea7..ef01660 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -28,6 +28,7 @@
#include <comphelper/string.hxx>
#include <ooo/vba/word/WdFieldType.hpp>
#include <swtypes.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
@@ -226,8 +227,8 @@ static uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xPare
return uno::makeAny( xField );
}
-typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > FieldEnumeration_BASE;
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > FieldCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< css::container::XEnumeration > FieldEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > FieldCollectionHelper_BASE;
class FieldEnumeration : public FieldEnumeration_BASE
{
diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx
index 7e76abd..6a63ac3 100644
--- a/sw/source/ui/vba/vbaframes.cxx
+++ b/sw/source/ui/vba/vbaframes.cxx
@@ -22,11 +22,12 @@
#include <com/sun/star/text/XTextViewCursor.hpp>
#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
#include "wordvbahelper.hxx"
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > FramesEnumeration_Base;
+typedef ::cppu::WeakImplHelper< container::XEnumeration > FramesEnumeration_Base;
class FramesEnumeration : public FramesEnumeration_Base
{
private:
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index 0824209..54eaca1 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -19,12 +19,13 @@
#include "vbaheadersfooters.hxx"
#include "vbaheaderfooter.hxx"
#include <ooo/vba/word/WdHeaderFooterIndex.hpp>
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
// I assume there is only one headersfooters in Writer
-typedef ::cppu::WeakImplHelper1<container::XIndexAccess > HeadersFootersIndexAccess_Base;
+typedef ::cppu::WeakImplHelper<container::XIndexAccess > HeadersFootersIndexAccess_Base;
class HeadersFootersIndexAccess : public HeadersFootersIndexAccess_Base
{
private:
diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx
index 0cdbb51..da3a62d 100644
--- a/sw/source/ui/vba/vbapalette.cxx
+++ b/sw/source/ui/vba/vbapalette.cxx
@@ -18,7 +18,7 @@
*/
#include "vbapalette.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <ooo/vba/word/WdColor.hpp>
#include <ooo/vba/word/WdColorIndex.hpp>
@@ -49,7 +49,7 @@ WdColor::wdColorGray50, // 15
WdColor::wdColorGray25, // 16
};
-typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess > XIndexAccess_BASE;
class DefaultPalette : public XIndexAccess_BASE
{
diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx
index 6fdf39d..19389c3 100644
--- a/sw/source/ui/vba/vbapanes.cxx
+++ b/sw/source/ui/vba/vbapanes.cxx
@@ -18,12 +18,13 @@
*/
#include "vbapanes.hxx"
#include "vbapane.hxx"
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
// I assume there is only one pane in Writer
-typedef ::cppu::WeakImplHelper1<container::XIndexAccess > PanesIndexAccess_Base;
+typedef ::cppu::WeakImplHelper<container::XIndexAccess > PanesIndexAccess_Base;
class PanesIndexAccess : public PanesIndexAccess_Base
{
private:
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index 8ae1ef4..d32c536 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -21,6 +21,7 @@
#include <tools/diagnose_ex.h>
#include "vbarange.hxx"
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
@@ -72,7 +73,7 @@ SwVbaParagraph::getServiceNames()
return aServiceNames;
}
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > ParagraphCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > ParagraphCollectionHelper_BASE;
class ParagraphCollectionHelper : public ParagraphCollectionHelper_BASE
{
diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx
index 62f9d90..4b49b77 100644
--- a/sw/source/ui/vba/vbarevisions.cxx
+++ b/sw/source/ui/vba/vbarevisions.cxx
@@ -18,15 +18,15 @@
*/
#include "vbarevisions.hxx"
#include "vbarevision.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/document/XRedlinesSupplier.hpp>
#include <com/sun/star/text/XTextRangeCompare.hpp>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > RevisionEnumeration_BASE;
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > RevisionCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< container::XEnumeration > RevisionEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > RevisionCollectionHelper_BASE;
typedef std::vector< uno::Reference< beans::XPropertySet > > RevisionMap;
class RedlinesEnumeration : public RevisionEnumeration_BASE
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index d929357..06cd0f4 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -23,12 +23,13 @@
#include <docsh.hxx>
#include <doc.hxx>
#include "wordvbahelper.hxx"
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > SectionEnumeration_BASE;
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > SectionCollectionHelper_Base;
+typedef ::cppu::WeakImplHelper< container::XEnumeration > SectionEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > SectionCollectionHelper_Base;
typedef std::vector< uno::Reference< beans::XPropertySet > > XSectionVec;
class SectionEnumeration : public SectionEnumeration_BASE
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index b413b1c..e46d74c 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -18,7 +18,7 @@
*/
#include "vbastyles.hxx"
#include "vbastyle.hxx"
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -157,7 +157,7 @@ static const MSOStyleNameTable aMSOStyleNameTable[] =
{ 0, 0, 0 }
};
-typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > StyleCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > StyleCollectionHelper_BASE;
class StyleCollectionHelper : public StyleCollectionHelper_BASE
{
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index 26b60c2..a81375d 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/table/XCellRange.hpp>
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace css;
@@ -58,8 +59,8 @@ static bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTab
return false;
}
-typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumBase;
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XNameAccess > TableCollectionHelper_Base;
+typedef ::cppu::WeakImplHelper< css::container::XEnumeration > EnumBase;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XNameAccess > TableCollectionHelper_Base;
typedef std::vector< uno::Reference< text::XTextTable > > XTextTableVec;
class TableCollectionHelper : public TableCollectionHelper_Base
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index 9827666..d0cbc08 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -20,11 +20,12 @@
#include "vbatableofcontents.hxx"
#include "vbarange.hxx"
#include <com/sun/star/text/XDocumentIndexesSupplier.hpp>
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > TableOfContentsCollectionHelper_Base;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > TableOfContentsCollectionHelper_Base;
typedef std::vector< uno::Reference< text::XDocumentIndex > > XTocVec;
class TablesOfContentsEnumWrapper : public EnumerationHelper_BASE
diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx
index 128b664..7ae01e3 100644
--- a/sw/source/ui/vba/vbatabstops.cxx
+++ b/sw/source/ui/vba/vbatabstops.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/style/TabAlign.hpp>
#include <ooo/vba/word/WdTabLeader.hpp>
#include <ooo/vba/word/WdTabAlignment.hpp>
+#include <cppuhelper/implbase.hxx>
using namespace ::ooo::vba;
using namespace ::com::sun::star;
@@ -37,7 +38,7 @@ static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaP
xParaProps->setPropertyValue("ParaTabStops", uno::makeAny( aSeq ) );
}
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > TabStopCollectionHelper_Base;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > TabStopCollectionHelper_Base;
class TabStopsEnumWrapper : public EnumerationHelper_BASE
{
diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 6f3a8e8..1621841 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -9,7 +9,7 @@
#include <uinums.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/container/XIndexReplace.hpp>
#include <com/sun/star/container/XNamed.hpp>
@@ -42,7 +42,7 @@ using namespace ::xmloff::token;
namespace sw {
class StoredChapterNumberingRules
- : public ::cppu::WeakImplHelper2<container::XNamed,container::XIndexReplace>
+ : public ::cppu::WeakImplHelper<container::XNamed,container::XIndexReplace>
{
private:
// TODO in case this ever becomes accessible via api need a invalidate
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f246575..d34efb3 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -117,6 +117,7 @@
#include <svx/dataaccessdescriptor.hxx>
#include <osl/mutex.hxx>
#include <rtl/textenc.h>
+#include <cppuhelper/implbase.hxx>
#include <ndindex.hxx>
#include <pam.hxx>
#include <swcrsr.hxx>
@@ -201,7 +202,7 @@ bool lcl_getCountFromResultSet( sal_Int32& rCount, const uno::Reference<XResultS
}
}
-class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper1
+class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper
< lang::XEventListener >
{
private:
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 552cc9c..2ad207c 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -32,7 +32,7 @@
#include <com/sun/star/sdb/XCompletedConnection.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
#include <com/sun/star/container/XContainer.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <svx/dbaexchange.hxx>
#include <dbmgr.hxx>
@@ -70,7 +70,7 @@ struct SwConnectionData
typedef boost::ptr_vector<SwConnectionData> SwConnectionArr;
-class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener >
+class SwDBTreeList_Impl : public cppu::WeakImplHelper < XContainerListener >
{
Reference< XDatabaseContext > xDBContext;
SwConnectionArr aConnections;
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index f4a7b17..c4042d8 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -24,7 +24,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/beans/XPropertiesChangeListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <officecfg/Office/Common.hxx>
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
@@ -206,7 +206,7 @@ static void lcl_Highlight(const OUString& rSource, SwTextPortions& aPortionList)
}
class SwSrcEditWindow::ChangesListener:
- public cppu::WeakImplHelper1< css::beans::XPropertiesChangeListener >
+ public cppu::WeakImplHelper< css::beans::XPropertiesChangeListener >
{
public:
ChangesListener(SwSrcEditWindow & editor): editor_(editor) {}
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index 12cb723..5a51d05 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -25,13 +25,13 @@
#include <com/sun/star/document/XExporter.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
namespace com { namespace sun { namespace star { namespace io {
class XInputStream;
} } } }
-class SwXFilterOptions : public ::cppu::WeakImplHelper5<
+class SwXFilterOptions : public ::cppu::WeakImplHelper<
::com::sun::star::beans::XPropertyAccess,
::com::sun::star::ui::dialogs::XExecutableDialog,
::com::sun::star::document::XImporter,
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index b542f96..c6691af 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -28,7 +28,7 @@
#include <com/sun/star/mail/XMailMessage.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/compbase1.hxx>
#include <cppuhelper/compbase2.hxx>
#include <vcl/scrbar.hxx>
@@ -136,7 +136,7 @@ public:
};
class SW_DLLPUBLIC SwAuthenticator :
- public cppu::WeakImplHelper1< ::com::sun::star::mail::XAuthenticator>
+ public cppu::WeakImplHelper< ::com::sun::star::mail::XAuthenticator>
{
OUString m_aUserName;
OUString m_aPassword;
@@ -156,7 +156,7 @@ public:
};
class SW_DLLPUBLIC SwConnectionContext :
- public cppu::WeakImplHelper1< ::com::sun::star::uno::XCurrentContext >
+ public cppu::WeakImplHelper< ::com::sun::star::uno::XCurrentContext >
{
OUString m_sMailServer;
sal_Int16 m_nPort;
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index b89ee26..655c7d3 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -27,7 +27,7 @@
#include <sfx2/objsh.hxx>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
class SwXTextView;
@@ -45,7 +45,7 @@ namespace com{ namespace sun{ namespace star {
}
}}}
-class SwScannerEventListener : public ::cppu::WeakImplHelper1<
+class SwScannerEventListener : public ::cppu::WeakImplHelper<
::com::sun::star::lang::XEventListener >
{
SwView* pView;
@@ -63,7 +63,7 @@ public:
};
// Clipboard EventListener
-class SwClipboardChangeListener : public ::cppu::WeakImplHelper1<
+class SwClipboardChangeListener : public ::cppu::WeakImplHelper<
::com::sun::star::datatransfer::clipboard::XClipboardListener >
{
SwView* pView;
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index e298197..f95c333 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.hxx
@@ -31,9 +31,7 @@
#include <com/sun/star/text/XText.hpp>
#include <svl/itemprop.hxx>
#include <svl/lstner.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <svtools/unoevent.hxx>
class SwTextBlocks;
class SwGlossaries;
@@ -51,7 +49,7 @@ typedef tools::SvRef<SwDocShell> SwDocShellRef;
SAL_CALL SwXAutoTextContainer_createInstance(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ) throw ( ::com::sun::star::uno::Exception );
-class SwXAutoTextContainer : public cppu::WeakImplHelper2
+class SwXAutoTextContainer : public cppu::WeakImplHelper
<
::com::sun::star::text::XAutoTextContainer2,
::com::sun::star::lang::XServiceInfo
@@ -89,7 +87,7 @@ public:
};
-class SwXAutoTextGroup : public cppu::WeakImplHelper6
+class SwXAutoTextGroup : public cppu::WeakImplHelper
<
::com::sun::star::text::XAutoTextGroup,
::com::sun::star::beans::XPropertySet,
@@ -157,7 +155,7 @@ public:
class SwXAutoTextEntry
:public SfxListener
- ,public cppu::WeakImplHelper5
+ ,public cppu::WeakImplHelper
<
::com::sun::star::text::XAutoTextEntry,
::com::sun::star::lang::XServiceInfo,
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index 7e65f7f8..3871d3c 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -24,15 +24,14 @@
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <list>
#include <vcl/svapp.hxx>
#include <osl/mutex.hxx>
class SwView;
-class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3
+class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper
<
::com::sun::star::frame::XDispatchProviderInterceptor,
::com::sun::star::lang::XEventListener,
@@ -94,7 +93,7 @@ struct StatusStruct_Impl
::com::sun::star::util::URL aURL;
};
typedef std::list< StatusStruct_Impl > StatusListenerList;
-class SwXDispatch : public cppu::WeakImplHelper2
+class SwXDispatch : public cppu::WeakImplHelper
<
::com::sun::star::frame::XDispatch,
::com::sun::star::view::XSelectionChangeListener
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index 6ede6aa..14c1ad5 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UNOMAILMERGE_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_UNOMAILMERGE_HXX
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <unotools/configitem.hxx>
@@ -63,7 +63,7 @@ class SwDBManager;
class MailMergeExecuteFinalizer;
class SwXMailMerge :
- public cppu::WeakImplHelper6
+ public cppu::WeakImplHelper
<
com::sun::star::task::XJob,
com::sun::star::util::XCancellable,
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index a0f24eb..38df3f4 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -24,8 +24,7 @@
#include <com/sun/star/view/XViewSettingsSupplier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <comphelper/ChainablePropertySet.hxx>
#include <comphelper/SettingsHelper.hxx>
#include <usrpref.hxx>
@@ -37,7 +36,7 @@ class SwDoc;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SwXModule_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
-class SwXModule : public cppu::WeakImplHelper3
+class SwXModule : public cppu::WeakImplHelper
<
::com::sun::star::view::XViewSettingsSupplier,
::com::sun::star::view::XPrintSettingsSupplier,
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index de1dadc31..17187fd 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.hxx
@@ -36,7 +36,7 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/datatransfer/XTransferableSupplier.hpp>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
#include <svl/itemprop.hxx>
#include "calbck.hxx"
#include "TextCursorHelper.hxx"
@@ -157,7 +157,7 @@ public:
SfxObjectShellLock BuildTmpSelectionDoc();
};
-typedef cppu::WeakImplHelper8<
+typedef cppu::WeakImplHelper<
::com::sun::star::text::XTextViewCursor,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::text::XPageCursor,
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 609414b..3839011 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -49,6 +49,7 @@
#include <com/sun/star/mail/XSmtpService.hpp>
#include <sfx2/viewfrm.hxx>
#include <sfx2/event.hxx>
+#include <cppuhelper/implbase.hxx>
#include <swevent.hxx>
#include <unomailmerge.hxx>
#include <swdll.hxx>
@@ -184,7 +185,7 @@ static bool LoadFromURL_impl(
namespace
{
- class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener >,
+ class DelayedFileDeletion : public ::cppu::WeakImplHelper< util::XCloseListener >,
private boost::noncopyable
{
protected:
diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx
index 424871a..8d7c296 100644
--- a/sw/source/uibase/uno/unomodule.hxx
+++ b/sw/source/uibase/uno/unomodule.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/frame/DispatchDescriptor.hpp>
#include <com/sun/star/uno/Reference.h>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -48,7 +48,7 @@ namespace com
}
}
-class SwUnoModule : public ::cppu::WeakImplHelper3< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
+class SwUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
{
css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory;
More information about the Libreoffice-commits
mailing list