summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/hierarchy
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2014-03-04 12:55:07 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2014-03-05 09:29:24 -0600
commit66f2c35fac22a235a1e491824126f105e6d3869c (patch)
tree0d3d10e637346a26cafda20b789d4ad78836cf9e /ucb/source/ucp/hierarchy
parent578bd15399a16b0a32e752e19ae42d989321d731 (diff)
de-macroize XINTERFACE_DECL
Change-Id: Iaa1cf999189f6b62547c208eadc38150400ca0fe Reviewed-on: https://gerrit.libreoffice.org/8454 Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Diffstat (limited to 'ucb/source/ucp/hierarchy')
-rw-r--r--ucb/source/ucp/hierarchy/hierarchycontent.hxx7
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.cxx7
-rw-r--r--ucb/source/ucp/hierarchy/hierarchydatasource.hxx7
-rw-r--r--ucb/source/ucp/hierarchy/hierarchyprovider.hxx7
4 files changed, 24 insertions, 4 deletions
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 69d0f1052dd5..11760b60f9bb 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 f57e0ada7856..5370e6a3b778 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 38489e05ee94..3d4536f3e34b 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 dff3aa942733..c045b9930fa8 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()