summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/ucbhelper/macros.hxx20
-rw-r--r--include/ucbhelper/resultset.hxx10
-rw-r--r--include/ucbhelper/resultsethelper.hxx10
-rw-r--r--ucb/source/cacher/cachedcontentresultset.hxx10
-rw-r--r--ucb/source/cacher/cachedcontentresultsetstub.hxx10
-rw-r--r--ucb/source/cacher/cacheddynamicresultset.hxx9
-rw-r--r--ucb/source/cacher/cacheddynamicresultsetstub.hxx10
-rw-r--r--ucb/source/core/provprox.hxx10
-rw-r--r--ucb/source/core/ucbstore.hxx20
9 files changed, 78 insertions, 31 deletions
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index 88e51e44b7fb..f97d2e3f0051 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -199,26 +199,6 @@ GETTYPES_IMPL_START( Class ) \
CPPU_TYPE_REF( I11 ) \
GETTYPES_IMPL_END
-// XServiceInfo decl.
-
-
-
-#define XSERVICEINFO_NOFACTORY_DECL() \
- virtual OUString SAL_CALL \
- getImplementationName() \
- throw( com::sun::star::uno::RuntimeException, std::exception ); \
- virtual sal_Bool SAL_CALL \
- supportsService( const OUString& ServiceName ) \
- throw( com::sun::star::uno::RuntimeException, std::exception ); \
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL \
- getSupportedServiceNames() \
- throw( com::sun::star::uno::RuntimeException, std::exception ); \
- \
- static OUString \
- getImplementationName_Static(); \
- static com::sun::star::uno::Sequence< OUString > \
- getSupportedServiceNames_Static();
-
// XServiceInfo impl. internals
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 2e283094b874..46e504dbbfb0 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -124,7 +124,15 @@ public:
throw( com::sun::star::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_NOFACTORY_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XComponent
virtual void SAL_CALL
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index ce87e82824d7..e47c612ab74f 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -151,7 +151,15 @@ public:
throw( com::sun::star::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_NOFACTORY_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XComponent ( base class of XDynamicResultSet )
virtual void SAL_CALL
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index efbfab060bdd..881cadb5d43c 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -215,9 +215,15 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
- XSERVICEINFO_NOFACTORY_DECL()
-
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XPropertySet inherited
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 256052aadfd6..4cc1004797d7 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -123,9 +123,15 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
- XSERVICEINFO_NOFACTORY_DECL()
-
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XFetchProvider
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index 3936190bbbc6..398efbea3e0a 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -72,8 +72,15 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
- XSERVICEINFO_NOFACTORY_DECL()
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// own methods ( inherited )
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index f9956f6ee801..acad5e31f34c 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -66,8 +66,16 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
- XSERVICEINFO_NOFACTORY_DECL()
};
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index e29694397acc..c8dd2a4b6fa3 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -130,7 +130,15 @@ public:
throw( css::uno::RuntimeException, std::exception );
// XServiceInfo
- XSERVICEINFO_NOFACTORY_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XContentProviderSupplier
virtual ::com::sun::star::uno::Reference<
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 7f7cafc6682c..f6121f103d7f 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -130,7 +130,15 @@ public:
// XServiceInfo
- XSERVICEINFO_NOFACTORY_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XPropertySetRegistry
virtual com::sun::star::uno::Reference<
@@ -200,7 +208,15 @@ public:
virtual ~PersistentPropertySet();
// XServiceInfo
- XSERVICEINFO_NOFACTORY_DECL()
+ virtual OUString SAL_CALL getImplementationName()
+ throw( css::uno::RuntimeException, std::exception );
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception );
+
+ static OUString getImplementationName_Static();
+ static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
// XComponent
virtual void SAL_CALL
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-14 17:43:13 +0000