diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-28 09:42:29 +0900 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-03 16:14:41 +0000 |
| commit | 1873563bb2d9743fe548ceaf2d1429280a27b956 (patch) | |
| tree | cc1f851977966aeda4978a618b80bba01ca8dce2 | |
| parent | 88890c2a7522394f355a3f47a4dfb4608ac5a1cd (diff) | |
sc: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I2f55a6231e903b0ca198cee3a88023ad1db6c50c
Reviewed-on: https://gerrit.libreoffice.org/18072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
100 files changed, 209 insertions, 242 deletions
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx index b389ef1031d9..2f7cfd1152b2 100644 --- a/sc/inc/AccessibleFilterTopWindow.hxx +++ b/sc/inc/AccessibleFilterTopWindow.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SC_INC_ACCESSIBLEFILTERTOPWINDOW_HXX #include "AccessibleFilterMenu.hxx" -#include <cppuhelper/implbase1.hxx> class ScCheckListMenuWindow; diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx index c9af7bc92626..2661b4ea22f7 100644 --- a/sc/inc/addruno.hxx +++ b/sc/inc/addruno.hxx @@ -22,12 +22,12 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> #include "global.hxx" #include "address.hxx" -class ScAddressConversionObj : public ::cppu::WeakImplHelper2< +class ScAddressConversionObj : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceInfo >, public SfxListener diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx index 7c38d97f57f9..0ea6db177085 100644 --- a/sc/inc/afmtuno.hxx +++ b/sc/inc/afmtuno.hxx @@ -35,16 +35,14 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> class ScAutoFormatFieldObj; class ScAutoFormatObj; #define SC_AFMTOBJ_INVALID USHRT_MAX -class ScAutoFormatsObj : public ::cppu::WeakImplHelper4< +class ScAutoFormatsObj : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XEnumerationAccess, ::com::sun::star::container::XIndexAccess, @@ -114,7 +112,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScAutoFormatObj : public ::cppu::WeakImplHelper6< +class ScAutoFormatObj : public ::cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess, ::com::sun::star::container::XEnumerationAccess, ::com::sun::star::container::XNamed, @@ -219,7 +217,7 @@ public: static ScAutoFormatObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj); }; -class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper2< +class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceInfo >, public SfxListener diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx index 6e4621604d18..56aa88bf84cd 100644 --- a/sc/inc/appluno.hxx +++ b/sc/inc/appluno.hxx @@ -29,9 +29,7 @@ #include <com/sun/star/sheet/XGlobalSheetSettings.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/ustring.hxx> #include <sfx2/sfxmodelfactory.hxx> @@ -76,7 +74,7 @@ OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw(); css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance( const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception ); -class ScSpreadsheetSettings : public cppu::WeakImplHelper3< +class ScSpreadsheetSettings : public cppu::WeakImplHelper< com::sun::star::sheet::XGlobalSheetSettings, com::sun::star::beans::XPropertySet, com::sun::star::lang::XServiceInfo> @@ -228,7 +226,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScRecentFunctionsObj : public cppu::WeakImplHelper2< +class ScRecentFunctionsObj : public cppu::WeakImplHelper< com::sun::star::sheet::XRecentFunctions, com::sun::star::lang::XServiceInfo> { @@ -254,7 +252,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScFunctionListObj : public cppu::WeakImplHelper4< +class ScFunctionListObj : public cppu::WeakImplHelper< com::sun::star::sheet::XFunctionDescriptions, com::sun::star::container::XEnumerationAccess, com::sun::star::container::XNameAccess, diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index ac2726d1f00c..7496a47f4366 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -88,8 +88,7 @@ #include <com/sun/star/beans/XTolerantMultiPropertySet.hpp> #include <com/sun/star/sheet/XExternalSheetName.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <boost/ptr_container/ptr_vector.hpp> #include <boost/scoped_ptr.hpp> @@ -1355,7 +1354,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScCellsObj : public cppu::WeakImplHelper2< +class ScCellsObj : public cppu::WeakImplHelper< com::sun::star::container::XEnumerationAccess, com::sun::star::lang::XServiceInfo >, public SfxListener @@ -1388,7 +1387,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScCellsEnumeration : public cppu::WeakImplHelper2< +class ScCellsEnumeration : public cppu::WeakImplHelper< com::sun::star::container::XEnumeration, com::sun::star::lang::XServiceInfo >, public SfxListener @@ -1426,7 +1425,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScCellFormatsObj : public cppu::WeakImplHelper3< +class ScCellFormatsObj : public cppu::WeakImplHelper< com::sun::star::container::XIndexAccess, com::sun::star::container::XEnumerationAccess, com::sun::star::lang::XServiceInfo >, @@ -1470,7 +1469,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScCellFormatsEnumeration : public cppu::WeakImplHelper2< +class ScCellFormatsEnumeration : public cppu::WeakImplHelper< com::sun::star::container::XEnumeration, com::sun::star::lang::XServiceInfo >, public SfxListener @@ -1511,7 +1510,7 @@ public: typedef std::vector< ScRangeList > ScMyRangeLists; -class ScUniqueCellFormatsObj : public cppu::WeakImplHelper3< +class ScUniqueCellFormatsObj : public cppu::WeakImplHelper< com::sun::star::container::XIndexAccess, com::sun::star::container::XEnumerationAccess, com::sun::star::lang::XServiceInfo >, @@ -1556,7 +1555,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScUniqueCellFormatsEnumeration : public cppu::WeakImplHelper2< +class ScUniqueCellFormatsEnumeration : public cppu::WeakImplHelper< com::sun::star::container::XEnumeration, com::sun::star::lang::XServiceInfo >, public SfxListener diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx index da79b1bd26ae..57475815326a 100644 --- a/sc/inc/chartuno.hxx +++ b/sc/inc/chartuno.hxx @@ -33,13 +33,13 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <cppuhelper/compbase4.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/compbase.hxx> +#include <cppuhelper/implbase.hxx> class ScDocShell; class ScChartObj; -class ScChartsObj : public cppu::WeakImplHelper4< +class ScChartsObj : public cppu::WeakImplHelper< com::sun::star::table::XTableCharts, com::sun::star::container::XEnumerationAccess, com::sun::star::container::XIndexAccess, @@ -105,7 +105,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -typedef ::cppu::WeakComponentImplHelper4< +typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::table::XTableChart, ::com::sun::star::document::XEmbeddedObjectSupplier, ::com::sun::star::container::XNamed, diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx index f0551e0abdc4..1252f59acf7c 100644 --- a/sc/inc/confuno.hxx +++ b/sc/inc/confuno.hxx @@ -24,11 +24,11 @@ #include <svl/lstner.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> class ScDocShell; -class ScDocumentConfiguration : public cppu::WeakImplHelper2< +class ScDocumentConfiguration : public cppu::WeakImplHelper< com::sun::star::beans::XPropertySet, com::sun::star::lang::XServiceInfo>, public SfxListener diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index 09ee64ca1438..20105b09259c 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -50,10 +50,7 @@ #include <com/sun/star/sheet/XDataPilotTable2.hpp> #include <com/sun/star/sheet/XDataPilotTables.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <vector> @@ -82,7 +79,7 @@ public: }; /** DataPilotTables collection per sheet. */ -class ScDataPilotTablesObj : public cppu::WeakImplHelper4< +class ScDataPilotTablesObj : public cppu::WeakImplHelper< com::sun::star::sheet::XDataPilotTables, com::sun::star::container::XEnumerationAccess, com::sun::star::container::XIndexAccess, @@ -421,7 +418,7 @@ private: ScDataPilotChildObjBase& operator=( const ScDataPilotChildObjBase& ) SAL_DELETED_FUNCTION; }; -typedef ::cppu::WeakImplHelper4 +typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XEnumerationAccess, ::com::sun::star::container::XIndexAccess, @@ -485,7 +482,7 @@ private: ::com::sun::star::uno::Any maOrient; /// Field orientation, no value = all fields. }; -typedef ::cppu::WeakImplHelper5 +typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XNamed, ::com::sun::star::beans::XPropertySet, @@ -630,7 +627,7 @@ struct ScFieldGroup typedef ::std::vector< ScFieldGroup > ScFieldGroups; -typedef ::cppu::WeakImplHelper4 +typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XEnumerationAccess, @@ -716,7 +713,7 @@ private: ScFieldGroups maGroups; }; -typedef ::cppu::WeakImplHelper5 +typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XEnumerationAccess, @@ -796,7 +793,7 @@ private: OUString maGroupName; }; -typedef ::cppu::WeakImplHelper2 +typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XNamed, ::com::sun::star::lang::XServiceInfo @@ -827,7 +824,7 @@ private: OUString maName; }; -typedef ::cppu::WeakImplHelper4 +typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XEnumerationAccess, ::com::sun::star::container::XIndexAccess, @@ -880,7 +877,7 @@ private: ScDataPilotItemObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const; }; -typedef ::cppu::WeakImplHelper3 +typedef ::cppu::WeakImplHelper < ::com::sun::star::container::XNamed, ::com::sun::star::beans::XPropertySet, diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx index 2f4bfd734c44..a0e04f0ebe85 100644 --- a/sc/inc/defltuno.hxx +++ b/sc/inc/defltuno.hxx @@ -24,12 +24,12 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/itemprop.hxx> class ScDocShell; -class ScDocDefaultsObj : public ::cppu::WeakImplHelper3< +class ScDocDefaultsObj : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySet, ::com::sun::star::beans::XPropertyState, ::com::sun::star::lang::XServiceInfo >, diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx index cf01087744a7..9638ed5f72dc 100644 --- a/sc/inc/dispuno.hxx +++ b/sc/inc/dispuno.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> #include "global.hxx" #include <boost/ptr_container/ptr_vector.hpp> @@ -37,7 +37,7 @@ typedef ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > XStatusListenerRef; typedef boost::ptr_vector<XStatusListenerRef> XStatusListenerArr_Impl; -class ScDispatchProviderInterceptor : public cppu::WeakImplHelper2< +class ScDispatchProviderInterceptor : public cppu::WeakImplHelper< com::sun::star::frame::XDispatchProviderInterceptor, com::sun::star::lang::XEventListener>, public SfxListener @@ -94,7 +94,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScDispatch : public cppu::WeakImplHelper2< +class ScDispatch : public cppu::WeakImplHelper< com::sun::star::frame::XDispatch, com::sun::star::view::XSelectionChangeListener >, public SfxListener diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index cd6888598f69..34235a2a0b75 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -48,10 +48,7 @@ #include <com/sun/star/sheet/opencl/XOpenCLSelection.hpp> #include <com/sun/star/sheet/opencl/OpenCLPlatform.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <svl/itemprop.hxx> #include <vcl/ITiledRenderable.hxx> @@ -416,7 +413,7 @@ public: virtual void resetSelection() SAL_OVERRIDE; }; -class ScDrawPagesObj : public cppu::WeakImplHelper2< +class ScDrawPagesObj : public cppu::WeakImplHelper< com::sun::star::drawing::XDrawPages, com::sun::star::lang::XServiceInfo>, public SfxListener @@ -462,7 +459,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScTableSheetsObj : public cppu::WeakImplHelper5< +class ScTableSheetsObj : public cppu::WeakImplHelper< com::sun::star::sheet::XSpreadsheets2, com::sun::star::sheet::XCellRangesAccess, com::sun::star::container::XEnumerationAccess, @@ -572,7 +569,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScTableColumnsObj : public cppu::WeakImplHelper5< +class ScTableColumnsObj : public cppu::WeakImplHelper< com::sun::star::table::XTableColumns, com::sun::star::container::XEnumerationAccess, com::sun::star::container::XNameAccess, @@ -679,7 +676,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScTableRowsObj : public cppu::WeakImplHelper4< +class ScTableRowsObj : public cppu::WeakImplHelper< com::sun::star::table::XTableRows, com::sun::star::container::XEnumerationAccess, com::sun::star::beans::XPropertySet, @@ -774,7 +771,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper2< +class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper< com::sun::star::beans::XPropertySet, com::sun::star::lang::XServiceInfo>, public SfxListener @@ -837,7 +834,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScAnnotationsObj : public cppu::WeakImplHelper3< +class ScAnnotationsObj : public cppu::WeakImplHelper< com::sun::star::sheet::XSheetAnnotations, com::sun::star::container::XEnumerationAccess, com::sun::star::lang::XServiceInfo>, @@ -890,7 +887,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScScenariosObj : public cppu::WeakImplHelper4< +class ScScenariosObj : public cppu::WeakImplHelper< com::sun::star::sheet::XScenarios, com::sun::star::container::XEnumerationAccess, com::sun::star::container::XIndexAccess, diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx index e2fb1b5f6b54..cdae3af4f413 100644 --- a/sc/inc/dptabsrc.hxx +++ b/sc/inc/dptabsrc.hxx @@ -40,10 +40,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase5.hxx> -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> #include "dptabdat.hxx" @@ -82,7 +79,7 @@ class ScDPLevel; class ScDPMembers; class ScDPMember; -class ScDPSource : public cppu::WeakImplHelper6< +class ScDPSource : public cppu::WeakImplHelper< com::sun::star::sheet::XDimensionsSupplier, com::sun::star::sheet::XDataPilotResults, com::sun::star::util::XRefreshable, @@ -267,7 +264,7 @@ public: #endif }; -class ScDPDimensions : public cppu::WeakImplHelper2< +class ScDPDimensions : public cppu::WeakImplHelper< com::sun::star::container::XNameAccess, com::sun::star::lang::XServiceInfo > { @@ -309,7 +306,7 @@ public: ScDPDimension* getByIndex(long nIndex) const; }; -class ScDPDimension : boost::noncopyable, public cppu::WeakImplHelper5< +class ScDPDimension : boost::noncopyable, public cppu::WeakImplHelper< com::sun::star::sheet::XHierarchiesSupplier, com::sun::star::container::XNamed, com::sun::star::util::XCloneable, @@ -421,7 +418,7 @@ public: const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const { return aReferenceValue;} }; -class ScDPHierarchies : public cppu::WeakImplHelper2< +class ScDPHierarchies : public cppu::WeakImplHelper< com::sun::star::container::XNameAccess, com::sun::star::lang::XServiceInfo > { @@ -462,7 +459,7 @@ public: ScDPHierarchy* getByIndex(long nIndex) const; }; -class ScDPHierarchy : public cppu::WeakImplHelper3< +class ScDPHierarchy : public cppu::WeakImplHelper< com::sun::star::sheet::XLevelsSupplier, com::sun::star::container::XNamed, com::sun::star::lang::XServiceInfo > @@ -497,7 +494,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScDPLevels : public cppu::WeakImplHelper2< +class ScDPLevels : public cppu::WeakImplHelper< com::sun::star::container::XNameAccess, com::sun::star::lang::XServiceInfo > { @@ -539,7 +536,7 @@ public: ScDPLevel* getByIndex(long nIndex) const; }; -class ScDPLevel : public cppu::WeakImplHelper5< +class ScDPLevel : public cppu::WeakImplHelper< com::sun::star::sheet::XMembersSupplier, com::sun::star::container::XNamed, com::sun::star::sheet::XDataPilotMemberResults, @@ -672,7 +669,7 @@ public: // hash map from name to index in the member array, for fast name access typedef std::unordered_map< OUString, sal_Int32, OUStringHash > ScDPMembersHashMap; -class ScDPMembers : public cppu::WeakImplHelper2< +class ScDPMembers : public cppu::WeakImplHelper< com::sun::star::container::XNameAccess, com::sun::star::lang::XServiceInfo > { @@ -723,7 +720,7 @@ public: SCROW GetSrcItemsCount(); }; -class ScDPMember : boost::noncopyable, public cppu::WeakImplHelper3< +class ScDPMember : boost::noncopyable, public cppu::WeakImplHelper< com::sun::star::container::XNamed, com::sun::star::beans::XPropertySet, com::sun::star::lang::XServiceInfo > diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx index db7e160ecec0..7b6eda52b253 100644 --- a/sc/inc/eventuno.hxx +++ b/sc/inc/eventuno.hxx @@ -22,14 +22,14 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameReplace.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> #include "global.hxx" class ScDocShell; -class ScSheetEventsObj : public cppu::WeakImplHelper2< +class ScSheetEventsObj : public cppu::WeakImplHelper< com::sun::star::container::XNameReplace, com::sun::star::lang::XServiceInfo>, public SfxListener diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index bb117090748a..905e907953f5 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -36,8 +36,7 @@ #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/util/DateTime.hpp> #include <cppuhelper/component.hxx> -#include <cppuhelper/implbase5.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> #include <boost/noncopyable.hpp> @@ -50,7 +49,7 @@ class ScEditFieldObj; class ScDocShell; class ScHeaderFooterTextData; -class ScCellFieldsObj : public cppu::WeakImplHelper5< +class ScCellFieldsObj : public cppu::WeakImplHelper< com::sun::star::container::XEnumerationAccess, com::sun::star::container::XIndexAccess, com::sun::star::container::XContainer, @@ -123,7 +122,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScHeaderFieldsObj : public cppu::WeakImplHelper5< +class ScHeaderFieldsObj : public cppu::WeakImplHelper< com::sun::star::container::XEnumerationAccess, com::sun::star::container::XIndexAccess, com::sun::star::container::XContainer, @@ -194,7 +193,7 @@ public: * Generic UNO wrapper for edit engine's field item in cells, headers, and * footers. */ -class ScEditFieldObj : public cppu::WeakImplHelper4< +class ScEditFieldObj : public cppu::WeakImplHelper< com::sun::star::text::XTextField, com::sun::star::beans::XPropertySet, com::sun::star::lang::XUnoTunnel, diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx index a3126db578ee..14039479037b 100644 --- a/sc/inc/filtuno.hxx +++ b/sc/inc/filtuno.hxx @@ -26,14 +26,14 @@ #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> #include "scdllapi.h" namespace com { namespace sun { namespace star { namespace io { class XInputStream; } } } } -class ScFilterOptionsObj : public ::cppu::WeakImplHelper5< +class ScFilterOptionsObj : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyAccess, ::com::sun::star::ui::dialogs::XExecutableDialog, ::com::sun::star::document::XImporter, diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx index 3ee15f1dd216..d59caf8c2212 100644 --- a/sc/inc/fmtuno.hxx +++ b/sc/inc/fmtuno.hxx @@ -36,9 +36,7 @@ #include <com/sun/star/sheet/XMultiFormulaTokens.hpp> #include <com/sun/star/sheet/FormulaToken.hpp> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/sheet/ConditionOperator2.hpp> #include "address.hxx" @@ -68,7 +66,7 @@ struct ScCondFormatEntryItem ScCondFormatEntryItem(); }; -class ScTableConditionalFormat : public cppu::WeakImplHelper5< +class ScTableConditionalFormat : public cppu::WeakImplHelper< com::sun::star::sheet::XSheetConditionalEntries, com::sun::star::container::XNameAccess, com::sun::star::container::XEnumerationAccess, @@ -141,7 +139,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScTableConditionalEntry : public cppu::WeakImplHelper3< +class ScTableConditionalEntry : public cppu::WeakImplHelper< com::sun::star::sheet::XSheetCondition2, com::sun::star::sheet::XSheetConditionalEntry, com::sun::star::lang::XServiceInfo > @@ -190,7 +188,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScTableValidationObj : public cppu::WeakImplHelper5< +class ScTableValidationObj : public cppu::WeakImplHelper< com::sun::star::sheet::XSheetCondition2, com::sun::star::sheet::XMultiFormulaTokens, com::sun::star::beans::XPropertySet, diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index abbd31f549d8..d267c2a12bf2 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sheet/XFunctionAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> class ScDocument; @@ -52,7 +52,7 @@ public: void Clear(); }; -class ScFunctionAccess : public cppu::WeakImplHelper3< +class ScFunctionAccess : public cppu::WeakImplHelper< com::sun::star::sheet::XFunctionAccess, com::sun::star::beans::XPropertySet, com::sun::star::lang::XServiceInfo>, diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx index 8ff623364787..4d87b79721eb 100644 --- a/sc/inc/miscuno.hxx +++ b/sc/inc/miscuno.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include "scdllapi.h" @@ -84,7 +84,7 @@ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \ if (rType == cppu::UnoType<x>::get()) \ { uno::Any aR; aR <<= uno::Reference<x>(static_cast<y*>(this)); return aR; } -class ScIndexEnumeration : public cppu::WeakImplHelper2< +class ScIndexEnumeration : public cppu::WeakImplHelper< com::sun::star::container::XEnumeration, com::sun::star::lang::XServiceInfo > { @@ -115,7 +115,7 @@ public: }; // new (uno 3) variant -class ScNameToIndexAccess : public cppu::WeakImplHelper2< +class ScNameToIndexAccess : public cppu::WeakImplHelper< com::sun::star::container::XIndexAccess, com::sun::star::lang::XServiceInfo > { diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index fa46ca59cd30..63f8b1057736 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -36,10 +36,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XActionLockable.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase5.hxx> -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> class ScDocShell; @@ -48,7 +45,7 @@ class ScRangeData; class ScTokenArray; class ScNamedRangesObj; -class SC_DLLPUBLIC ScNamedRangeObj : public ::cppu::WeakImplHelper6< +class SC_DLLPUBLIC ScNamedRangeObj : public ::cppu::WeakImplHelper< ::com::sun::star::sheet::XNamedRange, ::com::sun::star::sheet::XFormulaTokens, ::com::sun::star::sheet::XCellRangeReferrer, @@ -171,7 +168,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScNamedRangesObj : public ::cppu::WeakImplHelper6< +class ScNamedRangesObj : public ::cppu::WeakImplHelper< ::com::sun::star::sheet::XNamedRanges, ::com::sun::star::container::XEnumerationAccess, ::com::sun::star::container::XIndexAccess, @@ -337,7 +334,7 @@ public: virtual ~ScLocalNamedRangesObj(); }; -class ScLabelRangeObj : public ::cppu::WeakImplHelper2< +class ScLabelRangeObj : public ::cppu::WeakImplHelper< ::com::sun::star::sheet::XLabelRange, ::com::sun::star::lang::XServiceInfo >, public SfxListener @@ -376,7 +373,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScLabelRangesObj : public ::cppu::WeakImplHelper3< +class ScLabelRangesObj : public ::cppu::WeakImplHelper< ::com::sun::star::sheet::XLabelRanges, ::com::sun::star::container::XEnumerationAccess, ::com::sun::star::lang::XServiceInfo >, diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx index e11f3ad8f4fd..e8ec0e63c00d 100644 --- a/sc/inc/notesuno.hxx +++ b/sc/inc/notesuno.hxx @@ -25,7 +25,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/text/XSimpleText.hpp> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> #include "address.hxx" @@ -33,7 +33,7 @@ class ScDocShell; class SvxUnoText; class ScPostIt; -class ScAnnotationObj : public cppu::WeakImplHelper5< +class ScAnnotationObj : public cppu::WeakImplHelper< com::sun::star::container::XChild, com::sun::star::text::XSimpleText, com::sun::star::sheet::XSheetAnnotation, diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 0557c2ebef13..9f6258bca087 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -426,6 +426,7 @@ #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/component_context.hxx> #include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx index 0e7455ab2c51..32480a7c3ef2 100644 --- a/sc/inc/pch/precompiled_scfilt.hxx +++ b/sc/inc/pch/precompiled_scfilt.hxx @@ -296,6 +296,7 @@ #include <config_orcus.h> #include <cppuhelper/component_context.hxx> #include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx index bb9a44467230..130a34cf90fc 100644 --- a/sc/inc/pch/precompiled_vbaobj.hxx +++ b/sc/inc/pch/precompiled_vbaobj.hxx @@ -206,6 +206,7 @@ #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/component_context.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase4.hxx> diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx index 4182893ddf63..7dccd90df81e 100644 --- a/sc/inc/shapeuno.hxx +++ b/sc/inc/shapeuno.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/container/XChild.hpp> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> namespace com { namespace sun { namespace star { @@ -49,7 +49,7 @@ class ScMacroInfo; // object which aggregates all svx shape objects, // to add own properties -typedef ::cppu::WeakImplHelper5 < ::com::sun::star::beans::XPropertySet +typedef ::cppu::WeakImplHelper < ::com::sun::star::beans::XPropertySet , ::com::sun::star::beans::XPropertyState , ::com::sun::star::text::XTextContent , ::com::sun::star::document::XEventsSupplier diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx index 2a19c1b5dfc4..8719a6ff45b6 100644 --- a/sc/inc/srchuno.hxx +++ b/sc/inc/srchuno.hxx @@ -24,11 +24,11 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <svl/itemprop.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> class SvxSearchItem; -class ScCellSearchObj : public cppu::WeakImplHelper3< +class ScCellSearchObj : public cppu::WeakImplHelper< com::sun::star::util::XReplaceDescriptor, com::sun::star::lang::XUnoTunnel, com::sun::star::lang::XServiceInfo > diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index b8abfed38bff..a41d9e3e8a8d 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -34,8 +34,7 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase7.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XComponent.hpp> @@ -46,7 +45,7 @@ class SfxObjectShell; class ScStyleFamilyObj; class ScStyleObj; -class ScStyleFamiliesObj : public ::cppu::WeakImplHelper4< +class ScStyleFamiliesObj : public ::cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess, ::com::sun::star::container::XNameAccess, ::com::sun::star::style::XStyleLoader2, @@ -118,7 +117,7 @@ private: ::com::sun::star::uno::RuntimeException, std::exception); }; -class ScStyleFamilyObj : public ::cppu::WeakImplHelper4< +class ScStyleFamilyObj : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XIndexAccess, ::com::sun::star::beans::XPropertySet, @@ -210,7 +209,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScStyleObj : public ::cppu::WeakImplHelper7< +class ScStyleObj : public ::cppu::WeakImplHelper< ::com::sun::star::style::XStyle, ::com::sun::star::beans::XPropertySet, ::com::sun::star::beans::XMultiPropertySet, diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 433ef8416153..d99930cfa748 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -48,8 +48,7 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XElementAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> class ScDocShell; @@ -63,7 +62,7 @@ class ScDocShell; //! Graphic / OleObject (need separate collections!) -class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper2< +class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess, ::com::sun::star::lang::XServiceInfo >, public SfxListener @@ -96,7 +95,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; -class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper3< +class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySet, ::com::sun::star::document::XLinkTargetSupplier, ::com::sun::star::lang::XServiceInfo >, @@ -158,7 +157,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; -class ScLinkTargetsObj : public ::cppu::WeakImplHelper2< +class ScLinkTargetsObj : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess, ::com::sun::star::lang::XServiceInfo > { diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 3223c066f081..93c7b6696f06 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -28,8 +28,7 @@ #include <com/sun/star/sheet/XHeaderFooterContent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> #include "scdllapi.h" @@ -57,7 +56,7 @@ struct ScHeaderFieldData; // ScHeaderFooterContentObj is a dumb container which must be re-written into // the page template using setPropertyValue -class ScHeaderFooterContentObj : public cppu::WeakImplHelper3< +class ScHeaderFooterContentObj : public cppu::WeakImplHelper< com::sun::star::sheet::XHeaderFooterContent, com::sun::star::lang::XUnoTunnel, com::sun::star::lang::XServiceInfo > @@ -140,7 +139,7 @@ public: * * ScHeaderFooterTextObj changes the text in a ScHeaderFooterContentObj. */ -class ScHeaderFooterTextObj : public cppu::WeakImplHelper5< +class ScHeaderFooterTextObj : public cppu::WeakImplHelper< com::sun::star::text::XText, com::sun::star::text::XTextRangeMover, com::sun::star::container::XEnumerationAccess, diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx index 6c1009ff897d..6dd75aad1ff3 100644 --- a/sc/inc/tokenuno.hxx +++ b/sc/inc/tokenuno.hxx @@ -26,7 +26,7 @@ #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp> #include <com/sun/star/sheet/FormulaToken.hpp> #include <com/sun/star/sheet/XFormulaParser.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> #include <formula/FormulaOpCodeMapperObj.hxx> #include "address.hxx" @@ -48,7 +48,7 @@ public: const ScTokenArray& rTokenArray ); }; -class ScFormulaParserObj : public ::cppu::WeakImplHelper3< +class ScFormulaParserObj : public ::cppu::WeakImplHelper< ::com::sun::star::sheet::XFormulaParser, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceInfo >, diff --git a/sc/source/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx index 63dafef6c928..962898d22fed 100644 --- a/sc/source/core/inc/addinlis.hxx +++ b/sc/source/core/inc/addinlis.hxx @@ -24,11 +24,11 @@ #include <com/sun/star/sheet/XResultListener.hpp> #include <com/sun/star/sheet/XVolatileResult.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> class ScDocument; -class ScAddInListener : public cppu::WeakImplHelper2< +class ScAddInListener : public cppu::WeakImplHelper< com::sun::star::sheet::XResultListener, com::sun::star::lang::XServiceInfo >, public SvtBroadcaster diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 03ea1f34fcb2..eba2d5c88ec5 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -99,6 +99,7 @@ #include <com/sun/star/script/ModuleInfo.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <cppuhelper/component_context.hxx> +#include <cppuhelper/implbase.hxx> #include "xltoolbar.hxx" #include <oox/ole/vbaproject.hxx> #include <oox/ole/olestorage.hxx> @@ -109,7 +110,7 @@ using namespace ::comphelper; //OleNameOverrideContainer -class OleNameOverrideContainer : public ::cppu::WeakImplHelper1< container::XNameContainer > +class OleNameOverrideContainer : public ::cppu::WeakImplHelper< container::XNameContainer > { private: typedef std::unordered_map< OUString, uno::Reference< container::XIndexContainer >, OUStringHash, diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 47251d5b3997..f5c95bdeaf86 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -63,12 +63,12 @@ using ::std::list; -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> using namespace ::com::sun::star; -typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE; +typedef ::cppu::WeakImplHelper< container::XIndexAccess > XIndexAccess_BASE; typedef ::std::vector< ColorData > ColorDataVec; class PaletteIndex : public XIndexAccess_BASE diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx index e45bcb5cdeda..0432abd2c166 100644 --- a/sc/source/filter/inc/ooxformulaparser.hxx +++ b/sc/source/filter/inc/ooxformulaparser.hxx @@ -26,14 +26,14 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sheet/XFilterFormulaParser.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> namespace oox { namespace xls { class OOXMLFormulaParserImpl; -typedef ::cppu::WeakImplHelper3< +typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, ::com::sun::star::sheet::XFilterFormulaParser > OOXMLFormulaParser_BASE; diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 45c5f1e78932..2b18aafa56d9 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -21,11 +21,11 @@ #define INCLUDED_SC_SOURCE_FILTER_XML_XMLCODENAMEPROVIDER_HXX #include <com/sun/star/container/XNameAccess.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> class ScDocument; -class XMLCodeNameProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XNameAccess > +class XMLCodeNameProvider : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess > { ScDocument* mpDoc; OUString msDocName; diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 31e205e56ca4..5de9a78fd3d3 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -21,7 +21,7 @@ #include "document.hxx" #include <basic/basmgr.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/diagnose.h> #include <sfx2/objsh.hxx> #include "formulacell.hxx" @@ -99,7 +99,7 @@ ScMacroManager::~ScMacroManager() { } -typedef ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener > ContainerListenerHelper; +typedef ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener > ContainerListenerHelper; class VBAProjectListener : public ContainerListenerHelper { diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx index 15a67597c176..7760af0aee9b 100644 --- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx +++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx @@ -19,14 +19,14 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_CHARTRANGESELECTIONLISTENER_HXX #define INCLUDED_SC_SOURCE_UI_INC_CHARTRANGESELECTIONLISTENER_HXX -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <comphelper/broadcasthelper.hxx> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> class ScTabViewShell; -typedef ::cppu::WeakComponentImplHelper2< +typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::view::XSelectionChangeListener, ::com::sun::star::lang::XServiceInfo > ScChartRangeSelectionListener_Base; diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index 847dff59fa4a..c16e0b5bf717 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -22,13 +22,13 @@ #include <svl/lstner.hxx> #include <cppuhelper/interfacecontainer.h> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/document/XEventBroadcaster.hpp> class SdrModel; class ScDrawModelBroadcaster : public SfxListener, - public ::cppu::WeakImplHelper1< com::sun::star::document::XEventBroadcaster > + public ::cppu::WeakImplHelper< com::sun::star::document::XEventBroadcaster > { mutable ::osl::Mutex maListenerMutex; ::cppu::OInterfaceContainerHelper maEventListeners; diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx index 40f4c78b0370..848eff35fa3f 100644 --- a/sc/source/ui/inc/condformatuno.hxx +++ b/sc/source/ui/inc/condformatuno.hxx @@ -20,8 +20,7 @@ #include <com/sun/star/sheet/XDataBarEntry.hpp> #include <com/sun/star/sheet/XIconSetEntry.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/itemprop.hxx> #include <svl/lstner.hxx> #include <rtl/ref.hxx> @@ -49,7 +48,7 @@ class XSheetCellRanges; } } } -class ScCondFormatsObj : public cppu::WeakImplHelper1<com::sun::star::sheet::XConditionalFormats>, +class ScCondFormatsObj : public cppu::WeakImplHelper<com::sun::star::sheet::XConditionalFormats>, public SfxListener { public: @@ -82,7 +81,7 @@ private: ScDocShell* mpDocShell; }; -class ScCondFormatObj : public cppu::WeakImplHelper2<com::sun::star::sheet::XConditionalFormat, +class ScCondFormatObj : public cppu::WeakImplHelper<com::sun::star::sheet::XConditionalFormat, com::sun::star::beans::XPropertySet> { public: @@ -168,7 +167,7 @@ private: sal_Int32 mnKey; }; -class ScConditionEntryObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet, +class ScConditionEntryObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, com::sun::star::sheet::XConditionEntry> { public: @@ -231,7 +230,7 @@ private: const ScCondFormatEntry* mpFormat; }; -class ScColorScaleFormatObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet, +class ScColorScaleFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, com::sun::star::sheet::XConditionEntry> { public: @@ -293,7 +292,7 @@ private: const ScColorScaleFormat* mpFormat; }; -class ScColorScaleEntryObj : public cppu::WeakImplHelper1<com::sun::star::sheet::XColorScaleEntry> +class ScColorScaleEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XColorScaleEntry> { public: ScColorScaleEntryObj(rtl::Reference<ScColorScaleFormatObj> xParent, size_t nPos); @@ -325,7 +324,7 @@ private: size_t mnPos; }; -class ScDataBarFormatObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet, +class ScDataBarFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, com::sun::star::sheet::XConditionEntry> { public: @@ -386,7 +385,7 @@ private: const ScDataBarFormat* mpFormat; }; -class ScDataBarEntryObj : public cppu::WeakImplHelper1<com::sun::star::sheet::XDataBarEntry> +class ScDataBarEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XDataBarEntry> { public: ScDataBarEntryObj(rtl::Reference<ScDataBarFormatObj> xParent, size_t nPos); @@ -412,7 +411,7 @@ private: size_t mnPos; }; -class ScIconSetFormatObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet, +class ScIconSetFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, com::sun::star::sheet::XConditionEntry> { public: @@ -473,7 +472,7 @@ private: const ScIconSetFormat* mpFormat; }; -class ScIconSetEntryObj : public cppu::WeakImplHelper1<com::sun::star::sheet::XIconSetEntry> +class ScIconSetEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XIconSetEntry> { public: ScIconSetEntryObj(rtl::Reference<ScIconSetFormatObj> xParent, size_t nPos); @@ -499,7 +498,7 @@ private: size_t mnPos; }; -class ScCondDateFormatObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet, +class ScCondDateFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet, com::sun::star::sheet::XConditionEntry> { public: diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index ce1d3125e144..5d6b5b87d1bb 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -36,7 +36,6 @@ #include "docuno.hxx" #include <boost/scoped_ptr.hpp> -#include <cppuhelper/implbase1.hxx> #include <config_telepathy.h> #include <unordered_map> diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx index 9b70ea31e846..68095b6b48d2 100644 --- a/sc/source/ui/unoobj/exceldetect.hxx +++ b/sc/source/ui/unoobj/exceldetect.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_UNOOBJ_EXCELDETECT_HXX #define INCLUDED_SC_SOURCE_UI_UNOOBJ_EXCELDETECT_HXX -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/document/XExtendedFilterDetection.hpp> @@ -19,7 +19,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; }}}} -class ScExcelBiffDetect : public cppu::WeakImplHelper2<com::sun::star::document::XExtendedFilterDetection, com::sun::star::lang::XServiceInfo> +class ScExcelBiffDetect : public cppu::WeakImplHelper<com::sun::star::document::XExtendedFilterDetection, com::sun::star::lang::XServiceInfo> { public: ScExcelBiffDetect( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext ); diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index 2aae88cfe6e1..ce80be7ccf31 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -23,7 +23,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> @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } }}} -class ScFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > +class ScFilterDetect : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > { public: ScFilterDetect( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext ); diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 68913f657749..9098457281ae 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -63,6 +63,7 @@ #include <sfx2/app.hxx> #include <cppuhelper/component_context.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/script/vba/XVBACompatibility.hpp> using namespace ::com::sun::star; @@ -76,7 +77,7 @@ bool isInVBAMode( ScDocShell& rDocSh ) return false; } -class ScVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess > +class ScVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper< container::XNameAccess > { uno::Any maWorkbook; uno::Any maCachedObject; @@ -165,7 +166,7 @@ public: }; -class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery > +class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper< document::XCodeNameQuery > { ScDocShell& mrDocShell; public: diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 177cfc7d31f1..ed20b5b793a3 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -28,7 +28,7 @@ #include <editeng/unofield.hxx> #include <svx/shapepropertynotifier.hxx> #include <toolkit/helper/convert.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/drawing/XShape.hpp> @@ -1361,7 +1361,7 @@ SdrObject* ScShapeObj::GetSdrObject() const throw() #define SC_EVENTACC_SCRIPT "Script" #define SC_EVENTACC_EVENTTYPE "EventType" -class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper1< container::XNameReplace > +class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper< container::XNameReplace > { private: ScShapeObj* mpShape; diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index c70c9eef8640..d5fc99f72fd7 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -25,9 +25,9 @@ #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbaapplicationbase.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> -typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ov::excel::XApplication > ScVbaApplication_BASE; +typedef cppu::ImplInheritanceHelper< VbaApplicationBase, ov::excel::XApplication > ScVbaApplication_BASE; struct ScVbaAppSettings; diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx index 3ccbc2d7d202..dc6193763319 100644 --- a/sc/source/ui/vba/vbaassistant.hxx +++ b/sc/source/ui/vba/vbaassistant.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAASSISTANT_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAASSISTANT_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/XAssistant.hpp> #include <sfx2/sfxhelp.hxx> @@ -27,7 +27,7 @@ #include "excelvbahelper.hxx" #include <vbahelper/vbahelperinterface.hxx> -typedef ::cppu::WeakImplHelper1< ov::XAssistant > Assistant; +typedef ::cppu::WeakImplHelper< ov::XAssistant > Assistant; typedef InheritedHelperInterfaceImpl< Assistant > ScVbaAssistantImpl_BASE; class ScVbaAssistant : public ScVbaAssistantImpl_BASE diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 47020c181ddf..12ee55ce075f 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -20,6 +20,7 @@ #include "vbaaxes.hxx" #include "vbaaxis.hxx" #include "vbachart.hxx" +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XlAxisType.hpp> #include <ooo/vba/excel/XlAxisGroup.hpp> #include <ooo/vba/excel/XAxis.hpp> @@ -82,7 +83,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno: namespace { -class AxisIndexWrapper : public ::cppu::WeakImplHelper1< container::XIndexAccess > +class AxisIndexWrapper : public ::cppu::WeakImplHelper< container::XIndexAccess > { // if necessary for better performance we could change this into a map and cache the // indices -> Axis, currently we create a new Axis object diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx index cfef6b78dea8..a42824d8717f 100644 --- a/sc/source/ui/vba/vbaaxistitle.hxx +++ b/sc/source/ui/vba/vbaaxistitle.hxx @@ -20,10 +20,10 @@ #define INCLUDED_SC_SOURCE_UI_VBA_VBAAXISTITLE_HXX #include "vbatitle.hxx" -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XAxisTitle.hpp> -typedef TitleImpl< cppu::WeakImplHelper1< ov::excel::XAxisTitle > > AxisTitleBase; +typedef TitleImpl< cppu::WeakImplHelper< ov::excel::XAxisTitle > > AxisTitleBase; class ScVbaAxisTitle : public AxisTitleBase { diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index 7ef2b922fd07..b540585d82a8 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -19,7 +19,7 @@ #include "vbaborders.hxx" #include <sal/macros.h> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XlBordersIndex.hpp> #include <ooo/vba/excel/XlBorderWeight.hpp> #include <ooo/vba/excel/XlLineStyle.hpp> @@ -34,7 +34,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel; -typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base; +typedef ::cppu::WeakImplHelper<container::XIndexAccess > RangeBorders_Base; typedef InheritedHelperInterfaceImpl1<excel::XBorder > ScVbaBorder_Base; // #TODO sort these indexes to match the order in which Excel iterates over the diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index fe8f7ed08fb2..2dfc77d59437 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBABORDERS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBABORDERS_HXX -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/excel/XBorders.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 7548a96a0afc..d91bd3f17d3a 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACHARACTERS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBACHARACTERS_HXX -#include <cppuhelper/implbase1.hxx> - #include <ooo/vba/excel/XCharacters.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/text/XSimpleText.hpp> diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx index 02b79e909a0d..34cfb47d9b89 100644 --- a/sc/source/ui/vba/vbachart.hxx +++ b/sc/source/ui/vba/vbachart.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACHART_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBACHART_HXX -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/table/XTableChart.hpp> #include <com/sun/star/chart/XChartDocument.hpp> diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index 01dd37728d67..cdf5cea902b2 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACHARTOBJECT_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBACHARTOBJECT_HXX -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/table/XTableChart.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx index 810d6474a1a3..c3eaabf81d4c 100644 --- a/sc/source/ui/vba/vbachartobjects.hxx +++ b/sc/source/ui/vba/vbachartobjects.hxx @@ -22,7 +22,6 @@ #include <ooo/vba/excel/XChartObjects.hpp> #include <ooo/vba/excel/XChartObject.hpp> -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/table/XTableCharts.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx index 95bb635e985e..e1542ff63540 100644 --- a/sc/source/ui/vba/vbacharttitle.hxx +++ b/sc/source/ui/vba/vbacharttitle.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACHARTTITLE_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBACHARTTITLE_HXX #include "vbatitle.hxx" -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XChartTitle.hpp> -typedef TitleImpl< cppu::WeakImplHelper1< ov::excel::XChartTitle > > ChartTitleBase; +typedef TitleImpl< cppu::WeakImplHelper< ov::excel::XChartTitle > > ChartTitleBase; class ScVbaChartTitle : public ChartTitleBase { diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx index 9f41fb9cba8e..9f7e004b8c21 100644 --- a/sc/source/ui/vba/vbacomment.hxx +++ b/sc/source/ui/vba/vbacomment.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACOMMENT_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBACOMMENT_HXX -#include <cppuhelper/implbase1.hxx> - #include <ooo/vba/excel/XComment.hpp> #include <ooo/vba/excel/XApplication.hpp> #include <ooo/vba/msforms/XShape.hpp> diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx index 08b5d60fd050..3255dffc6413 100644 --- a/sc/source/ui/vba/vbacomments.hxx +++ b/sc/source/ui/vba/vbacomments.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACOMMENTS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBACOMMENTS_HXX -#include <cppuhelper/implbase1.hxx> - #include <ooo/vba/excel/XComments.hpp> #include "excelvbahelper.hxx" diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx index 9564ef3024e6..a249803c23e1 100644 --- a/sc/source/ui/vba/vbadialog.hxx +++ b/sc/source/ui/vba/vbadialog.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBADIALOG_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBADIALOG_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XDialog.hpp> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbadialogbase.hxx> -typedef cppu::ImplInheritanceHelper1< VbaDialogBase, ov::excel::XDialog > ScVbaDialog_BASE; +typedef cppu::ImplInheritanceHelper< VbaDialogBase, ov::excel::XDialog > ScVbaDialog_BASE; class ScVbaDialog : public ScVbaDialog_BASE { diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx index 06ae7c468c61..985dd5c7a501 100644 --- a/sc/source/ui/vba/vbadialogs.hxx +++ b/sc/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::excel::XDialogs > ScVbaDialogs_BASE; +typedef cppu::ImplInheritanceHelper< VbaDialogsBase, ov::excel::XDialogs > ScVbaDialogs_BASE; class ScVbaDialogs : public ScVbaDialogs_BASE { diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index d49cc688eed9..a083c2252dd3 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/util/XChangesListener.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <unotools/eventcfg.hxx> #include <vcl/svapp.hxx> @@ -108,7 +108,7 @@ uno::Reference< awt::XWindow > lclGetWindowForController( const uno::Reference< } // namespace // This class is to process Workbook window related event -class ScVbaEventListener : public ::cppu::WeakImplHelper4< awt::XTopWindowListener, +class ScVbaEventListener : public ::cppu::WeakImplHelper< awt::XTopWindowListener, awt::XWindowListener, frame::XBorderResizeListener, util::XChangesListener > diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index b87a11571e09..fd6274b60eda 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAFONT_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAFONT_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <ooo/vba/excel/XFont.hpp> @@ -29,7 +29,7 @@ class ScCellRangeObj; -typedef cppu::ImplInheritanceHelper1< VbaFontBase, ov::excel::XFont > ScVbaFont_BASE; +typedef cppu::ImplInheritanceHelper< VbaFontBase, ov::excel::XFont > ScVbaFont_BASE; class ScVbaFont : public ScVbaFont_BASE { diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 12b552a8519e..fc31ffb31150 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -25,14 +25,14 @@ #include <ooo/vba/excel/XGlobals.hpp> #include <ooo/vba/excel/XApplication.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "excelvbahelper.hxx" #include <vbahelper/vbaglobalbase.hxx> // class ScVbaGlobals -typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE; +typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE; class ScVbaGlobals : public ScVbaGlobals_BASE { diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 6cf6ec14a9cb..b3e80e0ca8c5 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -20,6 +20,7 @@ #include "vbahyperlinks.hxx" #include <algorithm> #include <vector> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/office/MsoHyperlinkType.hpp> #include "rangelst.hxx" #include "vbahyperlink.hxx" @@ -100,7 +101,7 @@ bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& namespace detail { -class ScVbaHlinkContainer : public ::cppu::WeakImplHelper1< container::XIndexAccess > +class ScVbaHlinkContainer : public ::cppu::WeakImplHelper< container::XIndexAccess > { public: explicit ScVbaHlinkContainer() throw (uno::RuntimeException); diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index aa289f22c39c..a30c17317db7 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -8,12 +8,13 @@ */ #include "vbamenubars.hxx" #include "vbamenubar.hxx" +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XlSheetType.hpp> using namespace com::sun::star; using namespace ooo::vba; -class MenuBarEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration > +class MenuBarEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { uno::Reference< XHelperInterface > m_xParent; uno::Reference< uno::XComponentContext > m_xContext; diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx index 331476438486..b714920b43d9 100644 --- a/sc/source/ui/vba/vbamenubars.hxx +++ b/sc/source/ui/vba/vbamenubars.hxx @@ -13,7 +13,6 @@ #include <ooo/vba/excel/XMenuBar.hpp> #include <ooo/vba/XCommandBars.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <cppuhelper/implbase1.hxx> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbacollectionimpl.hxx> diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index 2d6c20a1e572..4ef5b911a332 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -9,12 +9,13 @@ #include "vbamenuitems.hxx" #include "vbamenuitem.hxx" #include "vbamenu.hxx" +#include <cppuhelper/implbase.hxx> #include <ooo/vba/office/MsoControlType.hpp> using namespace com::sun::star; using namespace ooo::vba; -typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE; +typedef ::cppu::WeakImplHelper< container::XEnumeration > MenuEnumeration_BASE; class MenuEnumeration : public MenuEnumeration_BASE { diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index 16068af9fcba..0960970e0c9f 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -8,12 +8,13 @@ */ #include "vbamenus.hxx" #include "vbamenu.hxx" +#include <cppuhelper/implbase.hxx> #include <ooo/vba/office/MsoControlType.hpp> using namespace com::sun::star; using namespace ooo::vba; -typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE; +typedef ::cppu::WeakImplHelper< container::XEnumeration > MenuEnumeration_BASE; class MenuEnumeration : public MenuEnumeration_BASE { diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx index c97bdcda4126..aa02152bdf69 100644 --- a/sc/source/ui/vba/vbaoleobject.hxx +++ b/sc/source/ui/vba/vbaoleobject.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECT_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECT_HXX -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/drawing/XControlShape.hpp> #include <ooo/vba/excel/XOLEObject.hpp> #include <ooo/vba/msforms/XControl.hpp> diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx index 426dc12e5bff..efa8038e142e 100644 --- a/sc/source/ui/vba/vbaoleobjects.cxx +++ b/sc/source/ui/vba/vbaoleobjects.cxx @@ -24,11 +24,12 @@ #include "vbaoleobject.hxx" #include "vbaoleobjects.hxx" +#include <cppuhelper/implbase.hxx> using namespace com::sun::star; using namespace ooo::vba; -typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE; +typedef ::cppu::WeakImplHelper< container::XIndexAccess > XIndexAccess_BASE; namespace { diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx index ea8634690a62..a0cfa9a3582d 100644 --- a/sc/source/ui/vba/vbaoleobjects.hxx +++ b/sc/source/ui/vba/vbaoleobjects.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECTS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECTS_HXX -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/excel/XOLEObjects.hpp> #include <vbahelper/vbacollectionimpl.hxx> diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx index f21008caf304..3e7201d5b36d 100644 --- a/sc/source/ui/vba/vbaoutline.hxx +++ b/sc/source/ui/vba/vbaoutline.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SC_SOURCE_UI_VBA_VBAOUTLINE_HXX #include <com/sun/star/sheet/XSheetOutline.hpp> -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/excel/XOutline.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <vbahelper/vbahelperinterface.hxx> diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index e80c4acb98f9..31d4b45d922c 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPAGEBREAK_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAPAGEBREAK_HXX -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/excel/XPageBreak.hpp> #include <ooo/vba/excel/XHPageBreak.hpp> #include <ooo/vba/excel/XVPageBreak.hpp> diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index dcab022f6c12..4f442d1c54fd 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -18,11 +18,12 @@ */ #include "vbapagebreaks.hxx" #include "vbapagebreak.hxx" +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XWorksheet.hpp> using namespace ::com::sun::star; using namespace ::ooo::vba; -class RangePageBreaks : public ::cppu::WeakImplHelper1<container::XIndexAccess > +class RangePageBreaks : public ::cppu::WeakImplHelper<container::XIndexAccess > { private: uno::Reference< XHelperInterface > mxParent; diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx index 11b1a0cc9fbd..5cdd5ab64da0 100644 --- a/sc/source/ui/vba/vbapagebreaks.hxx +++ b/sc/source/ui/vba/vbapagebreaks.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPAGEBREAKS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAPAGEBREAKS_HXX -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/excel/XHPageBreaks.hpp> #include <ooo/vba/excel/XHPageBreak.hpp> #include <ooo/vba/excel/XVPageBreaks.hpp> diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx index 5b7ff9b6a815..e7ba2c4569d0 100644 --- a/sc/source/ui/vba/vbapagesetup.hxx +++ b/sc/source/ui/vba/vbapagesetup.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPAGESETUP_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAPAGESETUP_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XPageSetup.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> @@ -28,7 +28,7 @@ #include <vbahelper/vbapagesetupbase.hxx> #include <ooo/vba/excel/XlPaperSize.hpp> -typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ov::excel::XPageSetup > ScVbaPageSetup_BASE; +typedef cppu::ImplInheritanceHelper< VbaPageSetupBase, ov::excel::XPageSetup > ScVbaPageSetup_BASE; class ScVbaPageSetup : public ScVbaPageSetup_BASE { diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx index 2d52843d511a..8619bf27334b 100644 --- a/sc/source/ui/vba/vbapalette.cxx +++ b/sc/source/ui/vba/vbapalette.cxx @@ -20,7 +20,7 @@ #include "vbapalette.hxx" #include <sal/macros.h> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include "excelvbahelper.hxx" @@ -46,7 +46,7 @@ static const ColorData spnDefColorTable8[] = /* 56 */ 0x003366, 0x339966, 0x003300, 0x333300, 0x993300, 0x993366, 0x333399, 0x333333 }; -typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE; +typedef ::cppu::WeakImplHelper< container::XIndexAccess > XIndexAccess_BASE; class DefaultPalette : public XIndexAccess_BASE { diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx index 8553966a646e..654afc872874 100644 --- a/sc/source/ui/vba/vbapane.hxx +++ b/sc/source/ui/vba/vbapane.hxx @@ -20,11 +20,12 @@ #define INCLUDED_SC_SOURCE_UI_VBA_VBAPANE_HXX #include <com/sun/star/sheet/XViewPane.hpp> +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XPane.hpp> #include <vbahelper/vbahelperinterface.hxx> #include "excelvbahelper.hxx" -class ScVbaPane : public cppu::WeakImplHelper1< ov::excel::XPane > +class ScVbaPane : public cppu::WeakImplHelper< ov::excel::XPane > { public: ScVbaPane( diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx index a5bad13f6934..0b7844bbb4ec 100644 --- a/sc/source/ui/vba/vbapivotcache.hxx +++ b/sc/source/ui/vba/vbapivotcache.hxx @@ -18,7 +18,6 @@ */ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTCACHE_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTCACHE_HXX -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/sheet/XDataPilotTable.hpp> diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx index 3681e3beed96..0fc35d16959d 100644 --- a/sc/source/ui/vba/vbapivottable.hxx +++ b/sc/source/ui/vba/vbapivottable.hxx @@ -18,7 +18,6 @@ */ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTTABLE_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTTABLE_HXX -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/sheet/XDataPilotTable.hpp> #include <ooo/vba/excel/XPivotTable.hpp> diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index afe2a33c88a6..970abe8ddf23 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTTABLES_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTTABLES_HXX -#include <cppuhelper/implbase1.hxx> - #include <ooo/vba/excel/XPivotTables.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx index f557bb25960a..cb4e5a11278b 100644 --- a/sc/source/ui/vba/vbapropvalue.hxx +++ b/sc/source/ui/vba/vbapropvalue.hxx @@ -19,11 +19,11 @@ #ifndef SC_VBA_PROPVALULE_HXX #define SC_VBA_PROPVALULE_HXX #include <ooo/vba/XPropValue.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "excelvbahelper.hxx" -typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE; +typedef ::cppu::WeakImplHelper< ov::XPropValue > PropValueImpl_BASE; class PropListener { diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index e4eaf2f38bc3..004f0286aaab 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -156,6 +156,7 @@ #include "queryentry.hxx" #include "markdata.hxx" #include <comphelper/anytostring.hxx> +#include <cppuhelper/implbase.hxx> #include <global.hxx> @@ -310,7 +311,7 @@ public: // very simple class to pass to ScVbaCollectionBaseImpl containing // just one item -class SingleRangeIndexAccess : public ::cppu::WeakImplHelper2< container::XIndexAccess, +class SingleRangeIndexAccess : public ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > { private: @@ -604,7 +605,7 @@ sal_Int32 m_nCol; sal_Int32 m_nArea; }; -typedef ::cppu::WeakImplHelper1< container::XEnumeration > CellsEnumeration_BASE; +typedef ::cppu::WeakImplHelper< container::XEnumeration > CellsEnumeration_BASE; typedef ::std::vector< CellPos > vCellPos; // #FIXME - QUICK diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index fcde9b12213a..401bcd610676 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBARANGE_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBARANGE_HXX -#include <cppuhelper/implbase4.hxx> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <ooo/vba/excel/XRange.hpp> diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 39550fdcc41b..5451aeecf63c 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -23,6 +23,7 @@ #include <ooo/vba/excel/XButton.hpp> #include <ooo/vba/excel/XControlObject.hpp> #include <ooo/vba/excel/XSheetObject.hpp> +#include <cppuhelper/implbase.hxx> #include <vbahelper/vbahelperinterface.hxx> #include "vbapalette.hxx" @@ -117,7 +118,7 @@ protected: css::uno::Reference< css::beans::XPropertySet > mxShapeProps; }; -typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectBase, ov::excel::XControlObject > ScVbaControlObject_BASE; +typedef ::cppu::ImplInheritanceHelper< ScVbaSheetObjectBase, ov::excel::XControlObject > ScVbaControlObject_BASE; class ScVbaControlObjectBase : public ScVbaControlObject_BASE { @@ -162,7 +163,7 @@ protected: OUString maEventMethod; }; -typedef ::cppu::ImplInheritanceHelper1< ScVbaControlObjectBase, ov::excel::XButton > ScVbaButton_BASE; +typedef ::cppu::ImplInheritanceHelper< ScVbaControlObjectBase, ov::excel::XButton > ScVbaButton_BASE; class ScVbaButton : public ScVbaButton_BASE { diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 9a71a7cb3c69..3916dfea971c 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/form/XFormComponent.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> #include "vbasheetobject.hxx" +#include <cppuhelper/implbase.hxx> using namespace ::com::sun::star; using namespace ::ooo::vba; @@ -65,7 +66,7 @@ inline double lclPointsToHmm( const uno::Any& rPoints ) throw (uno::RuntimeExcep Derived classes provide all required functionality specific to the type of shapes covered by the container. */ -class ScVbaObjectContainer : public ::cppu::WeakImplHelper1< container::XIndexAccess > +class ScVbaObjectContainer : public ::cppu::WeakImplHelper< container::XIndexAccess > { public: explicit ScVbaObjectContainer( diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index dd23df21ef87..0b18d2a87beb 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBASHEETOBJECTS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBASHEETOBJECTS_HXX +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XGraphicObjects.hpp> #include <vbahelper/vbacollectionimpl.hxx> #include <rtl/ref.hxx> @@ -61,7 +62,7 @@ protected: ScVbaObjectContainerRef mxContainer; }; -typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectsBase, ov::excel::XGraphicObjects > ScVbaGraphicObjects_BASE; +typedef ::cppu::ImplInheritanceHelper< ScVbaSheetObjectsBase, ov::excel::XGraphicObjects > ScVbaGraphicObjects_BASE; /** Base class for collections containing a specific type of graphic object from a sheet. diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx index ae11d01f4676..983d593a92a5 100644 --- a/sc/source/ui/vba/vbatextboxshape.hxx +++ b/sc/source/ui/vba/vbatextboxshape.hxx @@ -18,14 +18,14 @@ */ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBATEXTBOXSHAPE_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBATEXTBOXSHAPE_HXX -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/text/XTextRange.hpp> #include <ooo/vba/msforms/XTextBoxShape.hpp> #include <vbahelper/vbashape.hxx> #include "excelvbahelper.hxx" #include "vbacharacters.hxx" -typedef cppu::ImplInheritanceHelper1< ScVbaShape, ov::msforms::XTextBoxShape > TextBoxShapeImpl_BASE; +typedef cppu::ImplInheritanceHelper< ScVbaShape, ov::msforms::XTextBoxShape > TextBoxShapeImpl_BASE; class ScVbaTextBoxShape : public TextBoxShapeImpl_BASE { diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx index 559a6c2a4543..9f5c8dd614e8 100644 --- a/sc/source/ui/vba/vbatextframe.hxx +++ b/sc/source/ui/vba/vbatextframe.hxx @@ -18,12 +18,13 @@ */ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBATEXTFRAME_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBATEXTFRAME_HXX +#include <cppuhelper/implbase.hxx> #include <ooo/vba/excel/XTextFrame.hpp> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbatextframe.hxx> //typedef InheritedHelperInterfaceImpl1< ov::excel::XTextFrame > ScVbaTextFrame_BASE; -typedef cppu::ImplInheritanceHelper1< VbaTextFrame, ov::excel::XTextFrame > ScVbaTextFrame_BASE; +typedef cppu::ImplInheritanceHelper< VbaTextFrame, ov::excel::XTextFrame > ScVbaTextFrame_BASE; class ScVbaTextFrame : public ScVbaTextFrame_BASE { diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx index 3cd33313fe94..957ecdf62bcf 100644 --- a/sc/source/ui/vba/vbavalidation.hxx +++ b/sc/source/ui/vba/vbavalidation.hxx @@ -18,7 +18,6 @@ */ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAVALIDATION_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAVALIDATION_HXX -#include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <ooo/vba/excel/XValidation.hpp> #include <com/sun/star/table/XCellRange.hpp> diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 7f2701732eae..500983412dd3 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/PosSize.hpp> +#include <cppuhelper/implbase.hxx> #include <docsh.hxx> #include <tabvwsh.hxx> @@ -54,12 +55,12 @@ SCTAB, OUStringHash, typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets; -typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess +typedef ::cppu::WeakImplHelper< container::XEnumerationAccess , com::sun::star::container::XIndexAccess , com::sun::star::container::XNameAccess > SelectedSheets_BASE; -class SelectedSheetsEnum : public ::cppu::WeakImplHelper1< container::XEnumeration > +class SelectedSheetsEnum : public ::cppu::WeakImplHelper< container::XEnumeration > { public: uno::Reference< uno::XComponentContext > m_xContext; diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx index 41c9ec12a115..c9931c59bfe1 100644 --- a/sc/source/ui/vba/vbawindow.hxx +++ b/sc/source/ui/vba/vbawindow.hxx @@ -27,12 +27,13 @@ #include <com/sun/star/frame/XModel.hpp> #include <ooo/vba/excel/XPane.hpp> #include <com/sun/star/awt/XDevice.hpp> +#include <cppuhelper/implbase.hxx> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbawindowbase.hxx> #include "vbaworkbook.hxx" -typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::excel::XWindow > WindowImpl_BASE; +typedef cppu::ImplInheritanceHelper< VbaWindowBase, ov::excel::XWindow > WindowImpl_BASE; class ScVbaWindow : public WindowImpl_BASE { diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index 3d4f573ca786..f02c891b5394 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include "vbawindow.hxx" #include "vbaglobals.hxx" @@ -103,7 +103,7 @@ public: } }; -typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess +typedef ::cppu::WeakImplHelper< container::XEnumerationAccess , com::sun::star::container::XIndexAccess , com::sun::star::container::XNameAccess > WindowsAccessImpl_BASE; diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index cef6f5699e4b..574c1a75e748 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWINDOWS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAWINDOWS_HXX -#include <cppuhelper/implbase1.hxx> #include <ooo/vba/excel/XWindows.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx index 6512f5cd02d6..ca0a2e1ebdb0 100644 --- a/sc/source/ui/vba/vbaworkbook.hxx +++ b/sc/source/ui/vba/vbaworkbook.hxx @@ -21,10 +21,11 @@ #include <com/sun/star/frame/XModel.hpp> #include <ooo/vba/excel/XWorkbook.hpp> +#include <cppuhelper/implbase.hxx> #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbadocumentbase.hxx> -typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ov::excel::XWorkbook > ScVbaWorkbook_BASE; +typedef cppu::ImplInheritanceHelper< VbaDocumentBase, ov::excel::XWorkbook > ScVbaWorkbook_BASE; class ScVbaWorkbook : public ScVbaWorkbook_BASE { diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 424fdcc06ca2..78af85ec3e0f 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.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/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index 080af1f6e187..8c36b4d0e1dd 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -19,13 +19,14 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX +#include <cppuhelper/implbase.hxx> #include <vbahelper/vbacollectionimpl.hxx> #include <ooo/vba/excel/XWorkbooks.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <vbahelper/vbadocumentsbase.hxx> #include "excelvbahelper.hxx" -typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks > ScVbaWorkbooks_BASE; +typedef cppu::ImplInheritanceHelper< VbaDocumentsBase, ov::excel::XWorkbooks > ScVbaWorkbooks_BASE; class ScVbaWorkbooks : public ScVbaWorkbooks_BASE { diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx index 30164e1013e2..94ca544fa303 100644 --- a/sc/source/ui/vba/vbaworksheet.hxx +++ b/sc/source/ui/vba/vbaworksheet.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEET_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEET_HXX -#include <cppuhelper/implbase2.hxx> #include <comphelper/unwrapargs.hxx> #include <com/sun/star/sheet/XSpreadsheet.hpp> diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 18b8515f8bed..5f6b24e73d29 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -28,7 +28,7 @@ #include <svl/eitem.hxx> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> @@ -59,7 +59,7 @@ typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap; // #FIXME #TODO the implementation of the Sheets collections sucks, // e.g. there is no support for tracking sheets added/removed from the collection -class WorkSheetsEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration > +class WorkSheetsEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration > { SheetMap mSheetMap; SheetMap::iterator mIt; @@ -78,7 +78,7 @@ public: } }; -class SheetCollectionHelper : public ::cppu::WeakImplHelper3< container::XNameAccess, +class SheetCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > { diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index 92ec4b212787..93df52c9c4f9 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEETS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEETS_HXX -#include <cppuhelper/implbase1.hxx> - #include <ooo/vba/excel/XWorksheets.hpp> #include <com/sun/star/sheet/XSpreadsheets.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> diff --git a/sc/workben/addin.hxx b/sc/workben/addin.hxx index 6e5033bc5a8d..04eab3b4d213 100644 --- a/sc/workben/addin.hxx +++ b/sc/workben/addin.hxx @@ -25,12 +25,12 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <stardiv/starcalc/test/XTestAddIn.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> com::sun::star::uno::Reference<com::sun::star::uno::XInterface> ScTestAddIn_CreateInstance( const com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>& ); -class ScTestAddIn : public cppu::WeakImplHelper4< +class ScTestAddIn : public cppu::WeakImplHelper< com::sun::star::sheet::XAddIn, stardiv::starcalc::test::XTestAddIn, com::sun::star::lang::XServiceName, diff --git a/sc/workben/result.hxx b/sc/workben/result.hxx index 559f4a1abd6b..b2a87d9a74fd 100644 --- a/sc/workben/result.hxx +++ b/sc/workben/result.hxx @@ -26,12 +26,12 @@ #include <com/sun/star/sheet/XVolatileResult.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> typedef ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XResultListener >* XResultListenerPtr; typedef boost::ptr_vector<XResultListenerPtr> XResultListenerArr_Impl; -class ScAddInResult : public cppu::WeakImplHelper1< +class ScAddInResult : public cppu::WeakImplHelper< com::sun::star::sheet::XVolatileResult> { private: |