summaryrefslogtreecommitdiff
path: root/svx/source/accessibility
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-03-10 16:15:26 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-03-10 17:39:59 +0100
commit3b0b4ac5fc16a5f5568dd4da63818723b6d1d6fd (patch)
treea4e997e80b83d4e9a5c1767f5af285eea2acf781 /svx/source/accessibility
parent62fae8bda81508828cca4ed8d2911961ce1971a4 (diff)
svx: simplify deprecated XTypeProvider.getImplementationId
Change-Id: I520563a98c1285fed97174d2aaedfdd042ca699f
Diffstat (limited to 'svx/source/accessibility')
-rw-r--r--svx/source/accessibility/GraphCtlAccessibleContext.cxx23
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx29
2 files changed, 3 insertions, 49 deletions
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index c5951c5335a6..ef06ecdc32a1 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -581,8 +581,7 @@ Sequence< OUString > SAL_CALL SvxGraphCtrlAccessibleContext::getSupportedService
//===== XTypeProvider =======================================================
Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception )
{
- ::SolarMutexGuard aGuard;
- return getUniqueId();
+ return css::uno::Sequence<sal_Int8>();
}
//===== XServiceName ========================================================
@@ -829,26 +828,6 @@ Rectangle SvxGraphCtrlAccessibleContext::GetBoundingBox( void ) throw( RuntimeEx
return aBounds;
}
-
-
-Sequence< sal_Int8 > SvxGraphCtrlAccessibleContext::getUniqueId( void )
-{
- // no guard because it's private -> has to guarded when using it!
- static OImplementationId* pId = 0;
- if( !pId )
- {
- ::SolarMutexGuard aGuard;
- if( !pId)
- {
- static OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
-}
-
-
-
void SvxGraphCtrlAccessibleContext::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
{
const SdrHint* pSdrHint = PTR_CAST( SdrHint, &rHint );
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index f783ac680883..56ac207ada69 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -543,7 +543,7 @@ Sequence< OUString > SAL_CALL SvxRectCtlAccessibleContext::getSupportedServiceNa
Sequence< sal_Int8 > SAL_CALL SvxRectCtlAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception )
{
- return getUniqueId();
+ return css::uno::Sequence<sal_Int8>();
}
//===== XAccessibleSelection =============================================
@@ -761,21 +761,6 @@ Rectangle SvxRectCtlAccessibleContext::GetBoundingBox( void ) throw( RuntimeExce
return Rectangle( mpRepr->GetPosPixel(), mpRepr->GetSizePixel() );
}
-Sequence< sal_Int8 > SvxRectCtlAccessibleContext::getUniqueId( void )
-{
- static OImplementationId* pId = 0;
- if( !pId )
- {
- MutexGuard aGuard( Mutex::getGlobalMutex() );
- if( !pId)
- {
- static OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
-}
-
void SvxRectCtlAccessibleContext::ThrowExceptionIfNotAlive( void ) throw( lang::DisposedException )
{
if( IsNotAlive() )
@@ -1154,17 +1139,7 @@ Sequence< OUString > SAL_CALL SvxRectCtlChildAccessibleContext::getSupportedServ
//===== XTypeProvider =======================================================
Sequence< sal_Int8 > SAL_CALL SvxRectCtlChildAccessibleContext::getImplementationId( void ) throw( RuntimeException, std::exception )
{
- static OImplementationId* pId = 0;
- if( !pId )
- {
- MutexGuard aGuard( Mutex::getGlobalMutex() );
- if( !pId)
- {
- static OImplementationId aId;
- pId = &aId;
- }
- }
- return pId->getImplementationId();
+ return css::uno::Sequence<sal_Int8>();
}
//===== internal ============================================================