diff options
| author | Noel Grandin <noel@peralex.com> | 2014-12-09 08:30:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-12-09 12:55:38 +0200 |
| commit | c227d963d8ea84445ef9617d30ac24092d33b92f (patch) | |
| tree | 51482b0291486f526876c297271c78bc1ea1b41e /chart2/inc | |
| parent | 13b6c147e5a07439fb52044e4dfd4e58af858ec9 (diff) | |
inline UNO helper macros
Change-Id: Ia401dd2f51108d2f3b08cd3d6d433a12ac17ee74
Diffstat (limited to 'chart2/inc')
| -rw-r--r-- | chart2/inc/ChartModel.hxx | 11 | ||||
| -rw-r--r-- | chart2/inc/ChartView.hxx | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 598c2b5aa942..0b06d0b46f58 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -20,7 +20,6 @@ #define INCLUDED_CHART2_INC_CHARTMODEL_HXX #include "LifeTime.hxx" -#include "ServiceMacros.hxx" #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XStorable2.hpp> @@ -234,7 +233,15 @@ public: // ::com::sun::star::lang::XServiceInfo - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static css::uno::Reference< css::uno::XInterface > SAL_CALL create( css::uno::Reference< css::uno::XComponentContext > const & xContext) throw(css::uno::Exception) { diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index 047192aec7b6..13bb25219501 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -21,7 +21,6 @@ #include "ChartModel.hxx" #include "chartview/ExplicitValueProvider.hxx" -#include "ServiceMacros.hxx" #include <cppuhelper/implbase10.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -116,7 +115,15 @@ public: virtual ~ChartView(); // ___lang::XServiceInfo___ - APPHELPER_XSERVICEINFO_DECL() + virtual OUString SAL_CALL getImplementationName() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; + + static OUString getImplementationName_Static(); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); // ___lang::XInitialization___ virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) |