include/ucbhelper/activedatasink.hxx | 9 +++++--
include/ucbhelper/activedatastreamer.hxx | 9 +++++--
include/ucbhelper/commandenvironment.hxx | 7 +++++
include/ucbhelper/contenthelper.hxx | 7 +++++
include/ucbhelper/contentinfo.hxx | 14 ++++++++++-
include/ucbhelper/macros.hxx | 17 --------------
include/ucbhelper/propertyvalueset.hxx | 7 +++++
include/ucbhelper/providerhelper.hxx | 10 +++++---
include/ucbhelper/resultset.hxx | 7 +++++
include/ucbhelper/resultsethelper.hxx | 7 +++++
include/ucbhelper/resultsetmetadata.hxx | 7 +++++
ucb/source/cacher/cachedcontentresultset.cxx | 7 +++++
ucb/source/cacher/cachedcontentresultset.hxx | 18 +++++++++++----
ucb/source/cacher/cachedcontentresultsetstub.hxx | 18 +++++++++++----
ucb/source/cacher/cacheddynamicresultset.hxx | 19 +++++++++++-----
ucb/source/cacher/cacheddynamicresultsetstub.hxx | 20 +++++++++++------
ucb/source/cacher/contentresultsetwrapper.hxx | 9 +++++--
ucb/source/cacher/dynamicresultsetwrapper.hxx | 9 +++++--
ucb/source/core/identify.hxx | 7 +++++
ucb/source/core/provprox.hxx | 14 ++++++++++-
ucb/source/core/ucb.hxx | 7 +++++
ucb/source/core/ucbprops.hxx | 7 +++++
ucb/source/core/ucbstore.cxx | 7 +++++
ucb/source/core/ucbstore.hxx | 21 +++++++++++++++--
ucb/source/sorter/sortdynres.hxx | 27 +++++++++++++++--------
ucb/source/sorter/sortresult.cxx | 7 +++++
ucb/source/sorter/sortresult.hxx | 7 +++++
ucb/source/ucp/cmis/cmis_content.hxx | 8 +++++-
ucb/source/ucp/cmis/cmis_provider.hxx | 7 +++++
ucb/source/ucp/cmis/cmis_repo_content.hxx | 8 +++++-
ucb/source/ucp/ftp/ftpcontent.hxx | 7 +++++
ucb/source/ucp/ftp/ftpcontentprovider.hxx | 7 +++++
ucb/source/ucp/gio/gio_content.hxx | 8 +++++-
ucb/source/ucp/gio/gio_provider.hxx | 7 +++++
ucb/source/ucp/gvfs/gvfs_content.hxx | 7 +++++
ucb/source/ucp/gvfs/gvfs_provider.hxx | 7 +++++
ucb/source/ucp/hierarchy/hierarchycontent.hxx | 7 +++++
ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 7 +++++
ucb/source/ucp/hierarchy/hierarchydatasource.hxx | 7 +++++
ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 7 +++++
ucb/source/ucp/package/pkgcontent.hxx | 7 +++++
ucb/source/ucp/package/pkgprovider.hxx | 7 +++++
ucb/source/ucp/tdoc/tdoc_content.hxx | 7 +++++
ucb/source/ucp/tdoc/tdoc_provider.hxx | 7 +++++
ucb/source/ucp/webdav-neon/webdavcontent.hxx | 7 +++++
ucb/source/ucp/webdav-neon/webdavprovider.hxx | 7 +++++
ucb/source/ucp/webdav/webdavcontent.hxx | 7 +++++
ucb/source/ucp/webdav/webdavprovider.hxx | 7 +++++
ucbhelper/source/client/content.cxx | 7 +++++
ucbhelper/source/provider/resultset.cxx | 7 +++++
xmlhelp/source/cxxhelp/provider/content.hxx | 7 +++++
xmlhelp/source/cxxhelp/provider/provider.hxx | 7 +++++
52 files changed, 375 insertions(+), 108 deletions(-)
New commits:
commit 66f2c35fac22a235a1e491824126f105e6d3869c
Author: Norbert Thiebaud <nthieb...@gmail.com>
Date: Tue Mar 4 12:55:07 2014 -0600
de-macroize XINTERFACE_DECL
Change-Id: Iaa1cf999189f6b62547c208eadc38150400ca0fe
Reviewed-on: https://gerrit.libreoffice.org/8454
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
Tested-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/include/ucbhelper/activedatasink.hxx
b/include/ucbhelper/activedatasink.hxx
index deaf6ac..5adf7be 100644
--- a/include/ucbhelper/activedatasink.hxx
+++ b/include/ucbhelper/activedatasink.hxx
@@ -45,8 +45,13 @@ class UCBHELPER_DLLPUBLIC ActiveDataSink : public
cppu::OWeakObject,
com::sun::star::io::XInputStream > m_xStream;
public:
- // XInterface
- XINTERFACE_DECL()
+ // XInterface
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/activedatastreamer.hxx
b/include/ucbhelper/activedatastreamer.hxx
index 799f7ee..0c1af6a 100644
--- a/include/ucbhelper/activedatastreamer.hxx
+++ b/include/ucbhelper/activedatastreamer.hxx
@@ -44,8 +44,13 @@ class ActiveDataStreamer : public cppu::OWeakObject,
com::sun::star::io::XStream > m_xStream;
public:
- // XInterface
- XINTERFACE_DECL()
+ // XInterface
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/commandenvironment.hxx
b/include/ucbhelper/commandenvironment.hxx
index 1c9ce54..9a6ad0b 100644
--- a/include/ucbhelper/commandenvironment.hxx
+++ b/include/ucbhelper/commandenvironment.hxx
@@ -70,7 +70,12 @@ public:
virtual ~CommandEnvironment();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/contenthelper.hxx
b/include/ucbhelper/contenthelper.hxx
index e1318eb..674a49a 100644
--- a/include/ucbhelper/contenthelper.hxx
+++ b/include/ucbhelper/contenthelper.hxx
@@ -324,7 +324,12 @@ public:
virtual ~ContentImplHelper();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/contentinfo.hxx
b/include/ucbhelper/contentinfo.hxx
index fbaa877..212c22e 100644
--- a/include/ucbhelper/contentinfo.hxx
+++ b/include/ucbhelper/contentinfo.hxx
@@ -68,7 +68,12 @@ public:
virtual ~PropertySetInfo();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
@@ -126,7 +131,12 @@ public:
virtual ~CommandProcessorInfo();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx
index e8b8cee..c6f31a6 100644
--- a/include/ucbhelper/macros.hxx
+++ b/include/ucbhelper/macros.hxx
@@ -37,23 +37,6 @@
-// XInterface decl.
-
-
-
-#define XINTERFACE_DECL() \
- virtual com::sun::star::uno::Any SAL_CALL \
- queryInterface( const com::sun::star::uno::Type & rType ) \
- throw( com::sun::star::uno::RuntimeException, std::exception ); \
- virtual void SAL_CALL \
- acquire() \
- throw(); \
- virtual void SAL_CALL \
- release() \
- throw();
-
-
-
// XInterface impl. internals.
diff --git a/include/ucbhelper/propertyvalueset.hxx
b/include/ucbhelper/propertyvalueset.hxx
index 1a65aba..e2c6ed5 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -79,7 +79,12 @@ public:
virtual ~PropertyValueSet();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/providerhelper.hxx
b/include/ucbhelper/providerhelper.hxx
index 88c1118..908e91c 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -142,10 +142,12 @@ public:
// XInterface
-
-
- XINTERFACE_DECL()
-
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 67e86b6..4d3a43d 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -108,7 +108,12 @@ public:
virtual ~ResultSet();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/resultsethelper.hxx
b/include/ucbhelper/resultsethelper.hxx
index 60dbbcf..ed8ae97 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -135,7 +135,12 @@ public:
virtual ~ResultSetImplHelper();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/include/ucbhelper/resultsetmetadata.hxx
b/include/ucbhelper/resultsetmetadata.hxx
index d663b38..72d4af4 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -194,7 +194,12 @@ public:
virtual ~ResultSetMetaData();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx
b/ucb/source/cacher/cachedcontentresultset.cxx
index 37cb74e..311e2bc 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -411,7 +411,12 @@ public:
virtual ~CCRS_PropertySetInfo();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx
b/ucb/source/cacher/cachedcontentresultset.hxx
index a18a688..32b9665 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -199,9 +199,13 @@ public:
virtual ~CachedContentResultSet();
- // XInterface inherited
-
- XINTERFACE_DECL()
+ // XInterface
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
@@ -489,8 +493,12 @@ public:
// XInterface
- XINTERFACE_DECL()
-
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx
b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 70fe3e3..22b32bf 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -96,9 +96,13 @@ public:
- // XInterface inherited
-
- XINTERFACE_DECL()
+ // XInterface
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// own inherited
@@ -169,8 +173,12 @@ public:
// XInterface
- XINTERFACE_DECL()
-
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx
b/ucb/source/cacher/cacheddynamicresultset.hxx
index 93c4fa0..39d5bdd 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -56,10 +56,13 @@ public:
virtual ~CachedDynamicResultSet();
-
- // XInterface inherited
-
- XINTERFACE_DECL()
+ // XInterface
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
@@ -99,8 +102,12 @@ public:
// XInterface
- XINTERFACE_DECL()
-
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index f7777ad..bcf92ac 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -50,10 +50,13 @@ public:
virtual ~CachedDynamicResultSetStub();
-
- // XInterface inherited
-
- XINTERFACE_DECL()
+ // XInterface
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
@@ -84,10 +87,13 @@ public:
virtual ~CachedDynamicResultSetStubFactory();
-
// XInterface
- XINTERFACE_DECL()
-
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx
b/ucb/source/cacher/contentresultsetwrapper.hxx
index 143a963..1aeb56e 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -529,9 +529,12 @@ public:
// XInterface
-
- XINTERFACE_DECL()
-
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
//XEventListener
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx
b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index a5c695c..a8dfd2a 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -193,9 +193,12 @@ public:
// XInterface
-
- XINTERFACE_DECL()
-
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XEventListener ( base of XDynamicResultSetListener )
diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index a7bfec4..dae7402 100644
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
@@ -39,7 +39,12 @@ public:
virtual ~ContentIdentifier();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index 842375a..dd9faba 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -60,7 +60,12 @@ public:
virtual ~UcbContentProviderProxyFactory();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
@@ -111,7 +116,12 @@ public:
virtual ~UcbContentProviderProxy();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index d702a76..e2f7de8 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -66,7 +66,12 @@ public:
virtual ~UniversalContentBroker();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index 853a4c7..2723d9e 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -59,7 +59,12 @@ public:
virtual ~UcbPropertiesManager();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index be2e6dd..3bbd924 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -133,7 +133,12 @@ public:
virtual ~PropertySetInfo_Impl();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index 929466c..50a8fd5 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -64,7 +64,12 @@ public:
virtual ~UcbStore();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
@@ -126,7 +131,12 @@ public:
virtual ~PropertySetRegistry();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
@@ -205,7 +215,12 @@ public:
virtual ~PersistentPropertySet();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index a6c3d7e..dc459c3 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -89,9 +89,12 @@ public:
// XInterface
-
- XINTERFACE_DECL()
-
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
@@ -165,9 +168,12 @@ public:
// XInterface
-
- XINTERFACE_DECL()
-
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XEventListener ( base of XDynamicResultSetListener )
@@ -208,9 +214,12 @@ public:
// XInterface
-
- XINTERFACE_DECL()
-
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx
index e6616db..bbeec37 100644
--- a/ucb/source/sorter/sortresult.cxx
+++ b/ucb/source/sorter/sortresult.cxx
@@ -104,7 +104,12 @@ public:
virtual ~SRSPropertySetInfo();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 4916050..24bb1c8 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -192,7 +192,12 @@ public:
void ResortNew( EventList* pList );
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx
b/ucb/source/ucp/cmis/cmis_content.hxx
index 1fee368..26a4975a 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -157,7 +157,13 @@ public:
virtual OUString getParentURL();
- XINTERFACE_DECL()
+ // XInterface
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx
b/ucb/source/ucp/cmis/cmis_provider.hxx
index fd23cac..83c4d44 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -28,7 +28,12 @@ public:
virtual ~ContentProvider();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx
b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 68118e4..1fee7de 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -92,7 +92,13 @@ public:
virtual OUString getParentURL();
- XINTERFACE_DECL()
+ // XInterface
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx
b/ucb/source/ucp/ftp/ftpcontent.hxx
index e797cb2..0cf88a9 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -69,7 +69,12 @@ namespace ftp
virtual ~FTPContent();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index ade75ef..565a79b 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -60,7 +60,12 @@ namespace ftp {
~FTPContentProvider();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/gio/gio_content.hxx
b/ucb/source/ucp/gio/gio_content.hxx
index f55716b..ea4b3e5 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -146,7 +146,13 @@ public:
virtual OUString getParentURL();
- XINTERFACE_DECL()
+ // XInterface
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/gio/gio_provider.hxx
b/ucb/source/ucp/gio/gio_provider.hxx
index c4c6124..86e39a0 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -36,7 +36,12 @@ public:
virtual ~ContentProvider();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx
b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 495bbfa..6284009 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.hxx
@@ -200,7 +200,12 @@ public:
virtual ~Content();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.hxx
b/ucb/source/ucp/gvfs/gvfs_provider.hxx
index 8ff142c..f2b2c2b 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.hxx
@@ -33,7 +33,12 @@ public:
virtual ~ContentProvider();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 69d0f10..11760b6 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -235,7 +235,12 @@ public:
virtual ~HierarchyContent();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
index f57e0ad..5370e6a 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx
@@ -100,7 +100,12 @@ public:
virtual ~HierarchyDataAccess();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XServiceInfo
XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index 38489e0..3d4536f 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -55,7 +55,12 @@ public:
virtual ~HierarchyDataSource();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XServiceInfo
XSERVICEINFO_DECL()
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index dff3aa9..c045b99 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -105,7 +105,12 @@ public:
virtual ~HierarchyContentProvider();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/package/pkgcontent.hxx
b/ucb/source/ucp/package/pkgcontent.hxx
index f67581e..4661ef5 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -255,7 +255,12 @@ public:
virtual ~Content();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/package/pkgprovider.hxx
b/ucb/source/ucp/package/pkgprovider.hxx
index ebab555..49283ed 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -61,7 +61,12 @@ public:
virtual ~ContentProvider();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx
b/ucb/source/ucp/tdoc/tdoc_content.hxx
index e731317..35195e7 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -261,7 +261,12 @@ public:
virtual ~Content();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx
b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 465aa6b..8c6fb7d 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -68,7 +68,12 @@ public:
virtual ~ContentProvider();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
index b729073..e7d7917 100644
--- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx
@@ -239,7 +239,12 @@ public:
virtual ~Content();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx
b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
index 6638637..45c142b 100644
--- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx
@@ -89,7 +89,12 @@ public:
virtual ~ContentProvider();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx
b/ucb/source/ucp/webdav/webdavcontent.hxx
index 1438f93..807d1f9 100644
--- a/ucb/source/ucp/webdav/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav/webdavcontent.hxx
@@ -225,7 +225,12 @@ public:
virtual ~Content();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx
b/ucb/source/ucp/webdav/webdavprovider.hxx
index 52148ec..5cfcb69 100644
--- a/ucb/source/ucp/webdav/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav/webdavprovider.hxx
@@ -77,7 +77,12 @@ public:
virtual ~ContentProvider();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/ucbhelper/source/client/content.cxx
b/ucbhelper/source/client/content.cxx
index e1ef0bb..2cffd34 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -143,7 +143,12 @@ public:
: m_rContent( rContent ) {}
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XContentEventListener
virtual void SAL_CALL contentEvent( const ContentEvent& evt )
diff --git a/ucbhelper/source/provider/resultset.cxx
b/ucbhelper/source/provider/resultset.cxx
index 3b8c907..6202e4c 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.cxx
@@ -99,7 +99,12 @@ public:
virtual ~PropertySetInfo();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/xmlhelp/source/cxxhelp/provider/content.hxx
b/xmlhelp/source/cxxhelp/provider/content.hxx
index 25f0ef1..85919d1 100644
--- a/xmlhelp/source/cxxhelp/provider/content.hxx
+++ b/xmlhelp/source/cxxhelp/provider/content.hxx
@@ -65,7 +65,12 @@ namespace chelp
virtual ~Content();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx
b/xmlhelp/source/cxxhelp/provider/provider.hxx
index 5e84122..d31b3d5 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -61,7 +61,12 @@ namespace chelp {
virtual ~ContentProvider();
// XInterface
- XINTERFACE_DECL()
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type &
rType )
+ throw( css::uno::RuntimeException, std::exception );
+ virtual void SAL_CALL acquire()
+ throw();
+ virtual void SAL_CALL release()
+ throw();
// XTypeProvider
XTYPEPROVIDER_DECL()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
