summaryrefslogtreecommitdiff
path: root/dbaccess/source/ui/browser
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-10 13:08:29 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-10 17:39:54 +0100
commit2f3be987324f0ca3c3b4c9b167b6d76b6e1d5612 (patch)
treec41e23876a7fe46d2f290474a85c27866fa75e21 /dbaccess/source/ui/browser
parent3aaaab3db773148e246f6fa48da0da4c755b65a9 (diff)
dbaccess: simplify deprecated XTypeProvider.getImplementationId
Required some clean-up of getImplementationId vs. getUnoTunnelImplementationId confusion. Change-Id: I645dd80d24efe7ed5224b220911eed8ad880b7c0
Diffstat (limited to 'dbaccess/source/ui/browser')
-rw-r--r--dbaccess/source/ui/browser/brwctrlr.cxx13
-rw-r--r--dbaccess/source/ui/browser/formadapter.cxx12
-rw-r--r--dbaccess/source/ui/browser/sbagrid.cxx12
-rw-r--r--dbaccess/source/ui/browser/unodatbr.cxx12
4 files changed, 4 insertions, 45 deletions
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 2f13b0867f66..b52472d1c205 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -515,18 +515,7 @@ Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes( ) throw (Runtime
Sequence< sal_Int8 > SAL_CALL SbaXDataBrowserController::getImplementationId( ) throw (RuntimeException, std::exception)
{
- SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getImplementationId" );
- static ::cppu::OImplementationId * pId = 0;
- if (! pId)
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if (! pId)
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
Any SAL_CALL SbaXDataBrowserController::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
diff --git a/dbaccess/source/ui/browser/formadapter.cxx b/dbaccess/source/ui/browser/formadapter.cxx
index ddf391759e3b..53f0b282703f 100644
--- a/dbaccess/source/ui/browser/formadapter.cxx
+++ b/dbaccess/source/ui/browser/formadapter.cxx
@@ -72,17 +72,7 @@ Sequence< Type > SAL_CALL SbaXFormAdapter::getTypes( ) throw (RuntimeException,
Sequence< sal_Int8 > SAL_CALL SbaXFormAdapter::getImplementationId( ) throw (RuntimeException, std::exception)
{
- static ::cppu::OImplementationId * pId = 0;
- if (! pId)
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if (! pId)
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
Any SAL_CALL SbaXFormAdapter::queryInterface(const Type& _rType) throw (RuntimeException, std::exception)
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 83d21fea74bc..11dbe6ef06b9 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -187,17 +187,7 @@ Sequence< Type > SAL_CALL SbaXGridControl::getTypes( ) throw (RuntimeException,
Sequence< sal_Int8 > SAL_CALL SbaXGridControl::getImplementationId( ) throw (RuntimeException, std::exception)
{
- static ::cppu::OImplementationId * pId = 0;
- if (! pId)
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if (! pId)
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
void SAL_CALL SbaXGridControl::createPeer(const Reference< ::com::sun::star::awt::XToolkit > & rToolkit, const Reference< ::com::sun::star::awt::XWindowPeer > & rParentPeer) throw( RuntimeException, std::exception )
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 0a439b14be61..2a332e24e450 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -276,17 +276,7 @@ Sequence< Type > SAL_CALL SbaTableQueryBrowser::getTypes( ) throw (RuntimeExcep
Sequence< sal_Int8 > SAL_CALL SbaTableQueryBrowser::getImplementationId( ) throw (RuntimeException, std::exception)
{
- static ::cppu::OImplementationId * pId = 0;
- if (! pId)
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if (! pId)
- {
- static ::cppu::OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
void SAL_CALL SbaTableQueryBrowser::disposing()