summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-10 14:31:21 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-10 17:39:55 +0100
commitc7f1ce594c641698e8ed8fc99f029030978f91e1 (patch)
tree924dc417a8d635ad3fb95023631eb6c6a3b9cc8a /extensions
parentc63ba20f2a591c50c3cee0bb5a2e1e8665e3e159 (diff)
extensions: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I234d36bc7ef9e8e27087067f6e43d7e522e52d4d
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/abpilot/unodialogabp.cxx12
-rw-r--r--extensions/source/dbpilots/unoautopilot.inl3
-rw-r--r--extensions/source/ole/servprov.cxx12
-rw-r--r--extensions/source/propctrlr/MasterDetailLinkDialog.cxx3
-rw-r--r--extensions/source/propctrlr/controlfontdialog.cxx3
-rw-r--r--extensions/source/propctrlr/pcrunodialogs.cxx3
6 files changed, 6 insertions, 30 deletions
diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx
index a69131a648e1..f3e3bd5dadcb 100644
--- a/extensions/source/abpilot/unodialogabp.cxx
+++ b/extensions/source/abpilot/unodialogabp.cxx
@@ -83,17 +83,7 @@ namespace abp
Sequence<sal_Int8> SAL_CALL OABSPilotUno::getImplementationId( ) throw(RuntimeException, std::exception)
{
- static ::cppu::OImplementationId* s_pId;
- if ( !s_pId )
- {
- ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
- if ( !s_pId )
- {
- static ::cppu::OImplementationId s_aId;
- s_pId = &s_aId;
- }
- }
- return s_pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl
index a602fe3fc577..c79254bd377e 100644
--- a/extensions/source/dbpilots/unoautopilot.inl
+++ b/extensions/source/dbpilots/unoautopilot.inl
@@ -32,8 +32,7 @@ OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Ref
template <class TYPE, class SERVICEINFO>
::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception)
{
- static ::cppu::OImplementationId aId;
- return aId.getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 6c9ba8cb8418..e650b2ed7c36 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -653,17 +653,7 @@ Sequence< Type > SAL_CALL OleServer_Impl::getTypes( ) throw(RuntimeException)
}
Sequence< sal_Int8 > SAL_CALL OleServer_Impl::getImplementationId() throw(RuntimeException)
{
- static OImplementationId *pId = 0;
- if( ! pId )
- {
- MutexGuard guard( Mutex::getGlobalMutex() );
- if( ! pId )
- {
- static OImplementationId id( false );
- pId = &id;
- }
- }
- return (*pId).getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
index 28a4f0be52f2..3f50b2efde26 100644
--- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
+++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx
@@ -45,8 +45,7 @@ namespace pcr
Sequence<sal_Int8> SAL_CALL MasterDetailLinkDialog::getImplementationId( ) throw(RuntimeException, std::exception)
{
- static ::cppu::OImplementationId aId;
- return aId.getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index 210ef9c807f9..603bccdacadc 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -67,8 +67,7 @@ namespace pcr
Sequence<sal_Int8> SAL_CALL OControlFontDialog::getImplementationId( ) throw(RuntimeException, std::exception)
{
- static ::cppu::OImplementationId aId;
- return aId.getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx
index 2e3d4d234b0e..4f60af8f50ed 100644
--- a/extensions/source/propctrlr/pcrunodialogs.cxx
+++ b/extensions/source/propctrlr/pcrunodialogs.cxx
@@ -71,8 +71,7 @@ namespace pcr
Sequence<sal_Int8> SAL_CALL OTabOrderDialog::getImplementationId( ) throw(RuntimeException, std::exception)
{
- static ::cppu::OImplementationId aId;
- return aId.getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}