summaryrefslogtreecommitdiff
path: root/chart2/source/inc/Scaling.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-12-09 08:30:11 +0200
committerNoel Grandin <noel@peralex.com>2014-12-09 12:55:38 +0200
commitc227d963d8ea84445ef9617d30ac24092d33b92f (patch)
tree51482b0291486f526876c297271c78bc1ea1b41e /chart2/source/inc/Scaling.hxx
parent13b6c147e5a07439fb52044e4dfd4e58af858ec9 (diff)
inline UNO helper macros
Change-Id: Ia401dd2f51108d2f3b08cd3d6d433a12ac17ee74
Diffstat (limited to 'chart2/source/inc/Scaling.hxx')
-rw-r--r--chart2/source/inc/Scaling.hxx42
1 files changed, 37 insertions, 5 deletions
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index fd968092c55b..96a1e2aa4df0 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -18,7 +18,7 @@
*/
#ifndef INCLUDED_CHART2_SOURCE_INC_SCALING_HXX
#define INCLUDED_CHART2_SOURCE_INC_SCALING_HXX
-#include "ServiceMacros.hxx"
+
#include <com/sun/star/chart2/XScaling.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XServiceName.hpp>
@@ -53,7 +53,15 @@ public:
return (::cppu::OWeakObject *)new LogarithmicScaling( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XScaling ____
virtual double SAL_CALL doScaling( double value )
@@ -96,7 +104,15 @@ public:
return (::cppu::OWeakObject *)new ExponentialScaling( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XScaling ____
virtual double SAL_CALL
@@ -139,7 +155,15 @@ public:
return (::cppu::OWeakObject *)new LinearScaling( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XScaling ____
virtual double SAL_CALL doScaling( double value )
@@ -181,7 +205,15 @@ public:
return (::cppu::OWeakObject *)new PowerScaling( xContext );
}
/// declare XServiceInfo methods
- APPHELPER_XSERVICEINFO_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// ____ XScaling ____
virtual double SAL_CALL