diff options
Diffstat (limited to 'sd/source/core')
-rw-r--r-- | sd/source/core/CustomAnimationPreset.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/TransitionPreset.cxx | 2 | ||||
-rw-r--r-- | sd/source/core/stlfamily.cxx | 22 | ||||
-rw-r--r-- | sd/source/core/stlsheet.cxx | 24 |
4 files changed, 25 insertions, 25 deletions
diff --git a/sd/source/core/CustomAnimationPreset.cxx b/sd/source/core/CustomAnimationPreset.cxx index a4b2a2dd7..d5dee6be3 100644 --- a/sd/source/core/CustomAnimationPreset.cxx +++ b/sd/source/core/CustomAnimationPreset.cxx @@ -614,7 +614,7 @@ const CustomAnimationPresets& CustomAnimationPresets::getCustomAnimationPresets( { if( !mpCustomAnimationPresets ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( !mpCustomAnimationPresets ) { diff --git a/sd/source/core/TransitionPreset.cxx b/sd/source/core/TransitionPreset.cxx index 2e9a1f9dd..f942b4f28 100644 --- a/sd/source/core/TransitionPreset.cxx +++ b/sd/source/core/TransitionPreset.cxx @@ -232,7 +232,7 @@ const TransitionPresetList& TransitionPreset::getTransitionPresetList() { if( !mpTransitionPresetList ) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( !mpTransitionPresetList ) { mpTransitionPresetList = new sd::TransitionPresetList(); diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index 8b97ce2a5..9b1156763 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -245,7 +245,7 @@ void SAL_CALL SdStyleFamily::setName( const ::rtl::OUString& ) throw (RuntimeExc Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); return Any( Reference< XStyle >( static_cast<SfxUnoStyleSheet*>(GetSheetByName( rName )) ) ); } @@ -254,7 +254,7 @@ Any SAL_CALL SdStyleFamily::getByName( const OUString& rName ) throw(NoSuchEleme Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); @@ -301,7 +301,7 @@ Sequence< OUString > SAL_CALL SdStyleFamily::getElementNames() throw(RuntimeExce sal_Bool SAL_CALL SdStyleFamily::hasByName( const OUString& aName ) throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); if( aName.getLength() ) @@ -340,7 +340,7 @@ Type SAL_CALL SdStyleFamily::getElementType() throw(RuntimeException) sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); if( mnFamily == SD_STYLE_FAMILY_MASTERPAGE ) @@ -367,7 +367,7 @@ sal_Bool SAL_CALL SdStyleFamily::hasElements() throw(RuntimeException) sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); sal_Int32 nCount = 0; @@ -393,7 +393,7 @@ sal_Int32 SAL_CALL SdStyleFamily::getCount() throw(RuntimeException) Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); if( Index >= 0 ) @@ -435,7 +435,7 @@ Any SAL_CALL SdStyleFamily::getByIndex( sal_Int32 Index ) throw(IndexOutOfBounds void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); if(rName.getLength() == 0) @@ -453,7 +453,7 @@ void SAL_CALL SdStyleFamily::insertByName( const OUString& rName, const Any& rEl void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); SdStyleSheet* pStyle = GetSheetByName( rName ); @@ -470,7 +470,7 @@ void SAL_CALL SdStyleFamily::removeByName( const OUString& rName ) throw(NoSuchE void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); SdStyleSheet* pOldStyle = GetSheetByName( rName ); @@ -486,7 +486,7 @@ void SAL_CALL SdStyleFamily::replaceByName( const OUString& rName, const Any& aE Reference< XInterface > SAL_CALL SdStyleFamily::createInstance() throw(Exception, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); if( mnFamily == SD_STYLE_FAMILY_MASTERPAGE ) @@ -557,7 +557,7 @@ Any SdStyleFamily::getPropertyValue( const OUString& PropertyName ) throw (Unkno { if (PropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") )) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; OUString sDisplayName; switch( mnFamily ) { diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx index 6530808ce..4d47b0094 100644 --- a/sd/source/core/stlsheet.cxx +++ b/sd/source/core/stlsheet.cxx @@ -993,7 +993,7 @@ Sequence< OUString > SAL_CALL SdStyleSheet::getSupportedServiceNames() throw(Run OUString SAL_CALL SdStyleSheet::getName() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); return GetApiName(); } @@ -1002,7 +1002,7 @@ OUString SAL_CALL SdStyleSheet::getName() throw(RuntimeException) void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); if( IsUserDefined() ) { @@ -1020,7 +1020,7 @@ void SAL_CALL SdStyleSheet::setName( const OUString& rName ) throw(RuntimeExcep sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); return IsUserDefined() ? sal_True : sal_False; } @@ -1029,7 +1029,7 @@ sal_Bool SAL_CALL SdStyleSheet::isUserDefined() throw(RuntimeException) sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); return IsUsed() ? sal_True : sal_False; } @@ -1038,7 +1038,7 @@ sal_Bool SAL_CALL SdStyleSheet::isInUse() throw(RuntimeException) OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); if( GetParent().Len() ) @@ -1054,7 +1054,7 @@ OUString SAL_CALL SdStyleSheet::getParentStyle() throw(RuntimeException) void SAL_CALL SdStyleSheet::setParentStyle( const OUString& rParentName ) throw(NoSuchElementException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); if( IsUserDefined() ) @@ -1099,7 +1099,7 @@ Reference< XPropertySetInfo > SdStyleSheet::getPropertySetInfo() throw(RuntimeEx void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); const SfxItemPropertySimpleEntry* pEntry = getPropertyMapEntry( aPropertyName ); @@ -1180,7 +1180,7 @@ void SAL_CALL SdStyleSheet::setPropertyValue( const OUString& aPropertyName, con Any SAL_CALL SdStyleSheet::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); @@ -1282,7 +1282,7 @@ void SAL_CALL SdStyleSheet::removeVetoableChangeListener( const OUString& , cons PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); @@ -1363,7 +1363,7 @@ PropertyState SAL_CALL SdStyleSheet::getPropertyState( const OUString& PropertyN Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); @@ -1383,7 +1383,7 @@ Sequence< PropertyState > SAL_CALL SdStyleSheet::getPropertyStates( const Sequen void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); @@ -1409,7 +1409,7 @@ void SAL_CALL SdStyleSheet::setPropertyToDefault( const OUString& PropertyName ) Any SAL_CALL SdStyleSheet::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; throwIfDisposed(); |