diff options
Diffstat (limited to 'chart2')
119 files changed, 2053 insertions, 294 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 598c2b5aa942..0b06d0b46f58 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_INC_CHARTMODEL_HXX #include "LifeTime.hxx" -#include "ServiceMacros.hxx" #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XStorable2.hpp> @@ -234,7 +233,15 @@ public: // ::com::sun::star::lang::XServiceInfo - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) { diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 047192aec7b6..13bb25219501 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -21,7 +21,6 @@ #include "ChartModel.hxx" #include "chartview/ExplicitValueProvider.hxx" -#include "ServiceMacros.hxx" #include <cppuhelper/implbase10.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -116,7 +115,15 @@ public: virtual ~ChartView(); // ___lang::XServiceInfo___ - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ___lang::XInitialization___ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 4f0b6d7b9d53..4a1c94ddf889 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -24,6 +24,7 @@ #include "WrappedDirectStateProperty.hxx" #include <comphelper/InlineContainer.hxx> #include <com/sun/star/drawing/FillStyle.hpp> +#include <cppuhelper/supportsservice.hxx> #include "LinePropertiesHelper.hxx" #include "FillProperties.hxx" @@ -179,7 +180,28 @@ Sequence< OUString > AreaWrapper::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( AreaWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL AreaWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString AreaWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index b65e2f8eb148..5bca1016a777 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_AREAWRAPPER_HXX #include "WrappedPropertySet.hxx" -#include "ServiceMacros.hxx" #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -52,7 +51,15 @@ public: virtual ~AreaWrapper(); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XShape ____ virtual ::com::sun::star::awt::Point SAL_CALL getPosition() diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index 10da0e77dff4..0454cac1bab0 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -29,6 +29,7 @@ #include "DisposeHelper.hxx" #include <unonames.hxx> +#include <cppuhelper/supportsservice.hxx> #include <comphelper/InlineContainer.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp> @@ -694,7 +695,28 @@ Sequence< OUString > AxisWrapper::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( AxisWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL AxisWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString AxisWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index eb36310cf70a..4178c910f17b 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -21,7 +21,6 @@ #include "WrappedPropertySet.hxx" #include "ReferenceSizePropertyProvider.hxx" -#include "ServiceMacros.hxx" #include <cppuhelper/implbase5.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -68,7 +67,15 @@ public: static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis ); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); //ReferenceSizePropertyProvider virtual void updateReferenceSize() SAL_OVERRIDE; diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 2acabf89d0d1..1a7c0c28b9c1 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -28,6 +28,7 @@ #include "DataSeriesHelper.hxx" #include "ControllerLockGuard.hxx" #include "Chart2ModelContact.hxx" +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> @@ -726,7 +727,28 @@ uno::Sequence< OUString > ChartDataWrapper::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ChartDataWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL ChartDataWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ChartDataWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 3822c2697aaf..23671fac3816 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_CHARTDATAWRAPPER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_CHARTDATAWRAPPER_HXX -#include "ServiceMacros.hxx" #include "MutexContainer.hxx" #include <cppuhelper/implbase5.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -55,7 +54,15 @@ public: virtual ~ChartDataWrapper(); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: // ____ XDateCategories ____ diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 695ecb1a92ff..e1a2299fddfb 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -47,6 +47,7 @@ #include "AreaWrapper.hxx" #include "WrappedAddInProperty.hxx" #include "WrappedIgnoreProperty.hxx" +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> @@ -1566,7 +1567,28 @@ uno::Sequence< OUString > ChartDocumentWrapper::getSupportedServiceNames_Static( } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ChartDocumentWrapper, CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME ); +OUString SAL_CALL ChartDocumentWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ChartDocumentWrapper::getImplementationName_Static() +{ + return CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME; +} + +sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index dfd565ed2b75..b85a88daa270 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -46,6 +46,7 @@ #include <algorithm> #include <comphelper/InlineContainer.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart/ChartAxisAssign.hpp> #include <com/sun/star/chart/ChartErrorCategory.hpp> @@ -881,7 +882,28 @@ uno::Sequence< OUString > DataSeriesPointWrapper::getSupportedServiceNames_Stati } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DataSeriesPointWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL DataSeriesPointWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString DataSeriesPointWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index c0d128d47a2d..2206607173f1 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_DATASERIESPOINTWRAPPER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_DATASERIESPOINTWRAPPER_HXX -#include "ServiceMacros.hxx" #include "WrappedPropertySet.hxx" #include "ReferenceSizePropertyProvider.hxx" #include <cppuhelper/implbase4.hxx> @@ -74,7 +73,15 @@ public: bool isLinesForbidden() { return !m_bLinesAllowed;} /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ___lang::XInitialization___ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 38ff60a1f9ed..296205390fcc 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -49,6 +49,7 @@ #include "WrappedAutomaticPositionProperties.hxx" #include "CommonConverters.hxx" #include <unonames.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/XTitled.hpp> @@ -2081,7 +2082,28 @@ uno::Sequence< OUString > DiagramWrapper::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DiagramWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL DiagramWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString DiagramWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 7dcc16d6816f..31b35ceec981 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_DIAGRAMWRAPPER_HXX #include "WrappedPropertySet.hxx" -#include "ServiceMacros.hxx" #include "DiagramHelper.hxx" #ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_13 @@ -82,7 +81,15 @@ public: virtual ~DiagramWrapper(); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XComponent ____ virtual void SAL_CALL dispose() diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index e432ddcc423f..b1a2ec43720e 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -30,6 +30,7 @@ #include "UserDefinedProperties.hxx" #include "WrappedDefaultProperty.hxx" +#include <cppuhelper/supportsservice.hxx> #include <algorithm> #include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> @@ -185,7 +186,28 @@ Sequence< OUString > GridWrapper::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( GridWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL GridWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString GridWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index bc0fe0818d78..03af0e6e5fa4 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_GRIDWRAPPER_HXX #include "WrappedPropertySet.hxx" -#include "ServiceMacros.hxx" #include <cppuhelper/implbase2.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -62,7 +61,15 @@ public: static void getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool& rbSubGrid ); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XComponent ____ virtual void SAL_CALL dispose() diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index cbb734ba5453..7fcb53ccc576 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -23,6 +23,7 @@ #include "LegendHelper.hxx" #include "ContainerHelper.hxx" #include <comphelper/InlineContainer.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/chart/ChartLegendPosition.hpp> @@ -432,7 +433,28 @@ Sequence< OUString > LegendWrapper::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( LegendWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL LegendWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString LegendWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 177be2486c91..8f76007f0ad8 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -21,7 +21,6 @@ #include "WrappedPropertySet.hxx" #include "ReferenceSizePropertyProvider.hxx" -#include "ServiceMacros.hxx" #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -55,7 +54,15 @@ public: virtual ~LegendWrapper(); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); //ReferenceSizePropertyProvider virtual void updateReferenceSize() SAL_OVERRIDE; diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 545575858f8a..541ed9f375b6 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -23,6 +23,7 @@ #include "DiagramHelper.hxx" #include "servicenames_charttypes.hxx" #include "ContainerHelper.hxx" +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/drawing/LineJoint.hpp> @@ -418,7 +419,28 @@ Sequence< OUString > MinMaxLineWrapper::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( MinMaxLineWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL MinMaxLineWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString MinMaxLineWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index ddef4f497d31..3143222fe0dd 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_MINMAXLINEWRAPPER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_MINMAXLINEWRAPPER_HXX -#include "ServiceMacros.hxx" #include "MutexContainer.hxx" #include "WrappedIgnoreProperty.hxx" #include <cppuhelper/interfacecontainer.hxx> @@ -60,7 +59,15 @@ public: virtual ~MinMaxLineWrapper(); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XComponent ____ virtual void SAL_CALL dispose() diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index aaa0c660104e..d6d2b43e55a6 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -23,6 +23,7 @@ #include "ControllerLockGuard.hxx" #include <comphelper/InlineContainer.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> @@ -523,7 +524,28 @@ Sequence< OUString > TitleWrapper::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( TitleWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL TitleWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString TitleWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 71650f57c5b2..e8cf9e8b55c5 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -22,7 +22,6 @@ #include "WrappedPropertySet.hxx" #include "ReferenceSizePropertyProvider.hxx" #include "Chart2ModelContact.hxx" -#include "ServiceMacros.hxx" #include "TitleHelper.hxx" #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> @@ -54,7 +53,15 @@ public: virtual ~TitleWrapper(); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); //ReferenceSizePropertyProvider virtual void updateReferenceSize() SAL_OVERRIDE; diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index 57de55083d2f..a5801ceb539b 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -23,6 +23,7 @@ #include "DiagramHelper.hxx" #include "servicenames_charttypes.hxx" #include "ContainerHelper.hxx" +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/chart2/XChartType.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> @@ -382,7 +383,28 @@ Sequence< OUString > UpDownBarWrapper::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( UpDownBarWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL UpDownBarWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString UpDownBarWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index 9d6f0f0dd5cc..314a8b98b9ea 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_UPDOWNBARWRAPPER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_UPDOWNBARWRAPPER_HXX -#include "ServiceMacros.hxx" #include "MutexContainer.hxx" #include <cppuhelper/interfacecontainer.hxx> @@ -59,7 +58,15 @@ public: virtual ~UpDownBarWrapper(); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XComponent ____ virtual void SAL_CALL dispose() diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 58c629bf4c22..fac7b7a1adda 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -21,6 +21,7 @@ #include "macros.hxx" #include "Chart2ModelContact.hxx" #include "ContainerHelper.hxx" +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/FillStyle.hpp> @@ -166,7 +167,28 @@ Sequence< OUString > WallFloorWrapper::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( WallFloorWrapper, OUString(lcl_aServiceName) ); +OUString SAL_CALL WallFloorWrapper::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString WallFloorWrapper::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace wrapper } // namespace chart diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index f1896d876227..58d43b2056de 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_CHARTAPIWRAPPER_WALLFLOORWRAPPER_HXX #include "WrappedPropertySet.hxx" -#include "ServiceMacros.hxx" #include <cppuhelper/implbase2.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -49,7 +48,15 @@ public: virtual ~WallFloorWrapper(); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XComponent ____ virtual void SAL_CALL dispose() diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index edf8d85cf4f8..2834ba338c66 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -28,6 +28,7 @@ #include <toolkit/awt/vclxwindow.hxx> #include <vcl/msgbox.hxx> #include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/supportsservice.hxx> #include <comphelper/servicehelper.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> @@ -60,10 +61,30 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg() } } // lang::XServiceInfo -APPHELPER_XSERVICEINFO_IMPL(CreationWizardUnoDlg,CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME) +OUString SAL_CALL CreationWizardUnoDlg::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString CreationWizardUnoDlg::getImplementationName_Static() +{ + return CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME; +} + +sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL CreationWizardUnoDlg::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} - uno::Sequence< OUString > CreationWizardUnoDlg -::getSupportedServiceNames_Static() +uno::Sequence< OUString > CreationWizardUnoDlg::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_WIZARD_DIALOG_SERVICE_NAME; diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index 84dc977966e1..e54fefb2e054 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -21,7 +21,6 @@ #include "AccessibleBase.hxx" #include "MutexContainer.hxx" -#include "ServiceMacros.hxx" #include <cppuhelper/implbase2.hxx> #include <cppuhelper/weakref.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 552f264c12a7..1c933d5b7b2d 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_CHARTDOCUMENTWRAPPER_HXX #include "WrappedPropertySet.hxx" -#include "ServiceMacros.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -65,7 +64,15 @@ public: virtual ~ChartDocumentWrapper(); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) { diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 9a00d9693005..b4ff5e876856 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -20,13 +20,13 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_UNO_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CHARTTYPE_UNO_HXX -#include "ServiceMacros.hxx" #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XModel.hpp> #include <vcl/vclevent.hxx> #include <svtools/genericunodialog.hxx> + namespace chart { typedef ::svt::OGenericUnoDialog ChartTypeUnoDlg_BASE; diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx index cc3b5d51a29a..95d47fd4c5ae 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CREATIONWIZARD_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CREATIONWIZARD_HXX -#include "ServiceMacros.hxx" #include "TimerTriggeredControllerLock.hxx" #include "TabPageNotifiable.hxx" diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index fc97659d1c9a..ce4f638dd442 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CREATIONWIZARD_UNO_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_CREATIONWIZARD_UNO_HXX -#include "ServiceMacros.hxx" #include "MutexContainer.hxx" #include <cppuhelper/component.hxx> #include <com/sun/star/awt/XWindow.hpp> @@ -63,7 +62,15 @@ public: virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XServiceInfo - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) { diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 7accfe9fa06e..a16a4ab5a14a 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -45,6 +45,7 @@ #include "UndoActions.hxx" #include <comphelper/InlineContainer.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> @@ -302,7 +303,28 @@ bool ChartController::impl_isDisposedOrSuspended() const // lang::XServiceInfo -APPHELPER_XSERVICEINFO_IMPL(ChartController,CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME) +OUString SAL_CALL ChartController::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ChartController::getImplementationName_Static() +{ + return CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME; +} + +sal_Bool SAL_CALL ChartController::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ChartController::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Sequence< OUString > ChartController::getSupportedServiceNames_Static() { diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 5e4401a382f8..81382eadaab1 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTCONTROLLER_HXX #include "LifeTime.hxx" -#include "ServiceMacros.hxx" #include "CommandDispatchContainer.hxx" #include "SelectionHelper.hxx" @@ -151,8 +150,15 @@ public: virtual ~ChartController(); // ::com::sun::star::lang::XServiceInfo - - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) { diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index 567b150efe16..fc574a241e5b 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -22,6 +22,7 @@ #include "MediaDescriptorHelper.hxx" #include "macros.hxx" #include <unotools/mediadescriptor.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/frame/XLoadable.hpp> @@ -56,10 +57,30 @@ ChartFrameLoader::~ChartFrameLoader() // lang::XServiceInfo -APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME) +OUString SAL_CALL ChartFrameLoader::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ChartFrameLoader::getImplementationName_Static() +{ + return CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME; +} + +sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} - uno::Sequence< OUString > ChartFrameLoader -::getSupportedServiceNames_Static() +uno::Sequence< OUString > ChartFrameLoader::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_FRAMELOADER_SERVICE_NAME; diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 994144192a1e..360f97e01b97 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTFRAMELOADER_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_CHARTFRAMELOADER_HXX -#include "ServiceMacros.hxx" #include <osl/conditn.hxx> #include <com/sun/star/frame/XSynchronousFrameLoader.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -53,8 +52,15 @@ public: virtual ~ChartFrameLoader(); // ::com::sun::star::lang::XServiceInfo + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - APPHELPER_XSERVICEINFO_DECL() + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) { diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 31073b103fe4..ba5d165fb831 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -27,6 +27,7 @@ #include "ResId.hxx" #include "Strings.hrc" +#include <cppuhelper/supportsservice.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> @@ -246,7 +247,28 @@ Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::Creat } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, OUString(lcl_aServiceName) ); +OUString SAL_CALL ElementSelectorToolbarController::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ElementSelectorToolbarController::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ElementSelectorToolbarController::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static() { diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index a27e29ab59ce..5c3a19d0464d 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_ELEMENTSELECTOR_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_MAIN_ELEMENTSELECTOR_HXX -#include "ServiceMacros.hxx" #include "ObjectHierarchy.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase1.hxx> @@ -79,7 +78,15 @@ public: virtual ~ElementSelectorToolbarController(); // XServiceInfo - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) { diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 3a98acd17a54..8119695628da 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -25,7 +25,6 @@ #include <comphelper/broadcasthelper.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/proparrhlp.hxx> -#include "ServiceMacros.hxx" // interfaces and types #include <com/sun/star/lang/XServiceInfo.hpp> @@ -91,7 +90,15 @@ public: return (::cppu::OWeakObject *)new CachedDataSequence( xContext ); } /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index b70b8244f7fb..993f7af35073 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_CONFIGCOLORSCHEME_HXX #define INCLUDED_CHART2_SOURCE_INC_CONFIGCOLORSCHEME_HXX -#include "ServiceMacros.hxx" #include "ConfigItemListener.hxx" #include "charttoolsdllapi.hxx" #include <cppuhelper/implbase2.hxx> @@ -61,7 +60,15 @@ public: return (::cppu::OWeakObject *)new ConfigColorScheme( xContext ); } /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: // ____ XColorScheme ____ diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 539fedad96a4..6f55fec23dea 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> -#include "ServiceMacros.hxx" namespace chart { @@ -54,7 +53,15 @@ public: return (::cppu::OWeakObject *)new DataSource( xContext ); } /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: // ____ XDataSource ____ diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 2dace4f88ea6..c5ff30df1390 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_INC_ERRORBAR_HXX #include "MutexContainer.hxx" -#include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" #include "charttoolsdllapi.hxx" #include "LineProperties.hxx" @@ -80,7 +79,16 @@ public: virtual ~ErrorBar(); /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); + /// establish methods for factory instatiation static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index de8c7518eca6..38c922b0e67b 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_INC_EXPLICITCATEGORIESPROVIDER_HXX #define INCLUDED_CHART2_SOURCE_INC_EXPLICITCATEGORIESPROVIDER_HXX -#include "ServiceMacros.hxx" #include <cppuhelper/implbase1.hxx> #include <cppuhelper/weakref.hxx> #include <com/sun/star/chart2/XCoordinateSystem.hpp> diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 045e948adc06..3c6477c34b25 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -32,7 +32,6 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <cppuhelper/implbase7.hxx> -#include "ServiceMacros.hxx" #include "CachedDataSequence.hxx" @@ -83,7 +82,15 @@ public: void createDefaultData(); /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) { diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 78688028e393..1e3f22e6563b 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -18,7 +18,7 @@ */ #ifndef INCLUDED_CHART2_SOURCE_INC_LABELEDDATASEQUENCE_HXX #define INCLUDED_CHART2_SOURCE_INC_LABELEDDATASEQUENCE_HXX -#include "ServiceMacros.hxx" + #include "MutexContainer.hxx" #include <comphelper/uno3.hxx> #include <cppuhelper/implbase2.hxx> @@ -66,7 +66,15 @@ public: return (::cppu::OWeakObject *)new LabeledDataSequence( xContext ); } /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: // ____ XLabeledDataSequence ____ diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index fd968092c55b..96a1e2aa4df0 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -18,7 +18,7 @@ */ #ifndef INCLUDED_CHART2_SOURCE_INC_SCALING_HXX #define INCLUDED_CHART2_SOURCE_INC_SCALING_HXX -#include "ServiceMacros.hxx" + #include <com/sun/star/chart2/XScaling.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceName.hpp> @@ -53,7 +53,15 @@ public: return (::cppu::OWeakObject *)new LogarithmicScaling( xContext ); } /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) @@ -96,7 +104,15 @@ public: return (::cppu::OWeakObject *)new ExponentialScaling( xContext ); } /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XScaling ____ virtual double SAL_CALL @@ -139,7 +155,15 @@ public: return (::cppu::OWeakObject *)new LinearScaling( xContext ); } /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) @@ -181,7 +205,15 @@ public: return (::cppu::OWeakObject *)new PowerScaling( xContext ); } /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XScaling ____ virtual double SAL_CALL diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx deleted file mode 100644 index 2fe5f9658272..000000000000 --- a/chart2/source/inc/ServiceMacros.hxx +++ /dev/null @@ -1,77 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#ifndef INCLUDED_CHART2_SOURCE_INC_SERVICEMACROS_HXX -#define INCLUDED_CHART2_SOURCE_INC_SERVICEMACROS_HXX - -#include <cppuhelper/supportsservice.hxx> - -/* -to use these macros the supported services and the implementation name needs to be static -especially you need to implement (declaration is contained in macro already): - -static com::sun::star::uno::Sequence< OUString > - Class::getSupportedServiceNames_Static(); -*/ - -// XServiceInfo decl - -namespace apphelper -{ - -#define APPHELPER_XSERVICEINFO_DECL() \ - virtual OUString SAL_CALL getImplementationName() \ - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) \ - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()\ - throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \ - \ - static OUString getImplementationName_Static(); \ - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); - -// XServiceInfo impl - -#define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \ -OUString SAL_CALL Class::getImplementationName() \ - throw( css::uno::RuntimeException, std::exception ) \ -{ \ - return getImplementationName_Static(); \ -} \ - \ -OUString Class::getImplementationName_Static() \ -{ \ - return ImplName; \ -} \ - \ -sal_Bool SAL_CALL Class::supportsService( const OUString& rServiceName ) \ - throw( css::uno::RuntimeException, std::exception ) \ -{ \ - return cppu::supportsService(this, rServiceName); \ -} \ - \ -css::uno::Sequence< OUString > SAL_CALL Class::getSupportedServiceNames() \ - throw( css::uno::RuntimeException, std::exception ) \ -{ \ - return getSupportedServiceNames_Static(); \ -} - -}//end namespace apphelper -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index a87b798ceed0..f4ca955a352c 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -25,7 +25,6 @@ #include <comphelper/broadcasthelper.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/proparrhlp.hxx> -#include "ServiceMacros.hxx" #include "charttoolsdllapi.hxx" // interfaces and types @@ -94,7 +93,15 @@ public: virtual ~UncachedDataSequence(); /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 0fd2cf4448aa..480954eaf498 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -27,6 +27,7 @@ #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/documentconstants.hxx> +#include <cppuhelper/supportsservice.hxx> #include <sot/storage.hxx> #include <osl/diagnose.h> @@ -777,7 +778,28 @@ OUString XMLFilter::getMediaType(bool _bOasis) return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART : MIMETYPE_VND_SUN_XML_CHART; } -APPHELPER_XSERVICEINFO_IMPL( XMLFilter, OUString("com.sun.star.comp.chart2.XMLFilter") ); +OUString SAL_CALL XMLFilter::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString XMLFilter::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart2.XMLFilter"); +} + +sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL XMLFilter::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDescriptor, bool & rOutOASIS ) { diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index 121138d14f44..ec6441ebca80 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_MODEL_INC_BASECOORDINATESYSTEM_HXX #define INCLUDED_CHART2_SOURCE_MODEL_INC_BASECOORDINATESYSTEM_HXX -#include "ServiceMacros.hxx" #include "OPropertySet.hxx" #include "MutexContainer.hxx" #include <cppuhelper/implbase6.hxx> diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index d547621f2bbc..dc1de9167d42 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_MODEL_INC_CARTESIANCOORDINATESYSTEM_HXX #define INCLUDED_CHART2_SOURCE_MODEL_INC_CARTESIANCOORDINATESYSTEM_HXX -#include "ServiceMacros.hxx" #include "BaseCoordinateSystem.hxx" namespace chart @@ -48,7 +47,15 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceInfo ____ - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class CartesianCoordinateSystem2d : public CartesianCoordinateSystem @@ -66,7 +73,15 @@ public: return (::cppu::OWeakObject *)new CartesianCoordinateSystem2d( xContext ); } // ____ XServiceInfo ____ - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class CartesianCoordinateSystem3d : public CartesianCoordinateSystem @@ -84,7 +99,15 @@ public: return (::cppu::OWeakObject *)new CartesianCoordinateSystem3d( xContext ); } // ____ XServiceInfo ____ - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; } // namespace chart diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index 6ea717251c39..c0be3882e490 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -23,7 +23,6 @@ #include "MutexContainer.hxx" #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> -#include "ServiceMacros.hxx" #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 0636de652e6d..8940547072ee 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -33,7 +33,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> // helper classes -#include "ServiceMacros.hxx" #include <cppuhelper/implbase8.hxx> #include <comphelper/uno3.hxx> #include <osl/mutex.hxx> @@ -80,7 +79,15 @@ public: return (::cppu::OWeakObject *)new DataSeries( xContext ); } /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 8245df8f4413..d1a17c3e3f33 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -35,8 +35,6 @@ #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include "ServiceMacros.hxx" - #include <map> #include <vector> @@ -75,7 +73,15 @@ public: } /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index af1bbce6d348..decf8ba381cc 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_MODEL_INC_POLARCOORDINATESYSTEM_HXX #define INCLUDED_CHART2_SOURCE_MODEL_INC_POLARCOORDINATESYSTEM_HXX -#include "ServiceMacros.hxx" #include "BaseCoordinateSystem.hxx" namespace chart @@ -48,7 +47,15 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ____ XServiceInfo ____ - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class PolarCoordinateSystem2d : public PolarCoordinateSystem @@ -66,7 +73,15 @@ public: return (::cppu::OWeakObject *)new PolarCoordinateSystem2d( xContext ); } // ____ XServiceInfo ____ - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; class PolarCoordinateSystem3d : public PolarCoordinateSystem @@ -84,7 +99,15 @@ public: return (::cppu::OWeakObject *)new PolarCoordinateSystem3d( xContext ); } // ____ XServiceInfo ____ - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); }; } // namespace chart diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index 65e465a1a85f..c01b96dfc9d7 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -25,7 +25,6 @@ #include "MutexContainer.hxx" #include "OPropertySet.hxx" -#include "ServiceMacros.hxx" #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index a091a0a086bb..46118bdafc02 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -31,7 +31,6 @@ #include <com/sun/star/xml/sax/XWriter.hpp> #include <osl/mutex.hxx> -#include "ServiceMacros.hxx" namespace com { namespace sun { namespace star { namespace embed @@ -70,7 +69,15 @@ public: return (::cppu::OWeakObject *)new XMLFilter( xContext ); } /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: // ____ XFilter ____ diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 06ae4301f074..428e75afe387 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/awt/Size.hpp> #include <rtl/uuid.h> #include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/supportsservice.hxx> #include <vector> #include <algorithm> @@ -637,7 +638,28 @@ IMPLEMENT_FORWARD_XINTERFACE2( Axis, Axis_Base, ::property::OPropertySet ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( Axis, OUString(lcl_aServiceName) ); +OUString SAL_CALL Axis::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString Axis::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 609ecedafc0f..faefe367330f 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -25,7 +25,6 @@ #include <cppuhelper/implbase6.hxx> #include <comphelper/uno3.hxx> -#include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/chart2/XAxis.hpp> @@ -66,7 +65,15 @@ public: return (::cppu::OWeakObject *)new Axis( xContext ); } /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index 2339be6d0fd5..34db0f20e953 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -20,6 +20,7 @@ #include "CartesianCoordinateSystem.hxx" #include "macros.hxx" #include "servicenames_coosystems.hxx" +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -85,8 +86,28 @@ Sequence< OUString > CartesianCoordinateSystem::getSupportedServiceNames_Static( } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem, - OUString("com.sun.star.comp.chart.CartesianCoordinateSystem")) +OUString SAL_CALL CartesianCoordinateSystem::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString CartesianCoordinateSystem::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.CartesianCoordinateSystem"); +} + +sal_Bool SAL_CALL CartesianCoordinateSystem::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} // ==== CartesianCoordinateSystem2d ==== @@ -108,7 +129,28 @@ Sequence< OUString > CartesianCoordinateSystem2d::getSupportedServiceNames_Stati } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem2d, OUString(lcl_aImplementationNameCartesian2d) ) +OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString CartesianCoordinateSystem2d::getImplementationName_Static() +{ + return OUString(lcl_aImplementationNameCartesian2d); +} + +sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} // ==== CartesianCoordinateSystem3d ==== @@ -130,7 +172,28 @@ Sequence< OUString > CartesianCoordinateSystem3d::getSupportedServiceNames_Stati } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( CartesianCoordinateSystem3d, OUString(lcl_aImplementationNameCartesian3d) ) +OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString CartesianCoordinateSystem3d::getImplementationName_Static() +{ + return OUString(lcl_aImplementationNameCartesian3d); +} + +sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 77354a99ab2b..4dddbdfd8c84 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -40,6 +40,7 @@ #include <comphelper/InlineContainer.hxx> #include <comphelper/processfactory.hxx> +#include <cppuhelper/supportsservice.hxx> #include <svl/numuno.hxx> #include <com/sun/star/lang/DisposedException.hpp> @@ -315,7 +316,28 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV // lang::XServiceInfo -APPHELPER_XSERVICEINFO_IMPL(ChartModel,CHART_MODEL_SERVICE_IMPLEMENTATION_NAME) +OUString SAL_CALL ChartModel::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ChartModel::getImplementationName_Static() +{ + return CHART_MODEL_SERVICE_IMPLEMENTATION_NAME; +} + +sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static() { diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index dd0c6d880ae1..7afc38c6804b 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/Sequence.hxx> +#include <cppuhelper/supportsservice.hxx> #include <algorithm> @@ -296,7 +297,28 @@ using impl::DataPoint_Base; IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DataPoint, OUString("com.sun.star.comp.chart.DataPoint") ); +OUString SAL_CALL DataPoint::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString DataPoint::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.DataPoint") ; +} + +sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL DataPoint::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index ce0c89b72baa..d7c8e6ed1177 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -30,7 +30,6 @@ #include "OPropertySet.hxx" #include "MutexContainer.hxx" #include "ModifyListenerHelper.hxx" -#include "ServiceMacros.hxx" namespace chart { @@ -59,7 +58,15 @@ public: /// merge XInterface implementations DECLARE_XINTERFACE() /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); protected: explicit DataPoint( const DataPoint & rOther ); diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 3189100fb80a..393c279e2d96 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -29,6 +29,7 @@ #include "CloneHelper.hxx" #include "ModifyListenerHelper.hxx" #include "EventListenerHelper.hxx" +#include <cppuhelper/supportsservice.hxx> #include <algorithm> @@ -576,8 +577,28 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataSeries, DataSeries_Base, OPropertySet ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DataSeries, - OUString("com.sun.star.comp.chart.DataSeries") ); +OUString SAL_CALL DataSeries::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString DataSeries::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.DataSeries"); +} + +sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index b96c1ac735b1..a01657078c75 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/drawing/CameraGeometry.hpp> #include <com/sun/star/drawing/HomogenMatrix.hpp> +#include <cppuhelper/supportsservice.hxx> #include <algorithm> #include <iterator> @@ -745,8 +746,28 @@ IMPLEMENT_FORWARD_XINTERFACE2( Diagram, Diagram_Base, ::property::OPropertySet ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( Diagram, - OUString("com.sun.star.comp.chart2.Diagram") ); +OUString SAL_CALL Diagram::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString Diagram::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart2.Diagram"); +} + +sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 21e0a9db7601..8ecfb0291d07 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -24,6 +24,7 @@ #include "PropertyHelper.hxx" #include "macros.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -240,8 +241,28 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope // do this in derived classes! // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( FormattedString, - OUString("com.sun.star.comp.chart.FormattedString") ); +OUString SAL_CALL FormattedString::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString FormattedString::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.FormattedString"); +} + +sal_Bool SAL_CALL FormattedString::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 8fb63c951585..a8d95a8f8d09 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -23,7 +23,6 @@ #include "OPropertySet.hxx" #include <cppuhelper/implbase5.hxx> #include <comphelper/uno3.hxx> -#include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/chart2/XFormattedString2.hpp> @@ -55,7 +54,15 @@ public: virtual ~FormattedString(); /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// establish methods for factory instatiation static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index f42c0e76834f..ce6a950c5333 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/uno/Sequence.hxx> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -243,7 +244,28 @@ Sequence< OUString > GridProperties::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( GridProperties, OUString(lcl_aServiceName) ); +OUString SAL_CALL GridProperties::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString GridProperties::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL GridProperties::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} // needed by MSC compiler using impl::GridProperties_Base; diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index c8cbf52780aa..d9ce4aaa2bf6 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_MODEL_MAIN_GRIDPROPERTIES_HXX #define INCLUDED_CHART2_SOURCE_MODEL_MAIN_GRIDPROPERTIES_HXX -#include "ServiceMacros.hxx" #include <osl/mutex.hxx> #include <cppuhelper/implbase4.hxx> #include <comphelper/uno3.hxx> @@ -65,7 +64,15 @@ public: } /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index be21cd9ec7a2..164612e91ad6 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/chart/ChartLegendExpansion.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/RelativeSize.hpp> +#include <cppuhelper/supportsservice.hxx> #include <algorithm> @@ -301,7 +302,28 @@ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( Legend, OUString(lcl_aServiceName) ); +OUString SAL_CALL Legend::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString Legend::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL Legend::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} // needed by MSC compiler using impl::Legend_Base; diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 76e7e41d3f09..a5a297bab7ec 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_MODEL_MAIN_LEGEND_HXX #define INCLUDED_CHART2_SOURCE_MODEL_MAIN_LEGEND_HXX -#include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" #include "OPropertySet.hxx" #include "MutexContainer.hxx" @@ -64,7 +63,15 @@ public: } /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index d9eea37794d3..e2c766102626 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <rtl/uuid.h> #include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/supportsservice.hxx> #include <vector> #include <algorithm> @@ -223,7 +224,28 @@ uno::Sequence< OUString > PageBackground::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( PageBackground, OUString(lcl_aServiceName) ); +OUString SAL_CALL PageBackground::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString PageBackground::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL PageBackground::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} using impl::PageBackground_Base; diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index daa1acd8f898..1cdb8170b58d 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -26,7 +26,6 @@ #include "OPropertySet.hxx" #include <cppuhelper/implbase4.hxx> -#include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" #include <comphelper/uno3.hxx> @@ -61,7 +60,15 @@ public: } /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index a48744ac6768..2ccf17506803 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -20,6 +20,7 @@ #include "PolarCoordinateSystem.hxx" #include "macros.hxx" #include "servicenames_coosystems.hxx" +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -85,8 +86,28 @@ Sequence< OUString > PolarCoordinateSystem::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem, - OUString("com.sun.star.comp.chart.PolarCoordinateSystem") ) +OUString SAL_CALL PolarCoordinateSystem::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString PolarCoordinateSystem::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.PolarCoordinateSystem"); +} + +sal_Bool SAL_CALL PolarCoordinateSystem::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} // ==== PolarCoordinateSystem2d ==== @@ -108,7 +129,28 @@ Sequence< OUString > PolarCoordinateSystem2d::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem2d, OUString(lcl_aImplementationNamePolar2d) ) +OUString SAL_CALL PolarCoordinateSystem2d::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString PolarCoordinateSystem2d::getImplementationName_Static() +{ + return OUString(lcl_aImplementationNamePolar2d) ; +} + +sal_Bool SAL_CALL PolarCoordinateSystem2d::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} // ==== PolarCoordinateSystem3d ==== @@ -130,7 +172,28 @@ Sequence< OUString > PolarCoordinateSystem3d::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( PolarCoordinateSystem3d, OUString(lcl_aImplementationNamePolar3d) ) +OUString SAL_CALL PolarCoordinateSystem3d::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString PolarCoordinateSystem3d::getImplementationName_Static() +{ + return OUString(lcl_aImplementationNamePolar3d); +} + +sal_Bool SAL_CALL PolarCoordinateSystem3d::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index d3cac0d24a28..2a9b1caec081 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/awt/Size.hpp> #include <rtl/uuid.h> #include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/supportsservice.hxx> #include <vector> #include <algorithm> @@ -374,7 +375,28 @@ uno::Sequence< OUString > Title::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( Title, OUString(lcl_aServiceName) ); +OUString SAL_CALL Title::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString Title::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL Title::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} // needed by MSC compiler using impl::Title_Base; diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index aa94f14a6c89..5d55dfe5935b 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_MODEL_MAIN_TITLE_HXX #define INCLUDED_CHART2_SOURCE_MODEL_MAIN_TITLE_HXX -#include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" #include "OPropertySet.hxx" #include "MutexContainer.hxx" @@ -62,7 +61,15 @@ public: } /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index c6a847eda59a..ef87681e4ed7 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -26,7 +26,6 @@ #include "OPropertySet.hxx" #include <cppuhelper/weak.hxx> -#include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" #include <cppuhelper/implbase3.hxx> #include <comphelper/uno3.hxx> diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index c739d1c3f351..7f16f17c7c02 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -20,6 +20,7 @@ #include "AreaChartType.hxx" #include "macros.hxx" #include "servicenames_charttypes.hxx" +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -61,8 +62,28 @@ uno::Sequence< OUString > AreaChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( AreaChartType, - OUString("com.sun.star.comp.chart.AreaChartType") ); +OUString SAL_CALL AreaChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString AreaChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.AreaChartType"); +} + +sal_Bool SAL_CALL AreaChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index afb255fb3bbc..21d17a3d2ac5 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_AREACHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 00c0e53a6f8d..87823c84c352 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -20,6 +20,7 @@ #include "BarChartType.hxx" #include "macros.hxx" #include "servicenames_charttypes.hxx" +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -72,8 +73,28 @@ uno::Sequence< OUString > BarChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( BarChartType, - OUString("com.sun.star.comp.chart.BarChartType") ); +OUString SAL_CALL BarChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString BarChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.BarChartType"); +} + +sal_Bool SAL_CALL BarChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 48962e5da1a4..5000022475dd 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_BARCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index 42ce1be61ab1..a2f754908caf 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/CurveStyle.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -223,8 +224,28 @@ uno::Sequence< OUString > BubbleChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( BubbleChartType, - OUString("com.sun.star.comp.chart.BubbleChartType") ); +OUString SAL_CALL BubbleChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString BubbleChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.BubbleChartType"); +} + +sal_Bool SAL_CALL BubbleChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index c588a412e832..0e8456b75183 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_BUBBLECHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" #include <com/sun/star/chart2/CurveStyle.hpp> namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index faf5f39627eb..eb18c8038010 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -24,6 +24,7 @@ #include "servicenames_charttypes.hxx" #include "ContainerHelper.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -336,8 +337,28 @@ uno::Sequence< OUString > CandleStickChartType::getSupportedServiceNames_Static( } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( CandleStickChartType, - OUString("com.sun.star.comp.chart.CandleStickChartType") ); +OUString SAL_CALL CandleStickChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString CandleStickChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.CandleStickChartType") ; +} + +sal_Bool SAL_CALL CandleStickChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index 3b205cf4bf4c..7a5ade0bfc06 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_CANDLESTICKCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 7facd15af85e..8b0670a9055c 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -23,7 +23,6 @@ #include "OPropertySet.hxx" #include <cppuhelper/implbase6.hxx> #include <comphelper/uno3.hxx> -#include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/chart2/XChartType.hpp> diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index f6ebbee5e483..7c68a5908438 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -35,6 +35,7 @@ #include "BubbleChartTypeTemplate.hxx" #include "GL3DBarChartTypeTemplate.hxx" #include <cppuhelper/component_context.hxx> +#include <cppuhelper/supportsservice.hxx> #include <comphelper/InlineContainer.hxx> #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/lang/XServiceName.hpp> @@ -612,8 +613,29 @@ Sequence< OUString > ChartTypeManager::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ChartTypeManager, - OUString("com.sun.star.comp.chart.ChartTypeManager") ); +OUString SAL_CALL ChartTypeManager::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ChartTypeManager::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.ChartTypeManager"); +} + +sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} + } // namespace chart /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index fb9e0a19c23e..d37e870f16fe 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_CHARTTYPETEMPLATE_HXX #include <cppuhelper/implbase2.hxx> -#include "ServiceMacros.hxx" #include "DataInterpreter.hxx" #include "StackMode.hxx" #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 4357b6a995fd..eb1f1c2ad59a 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -23,6 +23,7 @@ #include "PropertyHelper.hxx" #include "ContainerHelper.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; using ::com::sun::star::uno::Sequence; @@ -194,8 +195,28 @@ uno::Sequence< OUString > ColumnChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ColumnChartType, - OUString("com.sun.star.comp.chart.ColumnChartType") ); +OUString SAL_CALL ColumnChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ColumnChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.ColumnChartType"); +} + +sal_Bool SAL_CALL ColumnChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index beb9ca32f33e..1f35e279ccc1 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_COLUMNCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 621bf1beab6e..5db7d6655344 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -26,6 +26,7 @@ #include "ContainerHelper.hxx" #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> +#include <cppuhelper/supportsservice.hxx> #include <vector> #include <algorithm> @@ -388,7 +389,28 @@ Sequence< OUString > DataInterpreter::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DataInterpreter, OUString("com.sun.star.comp.chart2.DataInterpreter") ); +OUString SAL_CALL DataInterpreter::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString DataInterpreter::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart2.DataInterpreter"); +} + +sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL DataInterpreter::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index af589f13bf63..7c2cd4a191c2 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_DATAINTERPRETER_HXX #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_DATAINTERPRETER_HXX -#include "ServiceMacros.hxx" #include <cppuhelper/implbase2.hxx> #include <com/sun/star/chart2/XDataInterpreter.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -41,7 +40,15 @@ public: GetComponentContext() const { return m_xContext;} /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // convenience methods static OUString GetRole( diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 1b8381c87c46..35d57e2f5d00 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -27,6 +27,7 @@ #include "AxisIndexDefines.hxx" #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/AxisType.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; @@ -77,8 +78,28 @@ uno::Sequence< OUString > FilledNetChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( FilledNetChartType, - OUString("com.sun.star.comp.chart.FilledNetChartType") ); +OUString SAL_CALL FilledNetChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString FilledNetChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.FilledNetChartType"); +} + +sal_Bool SAL_CALL FilledNetChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 9d3eae614883..65ce78fbd6d3 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_FILLEDNETCHARTTYPE_HXX #include "NetChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index e99fe390c871..f22e29d59074 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -11,6 +11,7 @@ #include <servicenames_charttypes.hxx> #include <PropertyHelper.hxx> #include <unonames.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -100,8 +101,28 @@ GL3DBarChartType::GL3DBarChartType( const GL3DBarChartType& rOther ) : GL3DBarChartType::~GL3DBarChartType() {} -APPHELPER_XSERVICEINFO_IMPL( - GL3DBarChartType, OUString("com.sun.star.comp.chart.GL3DBarChartType") ); +OUString SAL_CALL GL3DBarChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString GL3DBarChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.GL3DBarChartType"); +} + +sal_Bool SAL_CALL GL3DBarChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Sequence<OUString> GL3DBarChartType::getSupportedServiceNames_Static() { diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index 91b471414c44..3ea07b82da6d 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -11,7 +11,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_GL3DBARCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx index 6acd53e960ff..e5fe1b9924ee 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx @@ -13,7 +13,6 @@ #include <MutexContainer.hxx> #include <ChartTypeTemplate.hxx> #include <OPropertySet.hxx> -#include <ServiceMacros.hxx> #include <comphelper/uno3.hxx> diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index c55f6c8ce389..131a39a46cb1 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -23,6 +23,7 @@ #include "servicenames_charttypes.hxx" #include "ContainerHelper.hxx" #include <unonames.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/CurveStyle.hpp> @@ -199,8 +200,28 @@ uno::Sequence< OUString > LineChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( LineChartType, - OUString("com.sun.star.comp.chart.LineChartType") ); +OUString SAL_CALL LineChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString LineChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.LineChartType"); +} + +sal_Bool SAL_CALL LineChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index e6dc000cf601..1628947cf680 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_LINECHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" #include <com/sun/star/chart2/CurveStyle.hpp> namespace chart diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index ab94fe3b018a..28bf2a5a2638 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -26,6 +26,7 @@ #include "AxisIndexDefines.hxx" #include "AxisHelper.hxx" +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/AxisType.hpp> @@ -181,8 +182,28 @@ uno::Sequence< OUString > NetChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( NetChartType, - OUString("com.sun.star.comp.chart.NetChartType") ); +OUString SAL_CALL NetChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString NetChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.NetChartType"); +} + +sal_Bool SAL_CALL NetChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index b6d446f0569e..32152edbd9f1 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_NETCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 841bf5a6ce28..1fff9a05b8c4 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -25,6 +25,7 @@ #include "servicenames_charttypes.hxx" #include "ContainerHelper.hxx" #include "AxisIndexDefines.hxx" +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/AxisType.hpp> @@ -239,8 +240,28 @@ uno::Sequence< OUString > PieChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( PieChartType, - OUString("com.sun.star.comp.chart.PieChartType") ); +OUString SAL_CALL PieChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString PieChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.PieChartType"); +} + +sal_Bool SAL_CALL PieChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index 9ee809f31e9a..c905852b840c 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_PIECHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" namespace chart { diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index 6d3fb904c0fd..937195966783 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -26,6 +26,7 @@ #include "AxisHelper.hxx" #include "AxisIndexDefines.hxx" #include <unonames.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/chart2/AxisType.hpp> @@ -259,8 +260,28 @@ uno::Sequence< OUString > ScatterChartType::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ScatterChartType, - OUString("com.sun.star.comp.chart.ScatterChartType") ); +OUString SAL_CALL ScatterChartType::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ScatterChartType::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart.ScatterChartType"); +} + +sal_Bool SAL_CALL ScatterChartType::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 8eb63a187cba..777afe0ff89c 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_SOURCE_MODEL_TEMPLATE_SCATTERCHARTTYPE_HXX #include "ChartType.hxx" -#include "ServiceMacros.hxx" #include <com/sun/star/chart2/CurveStyle.hpp> namespace chart diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 8c9e8db18402..36897f529480 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -25,6 +25,7 @@ #include "ModifyListenerHelper.hxx" #include <comphelper/sequenceashashmap.hxx> +#include <cppuhelper/supportsservice.hxx> #include <algorithm> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -260,7 +261,28 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( CachedDataSequence, OUString(lcl_aServiceName) ) +OUString SAL_CALL CachedDataSequence::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString CachedDataSequence::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL CachedDataSequence::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index b5d227444131..8bb1880c0165 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -23,6 +23,7 @@ #include <unotools/configitem.hxx> #include <sal/macros.h> +#include <cppuhelper/supportsservice.hxx> #include <set> @@ -177,8 +178,28 @@ Sequence< OUString > ConfigColorScheme::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ConfigColorScheme, - OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ) +OUString SAL_CALL ConfigColorScheme::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ConfigColorScheme::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ; +} + +sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 24f8b5140be1..a8a38532dd69 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -19,6 +19,7 @@ #include "DataSource.hxx" #include "LabeledDataSequence.hxx" +#include <cppuhelper/supportsservice.hxx> using ::osl::MutexGuard; using ::com::sun::star::uno::Sequence; @@ -69,7 +70,28 @@ Sequence< OUString > DataSource::getSupportedServiceNames_Static() return aServices; } -APPHELPER_XSERVICEINFO_IMPL( DataSource, OUString(lcl_aServiceName) ); +OUString SAL_CALL DataSource::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString DataSource::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index f3c5abc29d99..2173542ac064 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -25,6 +25,7 @@ #include "PropertyHelper.hxx" #include "CloneHelper.hxx" +#include <cppuhelper/supportsservice.hxx> #include <svl/itemprop.hxx> #include <vcl/svapp.hxx> @@ -468,7 +469,28 @@ uno::Sequence< OUString > ErrorBar::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ErrorBar, OUString(lcl_aServiceName) ); +OUString SAL_CALL ErrorBar::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ErrorBar::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL ErrorBar::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ErrorBar::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} // needed by MSC compiler using impl::ErrorBar_Base; diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 27de75e50672..75e114cd5b42 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <rtl/ustrbuf.hxx> #include <unotools/charclass.hxx> +#include <cppuhelper/supportsservice.hxx> #include <comphelper/sequenceashashmap.hxx> #include <vector> @@ -1549,7 +1550,28 @@ Sequence< OUString > InternalDataProvider::getSupportedServiceNames_Static() return aServices; } -APPHELPER_XSERVICEINFO_IMPL( InternalDataProvider, OUString(lcl_aServiceName) ); +OUString SAL_CALL InternalDataProvider::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString InternalDataProvider::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index 84609b9c2cb7..3d9660aa3ce1 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -20,6 +20,7 @@ #include "LabeledDataSequence.hxx" #include "ModifyListenerHelper.hxx" #include "macros.hxx" +#include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star; @@ -157,8 +158,28 @@ Sequence< OUString > LabeledDataSequence::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( LabeledDataSequence, - OUString("com.sun.star.comp.chart2.LabeledDataSequence") ) +OUString SAL_CALL LabeledDataSequence::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString LabeledDataSequence::getImplementationName_Static() +{ + return OUString("com.sun.star.comp.chart2.LabeledDataSequence"); +} + +sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } // namespace chart diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index 4d726a732260..2d8509c2e42b 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -26,6 +26,7 @@ #include "ContainerHelper.hxx" #include "CloneHelper.hxx" #include "PropertyHelper.hxx" +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> @@ -369,7 +370,28 @@ uno::Sequence< OUString > MeanValueRegressionCurve::getSupportedServiceNames_Sta return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( MeanValueRegressionCurve, lcl_aImplementationName_MeanValue ); +OUString SAL_CALL MeanValueRegressionCurve::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString MeanValueRegressionCurve::getImplementationName_Static() +{ + return lcl_aImplementationName_MeanValue; +} + +sal_Bool SAL_CALL MeanValueRegressionCurve::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL MeanValueRegressionCurve::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone() throw (uno::RuntimeException, std::exception) @@ -395,7 +417,28 @@ uno::Sequence< OUString > LinearRegressionCurve::getSupportedServiceNames_Static return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( LinearRegressionCurve, lcl_aImplementationName_Linear ); +OUString SAL_CALL LinearRegressionCurve::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString LinearRegressionCurve::getImplementationName_Static() +{ + return lcl_aImplementationName_Linear; +} + +sal_Bool SAL_CALL LinearRegressionCurve::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL LinearRegressionCurve::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone() throw (uno::RuntimeException, std::exception) @@ -421,7 +464,28 @@ uno::Sequence< OUString > LogarithmicRegressionCurve::getSupportedServiceNames_S return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( LogarithmicRegressionCurve, lcl_aImplementationName_Logarithmic ); +OUString SAL_CALL LogarithmicRegressionCurve::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString LogarithmicRegressionCurve::getImplementationName_Static() +{ + return lcl_aImplementationName_Logarithmic; +} + +sal_Bool SAL_CALL LogarithmicRegressionCurve::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL LogarithmicRegressionCurve::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone() throw (uno::RuntimeException, std::exception) @@ -447,7 +511,28 @@ uno::Sequence< OUString > ExponentialRegressionCurve::getSupportedServiceNames_S return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ExponentialRegressionCurve, lcl_aImplementationName_Exponential ); +OUString SAL_CALL ExponentialRegressionCurve::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ExponentialRegressionCurve::getImplementationName_Static() +{ + return lcl_aImplementationName_Exponential; +} + +sal_Bool SAL_CALL ExponentialRegressionCurve::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ExponentialRegressionCurve::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone() throw (uno::RuntimeException, std::exception) @@ -473,7 +558,28 @@ uno::Sequence< OUString > PotentialRegressionCurve::getSupportedServiceNames_Sta return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( PotentialRegressionCurve, lcl_aImplementationName_Potential ); +OUString SAL_CALL PotentialRegressionCurve::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString PotentialRegressionCurve::getImplementationName_Static() +{ + return lcl_aImplementationName_Potential; +} + +sal_Bool SAL_CALL PotentialRegressionCurve::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL PotentialRegressionCurve::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone() throw (uno::RuntimeException, std::exception) @@ -499,7 +605,28 @@ uno::Sequence< OUString > PolynomialRegressionCurve::getSupportedServiceNames_St return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( PolynomialRegressionCurve, lcl_aImplementationName_Polynomial ); +OUString SAL_CALL PolynomialRegressionCurve::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString PolynomialRegressionCurve::getImplementationName_Static() +{ + return lcl_aImplementationName_Polynomial; +} + +sal_Bool SAL_CALL PolynomialRegressionCurve::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL PolynomialRegressionCurve::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone() throw (uno::RuntimeException, std::exception) @@ -525,7 +652,28 @@ uno::Sequence< OUString > MovingAverageRegressionCurve::getSupportedServiceNames return aServices; } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( MovingAverageRegressionCurve, lcl_aImplementationName_MovingAverage ); +OUString SAL_CALL MovingAverageRegressionCurve::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString MovingAverageRegressionCurve::getImplementationName_Static() +{ + return lcl_aImplementationName_MovingAverage; +} + +sal_Bool SAL_CALL MovingAverageRegressionCurve::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL MovingAverageRegressionCurve::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone() throw (uno::RuntimeException, std::exception) diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 1ff6627eae5c..dfed109df919 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -21,7 +21,6 @@ #include "MutexContainer.hxx" #include "OPropertySet.hxx" -#include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" #include <cppuhelper/implbase6.hxx> @@ -157,7 +156,15 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// establish methods for factory instatiation static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) @@ -181,7 +188,15 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// establish methods for factory instatiation static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) @@ -205,7 +220,15 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// establish methods for factory instatiation static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) @@ -229,7 +252,15 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// establish methods for factory instatiation static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) @@ -253,7 +284,15 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// establish methods for factory instatiation static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) @@ -277,7 +316,15 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// establish methods for factory instatiation static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) @@ -301,7 +348,15 @@ public: throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; /// XServiceInfo declarations - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); /// establish methods for factory instatiation static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index a29d7d5828d1..933d2678b7bf 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -26,6 +26,7 @@ #include "macros.hxx" #include "ContainerHelper.hxx" #include <unonames.hxx> +#include <cppuhelper/supportsservice.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/drawing/FillStyle.hpp> @@ -315,7 +316,28 @@ uno::Sequence< OUString > RegressionEquation::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( RegressionEquation, OUString(lcl_aImplementationName) ); +OUString SAL_CALL RegressionEquation::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString RegressionEquation::getImplementationName_Static() +{ + return OUString(lcl_aImplementationName); +} + +sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL RegressionEquation::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} using impl::RegressionEquation_Base; diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index e305372b9621..0730619f09b0 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -28,7 +28,6 @@ #include "MutexContainer.hxx" #include "OPropertySet.hxx" -#include "ServiceMacros.hxx" #include "ModifyListenerHelper.hxx" #include <cppuhelper/implbase5.hxx> diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 2b4ea673938a..43ff6cd964a5 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -20,6 +20,7 @@ #include "Scaling.hxx" #include <rtl/math.hxx> #include "com/sun/star/uno/RuntimeException.hpp" +#include <cppuhelper/supportsservice.hxx> namespace { @@ -84,7 +85,28 @@ uno::Sequence< OUString > LogarithmicScaling::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( LogarithmicScaling, OUString(lcl_aServiceName_Logarithmic) ) +OUString SAL_CALL LogarithmicScaling::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString LogarithmicScaling::getImplementationName_Static() +{ + return OUString(lcl_aServiceName_Logarithmic); +} + +sal_Bool SAL_CALL LogarithmicScaling::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL LogarithmicScaling::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} ExponentialScaling::ExponentialScaling( const uno::Reference< uno::XComponentContext > & xContext ) : m_fBase( 10.0 ), @@ -132,7 +154,28 @@ uno::Sequence< OUString > ExponentialScaling::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( ExponentialScaling, OUString(lcl_aServiceName_Exponential) ) +OUString SAL_CALL ExponentialScaling::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ExponentialScaling::getImplementationName_Static() +{ + return OUString(lcl_aServiceName_Exponential); +} + +sal_Bool SAL_CALL ExponentialScaling::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ExponentialScaling::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} LinearScaling::LinearScaling( const uno::Reference< uno::XComponentContext > & xContext ) : m_fSlope( 1.0 ), @@ -184,7 +227,28 @@ uno::Sequence< OUString > LinearScaling::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( LinearScaling, OUString(lcl_aServiceName_Linear) ) +OUString SAL_CALL LinearScaling::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString LinearScaling::getImplementationName_Static() +{ + return OUString(lcl_aServiceName_Linear) ; +} + +sal_Bool SAL_CALL LinearScaling::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL LinearScaling::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} PowerScaling::PowerScaling( const uno::Reference< uno::XComponentContext > & xContext ) : m_fExponent( 10.0 ), @@ -235,7 +299,28 @@ uno::Sequence< OUString > PowerScaling::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( PowerScaling, OUString(lcl_aServiceName_Power) ) +OUString SAL_CALL PowerScaling::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString PowerScaling::getImplementationName_Static() +{ + return OUString(lcl_aServiceName_Power); +} + +sal_Bool SAL_CALL PowerScaling::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL PowerScaling::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } //namespace chart diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 3ba14aa36afd..27479f914254 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -23,6 +23,7 @@ #include "CommonFunctors.hxx" #include "ModifyListenerHelper.hxx" +#include <cppuhelper/supportsservice.hxx> #include <algorithm> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <rtl/math.hxx> @@ -156,7 +157,28 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( UncachedDataSequence, OUString(lcl_aServiceName) ) +OUString SAL_CALL UncachedDataSequence::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString UncachedDataSequence::getImplementationName_Static() +{ + return OUString(lcl_aServiceName); +} + +sal_Bool SAL_CALL UncachedDataSequence::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index c4931823615a..daf6f4ffd5e6 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/chart/TimeUnit.hpp> #include <rtl/math.hxx> #include "com/sun/star/uno/RuntimeException.hpp" +#include <cppuhelper/supportsservice.hxx> namespace { @@ -111,7 +112,28 @@ uno::Sequence< OUString > DateScaling::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( DateScaling, OUString(lcl_aServiceName_DateScaling) ) +OUString SAL_CALL DateScaling::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString DateScaling::getImplementationName_Static() +{ + return OUString(lcl_aServiceName_DateScaling); +} + +sal_Bool SAL_CALL DateScaling::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL DateScaling::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} InverseDateScaling::InverseDateScaling( const Date& rNullDate, sal_Int32 nTimeUnit, bool bShifted ) : m_aNullDate( rNullDate ) @@ -192,7 +214,28 @@ uno::Sequence< OUString > InverseDateScaling::getSupportedServiceNames_Static() } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static -APPHELPER_XSERVICEINFO_IMPL( InverseDateScaling, OUString(lcl_aServiceName_InverseDateScaling) ) +OUString SAL_CALL InverseDateScaling::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString InverseDateScaling::getImplementationName_Static() +{ + return OUString(lcl_aServiceName_InverseDateScaling); +} + +sal_Bool SAL_CALL InverseDateScaling::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL InverseDateScaling::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} } //namespace chart diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index df1d24ba20f8..f48518a6c9d9 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -18,7 +18,7 @@ */ #ifndef INCLUDED_CHART2_SOURCE_VIEW_AXES_DATESCALING_HXX #define INCLUDED_CHART2_SOURCE_VIEW_AXES_DATESCALING_HXX -#include "ServiceMacros.hxx" + #include <com/sun/star/chart2/XScaling.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceName.hpp> @@ -29,9 +29,6 @@ namespace chart { -/** -*/ - class DateScaling : public ::cppu::WeakImplHelper3 < ::com::sun::star::chart2::XScaling, @@ -44,7 +41,15 @@ public: virtual ~DateScaling(); /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) @@ -76,7 +81,15 @@ public: virtual ~InverseDateScaling(); /// declare XServiceInfo methods - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ____ XScaling ____ virtual double SAL_CALL doScaling( double value ) diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index edf6dc983693..258686d179cf 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -56,6 +56,7 @@ #include <rtl/uuid.h> #include <comphelper/scopeguard.hxx> #include <comphelper/servicehelper.hxx> +#include <cppuhelper/supportsservice.hxx> #include <boost/bind.hpp> #include <unotools/streamwrap.hxx> #include <unotools/localedatawrapper.hxx> @@ -1321,10 +1322,30 @@ sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlav // lang::XServiceInfo -APPHELPER_XSERVICEINFO_IMPL(ChartView,CHART_VIEW_SERVICE_IMPLEMENTATION_NAME) +OUString SAL_CALL ChartView::getImplementationName() + throw( css::uno::RuntimeException, std::exception ) +{ + return getImplementationName_Static(); +} + +OUString ChartView::getImplementationName_Static() +{ + return CHART_VIEW_SERVICE_IMPLEMENTATION_NAME; +} + +sal_Bool SAL_CALL ChartView::supportsService( const OUString& rServiceName ) + throw( css::uno::RuntimeException, std::exception ) +{ + return cppu::supportsService(this, rServiceName); +} + +css::uno::Sequence< OUString > SAL_CALL ChartView::getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) +{ + return getSupportedServiceNames_Static(); +} - uno::Sequence< OUString > ChartView -::getSupportedServiceNames_Static() +uno::Sequence< OUString > ChartView::getSupportedServiceNames_Static() { uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] = CHART_VIEW_SERVICE_NAME; |