From 13b6c147e5a07439fb52044e4dfd4e58af858ec9 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 8 Dec 2014 14:38:16 +0200 Subject: inline UNO helper macro APPHELPER_SERVICE_FACTORY_HELPER Change-Id: Ib416efb59ae166bb8d55dd7f3c84b7e5f72864e8 --- chart2/inc/ChartModel.hxx | 6 ++- .../source/controller/inc/ChartDocumentWrapper.hxx | 6 ++- .../controller/inc/dlg_CreationWizard_UNO.hxx | 6 ++- chart2/source/controller/main/ChartController.hxx | 6 ++- chart2/source/controller/main/ChartFrameloader.hxx | 6 ++- chart2/source/controller/main/ElementSelector.hxx | 6 ++- chart2/source/inc/CachedDataSequence.hxx | 6 ++- chart2/source/inc/ConfigColorScheme.hxx | 6 ++- chart2/source/inc/DataSource.hxx | 6 ++- chart2/source/inc/ErrorBar.hxx | 6 ++- chart2/source/inc/InternalDataProvider.hxx | 6 ++- chart2/source/inc/LabeledDataSequence.hxx | 6 ++- chart2/source/inc/Scaling.hxx | 24 +++++++++-- chart2/source/inc/ServiceMacros.hxx | 13 ------ .../source/model/inc/CartesianCoordinateSystem.hxx | 12 +++++- chart2/source/model/inc/ChartTypeManager.hxx | 6 ++- chart2/source/model/inc/DataSeries.hxx | 6 ++- chart2/source/model/inc/Diagram.hxx | 6 ++- chart2/source/model/inc/PolarCoordinateSystem.hxx | 12 +++++- chart2/source/model/inc/XMLFilter.hxx | 6 ++- chart2/source/model/main/Axis.hxx | 6 ++- chart2/source/model/main/FormattedString.hxx | 6 ++- chart2/source/model/main/GridProperties.hxx | 6 ++- chart2/source/model/main/Legend.hxx | 6 ++- chart2/source/model/main/PageBackground.hxx | 6 ++- chart2/source/model/main/Title.hxx | 6 ++- chart2/source/model/template/AreaChartType.hxx | 6 ++- chart2/source/model/template/BarChartType.hxx | 6 ++- chart2/source/model/template/BubbleChartType.hxx | 6 ++- .../source/model/template/CandleStickChartType.hxx | 6 ++- chart2/source/model/template/ChartTypeTemplate.hxx | 3 -- chart2/source/model/template/ColumnChartType.hxx | 6 ++- .../source/model/template/FilledNetChartType.hxx | 6 ++- chart2/source/model/template/GL3DBarChartType.hxx | 6 ++- chart2/source/model/template/LineChartType.hxx | 6 ++- chart2/source/model/template/NetChartType.hxx | 6 ++- chart2/source/model/template/PieChartType.hxx | 6 ++- chart2/source/model/template/ScatterChartType.hxx | 6 ++- chart2/source/tools/RegressionCurveModel.hxx | 47 ++++++++++++++++------ chart2/source/tools/RegressionEquation.hxx | 6 ++- 40 files changed, 245 insertions(+), 70 deletions(-) diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 79a17466bb18..598c2b5aa942 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -235,7 +235,11 @@ public: // ::com::sun::star::lang::XServiceInfo APPHELPER_XSERVICEINFO_DECL() - APPHELPER_SERVICE_FACTORY_HELPER(ChartModel) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ChartModel( xContext ); + } // ::com::sun::star::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/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index a14cf15b052c..552f264c12a7 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -66,7 +66,11 @@ public: /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() - APPHELPER_SERVICE_FACTORY_HELPER(ChartDocumentWrapper) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ChartDocumentWrapper( xContext ); + } void setAddIn( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable >& xAddIn ); ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > getAddIn() const { return m_xAddIn;} diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 4d4b8c0a3037..fc97659d1c9a 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -64,7 +64,11 @@ public: // XServiceInfo APPHELPER_XSERVICEINFO_DECL() - APPHELPER_SERVICE_FACTORY_HELPER(CreationWizardUnoDlg) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new CreationWizardUnoDlg( xContext ); + } // XExecutableDialog virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx index 4613fdd6e69d..5e4401a382f8 100644 --- a/chart2/source/controller/main/ChartController.hxx +++ b/chart2/source/controller/main/ChartController.hxx @@ -153,7 +153,11 @@ public: // ::com::sun::star::lang::XServiceInfo APPHELPER_XSERVICEINFO_DECL() - APPHELPER_SERVICE_FACTORY_HELPER(ChartController) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ChartController( xContext ); + } // ::com::sun::star::frame::XController (required interface) virtual void SAL_CALL diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 024ed2c1c2a0..994144192a1e 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -55,7 +55,11 @@ public: // ::com::sun::star::lang::XServiceInfo APPHELPER_XSERVICEINFO_DECL() - APPHELPER_SERVICE_FACTORY_HELPER(ChartFrameLoader) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ChartFrameLoader( xContext ); + } // ::com::sun::star::frame::XFrameLoader diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index 0b0d2b0409a1..a27e29ab59ce 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -80,7 +80,11 @@ public: // XServiceInfo APPHELPER_XSERVICEINFO_DECL() - APPHELPER_SERVICE_FACTORY_HELPER(ElementSelectorToolbarController) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ElementSelectorToolbarController( xContext ); + } // XInterface virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 243eea5d12bc..3a98acd17a54 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -85,7 +85,11 @@ public: virtual ~CachedDataSequence(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( CachedDataSequence ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new CachedDataSequence( xContext ); + } /// declare XServiceInfo methods APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index 1a737428ff9e..b70b8244f7fb 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -55,7 +55,11 @@ public: SAL_DLLPRIVATE virtual ~ConfigColorScheme(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( ConfigColorScheme ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ConfigColorScheme( xContext ); + } /// declare XServiceInfo methods APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index 84d2c3781e74..539fedad96a4 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -48,7 +48,11 @@ public: virtual ~DataSource(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( DataSource ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new DataSource( xContext ); + } /// declare XServiceInfo methods APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 55f57acee3a7..2dace4f88ea6 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -82,7 +82,11 @@ public: /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( ErrorBar ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ErrorBar( xContext ); + } // XPropertySet diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 459ffb8adb85..045e948adc06 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -84,7 +84,11 @@ public: /// declare XServiceInfo methods APPHELPER_XSERVICEINFO_DECL() - APPHELPER_SERVICE_FACTORY_HELPER(InternalDataProvider) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new InternalDataProvider( xContext ); + } // ____ XInternalDataProvider ____ virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index c3166e69219d..78688028e393 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -60,7 +60,11 @@ public: virtual ~LabeledDataSequence(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( LabeledDataSequence ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new LabeledDataSequence( xContext ); + } /// declare XServiceInfo methods APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index f978b57bf002..fd968092c55b 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -47,7 +47,11 @@ public: virtual ~LogarithmicScaling(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( LogarithmicScaling ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new LogarithmicScaling( xContext ); + } /// declare XServiceInfo methods APPHELPER_XSERVICEINFO_DECL() @@ -86,7 +90,11 @@ public: virtual ~ExponentialScaling(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( ExponentialScaling ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ExponentialScaling( xContext ); + } /// declare XServiceInfo methods APPHELPER_XSERVICEINFO_DECL() @@ -125,7 +133,11 @@ public: virtual ~LinearScaling(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( LinearScaling ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new LinearScaling( xContext ); + } /// declare XServiceInfo methods APPHELPER_XSERVICEINFO_DECL() @@ -163,7 +175,11 @@ public: virtual ~PowerScaling(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( PowerScaling ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new PowerScaling( xContext ); + } /// declare XServiceInfo methods APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx index 7097eb66d7be..2fe5f9658272 100644 --- a/chart2/source/inc/ServiceMacros.hxx +++ b/chart2/source/inc/ServiceMacros.hxx @@ -71,19 +71,6 @@ css::uno::Sequence< OUString > SAL_CALL Class::getSupportedServiceNames() \ return getSupportedServiceNames_Static(); \ } -// Service factory helper decl+impl - -//to use this macro you need to provide a constructor: -//class( Reference< XComponentContext > const & xContext ) -//and implement OWeakObject - -#define APPHELPER_SERVICE_FACTORY_HELPER(Class) \ -static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) \ - throw(css::uno::Exception) \ -{ \ - return (::cppu::OWeakObject *)new Class( xContext ); \ -} - }//end namespace apphelper #endif diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index a7061dbd2453..d547621f2bbc 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -60,7 +60,11 @@ public: virtual ~CartesianCoordinateSystem2d(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( CartesianCoordinateSystem2d ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new CartesianCoordinateSystem2d( xContext ); + } // ____ XServiceInfo ____ APPHELPER_XSERVICEINFO_DECL() }; @@ -74,7 +78,11 @@ public: virtual ~CartesianCoordinateSystem3d(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( CartesianCoordinateSystem3d ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new CartesianCoordinateSystem3d( xContext ); + } // ____ XServiceInfo ____ APPHELPER_XSERVICEINFO_DECL() }; diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index 28a29a203c04..6ea717251c39 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -62,7 +62,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( ChartTypeManager ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ChartTypeManager( xContext ); + } protected: // ____ XMultiServiceFactory ____ diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 22878fcc029a..0636de652e6d 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -74,7 +74,11 @@ public: virtual ~DataSeries(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( DataSeries ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new DataSeries( xContext ); + } /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 1b54819d50d5..8245df8f4413 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -68,7 +68,11 @@ public: virtual ~Diagram(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( Diagram ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new Diagram( xContext ); + } /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index dad791765a17..af1bbce6d348 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -60,7 +60,11 @@ public: virtual ~PolarCoordinateSystem2d(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( PolarCoordinateSystem2d ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new PolarCoordinateSystem2d( xContext ); + } // ____ XServiceInfo ____ APPHELPER_XSERVICEINFO_DECL() }; @@ -74,7 +78,11 @@ public: virtual ~PolarCoordinateSystem3d(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( PolarCoordinateSystem3d ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new PolarCoordinateSystem3d( xContext ); + } // ____ XServiceInfo ____ APPHELPER_XSERVICEINFO_DECL() }; diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index 9004264eab87..a091a0a086bb 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -64,7 +64,11 @@ public: virtual ~XMLFilter(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( XMLFilter ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new XMLFilter( xContext ); + } /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index e414789c457a..609ecedafc0f 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -60,7 +60,11 @@ public: virtual ~Axis(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( Axis ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new Axis( xContext ); + } /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index b62c82c5283b..8fb63c951585 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -57,7 +57,11 @@ public: /// declare XServiceInfo methods APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( FormattedString ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new FormattedString( xContext ); + } /// merge XInterface implementations DECLARE_XINTERFACE() diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index 1c75dcd559f1..c8cbf52780aa 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -58,7 +58,11 @@ public: virtual ~GridProperties(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( GridProperties ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new GridProperties( xContext ); + } /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 19d4a218d921..76e7e41d3f09 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -57,7 +57,11 @@ public: virtual ~Legend(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( Legend ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new Legend( xContext ); + } /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index 7098579eca7c..daa1acd8f898 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -54,7 +54,11 @@ public: virtual ~PageBackground(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( PageBackground ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new PageBackground( xContext ); + } /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 31a4b1fdc0d2..aa94f14a6c89 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -55,7 +55,11 @@ public: virtual ~Title(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( Title ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new Title( xContext ); + } /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index bb7417575b70..afb255fb3bbc 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -47,7 +47,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( AreaChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new AreaChartType( xContext ); + } protected: explicit AreaChartType( const AreaChartType & rOther ); diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 71d0dad30833..48962e5da1a4 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -47,7 +47,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( BarChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new BarChartType( xContext ); + } protected: explicit BarChartType( const BarChartType & rOther ); diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index a74533b98ba4..c588a412e832 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -48,7 +48,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( BubbleChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new BubbleChartType( xContext ); + } protected: explicit BubbleChartType( const BubbleChartType & rOther ); diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index 6f00058e954e..3b205cf4bf4c 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -47,7 +47,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( CandleStickChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new CandleStickChartType( xContext ); + } protected: explicit CandleStickChartType( const CandleStickChartType & rOther ); diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index b0dc88c4af09..fb9e0a19c23e 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -81,9 +81,6 @@ public: const OUString & rServiceName ); virtual ~ChartTypeTemplate(); - /// establish methods for factory instatiation -// APPHELPER_SERVICE_FACTORY_HELPER( ChartTypeTemplate ) - protected: // ____ XChartTypeTemplate ____ virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL createDiagramByDataSource( diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index a5287d966908..beb9ca32f33e 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -47,7 +47,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( ColumnChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ColumnChartType( xContext ); + } protected: explicit ColumnChartType( const ColumnChartType & rOther ); diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index 6690f5d78f9a..9d3eae614883 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -46,7 +46,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( FilledNetChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new FilledNetChartType( xContext ); + } protected: explicit FilledNetChartType( const FilledNetChartType & rOther ); diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index c758d467bf6d..91b471414c44 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -41,7 +41,11 @@ public: static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(); - APPHELPER_SERVICE_FACTORY_HELPER( GL3DBarChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new GL3DBarChartType( xContext ); + } protected: GL3DBarChartType( const GL3DBarChartType& rOther ); diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index 28d25ab98d5b..e6dc000cf601 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -48,7 +48,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( LineChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new LineChartType( xContext ); + } protected: explicit LineChartType( const LineChartType & rOther ); diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index aaf548ee7eb5..b6d446f0569e 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -74,7 +74,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( NetChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new NetChartType( xContext ); + } protected: explicit NetChartType( const NetChartType & rOther ); diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index f82fb20e2c70..9ee809f31e9a 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -48,7 +48,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( PieChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new PieChartType( xContext ); + } protected: explicit PieChartType( const PieChartType & rOther ); diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index d5be8d0378bc..8eb63a187cba 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -52,7 +52,11 @@ public: getSupportedServiceNames_Static(); /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( ScatterChartType ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ScatterChartType( xContext ); + } protected: explicit ScatterChartType( const ScatterChartType & rOther ); diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 4aad97372c95..1ff6627eae5c 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -104,11 +104,6 @@ protected: virtual OUString SAL_CALL getServiceName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // ____ XCloneable ____ - // not implemented here -// virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() -// throw (::com::sun::star::uno::RuntimeException); - // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) @@ -164,7 +159,11 @@ public: /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( MeanValueRegressionCurve ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new MeanValueRegressionCurve( xContext ); + } }; class LinearRegressionCurve : public RegressionCurveModel @@ -184,7 +183,11 @@ public: /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( LinearRegressionCurve ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new LinearRegressionCurve( xContext ); + } }; class LogarithmicRegressionCurve : public RegressionCurveModel @@ -204,7 +207,11 @@ public: /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( LogarithmicRegressionCurve ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new LogarithmicRegressionCurve( xContext ); + } }; class ExponentialRegressionCurve : public RegressionCurveModel @@ -224,7 +231,11 @@ public: /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( ExponentialRegressionCurve ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new ExponentialRegressionCurve( xContext ); + } }; class PotentialRegressionCurve : public RegressionCurveModel @@ -244,7 +255,11 @@ public: /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( PotentialRegressionCurve ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new PotentialRegressionCurve( xContext ); + } }; class PolynomialRegressionCurve : public RegressionCurveModel @@ -264,7 +279,11 @@ public: /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( PolynomialRegressionCurve ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new PolynomialRegressionCurve( xContext ); + } }; class MovingAverageRegressionCurve : public RegressionCurveModel @@ -284,7 +303,11 @@ public: /// XServiceInfo declarations APPHELPER_XSERVICEINFO_DECL() /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( MovingAverageRegressionCurve ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new MovingAverageRegressionCurve( xContext ); + } }; } // namespace chart diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index 0fe9798acb8b..e305372b9621 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -78,7 +78,11 @@ public: /// merge XInterface implementations DECLARE_XINTERFACE() /// establish methods for factory instatiation - APPHELPER_SERVICE_FACTORY_HELPER( RegressionEquation ) + static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) + throw(css::uno::Exception) + { + return (::cppu::OWeakObject *)new RegressionEquation( xContext ); + } protected: explicit RegressionEquation( const RegressionEquation & rOther ); -- cgit v1.2.3