summaryrefslogtreecommitdiffstats
path: root/UnoControls/source/controls/statusindicator.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'UnoControls/source/controls/statusindicator.cxx')
-rw-r--r--UnoControls/source/controls/statusindicator.cxx28
1 files changed, 5 insertions, 23 deletions
diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx
index 9d3f714bc2a9..e0c79a936ce7 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -115,30 +115,12 @@ void SAL_CALL StatusIndicator::release() throw()
Sequence< Type > SAL_CALL StatusIndicator::getTypes()
{
- // Optimize this method !
- // We initialize a static variable only one time. And we don't must use a mutex at every call!
- // For the first call; pTypeCollection is NULL - for the second call pTypeCollection is different from NULL!
- static OTypeCollection* pTypeCollection = nullptr;
+ static OTypeCollection ourTypeCollection(
+ cppu::UnoType<XLayoutConstrains>::get(),
+ cppu::UnoType<XStatusIndicator>::get(),
+ BaseContainerControl::getTypes() );
- if ( pTypeCollection == nullptr )
- {
- // Ready for multithreading; get global mutex for first call of this method only! see before
- MutexGuard aGuard( Mutex::getGlobalMutex() );
-
- // Control these pointer again ... it can be, that another instance will be faster then these!
- if ( pTypeCollection == nullptr )
- {
- // Create a static typecollection ...
- static OTypeCollection aTypeCollection ( cppu::UnoType<XLayoutConstrains>::get(),
- cppu::UnoType<XStatusIndicator>::get(),
- BaseContainerControl::getTypes()
- );
- // ... and set his address to static pointer!
- pTypeCollection = &aTypeCollection;
- }
- }
-
- return pTypeCollection->getTypes();
+ return ourTypeCollection.getTypes();
}
// XAggregation