diff options
Diffstat (limited to 'chart2/source/model')
57 files changed, 840 insertions, 96 deletions
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 |