summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-11-07 09:26:35 +0200
committerNoel Grandin <noel@peralex.com>2014-11-07 09:26:35 +0200
commitbd15fb03dfc3a14b8f1f233080ec3084e0bf25be (patch)
treef902bb14650f2da34e8ac675bf20463fcdacd865 /chart2
parent0adb90115596ce69e1d80becdaa39e23197fe454 (diff)
use css:: prefix to tidy up chart2 UNO macros
Change-Id: I8dbe23bfec15fbc905407f64a3a87a5c75dbcd54
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/inc/ServiceMacros.hxx56
1 files changed, 23 insertions, 33 deletions
diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx
index 05636f5f2ea4..69fae2e7adbc 100644
--- a/chart2/source/inc/ServiceMacros.hxx
+++ b/chart2/source/inc/ServiceMacros.hxx
@@ -32,42 +32,36 @@ static com::sun::star::uno::Sequence< OUString >
namespace apphelper
{
-#define APPHELPER_XSERVICEINFO_DECL() \
- virtual OUString SAL_CALL \
- getImplementationName() \
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- virtual sal_Bool SAL_CALL \
- supportsService( const OUString& ServiceName ) \
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL \
- getSupportedServiceNames() \
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
- \
- static OUString getImplementationName_Static(); \
- static ::com::sun::star::uno::Sequence< OUString > \
- getSupportedServiceNames_Static();
+#define APPHELPER_XSERVICEINFO_DECL() \
+ virtual OUString SAL_CALL getImplementationName() \
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) \
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()\
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; \
+ \
+ static OUString getImplementationName_Static(); \
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XServiceInfo impl
-#define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \
-OUString SAL_CALL Class::getImplementationName() \
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) \
+#define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \
+OUString SAL_CALL Class::getImplementationName() \
+ throw( css::uno::RuntimeException, std::exception ) \
{ \
return getImplementationName_Static(); \
} \
\
-OUString Class::getImplementationName_Static() \
+OUString Class::getImplementationName_Static() \
{ \
return ImplName; \
} \
\
-sal_Bool SAL_CALL \
-Class::supportsService( const OUString& ServiceName ) \
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) \
+sal_Bool SAL_CALL Class::supportsService( const OUString& ServiceName ) \
+ throw( css::uno::RuntimeException, std::exception ) \
{ \
- ::com::sun::star::uno::Sequence< OUString > aSNL = \
- getSupportedServiceNames(); \
- const OUString* pArray = aSNL.getArray(); \
+ css::uno::Sequence< OUString > aSNL = getSupportedServiceNames(); \
+ const OUString* pArray = aSNL.getArray(); \
for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) \
{ \
if( pArray[ i ] == ServiceName ) \
@@ -77,9 +71,8 @@ Class::supportsService( const OUString& ServiceName ) \
return sal_False; \
} \
\
-::com::sun::star::uno::Sequence< OUString > SAL_CALL \
-Class::getSupportedServiceNames() \
- throw( ::com::sun::star::uno::RuntimeException, std::exception ) \
+css::uno::Sequence< OUString > SAL_CALL Class::getSupportedServiceNames() \
+ throw( css::uno::RuntimeException, std::exception ) \
{ \
return getSupportedServiceNames_Static(); \
}
@@ -90,12 +83,9 @@ Class::getSupportedServiceNames() \
//class( Reference< XComponentContext > const & xContext )
//and implement OWeakObject
-#define APPHELPER_SERVICE_FACTORY_HELPER(Class) \
-static ::com::sun::star::uno::Reference< \
- ::com::sun::star::uno::XInterface > SAL_CALL \
- create( ::com::sun::star::uno::Reference< \
- ::com::sun::star::uno::XComponentContext > const & xContext) \
- throw(::com::sun::star::uno::Exception) \
+#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 ); \
}