diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-13 01:44:10 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-10-25 19:56:03 -0500 |
| commit | c561a3ed9bb98090ad46860e99818b7499ee760e (patch) | |
| tree | 45d5716b8b48d8f9d00a773c47ed6728123ff52f | |
| parent | 6978f3bb31b522fac22cf6e3abebab8681a1db0c (diff) | |
use SolarMutexGuard to guard the SolarMutex
70 files changed, 1014 insertions, 1014 deletions
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index 487b67693a..6808371125 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -186,7 +186,7 @@ void SmGraphicAccessible::LaunchEvent( uno::Reference< XAccessibleContext > SAL_CALL SmGraphicAccessible::getAccessibleContext() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return this; } @@ -196,7 +196,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::containsPoint( const awt::Point& aPoint ) //! the arguments coordinates are relativ to the current window ! //! Thus the top-left point is (0, 0) - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); @@ -209,7 +209,7 @@ uno::Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleAtPoint const awt::Point& aPoint ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; XAccessible *pRes = 0; if (containsPoint( aPoint )) pRes = this; @@ -219,7 +219,7 @@ uno::Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleAtPoint awt::Rectangle SAL_CALL SmGraphicAccessible::getBounds() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); OSL_ENSURE(pWin->GetParent()->GetAccessible() == getAccessibleParent(), @@ -230,7 +230,7 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getBounds() awt::Point SAL_CALL SmGraphicAccessible::getLocation() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); OSL_ENSURE(pWin->GetParent()->GetAccessible() == getAccessibleParent(), @@ -242,7 +242,7 @@ awt::Point SAL_CALL SmGraphicAccessible::getLocation() awt::Point SAL_CALL SmGraphicAccessible::getLocationOnScreen() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); OSL_ENSURE(pWin->GetParent()->GetAccessible() == getAccessibleParent(), @@ -253,7 +253,7 @@ awt::Point SAL_CALL SmGraphicAccessible::getLocationOnScreen() awt::Size SAL_CALL SmGraphicAccessible::getSize() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); OSL_ENSURE(pWin->GetParent()->GetAccessible() == getAccessibleParent(), @@ -271,7 +271,7 @@ awt::Size SAL_CALL SmGraphicAccessible::getSize() void SAL_CALL SmGraphicAccessible::grabFocus() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); @@ -281,7 +281,7 @@ void SAL_CALL SmGraphicAccessible::grabFocus() sal_Int32 SAL_CALL SmGraphicAccessible::getForeground() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); @@ -291,7 +291,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getForeground() sal_Int32 SAL_CALL SmGraphicAccessible::getBackground() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); @@ -307,7 +307,7 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getBackground() sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleChildCount() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return 0; } @@ -315,14 +315,14 @@ Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleChild( sal_Int32 /*i*/ ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; throw IndexOutOfBoundsException(); // there is no child... } Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleParent() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); @@ -334,7 +334,7 @@ Reference< XAccessible > SAL_CALL SmGraphicAccessible::getAccessibleParent() sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nIdx = -1; Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; if (pAccParent) @@ -350,14 +350,14 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent() sal_Int16 SAL_CALL SmGraphicAccessible::getAccessibleRole() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return AccessibleRole::DOCUMENT; } OUString SAL_CALL SmGraphicAccessible::getAccessibleDescription() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SmDocShell *pDoc = GetDoc_Impl(); return pDoc ? OUString(pDoc->GetText()) : OUString(); } @@ -365,14 +365,14 @@ OUString SAL_CALL SmGraphicAccessible::getAccessibleDescription() OUString SAL_CALL SmGraphicAccessible::getAccessibleName() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return aAccName; } Reference< XAccessibleRelationSet > SAL_CALL SmGraphicAccessible::getAccessibleRelationSet() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< XAccessibleRelationSet > xRelSet = new utl::AccessibleRelationSetHelper(); return xRelSet; // empty relation set } @@ -380,7 +380,7 @@ Reference< XAccessibleRelationSet > SAL_CALL SmGraphicAccessible::getAccessibleR Reference< XAccessibleStateSet > SAL_CALL SmGraphicAccessible::getAccessibleStateSet() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ::utl::AccessibleStateSetHelper *pStateSet = new ::utl::AccessibleStateSetHelper; @@ -410,7 +410,7 @@ Reference< XAccessibleStateSet > SAL_CALL SmGraphicAccessible::getAccessibleStat Locale SAL_CALL SmGraphicAccessible::getLocale() throw (IllegalAccessibleComponentStateException, RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // should be the document language... // We use the language of the localized symbol names here. return Application::GetSettings().GetUILocale(); @@ -423,7 +423,7 @@ void SAL_CALL SmGraphicAccessible::addEventListener( { if (xListener.is()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (pWin) { if (!nClientId) @@ -439,7 +439,7 @@ void SAL_CALL SmGraphicAccessible::removeEventListener( { if (xListener.is()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( nClientId, xListener ); if ( !nListenerCount ) { @@ -456,7 +456,7 @@ void SAL_CALL SmGraphicAccessible::removeEventListener( sal_Int32 SAL_CALL SmGraphicAccessible::getCaretPosition() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return 0; } @@ -473,7 +473,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::setCaretPosition( sal_Int32 nIndex ) sal_Unicode SAL_CALL SmGraphicAccessible::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; xub_StrLen nIdx = (xub_StrLen) nIndex; String aTxt( GetAccessibleText_Impl() ); @@ -487,7 +487,7 @@ Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttri const uno::Sequence< ::rtl::OUString > & /*rRequestedAttributes*/ ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; INT32 nLen = GetAccessibleText_Impl().Len(); if (!(0 <= nIndex && nIndex < nLen)) throw IndexOutOfBoundsException(); @@ -497,7 +497,7 @@ Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttri awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; awt::Rectangle aRes; @@ -571,14 +571,14 @@ awt::Rectangle SAL_CALL SmGraphicAccessible::getCharacterBounds( sal_Int32 nInde sal_Int32 SAL_CALL SmGraphicAccessible::getCharacterCount() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return GetAccessibleText_Impl().Len(); } sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nRes = -1; if (pWin) @@ -644,21 +644,21 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getIndexAtPoint( const awt::Point& aPoin OUString SAL_CALL SmGraphicAccessible::getSelectedText() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return OUString(); } sal_Int32 SAL_CALL SmGraphicAccessible::getSelectionStart() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return -1; } sal_Int32 SAL_CALL SmGraphicAccessible::getSelectionEnd() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return -1; } @@ -667,7 +667,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::setSelection( sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; INT32 nLen = GetAccessibleText_Impl().Len(); if (!(0 <= nStartIndex && nStartIndex < nLen) || !(0 <= nEndIndex && nEndIndex < nLen)) @@ -678,7 +678,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::setSelection( OUString SAL_CALL SmGraphicAccessible::getText() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return GetAccessibleText_Impl(); } @@ -691,7 +691,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange( //!! text should be copied exclusive that end index though. And arguments //!! may be switched. - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String aTxt( GetAccessibleText_Impl() ); xub_StrLen nStart = (xub_StrLen) Min(nStartIndex, nEndIndex); xub_StrLen nEnd = (xub_StrLen) Max(nStartIndex, nEndIndex); @@ -703,7 +703,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange( ::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String aTxt( GetAccessibleText_Impl() ); xub_StrLen nIdx = (xub_StrLen) nIndex; //!! nIndex is allowed to be the string length @@ -724,7 +724,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange( ::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String aTxt( GetAccessibleText_Impl() ); xub_StrLen nIdx = (xub_StrLen) nIndex; //!! nIndex is allowed to be the string length @@ -746,7 +746,7 @@ OUString SAL_CALL SmGraphicAccessible::getTextRange( ::com::sun::star::accessibility::TextSegment SAL_CALL SmGraphicAccessible::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String aTxt( GetAccessibleText_Impl() ); xub_StrLen nIdx = (xub_StrLen) nIndex; //!! nIndex is allowed to be the string length @@ -772,7 +772,7 @@ sal_Bool SAL_CALL SmGraphicAccessible::copyText( sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bReturn = sal_False; if (!pWin) @@ -1713,7 +1713,7 @@ void SmEditAccessible::ClearWin() uno::Reference< XAccessibleContext > SAL_CALL SmEditAccessible::getAccessibleContext( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return this; } @@ -1724,7 +1724,7 @@ sal_Bool SAL_CALL SmEditAccessible::containsPoint( const awt::Point& aPoint ) //! the arguments coordinates are relativ to the current window ! //! Thus the top left-point is (0, 0) - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); @@ -1736,7 +1736,7 @@ sal_Bool SAL_CALL SmEditAccessible::containsPoint( const awt::Point& aPoint ) uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pTextHelper) throw RuntimeException(); return pTextHelper->GetAt( aPoint ); @@ -1745,7 +1745,7 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleAtPoint( c awt::Rectangle SAL_CALL SmEditAccessible::getBounds( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); OSL_ENSURE(pWin->GetParent()->GetAccessible() == getAccessibleParent(), @@ -1756,7 +1756,7 @@ awt::Rectangle SAL_CALL SmEditAccessible::getBounds( ) awt::Point SAL_CALL SmEditAccessible::getLocation( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); OSL_ENSURE(pWin->GetParent()->GetAccessible() == getAccessibleParent(), @@ -1768,7 +1768,7 @@ awt::Point SAL_CALL SmEditAccessible::getLocation( ) awt::Point SAL_CALL SmEditAccessible::getLocationOnScreen( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); OSL_ENSURE(pWin->GetParent()->GetAccessible() == getAccessibleParent(), @@ -1779,7 +1779,7 @@ awt::Point SAL_CALL SmEditAccessible::getLocationOnScreen( ) awt::Size SAL_CALL SmEditAccessible::getSize( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); OSL_ENSURE(pWin->GetParent()->GetAccessible() == getAccessibleParent(), @@ -1797,7 +1797,7 @@ awt::Size SAL_CALL SmEditAccessible::getSize( ) void SAL_CALL SmEditAccessible::grabFocus( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); @@ -1807,7 +1807,7 @@ void SAL_CALL SmEditAccessible::grabFocus( ) sal_Int32 SAL_CALL SmEditAccessible::getForeground() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); @@ -1817,7 +1817,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getForeground() sal_Int32 SAL_CALL SmEditAccessible::getBackground() throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); @@ -1834,7 +1834,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getBackground() sal_Int32 SAL_CALL SmEditAccessible::getAccessibleChildCount( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pTextHelper) throw RuntimeException(); return pTextHelper->GetChildCount(); @@ -1843,7 +1843,7 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleChildCount( ) uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pTextHelper) throw RuntimeException(); return pTextHelper->GetChild( i ); @@ -1852,7 +1852,7 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleChild( sal uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleParent( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!pWin) throw RuntimeException(); @@ -1864,7 +1864,7 @@ uno::Reference< XAccessible > SAL_CALL SmEditAccessible::getAccessibleParent( ) sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nIdx = -1; Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0; if (pAccParent) @@ -1880,21 +1880,21 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent( ) sal_Int16 SAL_CALL SmEditAccessible::getAccessibleRole( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return AccessibleRole::PANEL /*TEXT ?*/; } rtl::OUString SAL_CALL SmEditAccessible::getAccessibleDescription( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return OUString(); // empty as agreed with product-management } rtl::OUString SAL_CALL SmEditAccessible::getAccessibleName( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // same name as displayed by the window when not docked return aAccName; } @@ -1902,7 +1902,7 @@ rtl::OUString SAL_CALL SmEditAccessible::getAccessibleName( ) uno::Reference< XAccessibleRelationSet > SAL_CALL SmEditAccessible::getAccessibleRelationSet( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< XAccessibleRelationSet > xRelSet = new utl::AccessibleRelationSetHelper(); return xRelSet; // empty relation set } @@ -1910,7 +1910,7 @@ uno::Reference< XAccessibleRelationSet > SAL_CALL SmEditAccessible::getAccessibl uno::Reference< XAccessibleStateSet > SAL_CALL SmEditAccessible::getAccessibleStateSet( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ::utl::AccessibleStateSetHelper *pStateSet = new ::utl::AccessibleStateSetHelper; @@ -1941,7 +1941,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL SmEditAccessible::getAccessibleSt Locale SAL_CALL SmEditAccessible::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // should be the document language... // We use the language of the localized symbol names here. return Application::GetSettings().GetUILocale(); diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index b521a7308b..0348da116a 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -172,7 +172,7 @@ SmFilterDetect::~SmFilterDetect() } // can't check the type for external filters, so set the "dont" flag accordingly - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SfxApplication* pApp = SFX_APP(); SfxAllItemSet *pSet = new SfxAllItemSet( pApp->GetPool() ); diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx index d93ad444ee..591ee432a6 100644 --- a/starmath/source/unodoc.cxx +++ b/starmath/source/unodoc.cxx @@ -58,7 +58,7 @@ uno::Sequence< rtl::OUString > SAL_CALL SmDocument_getSupportedServiceNames() th uno::Reference< uno::XInterface > SAL_CALL SmDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & /*rSMgr*/, const sal_uInt64 _nCreationFlags ) throw( uno::Exception ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !SM_MOD() ) SmDLL::Init(); diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index c6d130f35a..205a85d081 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -351,7 +351,7 @@ void SAL_CALL SmModel::release() throw() uno::Sequence< uno::Type > SAL_CALL SmModel::getTypes( ) throw(uno::RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< uno::Type > aTypes = SfxBaseModel::getTypes(); sal_Int32 nLen = aTypes.getLength(); aTypes.realloc(nLen + 4); @@ -431,7 +431,7 @@ uno::Sequence< OUString > SmModel::getSupportedServiceNames(void) throw( uno::Ru uno::Sequence< OUString > SmModel::getSupportedServiceNames_Static(void) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -443,7 +443,7 @@ uno::Sequence< OUString > SmModel::getSupportedServiceNames_Static(void) void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any* pValues) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SmDocShell *pDocSh = static_cast < SmDocShell * > (GetObjectShell()); @@ -932,7 +932,7 @@ sal_Int32 SAL_CALL SmModel::getRendererCount( const uno::Sequence< beans::PropertyValue >& /*xOptions*/ ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return 1; } @@ -965,7 +965,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SmModel::getRenderer( const uno::Sequence< beans::PropertyValue >& /*rxOptions*/ ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (0 != nRenderer) throw IllegalArgumentException(); @@ -1002,7 +1002,7 @@ void SAL_CALL SmModel::render( const uno::Sequence< beans::PropertyValue >& rxOptions ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (0 != nRenderer) throw IllegalArgumentException(); @@ -1099,7 +1099,7 @@ void SAL_CALL SmModel::render( void SAL_CALL SmModel::setParent( const uno::Reference< uno::XInterface >& xParent) throw( lang::NoSupportException, uno::RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SfxBaseModel::setParent( xParent ); uno::Reference< lang::XUnoTunnel > xParentTunnel( xParent, uno::UNO_QUERY ); if ( xParentTunnel.is() ) diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index a80142b41f..047e0996a5 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -124,7 +124,7 @@ namespace sw { ~UnoImplPtr() { - ::vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; delete m_p; // #i105557#: call dtor with locked solar mutex m_p = 0; } diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 8d6994bf73..4c7c449012 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -111,7 +111,7 @@ SwAccessibleCell::SwAccessibleCell( SwAccessibleMap *pInitMap, : SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrm ) , bIsSelected( sal_False ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString sBoxName( pCellFrm->GetTabBox()->GetName() ); SetName( sBoxName ); @@ -309,7 +309,7 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleCell::getTypes() uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId() throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -335,7 +335,7 @@ SwFrmFmt* SwAccessibleCell::GetTblBoxFormat() const uno::Any SwAccessibleCell::getCurrentValue( ) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleValue ); uno::Any aAny; @@ -346,7 +346,7 @@ uno::Any SwAccessibleCell::getCurrentValue( ) sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber ) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleValue ); double fValue = 0; diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 9978c1c8ad..d7eb4fdc73 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -524,7 +524,7 @@ void SwAccessibleContext::FireStateChangedEvent( sal_Int16 nState, void SwAccessibleContext::GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // SHOWING if( bIsShowingState ) @@ -576,7 +576,7 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM, SwAccessibleContext::~SwAccessibleContext() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; DBG_MSG_CD( "destructed" ) RemoveFrmFromAccessibleMap(); @@ -593,7 +593,7 @@ uno::Reference< XAccessibleContext > SAL_CALL sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount( void ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -604,7 +604,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleChild( sal_Int32 nIndex ) throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -648,7 +648,7 @@ uno::Reference< XAccessible> SAL_CALL uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -673,7 +673,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent ( sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -725,7 +725,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL SwAccessibleContext::getAccessibleStateSet (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -741,7 +741,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL lang::Locale SAL_CALL SwAccessibleContext::getLocale (void) throw (IllegalAccessibleComponentStateException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; lang::Locale aLoc( Application::GetSettings().GetLocale() ); return aLoc; @@ -755,7 +755,7 @@ void SAL_CALL SwAccessibleContext::addEventListener( if (xListener.is()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!nClientId) nClientId = comphelper::AccessibleEventNotifier::registerClient( ); comphelper::AccessibleEventNotifier::addEventListener( nClientId, xListener ); @@ -770,7 +770,7 @@ void SAL_CALL SwAccessibleContext::removeEventListener( if (xListener.is()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( nClientId, xListener ); if ( !nListenerCount ) { @@ -811,7 +811,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint const awt::Point& aPoint ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleComponent ) @@ -868,7 +868,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleComponent ) @@ -954,7 +954,7 @@ awt::Size SAL_CALL SwAccessibleContext::getSize() void SAL_CALL SwAccessibleContext::grabFocus() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ); @@ -1079,7 +1079,7 @@ void SwAccessibleContext::ScrolledInShape( const SdrObject* , void SwAccessibleContext::Dispose( sal_Bool bRecursive ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ASSERT( GetFrm() && GetMap(), "already disposed" ); ASSERT( GetMap()->GetVisArea() == GetVisArea(), @@ -1132,7 +1132,7 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive ) void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj, sal_Bool bRecursive ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( IsShowing( *(GetMap()), rChildFrmOrObj ) || rChildFrmOrObj.AlwaysIncludeAsChild() || @@ -1172,7 +1172,7 @@ void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj, void SwAccessibleContext::InvalidatePosOrSize( const SwRect& ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ASSERT( GetFrm() && !GetFrm()->Frm().IsEmpty(), "context should have a size" ); @@ -1211,7 +1211,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize( const SwAccessibleChild& rChildFrmOrObj, const SwRect& rOldFrm ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ASSERT( !rChildFrmOrObj.GetSwFrm() || !rChildFrmOrObj.GetSwFrm()->Frm().IsEmpty(), @@ -1304,21 +1304,21 @@ void SwAccessibleContext::InvalidateChildPosOrSize( void SwAccessibleContext::InvalidateContent() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; _InvalidateContent( sal_False ); } void SwAccessibleContext::InvalidateCursorPos() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; _InvalidateCursorPos(); } void SwAccessibleContext::InvalidateFocus() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; _InvalidateFocus(); } @@ -1460,7 +1460,7 @@ OUString SwAccessibleContext::GetResource( sal_uInt16 nResId, { String sStr; { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sStr = SW_RES( nResId ); } diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 82036c027d..2660a0c1e9 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -79,7 +79,7 @@ SwAccessibleDocumentBase::~SwAccessibleDocumentBase() void SwAccessibleDocumentBase::SetVisArea() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwRect aOldVisArea( GetVisArea() ); const SwRect& rNewVisArea = GetMap()->GetVisArea(); @@ -97,7 +97,7 @@ void SwAccessibleDocumentBase::SetVisArea() void SwAccessibleDocumentBase::AddChild( Window *pWin, sal_Bool bFireEvent ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ASSERT( !mpChildWin, "only one child window is supported" ); if( !mpChildWin ) @@ -116,7 +116,7 @@ void SwAccessibleDocumentBase::AddChild( Window *pWin, sal_Bool bFireEvent ) void SwAccessibleDocumentBase::RemoveChild( Window *pWin ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ASSERT( !mpChildWin || pWin == mpChildWin, "invalid child window to remove" ); if( mpChildWin && pWin == mpChildWin ) @@ -133,7 +133,7 @@ void SwAccessibleDocumentBase::RemoveChild( Window *pWin ) sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount( void ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // CHECK_FOR_DEFUNC is called by parent @@ -149,7 +149,7 @@ uno::Reference< XAccessible> SAL_CALL throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( mpChildWin ) { @@ -173,7 +173,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleDocumentBase::getAccessiblePar sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference < XAccessibleContext > xAcc( mxParent->getAccessibleContext() ); uno::Reference < XAccessible > xThis( this ); @@ -196,7 +196,7 @@ OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleDescription (void) awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window *pWin = GetWindow(); @@ -213,7 +213,7 @@ awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds() awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window *pWin = GetWindow(); @@ -229,7 +229,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation() ::com::sun::star::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window *pWin = GetWindow(); @@ -245,7 +245,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation() ::com::sun::star::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window *pWin = GetWindow(); @@ -261,7 +261,7 @@ sal_Bool SAL_CALL SwAccessibleDocumentBase::containsPoint( const awt::Point& aPoint ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window *pWin = GetWindow(); @@ -278,7 +278,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleDocumentBase::getAccessibleAt const awt::Point& aPoint ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( mpChildWin ) { @@ -449,7 +449,7 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes() uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId() throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 0c7ff53439..18808e2e80 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -86,7 +86,7 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleEmbeddedObject::getSupportedServi uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementationId() throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index 26cc6888e9..6043c4d332 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -64,7 +64,7 @@ SwAccessibleFootnote::SwAccessibleFootnote( bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE, pFtnFrm ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_uInt16 nResId = bIsEndnote ? STR_ACCESS_ENDNOTE_NAME : STR_ACCESS_FOOTNOTE_NAME; @@ -79,7 +79,7 @@ SwAccessibleFootnote::~SwAccessibleFootnote() OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -138,7 +138,7 @@ Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames() Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId() throw(RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index c704eb9939..84fbe620be 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -137,7 +137,7 @@ SwAccessibleFrameBase::SwAccessibleFrameBase( SwAccessibleContext( pInitMap, nInitRole, pFlyFrm ), bIsSelected( sal_False ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt(); const_cast< SwFrmFmt * >( pFrmFmt )->Add( this ); @@ -269,7 +269,7 @@ void SwAccessibleFrameBase::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) void SwAccessibleFrameBase::Dispose( sal_Bool bRecursive ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( GetRegisteredIn() ) pRegisteredIn->Remove( this ); diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index 47dcc98e16..d6ba4ee9ff 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -86,7 +86,7 @@ Sequence< OUString > SAL_CALL SwAccessibleGraphic::getSupportedServiceNames() Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId() throw(RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index 2ba5a5f14a..8730fff191 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -56,7 +56,7 @@ SwAccessibleHeaderFooter::SwAccessibleHeaderFooter( const SwHeaderFrm* pHdFrm ) : SwAccessibleContext( pInitMap, AccessibleRole::HEADER, pHdFrm ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString sArg( OUString::valueOf( (sal_Int32)pHdFrm->GetPhyPageNum() ) ); SetName( GetResource( STR_ACCESS_HEADER_NAME, &sArg ) ); @@ -67,7 +67,7 @@ SwAccessibleHeaderFooter::SwAccessibleHeaderFooter( const SwFooterFrm* pFtFrm ) : SwAccessibleContext( pInitMap, AccessibleRole::FOOTER, pFtFrm ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString sArg( OUString::valueOf( (sal_Int32)pFtFrm->GetPhyPageNum() ) ); SetName( GetResource( STR_ACCESS_FOOTER_NAME, &sArg ) ); @@ -80,7 +80,7 @@ SwAccessibleHeaderFooter::~SwAccessibleHeaderFooter() OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -132,7 +132,7 @@ Sequence< OUString > SAL_CALL SwAccessibleHeaderFooter::getSupportedServiceNames Sequence< sal_Int8 > SAL_CALL SwAccessibleHeaderFooter::getImplementationId() throw(RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index 7b10e4ddc7..1b5dbae545 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -79,7 +79,7 @@ sal_Int32 SAL_CALL SwAccessibleHyperlink::getAccessibleActionCount() sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; @@ -179,13 +179,13 @@ sal_Int32 SAL_CALL SwAccessibleHyperlink::getEndIndex() sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return xPara.isValid(); } void SwAccessibleHyperlink::Invalidate() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; xPara = 0; } diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 1f9cc0225a..a832fe135a 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -177,7 +177,7 @@ void SwAccessibleNoTextFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) void SwAccessibleNoTextFrame::Dispose( sal_Bool bRecursive ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( aDepend.GetRegisteredIn() ) const_cast < SwModify *>( aDepend.GetRegisteredIn() )->Remove( &aDepend ); @@ -189,7 +189,7 @@ void SwAccessibleNoTextFrame::Dispose( sal_Bool bRecursive ) OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -205,7 +205,7 @@ OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName (void) OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleDescription (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index a10567189c..51df1e32cc 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -133,7 +133,7 @@ SwAccessiblePage::SwAccessiblePage( SwAccessibleMap* pInitMap, DBG_ASSERT( pInitMap != NULL, "need map" ); DBG_ASSERT( pFrame->IsPageFrm(), "need page frame" ); - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString sPage = OUString::valueOf( static_cast<sal_Int32>( @@ -178,7 +178,7 @@ Sequence<OUString> SwAccessiblePage::getSupportedServiceNames( ) Sequence< sal_Int8 > SAL_CALL SwAccessiblePage::getImplementationId() throw(RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 4a18b15cdf..eef3b9a5b4 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -508,7 +508,7 @@ SwAccessibleParagraph::SwAccessibleParagraph( , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTxtFrm ) ) // <-- { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; bIsHeading = IsHeading(); // --> OD 2004-09-27 #117970# - set an empty accessibility name for paragraphs @@ -521,7 +521,7 @@ SwAccessibleParagraph::SwAccessibleParagraph( SwAccessibleParagraph::~SwAccessibleParagraph() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; delete pPortionData; delete pHyperTextData; @@ -834,7 +834,7 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary( ::rtl::OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ); @@ -848,7 +848,7 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary( lang::Locale SAL_CALL SwAccessibleParagraph::getLocale (void) throw (IllegalAccessibleComponentStateException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() ); if( !pTxtFrm ) @@ -871,7 +871,7 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale (void) uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccessibleRelationSet() throw ( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ); utl::AccessibleRelationSetHelper* pHelper = new utl::AccessibleRelationSetHelper(); @@ -908,7 +908,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess void SAL_CALL SwAccessibleParagraph::grabFocus() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ); @@ -1121,7 +1121,7 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(uno: uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId() throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -1140,7 +1140,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId() sal_Int32 SwAccessibleParagraph::getCaretPosition() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1162,7 +1162,7 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition() sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1195,7 +1195,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex ) sal_Unicode SwAccessibleParagraph::getCharacter( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1219,7 +1219,7 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes( throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); const ::rtl::OUString& rText = GetString(); @@ -1464,7 +1464,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes( const uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw ( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); tAccParaPropValMap aDefAttrSeq; @@ -1645,7 +1645,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getRunAttributes( throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); { @@ -1678,7 +1678,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1741,7 +1741,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds( sal_Int32 SwAccessibleParagraph::getCharacterCount() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1751,7 +1751,7 @@ sal_Int32 SwAccessibleParagraph::getCharacterCount() sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1828,7 +1828,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) ::rtl::OUString SwAccessibleParagraph::getSelectedText() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1842,7 +1842,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint ) sal_Int32 SwAccessibleParagraph::getSelectionStart() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1854,7 +1854,7 @@ sal_Int32 SwAccessibleParagraph::getSelectionStart() sal_Int32 SwAccessibleParagraph::getSelectionEnd() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1866,7 +1866,7 @@ sal_Int32 SwAccessibleParagraph::getSelectionEnd() sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1902,7 +1902,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n ::rtl::OUString SwAccessibleParagraph::getText() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1913,7 +1913,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1930,7 +1930,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n /*accessibility::*/TextSegment SwAccessibleParagraph::getTextAtIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -1966,7 +1966,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n /*accessibility::*/TextSegment SwAccessibleParagraph::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -2010,7 +2010,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n /*accessibility::*/TextSegment SwAccessibleParagraph::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); @@ -2052,7 +2052,7 @@ sal_Bool SwAccessibleParagraph::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // select and copy (through dispatch mechanism) setSelection( nStartIndex, nEndIndex ); @@ -2069,7 +2069,7 @@ sal_Bool SwAccessibleParagraph::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIn throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { CHECK_FOR_DEFUNC( XAccessibleEditableText ); - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( !IsEditableState() ) return sal_False; @@ -2084,7 +2084,7 @@ sal_Bool SwAccessibleParagraph::pasteText( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { CHECK_FOR_DEFUNC( XAccessibleEditableText ); - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( !IsEditableState() ) return sal_False; @@ -2112,7 +2112,7 @@ sal_Bool SwAccessibleParagraph::replaceText( const ::rtl::OUString& sReplacement ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleEditableText ); @@ -2174,7 +2174,7 @@ sal_Bool SwAccessibleParagraph::setAttributes( const uno::Sequence<PropertyValue>& rAttributeSet ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleEditableText ); const ::rtl::OUString& rText = GetString(); @@ -2357,7 +2357,7 @@ const SwTxtAttr *SwHyperlinkIter_Impl::next() sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleHypertext ); @@ -2379,7 +2379,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL SwAccessibleParagraph::getHyperLink( sal_Int32 nLinkIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleHypertext ); uno::Reference< XAccessibleHyperlink > xRet; @@ -2434,7 +2434,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleHypertext ); // parameter checking diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index fdcde3ff1d..dd0ef1aab7 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -91,7 +91,7 @@ Sequence<OUString> SwAccessiblePreview::getSupportedServiceNames( ) Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId() throw(RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index d090d5f6fc..b9aa2dfe1a 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -97,7 +97,7 @@ void SwAccessibleSelectionHelper::selectAccessibleChild( throw ( lang::IndexOutOfBoundsException, RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // Get the respective child as SwFrm (also do index checking), ... const SwAccessibleChild aChild = rContext.GetChild( *(rContext.GetMap()), @@ -127,7 +127,7 @@ sal_Bool SwAccessibleSelectionHelper::isAccessibleChildSelected( throw ( lang::IndexOutOfBoundsException, RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // Get the respective child as SwFrm (also do index checking), ... const SwAccessibleChild aChild = rContext.GetChild( *(rContext.GetMap()), @@ -162,7 +162,7 @@ void SwAccessibleSelectionHelper::clearAccessibleSelection( ) void SwAccessibleSelectionHelper::selectAllAccessibleChildren( ) throw ( RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // We can select only one. So iterate over the children to find // the first we can select, and select it. @@ -194,7 +194,7 @@ void SwAccessibleSelectionHelper::selectAllAccessibleChildren( ) sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) throw ( RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nCount = 0; // Only one frame can be selected at a time, and we only frames @@ -246,7 +246,7 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( throw ( lang::IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // Since the index is relative to the selected children, and since // there can be at most one selected frame child, the index must diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index dbdcbfd6e0..27112824b4 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -714,7 +714,7 @@ SwAccessibleTable::SwAccessibleTable( SwAccessibleContext( pInitMap, AccessibleRole::TABLE, pTabFrm ), mpTableData( 0 ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt(); const_cast< SwFrmFmt * >( pFrmFmt )->Add( this ); @@ -736,7 +736,7 @@ SwAccessibleTable::SwAccessibleTable( SwAccessibleTable::~SwAccessibleTable() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; delete mpTableData; } @@ -840,7 +840,7 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleTable::getTypes() uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTable::getImplementationId() throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -876,7 +876,7 @@ void SwAccessibleTable::ClearTableData() OUString SAL_CALL SwAccessibleTable::getAccessibleDescription (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -886,7 +886,7 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleDescription (void) sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowCount() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -896,7 +896,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowCount() sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnCount( ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -981,7 +981,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt( { sal_Int32 nExtend = -1; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1012,7 +1012,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt( { sal_Int32 nExtend = -1; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1066,7 +1066,7 @@ uno::Reference< XAccessibleTable > SAL_CALL uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleRows() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1090,7 +1090,7 @@ uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleRows uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleColumns() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1113,7 +1113,7 @@ uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleColu sal_Bool SAL_CALL SwAccessibleTable::isAccessibleRowSelected( sal_Int32 nRow ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1140,7 +1140,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1170,7 +1170,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCellAt( { uno::Reference< XAccessible > xRet; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1202,7 +1202,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected( { sal_Bool bRet = sal_False; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1229,7 +1229,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex( { sal_Int32 nRet = -1; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1247,7 +1247,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex ) { sal_Int32 nRet = -1; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1286,7 +1286,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn( { sal_Int32 nRet = -1; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1348,7 +1348,7 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleTable::getSupportedServiceNames() void SwAccessibleTable::InvalidatePosOrSize( const SwRect& rOldBox ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( HasTableData() ) GetTableData().SetTablePos( GetFrm()->Frm().Pos() ); @@ -1358,7 +1358,7 @@ void SwAccessibleTable::InvalidatePosOrSize( const SwRect& rOldBox ) void SwAccessibleTable::Dispose( sal_Bool bRecursive ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( GetRegisteredIn() ) pRegisteredIn->Remove( this ); @@ -1369,7 +1369,7 @@ void SwAccessibleTable::Dispose( sal_Bool bRecursive ) void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj, sal_Bool bRecursive ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const SwFrm *pFrm = rChildFrmOrObj.GetSwFrm(); ASSERT( pFrm, "frame expected" ); @@ -1392,7 +1392,7 @@ void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj, void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChildFrmOrObj, const SwRect& rOldBox ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( HasTableData() ) { @@ -1431,7 +1431,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); // --> OD 2007-06-27 #i77106# @@ -1538,7 +1538,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected( throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); // --> OD 2007-06-27 #i77106# @@ -1552,7 +1552,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected( void SAL_CALL SwAccessibleTable::clearAccessibleSelection( ) throw ( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); @@ -1579,7 +1579,7 @@ void SAL_CALL SwAccessibleTable::selectAllAccessibleChildren( ) sal_Int32 SAL_CALL SwAccessibleTable::getSelectedAccessibleChildCount( ) throw ( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); // iterate over all children and count isAccessibleChildSelected() @@ -1600,7 +1600,7 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTable::getSelectedAccessibleChi throw ( lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); // paremter checking (part 1): index lower 0 @@ -1629,7 +1629,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild( throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); SwCrsrShell* pCrsrShell = GetCrsrShell(); @@ -1684,7 +1684,7 @@ SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2 const SwTabFrm *pTabFrm ) : SwAccessibleTable( pMap2, pTabFrm ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt(); const_cast< SwFrmFmt * >( pFrmFmt )->Add( this ); @@ -1733,7 +1733,7 @@ uno::Any SAL_CALL SwAccessibleTableColHeaders::queryInterface( const uno::Type& sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount(void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 2257b3adb5..ef6b0c34b7 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -161,7 +161,7 @@ void SwAccessibleTextFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -176,7 +176,7 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void) OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -213,7 +213,7 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleTextFrame::getSupportedServiceNam uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTextFrame::getImplementationId() throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -255,7 +255,7 @@ AccessibleRelation SwAccessibleTextFrame::makeRelation( sal_Int16 nType, const S uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleTextFrame::getAccessibleRelationSet( ) throw ( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ); // get the frame, and insert prev/next relations into helper diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx index 27e71fc97d..dbed1c7382 100644 --- a/sw/source/core/bastyp/SwSmartTagMgr.cxx +++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx @@ -63,7 +63,7 @@ SwSmartTagMgr::~SwSmartTagMgr() // ::com::sun::star::util::XModifyListener void SwSmartTagMgr::modified( const lang::EventObject& rEO ) throw( RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // Installed recognizers have changed. We remove all existing smart tags: SW_MOD()->CheckSpellChanges( sal_False, sal_True, sal_True, sal_True ); @@ -74,7 +74,7 @@ void SwSmartTagMgr::modified( const lang::EventObject& rEO ) throw( RuntimeExcep // ::com::sun::star::util::XChangesListener void SwSmartTagMgr::changesOccurred( const util::ChangesEvent& rEvent ) throw( RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // Configuration has changed. We remove all existing smart tags: SW_MOD()->CheckSpellChanges( sal_False, sal_True, sal_True, sal_True ); diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx index 7c2ef6bb40..5a2d7efcd7 100644 --- a/sw/source/core/doc/docchart.cxx +++ b/sw/source/core/doc/docchart.cxx @@ -225,7 +225,7 @@ SwChartDataProvider * SwDoc::GetChartDataProvider( bool bCreate ) const { // since there must be only one instance of this object per document // we need a mutex here - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bCreate && !aChartDataProviderImplRef.get()) { diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index 0eebaaaa5e..7930463440 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -82,7 +82,7 @@ uno::Reference< XPropertySetInfo > SAL_CALL SwXTextDefaults::getPropertySetInfo( void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pDoc) throw RuntimeException(); const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap()->getByName( rPropertyName ); @@ -148,7 +148,7 @@ void SAL_CALL SwXTextDefaults::setPropertyValue( const OUString& rPropertyName, Any SAL_CALL SwXTextDefaults::getPropertyValue( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pDoc) throw RuntimeException(); const SfxItemPropertySimpleEntry *pMap = m_pPropSet->getPropertyMap()->getByName( rPropertyName ); @@ -193,7 +193,7 @@ void SAL_CALL SwXTextDefaults::removeVetoableChangeListener( const OUString& /*r PropertyState SAL_CALL SwXTextDefaults::getPropertyState( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex()); + SolarMutexGuard aGuard; PropertyState eRet = PropertyState_DIRECT_VALUE; if (!m_pDoc) throw RuntimeException(); diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 4b8588088d..39a17d1051 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -282,14 +282,14 @@ void SAL_CALL SwXBookmark::attach(const uno::Reference< text::XTextRange > & xTextRange) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; attachToRange( xTextRange ); } uno::Reference< text::XTextRange > SAL_CALL SwXBookmark::getAnchor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pImpl->m_pRegisteredBookmark) { @@ -304,7 +304,7 @@ SwXBookmark::getAnchor() throw (uno::RuntimeException) void SAL_CALL SwXBookmark::dispose() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (m_pImpl->m_pRegisteredBookmark) { m_pImpl->m_pDoc->getIDocumentMarkAccess()->deleteMark( @@ -316,7 +316,7 @@ void SAL_CALL SwXBookmark::addEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->m_pRegisteredBookmark) { @@ -329,7 +329,7 @@ void SAL_CALL SwXBookmark::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->m_pRegisteredBookmark || !m_pImpl->m_ListenerContainer.RemoveListener(xListener)) @@ -341,7 +341,7 @@ throw (uno::RuntimeException) OUString SAL_CALL SwXBookmark::getName() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return (m_pImpl->m_pRegisteredBookmark) ? m_pImpl->m_pRegisteredBookmark->GetName() @@ -351,7 +351,7 @@ throw (uno::RuntimeException) void SAL_CALL SwXBookmark::setName(const OUString& rName) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pImpl->m_pRegisteredBookmark) { @@ -434,7 +434,7 @@ uno::Reference<frame::XModel> SwXBookmark::GetModel() uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXBookmark::getPropertySetInfo() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; static uno::Reference< beans::XPropertySetInfo > xRef( aSwMapProvider.GetPropertySet(PROPERTY_MAP_BOOKMARK) @@ -459,7 +459,7 @@ uno::Any SAL_CALL SwXBookmark::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; uno::Any aRet; if (! ::sw::GetDefaultTextContentValue(aRet, rPropertyName)) @@ -528,7 +528,7 @@ SwXFieldmark::SwXFieldmark(bool _isReplacementObject, ::sw::mark::IMark* pBkm, S void SwXFieldmarkParameters::insertByName(const OUString& aName, const uno::Any& aElement) throw (lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IFieldmark::parameter_map_t* pParameters = getCoreParameters(); if(pParameters->find(aName) != pParameters->end()) throw container::ElementExistException(); @@ -538,7 +538,7 @@ void SwXFieldmarkParameters::insertByName(const OUString& aName, const uno::Any& void SwXFieldmarkParameters::removeByName(const OUString& aName) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!getCoreParameters()->erase(aName)) throw container::NoSuchElementException(); } @@ -546,7 +546,7 @@ void SwXFieldmarkParameters::removeByName(const OUString& aName) void SwXFieldmarkParameters::replaceByName(const OUString& aName, const uno::Any& aElement) throw (lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IFieldmark::parameter_map_t* pParameters = getCoreParameters(); IFieldmark::parameter_map_t::iterator pEntry = pParameters->find(aName); if(pEntry == pParameters->end()) @@ -557,7 +557,7 @@ void SwXFieldmarkParameters::replaceByName(const OUString& aName, const uno::Any uno::Any SwXFieldmarkParameters::getByName(const OUString& aName) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IFieldmark::parameter_map_t* pParameters = getCoreParameters(); IFieldmark::parameter_map_t::iterator pEntry = pParameters->find(aName); if(pEntry == pParameters->end()) @@ -568,7 +568,7 @@ uno::Any SwXFieldmarkParameters::getByName(const OUString& aName) uno::Sequence<OUString> SwXFieldmarkParameters::getElementNames() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IFieldmark::parameter_map_t* pParameters = getCoreParameters(); uno::Sequence<OUString> vResult(pParameters->size()); OUString* pOutEntry = vResult.getArray(); @@ -580,7 +580,7 @@ uno::Sequence<OUString> SwXFieldmarkParameters::getElementNames() ::sal_Bool SwXFieldmarkParameters::hasByName(const OUString& aName) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IFieldmark::parameter_map_t* pParameters = getCoreParameters(); return (pParameters->find(aName) != pParameters->end()); } @@ -594,7 +594,7 @@ uno::Type SwXFieldmarkParameters::getElementType() ::sal_Bool SwXFieldmarkParameters::hasElements() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return !getCoreParameters()->empty(); } @@ -624,7 +624,7 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe ::rtl::OUString SwXFieldmark::getFieldType(void) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const IFieldmark *pBkm = dynamic_cast<const IFieldmark*>(GetBookmark()); if(!pBkm) throw uno::RuntimeException(); @@ -634,7 +634,7 @@ void SwXFieldmark::attachToRange( const uno::Reference < text::XTextRange >& xTe void SwXFieldmark::setFieldType(const::rtl::OUString & fieldType) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IFieldmark *pBkm = const_cast<IFieldmark*>( dynamic_cast<const IFieldmark*>(GetBookmark())); if(!pBkm) @@ -645,7 +645,7 @@ void SwXFieldmark::setFieldType(const::rtl::OUString & fieldType) uno::Reference<container::XNameContainer> SwXFieldmark::getParameters() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; IFieldmark *pBkm = const_cast<IFieldmark*>( dynamic_cast<const IFieldmark*>(GetBookmark())); if(!pBkm) diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 58644d097a..c82d50020e 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -584,7 +584,7 @@ uno::Reference< chart2::data::XDataSource > SwChartDataProvider::Impl_createData const uno::Sequence< beans::PropertyValue >& rArguments, sal_Bool bTestOnly ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -1002,7 +1002,7 @@ sal_Bool SAL_CALL SwChartDataProvider::createDataSourcePossible( const uno::Sequence< beans::PropertyValue >& rArguments ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; sal_Bool bPossible = sal_True; try @@ -1021,7 +1021,7 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL SwChartDataProvider::create const uno::Sequence< beans::PropertyValue >& rArguments ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return Impl_createDataSource( rArguments ); } @@ -1068,7 +1068,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwChartDataProvider::detectArgume const uno::Reference< chart2::data::XDataSource >& xDataSource ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -1461,7 +1461,7 @@ sal_Bool SAL_CALL SwChartDataProvider::createDataSequenceByRangeRepresentationPo const OUString& rRangeRepresentation ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; sal_Bool bPossible = sal_True; try @@ -1480,7 +1480,7 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartDataProvider::crea const OUString& rRangeRepresentation ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return Impl_createDataSequenceByRangeRepresentation( rRangeRepresentation ); } @@ -1547,14 +1547,14 @@ sal_Bool SAL_CALL SwChartDataProvider::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return rServiceName.equalsAscii( SN_DATA_PROVIDER ); } uno::Sequence< OUString > SAL_CALL SwChartDataProvider::getSupportedServiceNames( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Sequence< OUString > aRes(1); aRes.getArray()[0] = C2U( SN_DATA_PROVIDER ); return aRes; @@ -1797,7 +1797,7 @@ void SwChartDataProvider::AddRowCols( rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUString& rRangeRepresentation ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -1870,7 +1870,7 @@ rtl::OUString SAL_CALL SwChartDataProvider::convertRangeToXML( const rtl::OUStri rtl::OUString SAL_CALL SwChartDataProvider::convertRangeFromXML( const rtl::OUString& rXMLRange ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -1929,14 +1929,14 @@ SwChartDataSource::~SwChartDataSource() uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL SwChartDataSource::getDataSequences( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return aLDS; } OUString SAL_CALL SwChartDataSource::getImplementationName( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return C2U("SwChartDataSource"); } @@ -1944,14 +1944,14 @@ sal_Bool SAL_CALL SwChartDataSource::supportsService( const OUString& rServiceName ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return rServiceName.equalsAscii( SN_DATA_SOURCE ); } uno::Sequence< OUString > SAL_CALL SwChartDataSource::getSupportedServiceNames( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Sequence< OUString > aRes(1); aRes.getArray()[0] = C2U( SN_DATA_SOURCE ); return aRes; @@ -2087,7 +2087,7 @@ sal_Int64 SAL_CALL SwChartDataSequence::getSomething( const uno::Sequence< sal_I uno::Sequence< uno::Any > SAL_CALL SwChartDataSequence::getData( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2116,7 +2116,7 @@ uno::Sequence< uno::Any > SAL_CALL SwChartDataSequence::getData( ) OUString SAL_CALL SwChartDataSequence::getSourceRangeRepresentation( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2137,7 +2137,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( chart2::data::LabelOrigin eLabelOrigin ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2251,7 +2251,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::generateLabel( uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getTextualData( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2280,7 +2280,7 @@ uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getTextualData( ) uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2312,7 +2312,7 @@ uno::Sequence< double > SAL_CALL SwChartDataSequence::getNumericalData( ) uno::Reference< util::XCloneable > SAL_CALL SwChartDataSequence::createClone( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); return new SwChartDataSequence( *this ); @@ -2321,7 +2321,7 @@ uno::Reference< util::XCloneable > SAL_CALL SwChartDataSequence::createClone( ) uno::Reference< beans::XPropertySetInfo > SAL_CALL SwChartDataSequence::getPropertySetInfo( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2334,7 +2334,7 @@ void SAL_CALL SwChartDataSequence::setPropertyValue( const uno::Any& rValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2351,7 +2351,7 @@ uno::Any SAL_CALL SwChartDataSequence::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2369,7 +2369,7 @@ void SAL_CALL SwChartDataSequence::addPropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - //vos::OGuard aGuard( Application::GetSolarMutex() ); + //SolarMutexGuard aGuard; DBG_ERROR( "not implemented" ); } @@ -2378,7 +2378,7 @@ void SAL_CALL SwChartDataSequence::removePropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - //vos::OGuard aGuard( Application::GetSolarMutex() ); + //SolarMutexGuard aGuard; DBG_ERROR( "not implemented" ); } @@ -2387,7 +2387,7 @@ void SAL_CALL SwChartDataSequence::addVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - //vos::OGuard aGuard( Application::GetSolarMutex() ); + //SolarMutexGuard aGuard; DBG_ERROR( "not implemented" ); } @@ -2396,7 +2396,7 @@ void SAL_CALL SwChartDataSequence::removeVetoableChangeListener( const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - //vos::OGuard aGuard( Application::GetSolarMutex() ); + //SolarMutexGuard aGuard; DBG_ERROR( "not implemented" ); } @@ -2416,7 +2416,7 @@ sal_Bool SAL_CALL SwChartDataSequence::supportsService( uno::Sequence< OUString > SAL_CALL SwChartDataSequence::getSupportedServiceNames( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Sequence< OUString > aRes(1); aRes.getArray()[0] = C2U( SN_DATA_SEQUENCE ); return aRes; @@ -2441,7 +2441,7 @@ void SwChartDataSequence::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) sal_Bool SAL_CALL SwChartDataSequence::isModified( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2452,7 +2452,7 @@ void SAL_CALL SwChartDataSequence::setModified( ::sal_Bool bModified ) throw (beans::PropertyVetoException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2783,7 +2783,7 @@ SwChartLabeledDataSequence::~SwChartLabeledDataSequence() uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequence::getValues( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); return xData; @@ -2819,7 +2819,7 @@ void SAL_CALL SwChartLabeledDataSequence::setValues( const uno::Reference< chart2::data::XDataSequence >& rxSequence ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2834,7 +2834,7 @@ void SAL_CALL SwChartLabeledDataSequence::setValues( uno::Reference< chart2::data::XDataSequence > SAL_CALL SwChartLabeledDataSequence::getLabel( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); return xLabels; @@ -2844,7 +2844,7 @@ void SAL_CALL SwChartLabeledDataSequence::setLabel( const uno::Reference< chart2::data::XDataSequence >& rxSequence ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2859,7 +2859,7 @@ void SAL_CALL SwChartLabeledDataSequence::setLabel( uno::Reference< util::XCloneable > SAL_CALL SwChartLabeledDataSequence::createClone( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (bDisposed) throw lang::DisposedException(); @@ -2899,7 +2899,7 @@ sal_Bool SAL_CALL SwChartLabeledDataSequence::supportsService( uno::Sequence< OUString > SAL_CALL SwChartLabeledDataSequence::getSupportedServiceNames( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Sequence< OUString > aRes(1); aRes.getArray()[0] = C2U( SN_LABELED_DATA_SEQUENCE ); return aRes; diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index f1636f8a60..816420ed39 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -476,7 +476,7 @@ const SvEventDescription* lcl_GetSupportedMacroItems() ******************************************************************/ OUString SwXServiceProvider::GetProviderName(sal_uInt16 nObjectType) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString sRet; sal_uInt16 nEntries = SAL_N_ELEMENTS(aProvNamesId); if(nObjectType < nEntries) @@ -517,7 +517,7 @@ sal_uInt16 SwXServiceProvider::GetProviderType(const OUString& rServiceName) uno::Reference< uno::XInterface > SwXServiceProvider::MakeInstance(sal_uInt16 nObjectType, SwDoc* pDoc) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< uno::XInterface > xRet; switch(nObjectType) { @@ -856,7 +856,7 @@ SwXTextTables::~SwXTextTables() sal_Int32 SwXTextTables::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nRet = 0; if(IsValid()) nRet = GetDoc()->GetTblFrmFmtCount(sal_True); @@ -866,7 +866,7 @@ sal_Int32 SwXTextTables::getCount(void) throw( uno::RuntimeException ) uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(IsValid()) { @@ -888,7 +888,7 @@ uno::Any SAL_CALL SwXTextTables::getByIndex(sal_Int32 nIndex) uno::Any SwXTextTables::getByName(const OUString& rItemName) throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(IsValid()) { @@ -917,7 +917,7 @@ uno::Any SwXTextTables::getByName(const OUString& rItemName) uno::Sequence< OUString > SwXTextTables::getElementNames(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); sal_uInt16 nCount = GetDoc()->GetTblFrmFmtCount(sal_True); @@ -938,7 +938,7 @@ uno::Sequence< OUString > SwXTextTables::getElementNames(void) sal_Bool SwXTextTables::hasByName(const OUString& rName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet= sal_False; if(IsValid()) { @@ -968,7 +968,7 @@ uno::Type SAL_CALL sal_Bool SwXTextTables::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return 0 != GetDoc()->GetTblFrmFmtCount(sal_True); @@ -994,7 +994,7 @@ uno::Sequence< OUString > SwXTextTables::getSupportedServiceNames(void) throw( u XTextTable* SwXTextTables::GetObject( SwFrmFmt& rFmt ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwXTextTable* pTbl = (SwXTextTable*)SwClientIter( rFmt ). First( TYPE( SwXTextTable )); if( !pTbl ) @@ -1087,7 +1087,7 @@ template<FlyCntType T> SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc) : m_aFrames() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const SwSpzFrmFmts* const pFmts = pDoc->GetSpzFrmFmts(); if(!pFmts->Count()) return; @@ -1119,14 +1119,14 @@ SwXFrameEnumeration<T>::SwXFrameEnumeration(const SwDoc* const pDoc) template<FlyCntType T> sal_Bool SwXFrameEnumeration<T>::hasMoreElements(void) throw( RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return !m_aFrames.empty(); } template<FlyCntType T> Any SwXFrameEnumeration<T>::nextElement(void) throw( NoSuchElementException, WrappedTargetException, RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_aFrames.empty()) throw NoSuchElementException(); Any aResult = *m_aFrames.begin(); @@ -1180,7 +1180,7 @@ SwXFrames::~SwXFrames() uno::Reference<container::XEnumeration> SwXFrames::createEnumeration(void) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); switch(eType) @@ -1201,7 +1201,7 @@ uno::Reference<container::XEnumeration> SwXFrames::createEnumeration(void) throw sal_Int32 SwXFrames::getCount(void) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return GetDoc()->GetFlyCount(eType); @@ -1210,7 +1210,7 @@ sal_Int32 SwXFrames::getCount(void) throw(uno::RuntimeException) uno::Any SwXFrames::getByIndex(sal_Int32 nIndex) throw(IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); if(nIndex < 0 || nIndex >= USHRT_MAX) @@ -1224,7 +1224,7 @@ uno::Any SwXFrames::getByIndex(sal_Int32 nIndex) uno::Any SwXFrames::getByName(const OUString& rName) throw(NoSuchElementException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); const SwFrmFmt* pFmt; @@ -1247,7 +1247,7 @@ uno::Any SwXFrames::getByName(const OUString& rName) uno::Sequence<OUString> SwXFrames::getElementNames(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); const Reference<XEnumeration> xEnum = createEnumeration(); @@ -1264,7 +1264,7 @@ uno::Sequence<OUString> SwXFrames::getElementNames(void) throw( uno::RuntimeExce sal_Bool SwXFrames::hasByName(const OUString& rName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); switch(eType) @@ -1280,7 +1280,7 @@ sal_Bool SwXFrames::hasByName(const OUString& rName) throw( uno::RuntimeExceptio uno::Type SAL_CALL SwXFrames::getElementType() throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; switch(eType) { case FLYCNTTYPE_FRM: @@ -1296,7 +1296,7 @@ uno::Type SAL_CALL SwXFrames::getElementType() throw(uno::RuntimeException) sal_Bool SwXFrames::hasElements(void) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return GetDoc()->GetFlyCount(eType) > 0; @@ -1441,7 +1441,7 @@ SwXTextSections::~SwXTextSections() sal_Int32 SwXTextSections::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); const SwSectionFmts& rSectFmts = GetDoc()->GetSections(); @@ -1457,7 +1457,7 @@ sal_Int32 SwXTextSections::getCount(void) throw( uno::RuntimeException ) uno::Any SwXTextSections::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< XTextSection > xRet; if(IsValid()) { @@ -1490,7 +1490,7 @@ uno::Any SwXTextSections::getByIndex(sal_Int32 nIndex) uno::Any SwXTextSections::getByName(const OUString& Name) throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(IsValid()) { @@ -1519,7 +1519,7 @@ uno::Any SwXTextSections::getByName(const OUString& Name) uno::Sequence< OUString > SwXTextSections::getElementNames(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); sal_uInt16 nCount = GetDoc()->GetSections().Count(); @@ -1552,7 +1552,7 @@ uno::Sequence< OUString > SwXTextSections::getElementNames(void) sal_Bool SwXTextSections::hasByName(const OUString& Name) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; String aName(Name); if(IsValid()) @@ -1584,7 +1584,7 @@ uno::Type SAL_CALL SwXTextSections::getElementType() throw(uno::RuntimeException sal_Bool SwXTextSections::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_uInt16 nCount = 0; if(IsValid()) { @@ -1628,7 +1628,7 @@ SwXBookmarks::~SwXBookmarks() sal_Int32 SwXBookmarks::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return GetDoc()->getIDocumentMarkAccess()->getMarksCount(); @@ -1637,7 +1637,7 @@ sal_Int32 SwXBookmarks::getCount(void) uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); IDocumentMarkAccess* const pMarkAccess = GetDoc()->getIDocumentMarkAccess(); @@ -1655,7 +1655,7 @@ uno::Any SwXBookmarks::getByIndex(sal_Int32 nIndex) uno::Any SwXBookmarks::getByName(const rtl::OUString& rName) throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); @@ -1674,7 +1674,7 @@ uno::Any SwXBookmarks::getByName(const rtl::OUString& rName) uno::Sequence< OUString > SwXBookmarks::getElementNames(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); @@ -1690,7 +1690,7 @@ uno::Sequence< OUString > SwXBookmarks::getElementNames(void) sal_Bool SwXBookmarks::hasByName(const OUString& rName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); @@ -1707,7 +1707,7 @@ uno::Type SAL_CALL SwXBookmarks::getElementType() sal_Bool SwXBookmarks::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return GetDoc()->getIDocumentMarkAccess()->getBookmarksCount() != 0; @@ -1724,7 +1724,7 @@ SwXNumberingRulesCollection::~SwXNumberingRulesCollection() sal_Int32 SwXNumberingRulesCollection::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return GetDoc()->GetNumRuleTbl().Count(); @@ -1733,7 +1733,7 @@ sal_Int32 SwXNumberingRulesCollection::getCount(void) throw( uno::RuntimeExcepti uno::Any SwXNumberingRulesCollection::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(IsValid()) { @@ -1759,7 +1759,7 @@ uno::Type SAL_CALL SwXNumberingRulesCollection::getElementType() throw(uno::Runt sal_Bool SwXNumberingRulesCollection::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return GetDoc()->GetNumRuleTbl().Count() > 0; @@ -1795,7 +1795,7 @@ SwXFootnotes::~SwXFootnotes() sal_Int32 SwXFootnotes::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); sal_Int32 nCount = 0; @@ -1815,7 +1815,7 @@ sal_Int32 SwXFootnotes::getCount(void) throw( uno::RuntimeException ) uno::Any SwXFootnotes::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; sal_Int32 nCount = 0; if(IsValid()) @@ -1853,7 +1853,7 @@ uno::Type SAL_CALL SwXFootnotes::getElementType() throw(uno::RuntimeException) sal_Bool SwXFootnotes::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return GetDoc()->GetFtnIdxs().Count() > 0; @@ -1893,7 +1893,7 @@ SwXReferenceMarks::~SwXReferenceMarks() sal_Int32 SwXReferenceMarks::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return GetDoc()->GetRefMarks(); @@ -1902,7 +1902,7 @@ sal_Int32 SwXReferenceMarks::getCount(void) throw( uno::RuntimeException ) uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex) throw( IndexOutOfBoundsException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(!IsValid()) throw uno::RuntimeException(); @@ -1924,7 +1924,7 @@ uno::Any SwXReferenceMarks::getByIndex(sal_Int32 nIndex) uno::Any SwXReferenceMarks::getByName(const OUString& rName) throw( NoSuchElementException, WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(IsValid()) { @@ -1944,7 +1944,7 @@ uno::Any SwXReferenceMarks::getByName(const OUString& rName) uno::Sequence< OUString > SwXReferenceMarks::getElementNames(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence<OUString> aRet; if(IsValid()) { @@ -1962,7 +1962,7 @@ uno::Sequence< OUString > SwXReferenceMarks::getElementNames(void) throw( uno::R sal_Bool SwXReferenceMarks::hasByName(const OUString& rName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return 0 != GetDoc()->GetRefMark( rName); @@ -1975,7 +1975,7 @@ uno::Type SAL_CALL SwXReferenceMarks::getElementType() throw(uno::RuntimeExcepti sal_Bool SwXReferenceMarks::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return 0 != GetDoc()->GetRefMarks(); @@ -1983,7 +1983,7 @@ sal_Bool SwXReferenceMarks::hasElements(void) throw( uno::RuntimeException ) SwXReferenceMark* SwXReferenceMarks::GetObject( SwDoc* pDoc, const SwFmtRefMark* pMark ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return SwXReferenceMark::CreateXReferenceMark(*pDoc, *pMark); } diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 41fb763ae4..3bf8c572d3 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -435,7 +435,7 @@ namespace SwXShapesEnumeration::SwXShapesEnumeration(SwXDrawPage* const pDrawPage) : m_aShapes() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ::std::insert_iterator<shapescontainer_t> pInserter = ::std::insert_iterator<shapescontainer_t>(m_aShapes, m_aShapes.begin()); sal_Int32 nCount = pDrawPage->getCount(); for(sal_Int32 nIdx = 0; nIdx < nCount; nIdx++) @@ -447,13 +447,13 @@ SwXShapesEnumeration::SwXShapesEnumeration(SwXDrawPage* const pDrawPage) BOOL SwXShapesEnumeration::hasMoreElements(void) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return !m_aShapes.empty(); } uno::Any SwXShapesEnumeration::nextElement(void) throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_aShapes.empty()) throw container::NoSuchElementException(); uno::Any aResult = *m_aShapes.begin(); @@ -481,7 +481,7 @@ uno::Sequence< OUString > SwXShapesEnumeration::getSupportedServiceNames(void) t ****************************************************************************/ uno::Reference< container::XEnumeration > SwXDrawPage::createEnumeration(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return uno::Reference< container::XEnumeration >( new SwXShapesEnumeration(this)); } @@ -560,7 +560,7 @@ uno::Sequence< uno::Type > SwXDrawPage::getTypes() throw( uno::RuntimeException sal_Int32 SwXDrawPage::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pDoc) throw uno::RuntimeException(); if(!pDoc->GetDrawModel()) @@ -576,7 +576,7 @@ uno::Any SwXDrawPage::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pDoc) throw uno::RuntimeException(); if(!pDoc->GetDrawModel()) @@ -593,7 +593,7 @@ uno::Type SwXDrawPage::getElementType(void) throw( uno::RuntimeException ) sal_Bool SwXDrawPage::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pDoc) throw uno::RuntimeException(); if(!pDoc->GetDrawModel()) @@ -605,7 +605,7 @@ sal_Bool SwXDrawPage::hasElements(void) throw( uno::RuntimeException ) void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pDoc) throw uno::RuntimeException(); uno::Reference< lang::XUnoTunnel > xShapeTunnel(xShape, uno::UNO_QUERY); @@ -777,7 +777,7 @@ void SwXDrawPage::add(const uno::Reference< drawing::XShape > & xShape) void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pDoc) throw uno::RuntimeException(); uno::Reference<lang::XComponent> xComp(xShape, uno::UNO_QUERY); @@ -786,7 +786,7 @@ void SwXDrawPage::remove(const uno::Reference< drawing::XShape > & xShape) throw uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference< drawing::XShapes > & xShapes) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pDoc || !xShapes.is()) throw uno::RuntimeException(); uno::Reference< drawing::XShapeGroup > xRet; @@ -840,7 +840,7 @@ uno::Reference< drawing::XShapeGroup > SwXDrawPage::group(const uno::Reference< void SwXDrawPage::ungroup(const uno::Reference< drawing::XShapeGroup > & xShapeGroup) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pDoc) throw uno::RuntimeException(); if(xPageAgg.is()) @@ -866,7 +866,7 @@ SwFmDrawPage* SwXDrawPage::GetSvxPage() { if(!xPageAgg.is() && pDoc) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // --> OD 2005-08-08 #i52858# - method name changed SdrModel* pModel = pDoc->GetOrCreateDrawModel(); // <-- @@ -1070,7 +1070,7 @@ uno::Sequence< uno::Type > SwXShape::getTypes( ) throw(uno::RuntimeException) uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // do we need to compute the implementation id for this instance? if( !pImplementationId && xShapeAgg.is()) { @@ -1112,7 +1112,7 @@ uno::Sequence< sal_Int8 > SwXShape::getImplementationId( ) throw(uno::RuntimeEx uno::Reference< beans::XPropertySetInfo > SwXShape::getPropertySetInfo(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< beans::XPropertySetInfo > aRet; if(xShapeAgg.is()) { @@ -1138,7 +1138,7 @@ void SwXShape::setPropertyValue(const rtl::OUString& rPropertyName, const uno::A lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName ); if(xShapeAgg.is()) @@ -1499,7 +1499,7 @@ uno::Any SwXShape::getPropertyValue(const rtl::OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SwFrmFmt* pFmt = GetFrmFmt(); if(xShapeAgg.is()) @@ -1753,7 +1753,7 @@ uno::Any SwXShape::_getPropAtAggrObj( const ::rtl::OUString& _rPropertyName ) beans::PropertyState SwXShape::getPropertyState( const rtl::OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< rtl::OUString > aNames(1); rtl::OUString* pStrings = aNames.getArray(); pStrings[0] = rPropertyName; @@ -1765,7 +1765,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( const uno::Sequence< rtl::OUString >& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); uno::Sequence< beans::PropertyState > aRet(aPropertyNames.getLength()); if(xShapeAgg.is()) @@ -1866,7 +1866,7 @@ uno::Sequence< beans::PropertyState > SwXShape::getPropertyStates( void SwXShape::setPropertyToDefault( const rtl::OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(xShapeAgg.is()) { @@ -1929,7 +1929,7 @@ uno::Any SwXShape::getPropertyDefault( const rtl::OUString& rPropertyName ) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); uno::Any aRet; if(xShapeAgg.is()) @@ -2017,7 +2017,7 @@ void SwXShape::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // get access to SwDoc // (see also SwXTextRange::XTextRangeToSwPaM) @@ -2084,7 +2084,7 @@ void SwXShape::attach(const uno::Reference< text::XTextRange > & xTextRange) uno::Reference< text::XTextRange > SwXShape::getAnchor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > aRef; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -2106,7 +2106,7 @@ uno::Reference< text::XTextRange > SwXShape::getAnchor(void) throw( uno::Runtim void SwXShape::dispose(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) { @@ -2827,7 +2827,7 @@ void SwXGroupShape::release( ) throw() void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SvxShape* pSvxShape = GetSvxShape(); SwFrmFmt* pFmt = GetFrmFmt(); if(pSvxShape && pFmt) @@ -2886,7 +2886,7 @@ void SwXGroupShape::add( const uno::Reference< XShape >& xShape ) throw (uno::Ru void SwXGroupShape::remove( const uno::Reference< XShape >& xShape ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference<XShapes> xShapes; if( xShapeAgg.is() ) { @@ -2901,7 +2901,7 @@ void SwXGroupShape::remove( const uno::Reference< XShape >& xShape ) throw (uno: sal_Int32 SwXGroupShape::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference<XIndexAccess> xAcc; if( xShapeAgg.is() ) { @@ -2918,7 +2918,7 @@ uno::Any SwXGroupShape::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference<XIndexAccess> xAcc; if( xShapeAgg.is() ) { @@ -2933,7 +2933,7 @@ uno::Any SwXGroupShape::getByIndex(sal_Int32 nIndex) uno::Type SwXGroupShape::getElementType( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference<XIndexAccess> xAcc; if( xShapeAgg.is() ) { @@ -2948,7 +2948,7 @@ uno::Type SwXGroupShape::getElementType( ) throw(uno::RuntimeException) sal_Bool SwXGroupShape::hasElements( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference<XIndexAccess> xAcc; if( xShapeAgg.is() ) { diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 14552fb7cb..ec7c0bc901 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -506,7 +506,7 @@ SwXFieldMaster::~SwXFieldMaster() uno::Reference< beans::XPropertySetInfo > SwXFieldMaster::getPropertySetInfo(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< beans::XPropertySetInfo > aRef = aSwMapProvider.GetPropertySet( lcl_GetPropMapIdForFieldType( nResTypeId ) )->getPropertySetInfo(); @@ -518,7 +518,7 @@ void SwXFieldMaster::setPropertyValue( const OUString& rPropertyName, throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFieldType* pType = GetFldType(sal_True); if(pType) { @@ -730,7 +730,7 @@ SV_IMPL_PTRARR(SwDependentFields, SwFmtFldPtr) uno::Any SwXFieldMaster::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SwFieldType* pType = GetFldType(sal_True); if( rPropertyName.equalsAsciiL( SW_PROP_NAME(UNO_NAME_INSTANCE_NAME)) ) @@ -900,7 +900,7 @@ void SwXFieldMaster::removeVetoableChangeListener(const OUString& /*PropertyName void SwXFieldMaster::dispose(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFieldType* pFldType = GetFldType(sal_True); if(pFldType) { @@ -1156,7 +1156,7 @@ SwXTextField::~SwXTextField() void SwXTextField::attachTextFieldMaster(const uno::Reference< beans::XPropertySet > & xFieldMaster) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!m_bIsDescriptor) throw uno::RuntimeException(); uno::Reference< lang::XUnoTunnel > xMasterTunnel(xFieldMaster, uno::UNO_QUERY); @@ -1178,7 +1178,7 @@ void SwXTextField::attachTextFieldMaster(const uno::Reference< beans::XPropertyS uno::Reference< beans::XPropertySet > SwXTextField::getTextFieldMaster(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFieldType* pType = 0; if( m_bIsDescriptor && m_aFieldTypeClient.GetRegisteredIn() ) { @@ -1200,7 +1200,7 @@ uno::Reference< beans::XPropertySet > SwXTextField::getTextFieldMaster(void) th OUString SwXTextField::getPresentation(sal_Bool bShowCommand) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString sRet; const SwField* pField = GetField(); if(pField) @@ -1214,7 +1214,7 @@ void SwXTextField::attachToRange( const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!m_bIsDescriptor) throw uno::RuntimeException(); uno::Reference<lang::XUnoTunnel> xRangeTunnel( xTextRange, uno::UNO_QUERY); @@ -1787,13 +1787,13 @@ void SwXTextField::attachToRange( void SwXTextField::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; attachToRange( xTextRange ); } uno::Reference< text::XTextRange > SwXTextField::getAnchor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > aRef; SwField* pField = (SwField*)GetField(); if(pField) @@ -1814,7 +1814,7 @@ uno::Reference< text::XTextRange > SwXTextField::getAnchor(void) throw( uno::Ru void SwXTextField::dispose(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwField* pField = (SwField*)GetField(); if(pField) { @@ -1851,7 +1851,7 @@ void SwXTextField::removeEventListener(const uno::Reference< lang::XEventListene uno::Reference< beans::XPropertySetInfo > SwXTextField::getPropertySetInfo(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; //kein static uno::Reference< beans::XPropertySetInfo > aRef; if(m_nServiceId != USHRT_MAX) @@ -1874,7 +1874,7 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwField* pField = (SwField*)GetField(); const SfxItemPropertySet* _pPropSet = aSwMapProvider.GetPropertySet( lcl_GetPropertyMapOfService( m_nServiceId)); @@ -2034,7 +2034,7 @@ void SwXTextField::setPropertyValue(const OUString& rPropertyName, const uno::An uno::Any SwXTextField::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; const SwField* pField = GetField(); const SfxItemPropertySet* _pPropSet = aSwMapProvider.GetPropertySet( @@ -2239,7 +2239,7 @@ void SwXTextField::removeVetoableChangeListener(const OUString& /*PropertyName*/ void SwXTextField::update( ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const SwField* pFld = GetField(); if(pFld) { @@ -2476,7 +2476,7 @@ sal_uInt16 lcl_GetIdByName( String& rName, String& rTypeName ) uno::Any SwXTextFieldMasters::getByName(const OUString& rName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!GetDoc()) throw uno::RuntimeException(); @@ -2546,7 +2546,7 @@ sal_Bool SwXTextFieldMasters::getInstanceName( uno::Sequence< OUString > SwXTextFieldMasters::getElementNames(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!GetDoc()) throw uno::RuntimeException(); @@ -2583,7 +2583,7 @@ uno::Sequence< OUString > SwXTextFieldMasters::getElementNames(void) sal_Bool SwXTextFieldMasters::hasByName(const OUString& rName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!GetDoc()) throw uno::RuntimeException(); @@ -2606,7 +2606,7 @@ uno::Type SwXTextFieldMasters::getElementType(void) throw( uno::RuntimeExceptio sal_Bool SwXTextFieldMasters::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return sal_True; @@ -2650,7 +2650,7 @@ void SwXTextFieldTypes::Invalidate() uno::Reference< container::XEnumeration > SwXTextFieldTypes::createEnumeration(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return new SwXFieldEnumeration(GetDoc()); @@ -2663,7 +2663,7 @@ uno::Type SwXTextFieldTypes::getElementType(void) throw( uno::RuntimeException sal_Bool SwXTextFieldTypes::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); //es gibt sie immer @@ -2672,7 +2672,7 @@ sal_Bool SwXTextFieldTypes::hasElements(void) throw( uno::RuntimeException ) void SwXTextFieldTypes::refresh(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); UnoActionContext aContext(GetDoc()); @@ -2687,7 +2687,7 @@ void SwXTextFieldTypes::refresh(void) throw( uno::RuntimeException ) void SwXTextFieldTypes::addRefreshListener(const uno::Reference< util::XRefreshListener > & l) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( !IsValid() ) throw uno::RuntimeException(); aRefreshCont.AddListener ( reinterpret_cast < const uno::Reference < lang::XEventListener > &> ( l )); @@ -2696,7 +2696,7 @@ void SwXTextFieldTypes::addRefreshListener(const uno::Reference< util::XRefreshL void SwXTextFieldTypes::removeRefreshListener(const uno::Reference< util::XRefreshListener > & l) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( !IsValid() || !aRefreshCont.RemoveListener ( reinterpret_cast < const uno::Reference < lang::XEventListener > &> ( l ) ) ) throw uno::RuntimeException(); } @@ -2790,14 +2790,14 @@ SwXFieldEnumeration::~SwXFieldEnumeration() sal_Bool SwXFieldEnumeration::hasMoreElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return nNextIndex < aItems.getLength(); } uno::Any SwXFieldEnumeration::nextElement(void) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!(nNextIndex < aItems.getLength())) throw container::NoSuchElementException(); diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index 8751144c25..35f678ef6f 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -81,7 +81,7 @@ uno::Sequence< uno::Type > SwXFlatParagraph::getTypes( ) throw(uno::RuntimeExce uno::Sequence< sal_Int8 > SwXFlatParagraph::getImplementationId( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -124,7 +124,7 @@ css::uno::Reference< css::container::XStringKeyMap > SAL_CALL SwXFlatParagraph:: void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const ::rtl::OUString & rIdentifier, ::sal_Int32 nStart, ::sal_Int32 nLength, const css::uno::Reference< css::container::XStringKeyMap > & rxMarkupInfoContainer) throw (css::uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwXTextMarkup::commitTextMarkup( nType, rIdentifier, nStart, nLength, rxMarkupInfoContainer ); } @@ -137,7 +137,7 @@ void SAL_CALL SwXFlatParagraph::commitTextMarkup(::sal_Int32 nType, const ::rtl: // text::XFlatParagraph: void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, ::sal_Bool bVal ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( mpTxtNode ) { @@ -157,7 +157,7 @@ void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, ::sal_Bool bVal ) // text::XFlatParagraph: ::sal_Bool SAL_CALL SwXFlatParagraph::isChecked( ::sal_Int32 nType ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( mpTxtNode ) { if ( text::TextMarkupType::SPELLCHECK == nType ) @@ -174,7 +174,7 @@ void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, ::sal_Bool bVal ) // text::XFlatParagraph: ::sal_Bool SAL_CALL SwXFlatParagraph::isModified() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return 0 == mpTxtNode; } @@ -182,7 +182,7 @@ void SAL_CALL SwXFlatParagraph::setChecked( ::sal_Int32 nType, ::sal_Bool bVal ) lang::Locale SAL_CALL SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (uno::RuntimeException, lang::IllegalArgumentException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!mpTxtNode) return SvxCreateLocale( LANGUAGE_NONE ); @@ -194,7 +194,7 @@ lang::Locale SAL_CALL SwXFlatParagraph::getLanguageOfText(::sal_Int32 nPos, ::sa lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPos, ::sal_Int32 nLen) throw (uno::RuntimeException, lang::IllegalArgumentException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!mpTxtNode) return SvxCreateLocale( LANGUAGE_NONE ); @@ -206,7 +206,7 @@ lang::Locale SAL_CALL SwXFlatParagraph::getPrimaryLanguageOfText(::sal_Int32 nPo // text::XFlatParagraph: void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, const ::rtl::OUString & aNewText, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( !mpTxtNode ) return; @@ -238,7 +238,7 @@ void SAL_CALL SwXFlatParagraph::changeText(::sal_Int32 nPos, ::sal_Int32 nLen, c // text::XFlatParagraph: void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 nLen, const css::uno::Sequence< css::beans::PropertyValue > & aAttributes) throw (css::uno::RuntimeException, css::lang::IllegalArgumentException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( !mpTxtNode ) return; @@ -263,7 +263,7 @@ void SAL_CALL SwXFlatParagraph::changeAttributes(::sal_Int32 nPos, ::sal_Int32 n // text::XFlatParagraph: css::uno::Sequence< ::sal_Int32 > SAL_CALL SwXFlatParagraph::getLanguagePortions() throw (css::uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return css::uno::Sequence< ::sal_Int32>(); } @@ -315,7 +315,7 @@ void SwXFlatParagraphIterator::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ) // check if document gets closed... if(!GetRegisteredIn()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; mpDoc = 0; } } @@ -330,7 +330,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getFirstPara() uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getNextPara() throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XFlatParagraph > xRet; if (!mpDoc) @@ -440,7 +440,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getLastPara() uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(const uno::Reference< text::XFlatParagraph > & xPara) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XFlatParagraph > xRet; if (!mpDoc) @@ -487,7 +487,7 @@ uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaAfter(co uno::Reference< text::XFlatParagraph > SwXFlatParagraphIterator::getParaBefore(const uno::Reference< text::XFlatParagraph > & xPara ) throw ( uno::RuntimeException, lang::IllegalArgumentException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XFlatParagraph > xRet; if (!mpDoc) diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index e16b51938d..f7da9ef1b8 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -833,7 +833,7 @@ SwXFrame::~SwXFrame() OUString SwXFrame::getName(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String sRet; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -847,7 +847,7 @@ OUString SwXFrame::getName(void) throw( uno::RuntimeException ) void SwXFrame::setName(const :: OUString& rName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); String sTmpName(rName); if(pFmt) @@ -950,7 +950,7 @@ SwFrmFmt *lcl_GetFrmFmt( const :: uno::Any& rValue, SwDoc *pDoc ) void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); const :: SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName); @@ -1417,7 +1417,7 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno:: uno::Any SwXFrame::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aAny; SwFrmFmt* pFmt = GetFrmFmt(); const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName); @@ -1706,7 +1706,7 @@ void SwXFrame::removeVetoableChangeListener( beans::PropertyState SwXFrame::getPropertyState( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< OUString > aPropertyNames(1); OUString* pNames = aPropertyNames.getArray(); pNames[0] = rPropertyName; @@ -1718,7 +1718,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates( const uno::Sequence< OUString >& aPropertyNames ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< beans::PropertyState > aStates(aPropertyNames.getLength()); beans::PropertyState* pStates = aStates.getArray(); SwFrmFmt* pFmt = GetFrmFmt(); @@ -1781,7 +1781,7 @@ uno::Sequence< beans::PropertyState > SwXFrame::getPropertyStates( void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) { @@ -1878,7 +1878,7 @@ void SwXFrame::setPropertyToDefault( const OUString& rPropertyName ) uno::Any SwXFrame::getPropertyDefault( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -1928,7 +1928,7 @@ void SwXFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) void SwXFrame::dispose(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if ( pFmt ) { @@ -1957,7 +1957,7 @@ void SwXFrame::dispose(void) throw( uno::RuntimeException ) uno::Reference< text::XTextRange > SwXFrame::getAnchor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > aRef; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -1988,7 +1988,7 @@ void SwXFrame::ResetDescriptor() void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsDescriptor()) throw uno::RuntimeException(); uno::Reference<lang::XUnoTunnel> xRangeTunnel( xTextRange, uno::UNO_QUERY); @@ -2354,7 +2354,7 @@ void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) awt::Point SwXFrame::getPosition(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::RuntimeException aRuntime; aRuntime.Message = C2U("position cannot be determined with this method"); throw aRuntime; @@ -2362,7 +2362,7 @@ awt::Point SwXFrame::getPosition(void) throw( uno::RuntimeException ) void SwXFrame::setPosition(const awt::Point& /*aPosition*/) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::RuntimeException aRuntime; aRuntime.Message = C2U("position cannot be changed with this method"); throw aRuntime; @@ -2455,7 +2455,7 @@ uno::Sequence< uno::Type > SAL_CALL SwXTextFrame::getTypes( ) throw(uno::Runtim uno::Sequence< sal_Int8 > SAL_CALL SwXTextFrame::getImplementationId( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -2494,7 +2494,7 @@ SwXTextFrame::CreateCursor() throw (uno::RuntimeException) uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextCursor > aRef; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -2541,7 +2541,7 @@ uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursor(void) throw( uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursorByRange(const uno::Reference< text::XTextRange > & aTextPosition) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextCursor > aRef; SwFrmFmt* pFmt = GetFrmFmt(); SwUnoInternalPaM aPam(*GetDoc()); @@ -2568,7 +2568,7 @@ uno::Reference< text::XTextCursor > SwXTextFrame::createTextCursorByRange(const uno::Reference< container::XEnumeration > SwXTextFrame::createEnumeration(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< container::XEnumeration > aRef; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -2605,13 +2605,13 @@ void SwXTextFrame::attach(const uno::Reference< text::XTextRange > & xTextRange) uno::Reference< text::XTextRange > SwXTextFrame::getAnchor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return SwXFrame::getAnchor(); } void SwXTextFrame::dispose(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwXFrame::dispose(); } @@ -2676,7 +2676,7 @@ sal_Int64 SAL_CALL SwXTextFrame::getSomething( const uno::Sequence< sal_Int8 >& ::uno::Any SwXTextFrame::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ::uno::Any aRet; if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_START_REDLINE))|| rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_END_REDLINE))) @@ -2750,7 +2750,7 @@ uno::Sequence< uno::Type > SAL_CALL uno::Sequence< sal_Int8 > SAL_CALL SwXTextGraphicObject::getImplementationId( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -2768,13 +2768,13 @@ void SwXTextGraphicObject::attach(const uno::Reference< text::XTextRange > & xTe uno::Reference< text::XTextRange > SwXTextGraphicObject::getAnchor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return SwXFrame::getAnchor(); } void SwXTextGraphicObject::dispose(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwXFrame::dispose(); } @@ -2885,7 +2885,7 @@ uno::Sequence< uno::Type > SAL_CALL SwXTextEmbeddedObject::getTypes( ) throw(un uno::Sequence< sal_Int8 > SAL_CALL SwXTextEmbeddedObject::getImplementationId( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -2903,13 +2903,13 @@ void SwXTextEmbeddedObject::attach(const uno::Reference< text::XTextRange > & xT uno::Reference< text::XTextRange > SwXTextEmbeddedObject::getAnchor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return SwXFrame::getAnchor(); } void SwXTextEmbeddedObject::dispose(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwXFrame::dispose(); } @@ -3110,7 +3110,7 @@ SwXOLEListener::~SwXOLEListener() void SwXOLEListener::modified( const lang::EventObject& /*rEvent*/ ) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwOLENode* pNd = 0; SwFmt* pFmt = GetFmt(); @@ -3142,7 +3142,7 @@ void SwXOLEListener::modified( const lang::EventObject& /*rEvent*/ ) void SwXOLEListener::disposing( const lang::EventObject& rEvent ) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< util::XModifyListener > xListener( this ); diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index f11e7681bc..c1e7fa3cf9 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -213,7 +213,7 @@ static const size_t g_nServicesFootnote( g_nServicesEndnote - 1 ); // NB: omit! sal_Bool SAL_CALL SwXFootnote::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return ::sw::SupportsServiceImpl( (m_pImpl->m_bIsEndnote) ? g_nServicesEndnote : g_nServicesFootnote, g_ServicesFootnote, rServiceName); @@ -222,7 +222,7 @@ throw (uno::RuntimeException) uno::Sequence< OUString > SAL_CALL SwXFootnote::getSupportedServiceNames() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return ::sw::GetSupportedServiceNamesImpl( (m_pImpl->m_bIsEndnote) ? g_nServicesEndnote : g_nServicesFootnote, g_ServicesFootnote); @@ -239,7 +239,7 @@ SwXFootnote::getTypes() throw (uno::RuntimeException) uno::Sequence< sal_Int8 > SAL_CALL SwXFootnote::getImplementationId() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -262,7 +262,7 @@ throw (uno::RuntimeException) OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ::rtl::OUString sRet; SwFmtFtn const*const pFmt = m_pImpl->GetFootnoteFormat(); @@ -284,7 +284,7 @@ OUString SAL_CALL SwXFootnote::getLabel() throw (uno::RuntimeException) void SAL_CALL SwXFootnote::setLabel(const OUString& aLabel) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFmtFtn const*const pFmt = m_pImpl->GetFootnoteFormat(); if(pFmt) @@ -310,7 +310,7 @@ void SAL_CALL SwXFootnote::attach(const uno::Reference< text::XTextRange > & xTextRange) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pImpl->m_bIsDescriptor) { @@ -378,7 +378,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXFootnote::getAnchor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFmtFtn const& rFmt( m_pImpl->GetFootnoteFormatOrThrow() ); @@ -394,7 +394,7 @@ SwXFootnote::getAnchor() throw (uno::RuntimeException) void SAL_CALL SwXFootnote::dispose() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFmtFtn const& rFmt( m_pImpl->GetFootnoteFormatOrThrow() ); @@ -411,7 +411,7 @@ SwXFootnote::addEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->GetFootnoteFormat()) { @@ -425,7 +425,7 @@ SwXFootnote::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->GetFootnoteFormat() || !m_pImpl->m_ListenerContainer.RemoveListener(xListener)) @@ -457,7 +457,7 @@ SwXFootnote::CreateCursor() throw (uno::RuntimeException) uno::Reference< text::XTextCursor > SAL_CALL SwXFootnote::createTextCursor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFmtFtn const& rFmt( m_pImpl->GetFootnoteFormatOrThrow() ); @@ -477,7 +477,7 @@ SwXFootnote::createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFmtFtn const& rFmt( m_pImpl->GetFootnoteFormatOrThrow() ); @@ -506,7 +506,7 @@ throw (uno::RuntimeException) uno::Reference< container::XEnumeration > SAL_CALL SwXFootnote::createEnumeration() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFmtFtn const& rFmt( m_pImpl->GetFootnoteFormatOrThrow() ); @@ -534,7 +534,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXFootnote::getPropertySetInfo() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; static uno::Reference< beans::XPropertySetInfo > xRet = aSwMapProvider.GetPropertySet(PROPERTY_MAP_FOOTNOTE) ->getPropertySetInfo(); @@ -556,7 +556,7 @@ SwXFootnote::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if (! ::sw::GetDefaultTextContentValue(aRet, rPropertyName)) diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 4175ae3e26..8e213f0aad 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -464,7 +464,7 @@ sal_Bool SAL_CALL SwXDocumentIndex::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return C2U("com.sun.star.text.BaseIndex") == rServiceName || ((TOX_INDEX == m_pImpl->m_eTOXType) && @@ -486,7 +486,7 @@ throw (uno::RuntimeException) uno::Sequence< OUString > SAL_CALL SwXDocumentIndex::getSupportedServiceNames() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; uno::Sequence< OUString > aRet(2); OUString* pArray = aRet.getArray(); @@ -521,7 +521,7 @@ SwXDocumentIndex::getSupportedServiceNames() throw (uno::RuntimeException) OUString SAL_CALL SwXDocumentIndex::getServiceName() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; USHORT nObjectType = SW_SERVICE_TYPE_INDEX; switch (m_pImpl->m_eTOXType) @@ -547,7 +547,7 @@ throw (uno::RuntimeException) void SAL_CALL SwXDocumentIndex::update() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt(); SwTOXBaseSection *const pTOXBase = (pFmt) ? @@ -564,7 +564,7 @@ void SAL_CALL SwXDocumentIndex::update() throw (uno::RuntimeException) uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXDocumentIndex::getPropertySetInfo() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; const uno::Reference< beans::XPropertySetInfo > xRef = m_pImpl->m_rPropSet.getPropertySetInfo(); @@ -578,7 +578,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SfxItemPropertySimpleEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName); @@ -893,7 +893,7 @@ SwXDocumentIndex::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SfxItemPropertySimpleEntry const*const pEntry = @@ -1284,7 +1284,7 @@ void SAL_CALL SwXDocumentIndex::attach(const uno::Reference< text::XTextRange > & xTextRange) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pImpl->m_bIsDescriptor) { @@ -1345,7 +1345,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXDocumentIndex::getAnchor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() ); if (!pSectionFmt) @@ -1389,7 +1389,7 @@ void lcl_RemoveChildSections(SwSectionFmt& rParentFmt) void SAL_CALL SwXDocumentIndex::dispose() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() ); if (pSectionFmt) @@ -1405,7 +1405,7 @@ SwXDocumentIndex::addEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->GetRegisteredIn()) { @@ -1419,7 +1419,7 @@ SwXDocumentIndex::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->GetRegisteredIn() || !m_pImpl->m_ListenerContainer.RemoveListener(xListener)) @@ -1430,7 +1430,7 @@ throw (uno::RuntimeException) OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; OUString uRet; SwSectionFmt *const pSectionFmt( m_pImpl->GetSectionFmt() ); @@ -1452,7 +1452,7 @@ OUString SAL_CALL SwXDocumentIndex::getName() throw (uno::RuntimeException) void SAL_CALL SwXDocumentIndex::setName(const OUString& rName) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!rName.getLength()) { @@ -1688,7 +1688,7 @@ sal_Bool SAL_CALL SwXDocumentIndexMark::supportsService(const OUString& rServiceName) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return rServiceName.equalsAscii(cBaseMark) || rServiceName.equalsAscii(cTextContent) @@ -1705,7 +1705,7 @@ throw (uno::RuntimeException) uno::Sequence< OUString > SAL_CALL SwXDocumentIndexMark::getSupportedServiceNames() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; const sal_Int32 nCnt = (m_pImpl->m_eTOXType == TOX_INDEX) ? 4 : 3; uno::Sequence< OUString > aRet(nCnt); @@ -1734,7 +1734,7 @@ SwXDocumentIndexMark::getSupportedServiceNames() throw (uno::RuntimeException) OUString SAL_CALL SwXDocumentIndexMark::getMarkEntry() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString sRet; SwTOXType *const pType = m_pImpl->GetTOXType(); @@ -1757,7 +1757,7 @@ void SAL_CALL SwXDocumentIndexMark::setMarkEntry(const OUString& rIndexEntry) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTOXType *const pType = m_pImpl->GetTOXType(); if (pType && m_pImpl->m_pTOXMark) @@ -1792,7 +1792,7 @@ SwXDocumentIndexMark::attach( const uno::Reference< text::XTextRange > & xTextRange) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pImpl->m_bIsDescriptor) { @@ -1999,7 +1999,7 @@ void SwXDocumentIndexMark::Impl::InsertTOXMark( uno::Reference< text::XTextRange > SAL_CALL SwXDocumentIndexMark::getAnchor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTOXType *const pType = m_pImpl->GetTOXType(); if (!pType || !m_pImpl->m_pTOXMark) @@ -2033,7 +2033,7 @@ SwXDocumentIndexMark::getAnchor() throw (uno::RuntimeException) void SAL_CALL SwXDocumentIndexMark::dispose() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTOXType *const pType = m_pImpl->GetTOXType(); if (pType && m_pImpl->m_pTOXMark) @@ -2047,7 +2047,7 @@ SwXDocumentIndexMark::addEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->GetRegisteredIn()) { @@ -2061,7 +2061,7 @@ SwXDocumentIndexMark::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->GetRegisteredIn() || !m_pImpl->m_ListenerContainer.RemoveListener(xListener)) @@ -2073,7 +2073,7 @@ throw (uno::RuntimeException) uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXDocumentIndexMark::getPropertySetInfo() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; static uno::Reference< beans::XPropertySetInfo > xInfos[3]; int nPos = 0; @@ -2106,7 +2106,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SfxItemPropertySimpleEntry const*const pEntry = m_pImpl->m_rPropSet.getPropertyMap()->getByName(rPropertyName); @@ -2230,7 +2230,7 @@ SwXDocumentIndexMark::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SfxItemPropertySimpleEntry const*const pEntry = @@ -2420,7 +2420,7 @@ SwXDocumentIndexes::getSupportedServiceNames() throw (uno::RuntimeException) sal_Int32 SAL_CALL SwXDocumentIndexes::getCount() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); @@ -2444,7 +2444,7 @@ SwXDocumentIndexes::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); @@ -2476,7 +2476,7 @@ SwXDocumentIndexes::getByName(const OUString& rName) throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); @@ -2505,7 +2505,7 @@ throw (container::NoSuchElementException, lang::WrappedTargetException, uno::Sequence< OUString > SAL_CALL SwXDocumentIndexes::getElementNames() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); @@ -2543,7 +2543,7 @@ sal_Bool SAL_CALL SwXDocumentIndexes::hasByName(const OUString& rName) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); @@ -2629,7 +2629,7 @@ SwXDocumentIndex::StyleAccess_Impl::replaceByIndex( throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(nIndex < 0 || nIndex > MAXLEVEL) { @@ -2672,7 +2672,7 @@ SwXDocumentIndex::StyleAccess_Impl::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(nIndex < 0 || nIndex > MAXLEVEL) { @@ -2783,7 +2783,7 @@ SwXDocumentIndex::TokenAccess_Impl::replaceByIndex( throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTOXBase & rTOXBase( m_xParent->m_pImpl->GetTOXSectionOrThrow() ); @@ -2974,7 +2974,7 @@ throw (lang::IllegalArgumentException, lang::IndexOutOfBoundsException, sal_Int32 SAL_CALL SwXDocumentIndex::TokenAccess_Impl::getCount() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const sal_Int32 nRet = m_xParent->m_pImpl->GetFormMax(); return nRet; @@ -2985,7 +2985,7 @@ SwXDocumentIndex::TokenAccess_Impl::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTOXBase & rTOXBase( m_xParent->m_pImpl->GetTOXSectionOrThrow() ); diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 2beb02f558..63d8321b5e 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -1031,7 +1031,7 @@ throw (uno::RuntimeException) void SAL_CALL SwXTextCursor::collapseToStart() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1047,7 +1047,7 @@ void SAL_CALL SwXTextCursor::collapseToStart() throw (uno::RuntimeException) void SAL_CALL SwXTextCursor::collapseToEnd() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1063,7 +1063,7 @@ void SAL_CALL SwXTextCursor::collapseToEnd() throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::isCollapsed() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_True; SwUnoCrsr *const pUnoCrsr = m_pImpl->GetCursor(); @@ -1078,7 +1078,7 @@ sal_Bool SAL_CALL SwXTextCursor::goLeft(sal_Int16 nCount, sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1097,7 +1097,7 @@ sal_Bool SAL_CALL SwXTextCursor::goRight(sal_Int16 nCount, sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1115,7 +1115,7 @@ throw (uno::RuntimeException) void SAL_CALL SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1171,7 +1171,7 @@ SwXTextCursor::gotoStart(sal_Bool Expand) throw (uno::RuntimeException) void SAL_CALL SwXTextCursor::gotoEnd(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1200,7 +1200,7 @@ SwXTextCursor::gotoRange( const uno::Reference< text::XTextRange > & xRange, sal_Bool bExpand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!xRange.is()) { @@ -1324,7 +1324,7 @@ throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1335,7 +1335,7 @@ sal_Bool SAL_CALL SwXTextCursor::isStartOfWord() throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1347,7 +1347,7 @@ sal_Bool SAL_CALL SwXTextCursor::isEndOfWord() throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1394,7 +1394,7 @@ SwXTextCursor::gotoNextWord(sal_Bool Expand) throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1434,7 +1434,7 @@ SwXTextCursor::gotoPreviousWord(sal_Bool Expand) throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1470,7 +1470,7 @@ SwXTextCursor::gotoEndOfWord(sal_Bool Expand) throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1506,7 +1506,7 @@ SwXTextCursor::gotoStartOfWord(sal_Bool Expand) throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1529,7 +1529,7 @@ SwXTextCursor::isStartOfSentence() throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1553,7 +1553,7 @@ SwXTextCursor::isEndOfSentence() throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::gotoNextSentence(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1589,7 +1589,7 @@ sal_Bool SAL_CALL SwXTextCursor::gotoPreviousSentence(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1618,7 +1618,7 @@ sal_Bool SAL_CALL SwXTextCursor::gotoStartOfSentence(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1642,7 +1642,7 @@ throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1667,7 +1667,7 @@ SwXTextCursor::gotoEndOfSentence(sal_Bool Expand) throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::isStartOfParagraph() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1678,7 +1678,7 @@ SwXTextCursor::isStartOfParagraph() throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::isEndOfParagraph() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1690,7 +1690,7 @@ sal_Bool SAL_CALL SwXTextCursor::gotoStartOfParagraph(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1715,7 +1715,7 @@ throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1740,7 +1740,7 @@ SwXTextCursor::gotoEndOfParagraph(sal_Bool Expand) throw (uno::RuntimeException) sal_Bool SAL_CALL SwXTextCursor::gotoNextParagraph(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1757,7 +1757,7 @@ sal_Bool SAL_CALL SwXTextCursor::gotoPreviousParagraph(sal_Bool Expand) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1773,7 +1773,7 @@ throw (uno::RuntimeException) uno::Reference< text::XText > SAL_CALL SwXTextCursor::getText() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_xParentText; } @@ -1781,7 +1781,7 @@ SwXTextCursor::getText() throw (uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXTextCursor::getStart() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1807,7 +1807,7 @@ SwXTextCursor::getStart() throw (uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXTextCursor::getEnd() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1832,7 +1832,7 @@ SwXTextCursor::getEnd() throw (uno::RuntimeException) OUString SAL_CALL SwXTextCursor::getString() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -1844,7 +1844,7 @@ OUString SAL_CALL SwXTextCursor::getString() throw (uno::RuntimeException) void SAL_CALL SwXTextCursor::setString(const OUString& aString) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); (void) rUnoCursor; // just to check if valid @@ -2150,7 +2150,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXTextCursor::getPropertySetInfo() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; static uno::Reference< beans::XPropertySetInfo > xRef; if(!xRef.is()) @@ -2179,7 +2179,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -2214,7 +2214,7 @@ SwXTextCursor::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -2286,7 +2286,7 @@ beans::PropertyState SAL_CALL SwXTextCursor::getPropertyState(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -2300,7 +2300,7 @@ SwXTextCursor::getPropertyStates( const uno::Sequence< OUString >& rPropertyNames) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -2366,7 +2366,7 @@ void SAL_CALL SwXTextCursor::setAllPropertiesToDefault() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -2390,7 +2390,7 @@ SwXTextCursor::setPropertiesToDefault( const uno::Sequence< OUString >& rPropertyNames) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -2462,7 +2462,7 @@ SwXTextCursor::getPropertyDefaults( throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -2508,7 +2508,7 @@ SwXTextCursor::makeRedline( const uno::Sequence< beans::PropertyValue >& rRedlineProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -2520,7 +2520,7 @@ void SAL_CALL SwXTextCursor::insertDocumentFromURL(const OUString& rURL, throw (lang::IllegalArgumentException, io::IOException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -2601,7 +2601,7 @@ SwUnoCursorHelper::CreateSortDescriptor(const bool bFromTable) uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextCursor::createSortDescriptor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return SwUnoCursorHelper::CreateSortDescriptor(false); } @@ -2857,7 +2857,7 @@ void SAL_CALL SwXTextCursor::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); @@ -2901,7 +2901,7 @@ uno::Reference< container::XEnumeration > SAL_CALL SwXTextCursor::createContentEnumeration(const OUString& rServiceName) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!rServiceName.equalsAscii("com.sun.star.text.TextContent")) { @@ -2918,7 +2918,7 @@ throw (uno::RuntimeException) uno::Reference< container::XEnumeration > SAL_CALL SwXTextCursor::createEnumeration() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; SwUnoCrsr & rUnoCursor( m_pImpl->GetCursorOrThrow() ); diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 98c6ae67e1..b534aad8f4 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -574,7 +574,7 @@ throw (uno::RuntimeException) sal_Bool SAL_CALL SwXParagraphEnumeration::hasMoreElements() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return (m_pImpl->m_bFirstParagraph) ? sal_True : m_pImpl->m_xNextPara.is(); } @@ -721,7 +721,7 @@ uno::Any SAL_CALL SwXParagraphEnumeration::nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (m_pImpl->m_bFirstParagraph) { @@ -951,7 +951,7 @@ SwXTextRange::getSupportedServiceNames() throw (uno::RuntimeException) uno::Reference< text::XText > SAL_CALL SwXTextRange::getText() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pImpl->m_xParentText.is()) { @@ -974,7 +974,7 @@ SwXTextRange::getText() throw (uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXTextRange::getStart() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; ::sw::mark::IMark const * const pBkmk = m_pImpl->GetBookmark(); @@ -1002,7 +1002,7 @@ SwXTextRange::getStart() throw (uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXTextRange::getEnd() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; ::sw::mark::IMark const * const pBkmk = m_pImpl->GetBookmark(); @@ -1029,7 +1029,7 @@ SwXTextRange::getEnd() throw (uno::RuntimeException) OUString SAL_CALL SwXTextRange::getString() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString sRet; // for tables there is no bookmark, thus also no text @@ -1045,7 +1045,7 @@ OUString SAL_CALL SwXTextRange::getString() throw (uno::RuntimeException) void SAL_CALL SwXTextRange::setString(const OUString& rString) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; DeleteAndInsert(rString, false); } @@ -1306,7 +1306,7 @@ uno::Reference< container::XEnumeration > SAL_CALL SwXTextRange::createContentEnumeration(const OUString& rServiceName) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!rServiceName.equalsAscii("com.sun.star.text.TextContent")) { @@ -1333,7 +1333,7 @@ throw (uno::RuntimeException) uno::Reference< container::XEnumeration > SAL_CALL SwXTextRange::createEnumeration() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!GetDoc() || !m_pImpl->GetBookmark()) { @@ -1380,7 +1380,7 @@ SwXTextRange::getAvailableServiceNames() throw (uno::RuntimeException) uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXTextRange::getPropertySetInfo() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Reference< beans::XPropertySetInfo > xRef = m_pImpl->m_rPropSet.getPropertySetInfo(); @@ -1394,7 +1394,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!GetDoc() || !m_pImpl->GetBookmark()) { @@ -1411,7 +1411,7 @@ SwXTextRange::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!GetDoc() || !m_pImpl->GetBookmark()) { @@ -1471,7 +1471,7 @@ beans::PropertyState SAL_CALL SwXTextRange::getPropertyState(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!GetDoc() || !m_pImpl->GetBookmark()) { @@ -1487,7 +1487,7 @@ uno::Sequence< beans::PropertyState > SAL_CALL SwXTextRange::getPropertyStates(const uno::Sequence< OUString >& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!GetDoc() || !m_pImpl->GetBookmark()) { @@ -1502,7 +1502,7 @@ throw (beans::UnknownPropertyException, uno::RuntimeException) void SAL_CALL SwXTextRange::setPropertyToDefault(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!GetDoc() || !m_pImpl->GetBookmark()) { @@ -1519,7 +1519,7 @@ SwXTextRange::getPropertyDefault(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!GetDoc() || !m_pImpl->GetBookmark()) { @@ -1537,7 +1537,7 @@ SwXTextRange::makeRedline( const uno::Sequence< beans::PropertyValue >& rRedlineProperties ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!GetDoc() || !m_pImpl->GetBookmark()) { @@ -1677,7 +1677,7 @@ SwXTextRanges::getSupportedServiceNames() throw (uno::RuntimeException) sal_Int32 SAL_CALL SwXTextRanges::getCount() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return static_cast<sal_Int32>(m_pImpl->m_Ranges.size()); } @@ -1686,7 +1686,7 @@ uno::Any SAL_CALL SwXTextRanges::getByIndex(sal_Int32 nIndex) throw (lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ((nIndex < 0) || (static_cast<size_t>(nIndex) >= m_pImpl->m_Ranges.size())) @@ -1923,7 +1923,7 @@ SwXParaFrameEnumeration::~SwXParaFrameEnumeration() sal_Bool SAL_CALL SwXParaFrameEnumeration::hasMoreElements() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pImpl->GetCursor()) throw uno::RuntimeException(); @@ -1938,7 +1938,7 @@ uno::Any SAL_CALL SwXParaFrameEnumeration::nextElement() throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pImpl->GetCursor()) { diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 17721c163b..84ca2d265e 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -344,7 +344,7 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXParagraph::getPropertySetInfo() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; static uno::Reference< beans::XPropertySetInfo > xRef = m_pImpl->m_rPropSet.getPropertySetInfo(); @@ -358,7 +358,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence<OUString> aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; uno::Sequence<uno::Any> aValues(1); @@ -371,7 +371,7 @@ SwXParagraph::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence<OUString> aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; const uno::Sequence< uno::Any > aRet = @@ -423,7 +423,7 @@ void SAL_CALL SwXParagraph::setPropertyValues( throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // workaround for bad designed API try @@ -485,7 +485,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXParagraph::getPropertyValues(const uno::Sequence< OUString >& rPropertyNames) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< uno::Any > aValues; // workaround for bad designed API @@ -543,7 +543,7 @@ SwXParagraph::setPropertyValuesTolerant( const uno::Sequence< uno::Any >& rValues ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (rPropertyNames.getLength() != rValues.getLength()) { @@ -636,7 +636,7 @@ SwXParagraph::getPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Sequence< beans::GetDirectPropertyTolerantResult > aTmpRes( m_pImpl->GetPropertyValuesTolerant_Impl( rPropertyNames, false ) ); @@ -659,7 +659,7 @@ SwXParagraph::getDirectPropertyValuesTolerant( const uno::Sequence< OUString >& rPropertyNames ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return m_pImpl->GetPropertyValuesTolerant_Impl( rPropertyNames, true ); } @@ -670,7 +670,7 @@ SwXParagraph::Impl::GetPropertyValuesTolerant_Impl( bool bDirectValuesOnly ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SwTxtNode & rTxtNode(GetTxtNodeOrThrow()); @@ -921,7 +921,7 @@ beans::PropertyState SAL_CALL SwXParagraph::getPropertyState(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow()); @@ -946,7 +946,7 @@ SwXParagraph::getPropertyStates( const uno::Sequence< OUString >& PropertyNames) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow()); @@ -988,7 +988,7 @@ void SAL_CALL SwXParagraph::setPropertyToDefault(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow()); @@ -1063,7 +1063,7 @@ SwXParagraph::getPropertyDefault(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow()); @@ -1097,7 +1097,7 @@ void SAL_CALL SwXParagraph::attach(const uno::Reference< text::XTextRange > & /*xTextRange*/) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // SwXParagraph will only created in order to be inserted by // 'insertTextContentBefore' or 'insertTextContentAfter' therefore // they cannot be attached @@ -1107,7 +1107,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXParagraph::getAnchor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow()); @@ -1122,7 +1122,7 @@ SwXParagraph::getAnchor() throw (uno::RuntimeException) void SAL_CALL SwXParagraph::dispose() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTxtNode *const pTxtNode( m_pImpl->GetTxtNode() ); if (pTxtNode) @@ -1141,7 +1141,7 @@ void SAL_CALL SwXParagraph::addEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->GetTxtNode()) { @@ -1154,7 +1154,7 @@ void SAL_CALL SwXParagraph::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->GetTxtNode() || !m_pImpl->m_ListenerContainer.RemoveListener(xListener)) @@ -1166,7 +1166,7 @@ throw (uno::RuntimeException) uno::Reference< container::XEnumeration > SAL_CALL SwXParagraph::createEnumeration() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow()); @@ -1185,14 +1185,14 @@ uno::Type SAL_CALL SwXParagraph::getElementType() throw (uno::RuntimeException) sal_Bool SAL_CALL SwXParagraph::hasElements() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return (GetTxtNode()) ? sal_True : sal_False; } uno::Reference< text::XText > SAL_CALL SwXParagraph::getText() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_xParentText; } @@ -1200,7 +1200,7 @@ SwXParagraph::getText() throw (uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXParagraph::getStart() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow()); @@ -1217,7 +1217,7 @@ SwXParagraph::getStart() throw (uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXParagraph::getEnd() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTxtNode & rTxtNode(m_pImpl->GetTxtNodeOrThrow()); @@ -1233,7 +1233,7 @@ SwXParagraph::getEnd() throw (uno::RuntimeException) OUString SAL_CALL SwXParagraph::getString() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString aRet; SwTxtNode const*const pTxtNode( GetTxtNode() ); if (pTxtNode) @@ -1257,7 +1257,7 @@ OUString SAL_CALL SwXParagraph::getString() throw (uno::RuntimeException) void SAL_CALL SwXParagraph::setString(const OUString& aString) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTxtNode const*const pTxtNode( GetTxtNode() ); if (pTxtNode) @@ -1288,7 +1288,7 @@ uno::Reference< container::XEnumeration > SAL_CALL SwXParagraph::createContentEnumeration(const OUString& rServiceName) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!rServiceName.equalsAscii("com.sun.star.text.TextContent")) { diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 55d9bc69c4..5d2f7ed16e 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -146,7 +146,7 @@ SwXTextPortion::SwXTextPortion(const SwUnoCrsr* pPortionCrsr, SwXTextPortion::~SwXTextPortion() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); delete pUnoCrsr; } @@ -160,7 +160,7 @@ throw( uno::RuntimeException ) uno::Reference< text::XTextRange > SwXTextPortion::getStart() throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) @@ -175,7 +175,7 @@ throw( uno::RuntimeException ) uno::Reference< text::XTextRange > SwXTextPortion::getEnd() throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) @@ -190,7 +190,7 @@ throw( uno::RuntimeException ) OUString SwXTextPortion::getString() throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString aTxt; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) @@ -209,7 +209,7 @@ throw( uno::RuntimeException ) void SwXTextPortion::setString(const OUString& aString) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) throw uno::RuntimeException(); @@ -220,7 +220,7 @@ void SwXTextPortion::setString(const OUString& aString) throw( uno::RuntimeExcep uno::Reference< beans::XPropertySetInfo > SwXTextPortion::getPropertySetInfo() throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; //! PropertySetInfo for text portion extensions static uno::Reference< beans::XPropertySetInfo > xTxtPorExtRef = aSwMapProvider.GetPropertySet( @@ -239,7 +239,7 @@ void SwXTextPortion::setPropertyValue(const OUString& rPropertyName, throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) throw uno::RuntimeException(); @@ -437,7 +437,7 @@ uno::Any SwXTextPortion::getPropertyValue( const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< ::rtl::OUString > aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; return GetPropertyValues_Impl(aPropertyNames).getConstArray()[0]; @@ -477,7 +477,7 @@ void SwXTextPortion::setPropertyValues( throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // workaround for bad designed API try @@ -498,7 +498,7 @@ uno::Sequence< uno::Any > SwXTextPortion::getPropertyValues( const uno::Sequence< OUString >& rPropertyNames ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< uno::Any > aValues; // workaround for bad designed API @@ -524,7 +524,7 @@ uno::Sequence< beans::SetPropertyTolerantFailed > SAL_CALL SwXTextPortion::setPr const uno::Sequence< uno::Any >& rValues ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (rPropertyNames.getLength() != rValues.getLength()) throw lang::IllegalArgumentException(); @@ -595,7 +595,7 @@ uno::Sequence< beans::GetPropertyTolerantResult > SAL_CALL SwXTextPortion::getPr const uno::Sequence< OUString >& rPropertyNames ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Sequence< beans::GetDirectPropertyTolerantResult > aTmpRes( GetPropertyValuesTolerant_Impl( rPropertyNames, sal_False ) ); @@ -614,7 +614,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion: const uno::Sequence< OUString >& rPropertyNames ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return GetPropertyValuesTolerant_Impl( rPropertyNames, sal_True ); } @@ -623,7 +623,7 @@ uno::Sequence< beans::GetDirectPropertyTolerantResult > SAL_CALL SwXTextPortion: sal_Bool bDirectValuesOnly ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = this->GetCursor(); if(!pUnoCrsr) @@ -755,7 +755,7 @@ void SwXTextPortion::removeVetoableChangeListener(const OUString& /*rPropertyNam beans::PropertyState SwXTextPortion::getPropertyState(const OUString& rPropertyName) throw( beans::UnknownPropertyException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; beans::PropertyState eRet = beans::PropertyState_DEFAULT_VALUE; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) @@ -778,7 +778,7 @@ uno::Sequence< beans::PropertyState > SwXTextPortion::getPropertyStates( const uno::Sequence< OUString >& rPropertyNames) throw( beans::UnknownPropertyException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); if(!pUnoCrsr) throw uno::RuntimeException(); @@ -803,7 +803,7 @@ uno::Sequence< beans::PropertyState > SwXTextPortion::getPropertyStates( void SwXTextPortion::setPropertyToDefault(const OUString& rPropertyName) throw( beans::UnknownPropertyException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) throw uno::RuntimeException(); @@ -815,7 +815,7 @@ void SwXTextPortion::setPropertyToDefault(const OUString& rPropertyName) uno::Any SwXTextPortion::getPropertyDefault(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) @@ -829,7 +829,7 @@ uno::Any SwXTextPortion::getPropertyDefault(const OUString& rPropertyName) void SwXTextPortion::attach(const uno::Reference< text::XTextRange > & /*xTextRange*/) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // SwXTextPortion cannot be created at the factory therefore // they cannot be attached throw uno::RuntimeException(); @@ -838,7 +838,7 @@ void SwXTextPortion::attach(const uno::Reference< text::XTextRange > & /*xTextRa uno::Reference< text::XTextRange > SwXTextPortion::getAnchor() throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > aRet; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) @@ -851,7 +851,7 @@ throw( uno::RuntimeException ) void SwXTextPortion::dispose() throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) throw uno::RuntimeException(); @@ -862,7 +862,7 @@ throw( uno::RuntimeException ) void SwXTextPortion::addEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!GetRegisteredIn()) throw uno::RuntimeException(); @@ -871,7 +871,7 @@ void SwXTextPortion::addEventListener(const uno::Reference< lang::XEventListener void SwXTextPortion::removeEventListener(const uno::Reference< lang::XEventListener > & aListener) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!GetRegisteredIn() || !m_ListenerContainer.RemoveListener(aListener)) throw uno::RuntimeException(); } @@ -879,7 +879,7 @@ void SwXTextPortion::removeEventListener(const uno::Reference< lang::XEventListe uno::Reference< container::XEnumeration > SwXTextPortion::createContentEnumeration(const OUString& /*aServiceName*/) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); if(!pUnoCrsr) throw uno::RuntimeException(); @@ -912,7 +912,7 @@ sal_Int64 SwXTextPortion::getSomething( const uno::Sequence< sal_Int8 >& rId ) uno::Sequence< OUString > SwXTextPortion::getAvailableServiceNames() throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< OUString > aRet(1); OUString* pArray = aRet.getArray(); pArray[0] = C2U("com.sun.star.text.TextContent"); @@ -927,7 +927,7 @@ throw( uno::RuntimeException ) sal_Bool SwXTextPortion::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); if(!pUnoCrsr) throw uno::RuntimeException(); @@ -950,7 +950,7 @@ sal_Bool SwXTextPortion::supportsService(const OUString& rServiceName) throw( un uno::Sequence< OUString > SwXTextPortion::getSupportedServiceNames() throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); if (!pUnoCrsr) throw uno::RuntimeException(); diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 9212aed7bc..fa5e7696ac 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -270,7 +270,7 @@ SwXTextPortionEnumeration::SwXTextPortionEnumeration( SwXTextPortionEnumeration::~SwXTextPortionEnumeration() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); delete pUnoCrsr; @@ -279,7 +279,7 @@ SwXTextPortionEnumeration::~SwXTextPortionEnumeration() sal_Bool SwXTextPortionEnumeration::hasMoreElements() throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return (m_Portions.size() > 0) ? sal_True : sal_False; } @@ -288,7 +288,7 @@ uno::Any SwXTextPortionEnumeration::nextElement() throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_Portions.size()) throw container::NoSuchElementException(); diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index 437bab58bb..bad37bf588 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -108,7 +108,7 @@ uno::Sequence<uno::Type> SwXRedlineText::getTypes() uno::Sequence<sal_Int8> SwXRedlineText::getImplementationId() throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -122,7 +122,7 @@ uno::Sequence<sal_Int8> SwXRedlineText::getImplementationId() uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwPosition aPos(aNodeIndex); SwXTextCursor *const pXCursor = @@ -175,7 +175,7 @@ uno::Reference<text::XTextCursor> SwXRedlineText::createTextCursorByRange( uno::Reference<container::XEnumeration> SwXRedlineText::createEnumeration(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwPaM aPam(aNodeIndex); aPam.Move(fnMoveForward, fnGoNode); ::std::auto_ptr<SwUnoCrsr> pUnoCursor( @@ -260,7 +260,7 @@ static uno::Sequence<beans::PropertyValue> lcl_GetSuccessorProperties(const SwRe uno::Any SwXRedlinePortion::getPropertyValue( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Validate(); uno::Any aRet; if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_TEXT))) @@ -306,7 +306,7 @@ void SwXRedlinePortion::Validate() throw( uno::RuntimeException ) uno::Sequence< sal_Int8 > SAL_CALL SwXRedlinePortion::getImplementationId( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -435,7 +435,7 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any throw(beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pDoc) throw uno::RuntimeException(); if(rPropertyName.equalsAsciiL(SW_PROP_NAME(UNO_NAME_REDLINE_AUTHOR))) @@ -504,7 +504,7 @@ void SwXRedline::setPropertyValue( const OUString& rPropertyName, const uno::Any uno::Any SwXRedline::getPropertyValue( const OUString& rPropertyName ) throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pDoc) throw uno::RuntimeException(); uno::Any aRet; @@ -608,7 +608,7 @@ void SwXRedline::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) uno::Reference< container::XEnumeration > SwXRedline::createEnumeration(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< container::XEnumeration > xRet; if(!pDoc) throw uno::RuntimeException(); @@ -639,7 +639,7 @@ sal_Bool SwXRedline::hasElements( ) throw(uno::RuntimeException) uno::Reference< text::XTextCursor > SwXRedline::createTextCursor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pDoc) throw uno::RuntimeException(); @@ -708,7 +708,7 @@ uno::Sequence<uno::Type> SwXRedline::getTypes() uno::Sequence<sal_Int8> SwXRedline::getImplementationId() throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index c11b90821f..8bcd58f5c3 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -59,7 +59,7 @@ SwXRedlines::~SwXRedlines() sal_Int32 SwXRedlines::getCount( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); const SwRedlineTbl& rRedTbl = GetDoc()->GetRedlineTbl(); @@ -69,7 +69,7 @@ sal_Int32 SwXRedlines::getCount( ) throw(uno::RuntimeException) uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); const SwRedlineTbl& rRedTbl = GetDoc()->GetRedlineTbl(); @@ -87,7 +87,7 @@ uno::Any SwXRedlines::getByIndex(sal_Int32 nIndex) uno::Reference< container::XEnumeration > SwXRedlines::createEnumeration(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); return uno::Reference< container::XEnumeration >(new SwXRedlineEnumeration(*GetDoc())); @@ -100,7 +100,7 @@ uno::Type SwXRedlines::getElementType( ) throw(uno::RuntimeException) sal_Bool SwXRedlines::hasElements( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw uno::RuntimeException(); const SwRedlineTbl& rRedTbl = GetDoc()->GetRedlineTbl(); diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 43fbe0b922..4a2b1bb4d7 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -280,7 +280,7 @@ void SAL_CALL SwXReferenceMark::attach(const uno::Reference< text::XTextRange > & xTextRange) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pImpl->m_bIsDescriptor) { @@ -313,7 +313,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXReferenceMark::getAnchor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (m_pImpl->IsValid()) { @@ -343,7 +343,7 @@ SwXReferenceMark::getAnchor() throw (uno::RuntimeException) void SAL_CALL SwXReferenceMark::dispose() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (m_pImpl->IsValid()) { SwFmtRefMark const*const pNewMark = @@ -376,7 +376,7 @@ void SAL_CALL SwXReferenceMark::addEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->IsValid()) { @@ -389,7 +389,7 @@ void SAL_CALL SwXReferenceMark::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->IsValid() || !m_pImpl->m_ListenerContainer.RemoveListener(xListener)) @@ -401,7 +401,7 @@ throw (uno::RuntimeException) OUString SAL_CALL SwXReferenceMark::getName() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!m_pImpl->IsValid() || !m_pImpl->m_pDoc->GetRefMark(m_pImpl->m_sMarkName)) { @@ -413,7 +413,7 @@ throw (uno::RuntimeException) void SAL_CALL SwXReferenceMark::setName(const OUString& rName) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (m_pImpl->m_bIsDescriptor) { m_pImpl->m_sMarkName = rName; @@ -460,7 +460,7 @@ throw (uno::RuntimeException) uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXReferenceMark::getPropertySetInfo() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; static uno::Reference< beans::XPropertySetInfo > xRef = aSwMapProvider.GetPropertySet(PROPERTY_MAP_PARAGRAPH_EXTENSIONS) @@ -934,7 +934,7 @@ SwXMeta::addEventListener( uno::Reference< lang::XEventListener> const & xListener ) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; m_pImpl->m_ListenerContainer.AddListener(xListener); if (m_pImpl->m_bIsDisposed) @@ -948,7 +948,7 @@ SwXMeta::removeEventListener( uno::Reference< lang::XEventListener> const & xListener ) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->m_bIsDisposed) { @@ -959,7 +959,7 @@ throw (uno::RuntimeException) void SAL_CALL SwXMeta::dispose() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_pImpl->m_bIsDescriptor) { @@ -993,7 +993,7 @@ SwXMeta::AttachImpl(const uno::Reference< text::XTextRange > & i_xTextRange, const USHORT i_nWhich) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_pImpl->m_bIsDisposed) { @@ -1087,7 +1087,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXMeta::getAnchor() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_pImpl->m_bIsDisposed) { @@ -1121,35 +1121,35 @@ SwXMeta::getAnchor() throw (uno::RuntimeException) uno::Reference< text::XText > SAL_CALL SwXMeta::getText() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return this; } uno::Reference< text::XTextRange > SAL_CALL SwXMeta::getStart() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_Text.getStart(); } uno::Reference< text::XTextRange > SAL_CALL SwXMeta::getEnd() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_Text.getEnd(); } rtl::OUString SAL_CALL SwXMeta::getString() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_Text.getString(); } void SAL_CALL SwXMeta::setString(const rtl::OUString& rString) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_Text.setString(rString); } @@ -1157,7 +1157,7 @@ SwXMeta::setString(const rtl::OUString& rString) throw (uno::RuntimeException) uno::Reference< text::XTextCursor > SAL_CALL SwXMeta::createTextCursor() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_Text.createTextCursor(); } @@ -1166,7 +1166,7 @@ SwXMeta::createTextCursorByRange( const uno::Reference<text::XTextRange> & xTextPosition) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_Text.createTextCursorByRange(xTextPosition); } @@ -1175,7 +1175,7 @@ SwXMeta::insertString(const uno::Reference<text::XTextRange> & xRange, const rtl::OUString& rString, sal_Bool bAbsorb) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_Text.insertString(xRange, rString, bAbsorb); } @@ -1184,7 +1184,7 @@ SwXMeta::insertControlCharacter(const uno::Reference<text::XTextRange> & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_Text.insertControlCharacter(xRange, nControlCharacter, bAbsorb); } @@ -1195,7 +1195,7 @@ SwXMeta::insertTextContent( const uno::Reference<text::XTextRange> & xRange, const uno::Reference<text::XTextContent> & xContent, sal_Bool bAbsorb) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_Text.insertTextContent(xRange, xContent, bAbsorb); } @@ -1204,7 +1204,7 @@ SwXMeta::removeTextContent( const uno::Reference< text::XTextContent > & xContent) throw (container::NoSuchElementException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->m_Text.removeTextContent(xContent); } @@ -1212,7 +1212,7 @@ SwXMeta::removeTextContent( uno::Reference< uno::XInterface > SAL_CALL SwXMeta::getParent() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; SwTxtNode * pTxtNode; xub_StrLen nMetaStart; xub_StrLen nMetaEnd; @@ -1245,7 +1245,7 @@ SwXMeta::getElementType() throw (uno::RuntimeException) sal_Bool SAL_CALL SwXMeta::hasElements() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->GetRegisteredIn() ? sal_True : sal_False; } @@ -1254,7 +1254,7 @@ SwXMeta::hasElements() throw (uno::RuntimeException) uno::Reference< container::XEnumeration > SAL_CALL SwXMeta::createEnumeration() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (m_pImpl->m_bIsDisposed) { @@ -1408,7 +1408,7 @@ SwXMetaField::getAnchor() throw (uno::RuntimeException) uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMetaField::getPropertySetInfo() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; static uno::Reference< beans::XPropertySetInfo > xRef( aSwMapProvider.GetPropertySet(PROPERTY_MAP_METAFIELD) @@ -1423,7 +1423,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; ::sw::MetaField * const pMeta( const_cast< ::sw::MetaField * >(m_pImpl->GetMetaField()) ); @@ -1457,7 +1457,7 @@ SwXMetaField::getPropertyValue(const ::rtl::OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; ::sw::MetaField const * const pMeta( m_pImpl->GetMetaField() ); if (!pMeta) @@ -1608,7 +1608,7 @@ getPrefixAndSuffix( SwXMetaField::getPresentation(sal_Bool bShowCommand) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (bShowCommand) { diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index f49f15bc45..2f5c74ad54 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -233,7 +233,7 @@ throw (uno::RuntimeException) uno::Reference< text::XTextSection > SAL_CALL SwXTextSection::getParentSection() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSectionFmt & rSectionFmt( m_pImpl->GetSectionFmtOrThrow() ); @@ -246,7 +246,7 @@ SwXTextSection::getParentSection() throw (uno::RuntimeException) uno::Sequence< uno::Reference< text::XTextSection > > SAL_CALL SwXTextSection::getChildSections() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSectionFmt & rSectionFmt( m_pImpl->GetSectionFmtOrThrow() ); @@ -266,7 +266,7 @@ void SAL_CALL SwXTextSection::attach(const uno::Reference< text::XTextRange > & xTextRange) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->m_bIsDescriptor) { @@ -431,7 +431,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXTextSection::getAnchor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; SwSectionFmt *const pSectFmt = m_pImpl->GetSectionFmt(); @@ -458,7 +458,7 @@ SwXTextSection::getAnchor() throw (uno::RuntimeException) void SAL_CALL SwXTextSection::dispose() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSectionFmt *const pSectFmt = m_pImpl->GetSectionFmt(); if (pSectFmt) @@ -471,7 +471,7 @@ void SAL_CALL SwXTextSection::addEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->GetSectionFmt()) { @@ -484,7 +484,7 @@ void SAL_CALL SwXTextSection::removeEventListener( const uno::Reference< lang::XEventListener > & xListener) throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; if (!m_pImpl->GetSectionFmt() || !m_pImpl->m_ListenerContainer.RemoveListener(xListener)) @@ -496,7 +496,7 @@ throw (uno::RuntimeException) uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXTextSection::getPropertySetInfo() throw (uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; static const uno::Reference< beans::XPropertySetInfo > aRef = m_pImpl->m_rPropSet.getPropertySetInfo(); @@ -937,7 +937,7 @@ SwXTextSection::setPropertyValues( throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // workaround for bad designed API try @@ -960,7 +960,7 @@ throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< ::rtl::OUString > aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; @@ -1291,7 +1291,7 @@ SwXTextSection::getPropertyValues( const uno::Sequence< ::rtl::OUString >& rPropertyNames) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< uno::Any > aValues; // workaround for bad designed API @@ -1320,7 +1320,7 @@ SwXTextSection::getPropertyValue(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< ::rtl::OUString > aPropertyNames(1); aPropertyNames.getArray()[0] = rPropertyName; @@ -1401,7 +1401,7 @@ beans::PropertyState SAL_CALL SwXTextSection::getPropertyState(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< OUString > aNames(1); aNames.getArray()[0] = rPropertyName; @@ -1413,7 +1413,7 @@ SwXTextSection::getPropertyStates( const uno::Sequence< OUString >& rPropertyNames) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt(); if (!pFmt && !m_pImpl->m_bIsDescriptor) @@ -1497,7 +1497,7 @@ void SAL_CALL SwXTextSection::setPropertyToDefault(const OUString& rPropertyName) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt(); if (!pFmt && !m_pImpl->m_bIsDescriptor) @@ -1645,7 +1645,7 @@ SwXTextSection::getPropertyDefault(const OUString& rPropertyName) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt(); @@ -1707,7 +1707,7 @@ throw (beans::UnknownPropertyException, lang::WrappedTargetException, OUString SAL_CALL SwXTextSection::getName() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ::rtl::OUString sRet; SwSectionFmt const*const pFmt = m_pImpl->GetSectionFmt(); @@ -1729,7 +1729,7 @@ OUString SAL_CALL SwXTextSection::getName() throw (uno::RuntimeException) void SAL_CALL SwXTextSection::setName(const OUString& rName) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSectionFmt *const pFmt = m_pImpl->GetSectionFmt(); if(pFmt) diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 84c23af6f4..dbfd7a991e 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -334,7 +334,7 @@ uno::Reference< beans::XPropertySetInfo > SwXFootnoteProperties::getPropertySet void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(pDoc) { const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap()->getByName( rPropertyName ); @@ -456,7 +456,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(pDoc) { @@ -645,7 +645,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(pDoc) { const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap()->getByName( rPropertyName ); @@ -722,7 +722,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(pDoc) { @@ -877,7 +877,7 @@ void SwXLineNumberingProperties::setPropertyValue( throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(pDoc) { const SfxItemPropertySimpleEntry* pEntry = m_pPropertySet->getPropertyMap()->getByName( rPropertyName ); @@ -995,7 +995,7 @@ void SwXLineNumberingProperties::setPropertyValue( Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Any aRet; if(pDoc) { @@ -1228,7 +1228,7 @@ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) : SwXNumberingRules::~SwXNumberingRules() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(pDoc && sCreatedNumRuleName.Len()) pDoc->DelNumRule( sCreatedNumRuleName ); if( pNumRule && bOwnNumRuleCreated ) @@ -1239,7 +1239,7 @@ void SwXNumberingRules::replaceByIndex(sal_Int32 nIndex, const uno::Any& rElemen throw( lang::IllegalArgumentException, lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(nIndex < 0 || MAXLEVEL <= nIndex) throw lang::IndexOutOfBoundsException(); @@ -1320,7 +1320,7 @@ uno::Any SwXNumberingRules::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(nIndex < 0 || MAXLEVEL <= nIndex) throw lang::IndexOutOfBoundsException(); @@ -1360,7 +1360,7 @@ sal_Bool SwXNumberingRules::hasElements(void) throw( uno::RuntimeException ) uno::Sequence<beans::PropertyValue> SwXNumberingRules::GetNumberingRuleByIndex( const SwNumRule& rNumRule, sal_Int32 nIndex) const { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; DBG_ASSERT( 0 <= nIndex && nIndex < MAXLEVEL, "index out of range" ); const SwNumFmt& rFmt = rNumRule.Get( (sal_uInt16)nIndex ); @@ -1636,7 +1636,7 @@ void SwXNumberingRules::SetNumberingRuleByIndex( const uno::Sequence<beans::PropertyValue>& rProperties, sal_Int32 nIndex) throw( uno::RuntimeException, lang::IllegalArgumentException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; DBG_ASSERT( 0 <= nIndex && nIndex < MAXLEVEL, "index out of range" ); // the order of the names is important! @@ -2436,19 +2436,19 @@ SwXTextColumns::~SwXTextColumns() sal_Int32 SwXTextColumns::getReferenceValue(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return nReference; } sal_Int16 SwXTextColumns::getColumnCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return static_cast< sal_Int16>( aTextColumns.getLength() ); } void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(nColumns <= 0) throw uno::RuntimeException(); bIsAutomaticWidth = sal_True; @@ -2469,14 +2469,14 @@ void SwXTextColumns::setColumnCount(sal_Int16 nColumns) throw( uno::RuntimeExcep uno::Sequence< TextColumn > SwXTextColumns::getColumns(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return aTextColumns; } void SwXTextColumns::setColumns(const uno::Sequence< TextColumn >& rColumns) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nReferenceTemp = 0; const TextColumn* prCols = rColumns.getConstArray(); for(long i = 0; i < rColumns.getLength(); i++) diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index bd897eb02a..5c6d3bd577 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -458,26 +458,26 @@ sal_Int64 SAL_CALL SwXTextSearch::getSomething( const uno::Sequence< sal_Int8 >& OUString SwXTextSearch::getSearchString(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return sSearchText; } void SwXTextSearch::setSearchString(const OUString& rString) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sSearchText = String(rString); } OUString SwXTextSearch::getReplaceString(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return sReplaceText; } void SwXTextSearch::setReplaceString(const OUString& rReplaceString) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sReplaceText = String(rReplaceString); } @@ -491,7 +491,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName); if(pEntry) { @@ -522,7 +522,7 @@ void SwXTextSearch::setPropertyValue(const OUString& rPropertyName, const uno::A uno::Any SwXTextSearch::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName(rPropertyName); @@ -579,13 +579,13 @@ void SwXTextSearch::removeVetoableChangeListener(const OUString& /*rPropertyName sal_Bool SwXTextSearch::getValueSearch(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return bIsValueSearch; } void SwXTextSearch::setValueSearch(sal_Bool ValueSearch_) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; bIsValueSearch = ValueSearch_; } diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index c31b950216..b53bfe33dc 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -238,7 +238,7 @@ uno::Any SAL_CALL SwXStyleFamilies::getByName(const OUString& Name) lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // der Index kommt aus const unsigned short aStyleByIndex[] = uno::Any aRet; if(!IsValid()) @@ -290,7 +290,7 @@ sal_Int32 SwXStyleFamilies::getCount(void) throw( uno::RuntimeException ) uno::Any SwXStyleFamilies::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(nIndex < 0 || nIndex >= STYLE_FAMILY_COUNT) throw lang::IndexOutOfBoundsException(); @@ -374,7 +374,7 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL, const uno::Sequence< beans::PropertyValue >& aOptions) throw( io::IOException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bLoadStyleText = sal_True; sal_Bool bLoadStylePage = sal_True; sal_Bool bLoadStyleOverwrite = sal_True; @@ -421,7 +421,7 @@ void SwXStyleFamilies::loadStylesFromURL(const OUString& rURL, uno::Sequence< beans::PropertyValue > SwXStyleFamilies::getStyleLoaderOptions(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< beans::PropertyValue > aSeq(5); beans::PropertyValue* pArray = aSeq.getArray(); uno::Any aVal; @@ -632,14 +632,14 @@ sal_Int32 lcl_GetCountOrName ( const SwDoc &rDoc, SfxStyleFamily eFamily, String sal_Int32 SwXStyleFamily::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return lcl_GetCountOrName ( *pDocShell->GetDoc(), eFamily, NULL ); } uno::Any SwXStyleFamily::getByIndex(sal_Int32 nTempIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if ( nTempIndex >= 0 && nTempIndex < USHRT_MAX ) { @@ -776,7 +776,7 @@ uno::Any SwXStyleFamily::getByIndex(sal_Int32 nTempIndex) uno::Any SwXStyleFamily::getByName(const OUString& rName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; String sStyleName; SwStyleNameMapper::FillUIName(rName, sStyleName, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ); @@ -808,7 +808,7 @@ uno::Any SwXStyleFamily::getByName(const OUString& rName) uno::Sequence< OUString > SwXStyleFamily::getElementNames(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< OUString > aRet; if(pBasePool) { @@ -831,7 +831,7 @@ uno::Sequence< OUString > SwXStyleFamily::getElementNames(void) throw( uno::Runt sal_Bool SwXStyleFamily::hasByName(const OUString& rName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(pBasePool) { @@ -863,7 +863,7 @@ sal_Bool SwXStyleFamily::hasElements(void) throw( uno::RuntimeException ) void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElement) throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(pBasePool) { String sStyleName; @@ -933,7 +933,7 @@ void SwXStyleFamily::insertByName(const OUString& rName, const uno::Any& rElemen void SwXStyleFamily::replaceByName(const OUString& rName, const uno::Any& rElement) throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(pBasePool) { pBasePool->SetSearchMask(eFamily); @@ -965,7 +965,7 @@ void SwXStyleFamily::replaceByName(const OUString& rName, const uno::Any& rEleme void SwXStyleFamily::removeByName(const OUString& rName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(pBasePool) { pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL ); @@ -999,7 +999,7 @@ uno::Any SAL_CALL SwXStyleFamily::getPropertyValue( const ::rtl::OUString& sProp if ( sPropertyName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("DisplayName") ) ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_uInt32 nResId = 0; switch ( eFamily ) { @@ -1394,7 +1394,7 @@ void SwXStyle::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew) OUString SwXStyle::getName(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String aString; if(pBasePool) { @@ -1412,7 +1412,7 @@ OUString SwXStyle::getName(void) throw( uno::RuntimeException ) void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(pBasePool) { pBasePool->SetSearchMask(eFamily, SFXSTYLEBIT_ALL ); @@ -1435,7 +1435,7 @@ void SwXStyle::setName(const OUString& rName) throw( uno::RuntimeException ) sal_Bool SwXStyle::isUserDefined(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(pBasePool) { @@ -1452,7 +1452,7 @@ sal_Bool SwXStyle::isUserDefined(void) throw( uno::RuntimeException ) sal_Bool SwXStyle::isInUse(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(pBasePool) { @@ -1468,7 +1468,7 @@ sal_Bool SwXStyle::isInUse(void) throw( uno::RuntimeException ) OUString SwXStyle::getParentStyle(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String aString; if(pBasePool) { @@ -1488,7 +1488,7 @@ OUString SwXStyle::getParentStyle(void) throw( uno::RuntimeException ) void SwXStyle::setParentStyle(const OUString& rParentStyle) throw( container::NoSuchElementException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String sParentStyle; SwStyleNameMapper::FillUIName(rParentStyle, sParentStyle, lcl_GetSwEnumFromSfxEnum ( eFamily ), sal_True ); if(pBasePool) @@ -2180,7 +2180,7 @@ void SwXStyle::setPropertyValues( throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // workaround for bad designed API try @@ -2490,7 +2490,7 @@ uno::Sequence< uno::Any > SAL_CALL SwXStyle::GetPropertyValues_Impl( uno::Sequence< uno::Any > SwXStyle::getPropertyValues( const uno::Sequence< OUString >& rPropertyNames ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< uno::Any > aValues; // workaround for bad designed API @@ -2537,7 +2537,7 @@ void SwXStyle::setPropertyValue(const OUString& rPropertyName, const uno::Any& r lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const uno::Sequence<OUString> aProperties(&rPropertyName, 1); const uno::Sequence<uno::Any> aValues(&rValue, 1); SetPropertyValues_Impl( aProperties, aValues ); @@ -2546,7 +2546,7 @@ void SwXStyle::setPropertyValue(const OUString& rPropertyName, const uno::Any& r uno::Any SwXStyle::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const uno::Sequence<OUString> aProperties(&rPropertyName, 1); return GetPropertyValues_Impl(aProperties).getConstArray()[0]; @@ -2583,7 +2583,7 @@ void SwXStyle::removeVetoableChangeListener(const OUString& /*rPropertyName*/, beans::PropertyState SwXStyle::getPropertyState(const OUString& rPropertyName) throw( beans::UnknownPropertyException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< OUString > aNames(1); OUString* pNames = aNames.getArray(); @@ -2596,7 +2596,7 @@ uno::Sequence< beans::PropertyState > SwXStyle::getPropertyStates( const uno::Sequence< OUString >& rPropertyNames) throw( beans::UnknownPropertyException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< beans::PropertyState > aRet(rPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); if(pBasePool) @@ -2704,7 +2704,7 @@ void SwXStyle::setPropertyToDefault(const OUString& rPropertyName) void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFmt *pTargetFmt = 0; if(pBasePool) @@ -2783,7 +2783,7 @@ void SAL_CALL SwXStyle::setPropertiesToDefault( const uno::Sequence< OUString >& void SAL_CALL SwXStyle::setAllPropertiesToDefault( ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(pBasePool) { pBasePool->SetSearchMask(eFamily); @@ -2907,7 +2907,7 @@ void SAL_CALL SwXStyle::setAllPropertiesToDefault( ) uno::Sequence< uno::Any > SAL_CALL SwXStyle::getPropertyDefaults( const uno::Sequence< OUString >& aPropertyNames ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nCount = aPropertyNames.getLength(); uno::Sequence < uno::Any > aRet ( nCount ); if ( nCount ) @@ -3247,7 +3247,7 @@ void SwXPageStyle::setPropertyValues( const uno::Sequence< uno::Any >& rValues ) throw(beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // workaround for bad designed API try @@ -3493,7 +3493,7 @@ uno::Sequence< uno::Any > SwXPageStyle::getPropertyValues( const uno::Sequence< OUString >& rPropertyNames ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< uno::Any > aValues; // workaround for bad designed API @@ -3516,7 +3516,7 @@ uno::Sequence< uno::Any > SwXPageStyle::getPropertyValues( uno::Any SwXPageStyle::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const uno::Sequence<OUString> aProperties(&rPropertyName, 1); return GetPropertyValues_Impl(aProperties).getConstArray()[0]; } @@ -3528,7 +3528,7 @@ void SwXPageStyle::setPropertyValue(const OUString& rPropertyName, const uno::An lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const uno::Sequence<OUString> aProperties(&rPropertyName, 1); const uno::Sequence<uno::Any> aValues(&rValue, 1); SetPropertyValues_Impl( aProperties, aValues ); @@ -3585,7 +3585,7 @@ uno::Any SwXAutoStyles::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(nIndex < 0 || nIndex >= AUTOSTYLE_FAMILY_COUNT) throw lang::IndexOutOfBoundsException(); @@ -3925,7 +3925,7 @@ uno::Any SwXAutoStyle::getPropertyValue( const OUString& rPropertyName ) lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const uno::Sequence<OUString> aProperties(&rPropertyName, 1); return GetPropertyValues_Impl(aProperties).getConstArray()[0]; } @@ -4019,7 +4019,7 @@ uno::Sequence< uno::Any > SwXAutoStyle::getPropertyValues ( const uno::Sequence< ::rtl::OUString >& rPropertyNames ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< uno::Any > aValues; // workaround for bad designed API @@ -4063,7 +4063,7 @@ beans::PropertyState SwXAutoStyle::getPropertyState( const OUString& rPropertyNa throw( beans::UnknownPropertyException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< OUString > aNames(1); OUString* pNames = aNames.getArray(); @@ -4093,7 +4093,7 @@ uno::Sequence< beans::PropertyState > SwXAutoStyle::getPropertyStates( { if( !pSet.get() ) throw uno::RuntimeException(); - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< beans::PropertyState > aRet(rPropertyNames.getLength()); beans::PropertyState* pStates = aRet.getArray(); const OUString* pNames = rPropertyNames.getConstArray(); @@ -4146,7 +4146,7 @@ uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties() throw (uno:: { if( !pSet.get() ) throw uno::RuntimeException(); - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; std::vector< beans::PropertyValue > aPropertyVector; sal_Int8 nPropSetId = 0; diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index d6a4f1a953..b29e41b538 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -822,7 +822,7 @@ uno::Sequence< uno::Type > SAL_CALL SwXCell::getTypes( ) throw(uno::RuntimeExce uno::Sequence< sal_Int8 > SAL_CALL SwXCell::getImplementationId( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -892,7 +892,7 @@ bool SwXCell::IsValid() const OUString SwXCell::getFormula(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString sRet; if(IsValid()) { @@ -906,7 +906,7 @@ OUString SwXCell::getFormula(void) throw( uno::RuntimeException ) void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(IsValid()) { // Der Text mu? zunaechst (vielleicht) geloescht werden @@ -937,7 +937,7 @@ void SwXCell::setFormula(const OUString& rFormula) throw( uno::RuntimeException double SwXCell::getValue(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; double const fRet = lcl_getValue( *this ); // #i112652# a table cell may contain NaN as a value, do not filter that @@ -946,13 +946,13 @@ double SwXCell::getValue(void) throw( uno::RuntimeException ) void SwXCell::setValue(double rValue) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; lcl_setValue( *this, rValue ); } table::CellContentType SwXCell::getType(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; table::CellContentType nRes = table::CellContentType_EMPTY; sal_uInt32 nNdPos = pBox->IsFormulaOrValueBox(); @@ -970,20 +970,20 @@ table::CellContentType SwXCell::getType(void) throw( uno::RuntimeException ) void SwXCell::setString(const OUString& aString) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; lcl_setString( *this, aString ); } sal_Int32 SwXCell::getError(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString sContent = getString(); return sContent.equals(ViewShell::GetShellRes()->aCalc_Error); } uno::Reference< text::XTextCursor > SwXCell::createTextCursor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextCursor > aRef; if(pStartNode || IsValid()) { @@ -1008,7 +1008,7 @@ uno::Reference< text::XTextCursor > SwXCell::createTextCursor(void) throw( uno: uno::Reference< text::XTextCursor > SwXCell::createTextCursorByRange(const uno::Reference< text::XTextRange > & xTextPosition) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextCursor > aRef; SwUnoInternalPaM aPam(*GetDoc()); if ((pStartNode || IsValid()) @@ -1041,7 +1041,7 @@ uno::Reference< beans::XPropertySetInfo > SwXCell::getPropertySetInfo(void) thr void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(IsValid()) { const SfxItemPropertySimpleEntry* pEntry = @@ -1071,7 +1071,7 @@ void SwXCell::setPropertyValue(const OUString& rPropertyName, const uno::Any& aV uno::Any SwXCell::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; if(IsValid()) { @@ -1146,7 +1146,7 @@ void SwXCell::removeVetoableChangeListener(const OUString& /*rPropertyName*/, co uno::Reference< container::XEnumeration > SwXCell::createEnumeration(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< container::XEnumeration > aRef; if(IsValid()) { @@ -1305,7 +1305,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, const uno::Any& aValue) throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) { @@ -1364,7 +1364,7 @@ void SwXTextTableRow::setPropertyValue(const OUString& rPropertyName, uno::Any SwXTextTableRow::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -1514,7 +1514,7 @@ SwXTextTableCursor::SwXTextTableCursor(SwFrmFmt& rTableFmt, const SwTableCursor* SwXTextTableCursor::~SwXTextTableCursor() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) delete pUnoCrsr; @@ -1522,7 +1522,7 @@ SwXTextTableCursor::~SwXTextTableCursor() OUString SwXTextTableCursor::getRangeName(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString aRet; SwUnoCrsr* pUnoCrsr = GetCrsr(); @@ -1563,7 +1563,7 @@ OUString SwXTextTableCursor::getRangeName(void) throw( uno::RuntimeException ) sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& CellName, sal_Bool Expand) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) @@ -1578,7 +1578,7 @@ sal_Bool SwXTextTableCursor::gotoCellByName(const OUString& CellName, sal_Bool E sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool Expand) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) @@ -1592,7 +1592,7 @@ sal_Bool SwXTextTableCursor::goLeft(sal_Int16 Count, sal_Bool Expand) throw( uno sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool Expand) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) @@ -1606,7 +1606,7 @@ sal_Bool SwXTextTableCursor::goRight(sal_Int16 Count, sal_Bool Expand) throw( un sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) @@ -1620,7 +1620,7 @@ sal_Bool SwXTextTableCursor::goUp(sal_Int16 Count, sal_Bool Expand) throw( uno:: sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool Expand) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) @@ -1634,7 +1634,7 @@ sal_Bool SwXTextTableCursor::goDown(sal_Int16 Count, sal_Bool Expand) throw( uno void SwXTextTableCursor::gotoStart(sal_Bool Expand) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) { @@ -1646,7 +1646,7 @@ void SwXTextTableCursor::gotoStart(sal_Bool Expand) throw( uno::RuntimeException void SwXTextTableCursor::gotoEnd(sal_Bool Expand) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) { @@ -1658,7 +1658,7 @@ void SwXTextTableCursor::gotoEnd(sal_Bool Expand) throw( uno::RuntimeException ) sal_Bool SwXTextTableCursor::mergeRange(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) @@ -1687,7 +1687,7 @@ sal_Bool SwXTextTableCursor::mergeRange(void) throw( uno::RuntimeException ) sal_Bool SwXTextTableCursor::splitRange(sal_Int16 Count, sal_Bool Horizontal) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (Count <= 0) throw uno::RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Illegal first argument: needs to be > 0" ) ), static_cast < cppu::OWeakObject * > ( this ) ); sal_Bool bRet = sal_False; @@ -1723,7 +1723,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) { @@ -1784,7 +1784,7 @@ void SwXTextTableCursor::setPropertyValue(const OUString& rPropertyName, uno::Any SwXTextTableCursor::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SwUnoCrsr* pUnoCrsr = GetCrsr(); if(pUnoCrsr) @@ -2149,7 +2149,7 @@ void SwXTextTable::initialize(sal_Int32 nR, sal_Int32 nC) throw( uno::RuntimeExc uno::Reference< table::XTableRows > SwXTextTable::getRows(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< table::XTableRows > xRet; if (SwFrmFmt* pFmt = GetFrmFmt()) { @@ -2166,7 +2166,7 @@ uno::Reference< table::XTableRows > SwXTextTable::getRows(void) throw( uno::Run uno::Reference< table::XTableColumns > SwXTextTable::getColumns(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< table::XTableColumns > xRet; if (SwFrmFmt* pFmt = GetFrmFmt()) { @@ -2183,7 +2183,7 @@ uno::Reference< table::XTableColumns > SwXTextTable::getColumns(void) throw( un uno::Reference< table::XCell > SwXTextTable::getCellByName(const OUString& CellName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< table::XCell > xRet; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -2203,7 +2203,7 @@ uno::Reference< table::XCell > SwXTextTable::getCellByName(const OUString& Cell uno::Sequence< OUString > SwXTextTable::getCellNames(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) { @@ -2229,7 +2229,7 @@ uno::Sequence< OUString > SwXTextTable::getCellNames(void) throw( uno::RuntimeEx uno::Reference< text::XTextTableCursor > SwXTextTable::createCursorByCellName(const OUString& CellName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextTableCursor > xRet; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -2344,14 +2344,14 @@ void SwXTextTable::attachToRange(const uno::Reference< text::XTextRange > & xTex void SwXTextTable::attach(const uno::Reference< text::XTextRange > & xTextRange) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; attachToRange( xTextRange ); } uno::Reference< text::XTextRange > SwXTextTable::getAnchor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(!pFmt) throw uno::RuntimeException(); @@ -2361,7 +2361,7 @@ uno::Reference< text::XTextRange > SwXTextTable::getAnchor(void) void SwXTextTable::dispose(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) { @@ -2391,7 +2391,7 @@ void SwXTextTable::removeEventListener(const uno::Reference< lang::XEventListene uno::Reference< table::XCell > SwXTextTable::getCellByPosition(sal_Int32 nColumn, sal_Int32 nRow) throw( uno::RuntimeException, lang::IndexOutOfBoundsException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< table::XCell > aRef; SwFrmFmt* pFmt = GetFrmFmt(); // Sheet interessiert nicht @@ -2411,7 +2411,7 @@ uno::Reference< table::XCellRange > SwXTextTable::GetRangeByName(SwFrmFmt* pFmt const String& rTLName, const String& rBRName, SwRangeDescriptor& rDesc) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< table::XCellRange > aRef; String sTLName(rTLName); String sBRName(rBRName); @@ -2448,7 +2448,7 @@ uno::Reference< table::XCellRange > SwXTextTable::getCellRangeByPosition(sal_In sal_Int32 nRight, sal_Int32 nBottom) throw( uno::RuntimeException, lang::IndexOutOfBoundsException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< table::XCellRange > aRef; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt && nRight < USHRT_MAX && nBottom < USHRT_MAX && @@ -2480,7 +2480,7 @@ uno::Reference< table::XCellRange > SwXTextTable::getCellRangeByPosition(sal_In uno::Reference< table::XCellRange > SwXTextTable::getCellRangeByName(const OUString& aRange) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< table::XCellRange > aRef; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -2517,7 +2517,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXTextTable::getDataArray() { // see SwXTextTable::getData(...) also - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); if(!nRowCount || !nColCount) @@ -2578,7 +2578,7 @@ void SAL_CALL SwXTextTable::setDataArray( { // see SwXTextTable::setData(...) also - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); @@ -2643,7 +2643,7 @@ void SAL_CALL SwXTextTable::setDataArray( uno::Sequence< uno::Sequence< double > > SwXTextTable::getData(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); if(!nRowCount || !nColCount) @@ -2685,7 +2685,7 @@ uno::Sequence< uno::Sequence< double > > SwXTextTable::getData(void) void SwXTextTable::setData(const uno::Sequence< uno::Sequence< double > >& rData) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); sal_Bool bChanged = sal_False; @@ -2732,7 +2732,7 @@ void SwXTextTable::setData(const uno::Sequence< uno::Sequence< double > >& rData uno::Sequence< OUString > SwXTextTable::getRowDescriptions(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); if(!nRowCount) { @@ -2772,7 +2772,7 @@ uno::Sequence< OUString > SwXTextTable::getRowDescriptions(void) throw( uno::Run void SwXTextTable::setRowDescriptions(const uno::Sequence< OUString >& rRowDesc) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) { @@ -2808,7 +2808,7 @@ void SwXTextTable::setRowDescriptions(const uno::Sequence< OUString >& rRowDesc) uno::Sequence< OUString > SwXTextTable::getColumnDescriptions(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nColCount = getColumnCount(); if(!nColCount) { @@ -2848,7 +2848,7 @@ uno::Sequence< OUString > SwXTextTable::getColumnDescriptions(void) void SwXTextTable::setColumnDescriptions(const uno::Sequence< OUString >& rColumnDesc) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nColCount = getColumnCount(); if(!nColCount) { @@ -2917,7 +2917,7 @@ double SwXTextTable::getNotANumber(void) throw( uno::RuntimeException ) uno::Sequence< beans::PropertyValue > SwXTextTable::createSortDescriptor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return SwUnoCursorHelper::CreateSortDescriptor(true); } @@ -2925,7 +2925,7 @@ uno::Sequence< beans::PropertyValue > SwXTextTable::createSortDescriptor(void) void SwXTextTable::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSortOptions aSortOpt; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt && @@ -2946,7 +2946,7 @@ void SwXTextTable::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor void SwXTextTable::autoFormat(const OUString& aName) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) { @@ -2988,7 +2988,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(!aValue.hasValue()) throw lang::IllegalArgumentException(); @@ -3195,7 +3195,7 @@ void SwXTextTable::setPropertyValue(const OUString& rPropertyName, uno::Any SwXTextTable::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SwFrmFmt* pFmt = GetFrmFmt(); const SfxItemPropertySimpleEntry* pEntry = @@ -3428,7 +3428,7 @@ void SwXTextTable::removeVetoableChangeListener(const OUString& /*rPropertyName* OUString SwXTextTable::getName(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String sRet; SwFrmFmt* pFmt = GetFrmFmt(); if(!pFmt && !bIsDescriptor) @@ -3444,7 +3444,7 @@ OUString SwXTextTable::getName(void) throw( uno::RuntimeException ) void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); String sNewTblName(rName); if((!pFmt && !bIsDescriptor) || @@ -3502,7 +3502,7 @@ void SwXTextTable::setName(const OUString& rName) throw( uno::RuntimeException ) sal_uInt16 SwXTextTable::getRowCount(void) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRet = 0; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -3518,7 +3518,7 @@ sal_uInt16 SwXTextTable::getRowCount(void) sal_uInt16 SwXTextTable::getColumnCount(void) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); sal_Int16 nRet = 0; if(pFmt) @@ -3643,14 +3643,14 @@ SwXCellRange::SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt, SwXCellRange::~SwXCellRange() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; delete pTblCrsr; } uno::Reference< table::XCell > SwXCellRange::getCellByPosition(sal_Int32 nColumn, sal_Int32 nRow) throw( uno::RuntimeException, lang::IndexOutOfBoundsException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< table::XCell > aRet; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -3673,7 +3673,7 @@ uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByPosition( sal_Int32 nLeft, sal_Int32 nTop, sal_Int32 nRight, sal_Int32 nBottom) throw( uno::RuntimeException, lang::IndexOutOfBoundsException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< table::XCellRange > aRet; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt && getColumnCount() > nRight && getRowCount() > nBottom && @@ -3728,7 +3728,7 @@ uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByPosition( uno::Reference< table::XCellRange > SwXCellRange::getCellRangeByName(const OUString& rRange) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String sRange(rRange); String sTLName(sRange.GetToken(0, ':')); String sBRName(sRange.GetToken(1, ':')); @@ -3754,7 +3754,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) { @@ -3870,7 +3870,7 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -3979,7 +3979,7 @@ void SwXCellRange::GetDataSequence( // from 0 even if the cell is formatted to text throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // compare to SwXCellRange::getDataArray (note different return types though) @@ -4120,7 +4120,7 @@ uno::Sequence< uno::Sequence< uno::Any > > SAL_CALL SwXCellRange::getDataArray() // see SwXCellRange::getData also // also see SwXCellRange::GetDataSequence - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); // @@ -4182,7 +4182,7 @@ void SAL_CALL SwXCellRange::setDataArray( { // see SwXCellRange::setData also - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); if(!nRowCount || !nColCount) @@ -4244,7 +4244,7 @@ void SAL_CALL SwXCellRange::setDataArray( uno::Sequence< uno::Sequence< double > > SwXCellRange::getData(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); // @@ -4284,7 +4284,7 @@ uno::Sequence< uno::Sequence< double > > SwXCellRange::getData(void) throw( uno: void SwXCellRange::setData(const uno::Sequence< uno::Sequence< double > >& rData) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); sal_Int16 nColCount = getColumnCount(); if(!nRowCount || !nColCount) @@ -4327,7 +4327,7 @@ void SwXCellRange::setData(const uno::Sequence< uno::Sequence< double > >& rData uno::Sequence< OUString > SwXCellRange::getRowDescriptions(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nRowCount = getRowCount(); if(!nRowCount) { @@ -4367,7 +4367,7 @@ uno::Sequence< OUString > SwXCellRange::getRowDescriptions(void) void SwXCellRange::setRowDescriptions(const uno::Sequence< OUString >& rRowDesc) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) { @@ -4401,7 +4401,7 @@ void SwXCellRange::setRowDescriptions(const uno::Sequence< OUString >& rRowDesc) uno::Sequence< OUString > SwXCellRange::getColumnDescriptions(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nColCount = getColumnCount(); if(!nColCount) { @@ -4441,7 +4441,7 @@ uno::Sequence< OUString > SwXCellRange::getColumnDescriptions(void) void SwXCellRange::setColumnDescriptions(const uno::Sequence< OUString >& ColumnDesc) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nColCount = getColumnCount(); SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt) @@ -4497,7 +4497,7 @@ double SwXCellRange::getNotANumber(void) throw( uno::RuntimeException ) uno::Sequence< beans::PropertyValue > SwXCellRange::createSortDescriptor(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return SwUnoCursorHelper::CreateSortDescriptor(true); } @@ -4505,7 +4505,7 @@ uno::Sequence< beans::PropertyValue > SwXCellRange::createSortDescriptor(void) t void SAL_CALL SwXCellRange::sort(const uno::Sequence< beans::PropertyValue >& rDescriptor) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwSortOptions aSortOpt; SwFrmFmt* pFmt = GetFrmFmt(); if(pFmt && @@ -4588,7 +4588,7 @@ SwXTableRows::~SwXTableRows() sal_Int32 SwXTableRows::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nRet = 0; SwFrmFmt* pFrmFmt = GetFrmFmt(); if(!pFrmFmt) @@ -4604,7 +4604,7 @@ sal_Int32 SwXTableRows::getCount(void) throw( uno::RuntimeException ) uno::Any SwXTableRows::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; SwFrmFmt* pFrmFmt = GetFrmFmt(); if(!pFrmFmt || nIndex < 0 ) @@ -4645,7 +4645,7 @@ uno::Type SAL_CALL SwXTableRows::getElementType(void) throw( uno::RuntimeExcepti sal_Bool SwXTableRows::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFrmFmt = GetFrmFmt(); if(!pFrmFmt) throw uno::RuntimeException(); @@ -4655,7 +4655,7 @@ sal_Bool SwXTableRows::hasElements(void) throw( uno::RuntimeException ) void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (nCount == 0) return; SwFrmFmt* pFrmFmt = GetFrmFmt(); @@ -4709,7 +4709,7 @@ void SwXTableRows::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno: void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (nCount == 0) return; SwFrmFmt* pFrmFmt = GetFrmFmt(); @@ -4806,7 +4806,7 @@ SwXTableColumns::~SwXTableColumns() sal_Int32 SwXTableColumns::getCount(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int32 nRet = 0; SwFrmFmt* pFrmFmt = GetFrmFmt(); if(!pFrmFmt) @@ -4827,7 +4827,7 @@ sal_Int32 SwXTableColumns::getCount(void) throw( uno::RuntimeException ) uno::Any SwXTableColumns::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< uno::XInterface > xRet; SwFrmFmt* pFrmFmt = GetFrmFmt(); if(!pFrmFmt) @@ -4856,7 +4856,7 @@ uno::Type SAL_CALL SwXTableColumns::getElementType(void) throw( uno::RuntimeExce sal_Bool SwXTableColumns::hasElements(void) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt* pFrmFmt = GetFrmFmt(); if(!pFrmFmt) throw uno::RuntimeException(); @@ -4865,7 +4865,7 @@ sal_Bool SwXTableColumns::hasElements(void) throw( uno::RuntimeException ) void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (nCount == 0) return; SwFrmFmt* pFrmFmt = GetFrmFmt(); @@ -4918,7 +4918,7 @@ void SwXTableColumns::insertByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( u void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount) throw( uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (nCount == 0) return; SwFrmFmt* pFrmFmt = GetFrmFmt(); diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 9608a09e21..c0890d2a03 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -297,7 +297,7 @@ SwXText::insertString(const uno::Reference< text::XTextRange >& xTextRange, const OUString& rString, sal_Bool bAbsorb) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!xTextRange.is()) { @@ -405,7 +405,7 @@ SwXText::insertControlCharacter( sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!xTextRange.is()) { @@ -519,7 +519,7 @@ SwXText::insertTextContent( sal_Bool bAbsorb) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!xRange.is()) { @@ -632,7 +632,7 @@ SwXText::insertTextContentBefore( const uno::Reference< text::XTextContent>& xSuccessor) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!GetDoc()) { @@ -693,7 +693,7 @@ SwXText::insertTextContentAfter( const uno::Reference< text::XTextContent>& xPredecessor) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!GetDoc()) { @@ -750,7 +750,7 @@ SwXText::removeTextContentBefore( const uno::Reference< text::XTextContent>& xSuccessor) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!GetDoc()) { @@ -803,7 +803,7 @@ SwXText::removeTextContentAfter( const uno::Reference< text::XTextContent>& xPredecessor) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!GetDoc()) { @@ -870,7 +870,7 @@ throw (container::NoSuchElementException, uno::RuntimeException) uno::Reference< text::XText > SAL_CALL SwXText::getText() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const uno::Reference< text::XText > xRet(this); return xRet; @@ -879,7 +879,7 @@ SwXText::getText() throw (uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXText::getStart() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const uno::Reference< text::XTextCursor > xRef = CreateCursor(); if(!xRef.is()) @@ -896,7 +896,7 @@ SwXText::getStart() throw (uno::RuntimeException) uno::Reference< text::XTextRange > SAL_CALL SwXText::getEnd() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const uno::Reference< text::XTextCursor > xRef = CreateCursor(); if(!xRef.is()) @@ -912,7 +912,7 @@ SwXText::getEnd() throw (uno::RuntimeException) OUString SAL_CALL SwXText::getString() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const uno::Reference< text::XTextCursor > xRet = CreateCursor(); if(!xRet.is()) @@ -928,7 +928,7 @@ OUString SAL_CALL SwXText::getString() throw (uno::RuntimeException) void SAL_CALL SwXText::setString(const OUString& rString) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!GetDoc()) { @@ -1086,7 +1086,7 @@ SwXText::compareRegionStarts( const uno::Reference<text::XTextRange>& xRange2) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!xRange1.is() || !xRange2.is()) { @@ -1104,7 +1104,7 @@ SwXText::compareRegionEnds( const uno::Reference<text::XTextRange>& xRange2) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!xRange1.is() || !xRange2.is()) { @@ -1119,7 +1119,7 @@ throw (lang::IllegalArgumentException, uno::RuntimeException) uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXText::getPropertySetInfo() throw(uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; static uno::Reference< beans::XPropertySetInfo > xInfo = m_pImpl->m_rPropSet.getPropertySetInfo(); @@ -1142,7 +1142,7 @@ SwXText::getPropertyValue( throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) { @@ -1254,7 +1254,7 @@ SwXText::appendParagraph( const uno::Sequence< beans::PropertyValue > & rProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->finishOrAppendParagraph(false, rProperties); } @@ -1264,7 +1264,7 @@ SwXText::finishParagraph( const uno::Sequence< beans::PropertyValue > & rProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard g(Application::GetSolarMutex()); + SolarMutexGuard g; return m_pImpl->finishOrAppendParagraph(true, rProperties); } @@ -1382,7 +1382,7 @@ SwXText::appendTextPortion( rCharacterAndParagraphProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) { @@ -1488,7 +1488,7 @@ SwXText::appendTextContent( rCharacterAndParagraphProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!IsValid()) { @@ -1549,7 +1549,7 @@ SwXText::convertToTextFrame( const uno::Sequence< beans::PropertyValue >& rFrameProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) { @@ -2186,7 +2186,7 @@ SwXText::convertToTable( const uno::Sequence< beans::PropertyValue >& rTableProperties) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) { @@ -2389,7 +2389,7 @@ SwXBodyText::getTypes() throw (uno::RuntimeException) uno::Sequence< sal_Int8 > SAL_CALL SwXBodyText::getImplementationId() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -2441,7 +2441,7 @@ SwXTextCursor * SwXBodyText::CreateTextCursor(const bool bIgnoreTables) uno::Reference< text::XTextCursor > SAL_CALL SwXBodyText::createTextCursor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const uno::Reference< text::XTextCursor > xRef( static_cast<text::XWordCursor*>(CreateTextCursor(false)) ); @@ -2459,7 +2459,7 @@ SwXBodyText::createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) { @@ -2500,7 +2500,7 @@ uno::Reference< container::XEnumeration > SAL_CALL SwXBodyText::createEnumeration() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!IsValid()) { @@ -2528,7 +2528,7 @@ SwXBodyText::getElementType() throw (uno::RuntimeException) sal_Bool SAL_CALL SwXBodyText::hasElements() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (!IsValid()) { @@ -2675,7 +2675,7 @@ SwXHeadFootText::getTypes() throw (uno::RuntimeException) uno::Sequence< sal_Int8 > SAL_CALL SwXHeadFootText::getImplementationId() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static uno::Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -2699,7 +2699,7 @@ throw (uno::RuntimeException) uno::Reference< text::XTextCursor > SAL_CALL SwXHeadFootText::createTextCursor() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt & rHeadFootFmt( m_pImpl->GetHeadFootFmtOrThrow() ); @@ -2747,7 +2747,7 @@ SwXHeadFootText::createTextCursorByRange( const uno::Reference< text::XTextRange > & xTextPosition) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt & rHeadFootFmt( m_pImpl->GetHeadFootFmtOrThrow() ); @@ -2782,7 +2782,7 @@ uno::Reference< container::XEnumeration > SAL_CALL SwXHeadFootText::createEnumeration() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwFrmFmt & rHeadFootFmt( m_pImpl->GetHeadFootFmtOrThrow() ); diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index 29e3fd1ef6..a61a76010a 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -59,7 +59,7 @@ SwXTextMarkup::~SwXTextMarkup() uno::Reference< container::XStringKeyMap > SAL_CALL SwXTextMarkup::getMarkupInfoContainer() throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< container::XStringKeyMap > xProp = new SwXStringKeyMap; return xProp; @@ -73,7 +73,7 @@ void SAL_CALL SwXTextMarkup::commitTextMarkup( const uno::Reference< container::XStringKeyMap > & xMarkupInfoContainer) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // paragraph already dead or modified? if ( !mpTxtNode || nLength <= 0 ) @@ -332,7 +332,7 @@ void SAL_CALL SwXTextMarkup::commitMultiTextMarkup( const uno::Sequence< text::TextMarkupDescriptor > &rMarkups ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // paragraph already dead or modified? if ( !mpTxtNode ) @@ -430,7 +430,7 @@ void SwXTextMarkup::Modify( SfxPoolItem* /*pOld*/, SfxPoolItem* /*pNew*/ ) pRegisteredIn->Remove( this ); // <-- - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; mpTxtNode = 0; } diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index 233d102720..3657067cc6 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -471,7 +471,7 @@ Reference<XTextCursor> XMLRedlineImportHelper::CreateRedlineTextSection( Reference<XTextCursor> xReturn; // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // get RedlineInfo RedlineMapType::iterator aFind = aRedlineMap.find(rId); @@ -563,7 +563,7 @@ void XMLRedlineImportHelper::AdjustStartNodeCursor( Reference<XTextRange> & /*rRange*/) { // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // start + end nodes are treated the same. For either it's // necessary that the target node already exists. @@ -603,7 +603,7 @@ void XMLRedlineImportHelper::InsertIntoDocument(RedlineInfo* pRedlineInfo) DBG_ASSERT(IsReady(pRedlineInfo), "redline info not complete yet!"); // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // Insert the Redline as described by pRedlineInfo into the // document. If we are in insert mode, don't insert any redlines diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index b5f3e52b20..54e551cf10 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -200,7 +200,7 @@ sal_uInt32 SwXMLExport::exportDoc( enum XMLTokenEnum eClass ) return ERR_SWG_WRITE_ERROR; // from here, we use core interfaces -> lock Solar-Mutex (#91949#) - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; { Reference<XPropertySet> rInfoSet = getExportInfo(); diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index d645bbd871..ce938ddc58 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -584,7 +584,7 @@ void SwXMLImport::startDocument( void ) return; // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< XPropertySet > xImportInfo( getImportInfo() ); @@ -797,7 +797,7 @@ void SwXMLImport::endDocument( void ) return; // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( pGraphicResolver ) SvXMLGraphicHelper::Destroy( pGraphicResolver ); @@ -1082,7 +1082,7 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps) return; // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference < XTextDocument > xTextDoc( GetModel(), UNO_QUERY ); Reference < XText > xText = xTextDoc->getText(); @@ -1169,7 +1169,7 @@ void SwXMLImport::SetViewSettings(const Sequence < PropertyValue > & aViewProps) void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aConfigProps) { // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< lang::XMultiServiceFactory > xFac( GetModel(), UNO_QUERY ); if( !xFac.is() ) diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 4e9147684e..895e6b5fdb 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -1315,7 +1315,7 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport, OUString sXmlId; // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; i++ ) @@ -2681,7 +2681,7 @@ void SwXMLTableContext::MakeTable() // this method will modify the document directly -> lock SolarMutex // This will call all other MakeTable*(..) methods, so // those don't need to be locked separately. - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // #i97274# handle invalid tables if (!pRows || !pRows->Count() || !GetColumnCount()) diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 9dfc349efe..5c2eeced0f 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -231,7 +231,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject( sal_Int32 nWidth, sal_Int32 nHeight ) { // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference < XPropertySet > xPropSet; @@ -550,7 +550,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOOoLink( sal_Int32 nWidth, sal_Int32 nHeight ) { // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference < XPropertySet > xPropSet; @@ -639,7 +639,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertApplet( sal_Int32 nWidth, sal_Int32 nHeight ) { // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference < XPropertySet > xPropSet; uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY ); @@ -766,7 +766,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra sal_Int32 nWidth, sal_Int32 nHeight ) { // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference < XPropertySet > xPropSet; uno::Reference<XUnoTunnel> xCrsrTunnel( GetCursor(), UNO_QUERY ); @@ -917,7 +917,7 @@ void SwXMLTextImportHelper::endAppletOrPlugin( ::std::map < const ::rtl::OUString, ::rtl::OUString, ::comphelper::UStringLess > &rParamMap) { // this method will modify the document directly -> lock SolarMutex - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference<XUnoTunnel> xCrsrTunnel( rPropSet, UNO_QUERY ); ASSERT( xCrsrTunnel.is(), "missing XUnoTunnel for embedded" ); diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index a7df045539..106c3bedf0 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -2944,7 +2944,7 @@ SwConnectionDisposedListener_Impl::~SwConnectionDisposedListener_Impl() void SwConnectionDisposedListener_Impl::disposing( const EventObject& rSource ) throw (RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference<XConnection> xSource(rSource.Source, UNO_QUERY); for(USHORT nPos = rDBMgr.aDataSourceParams.Count(); nPos; nPos--) { diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index c4077f8b8c..61dd3d5999 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -124,7 +124,7 @@ void SwDBTreeList_Impl::elementInserted( const ContainerEvent& ) throw (Runtime void SwDBTreeList_Impl::elementRemoved( const ContainerEvent& rEvent ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; ::rtl::OUString sSource; rEvent.Accessor >>= sSource; for(USHORT i = 0; i < aConnections.Count(); i++) diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 41d4b156ce..48177d9c18 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -208,7 +208,7 @@ void SwMailDispatcherListener_Impl::stopped( void SwMailDispatcherListener_Impl::idle(::rtl::Reference<MailDispatcher> /*xMailDispatcher*/) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; m_pSendMailDialog->AllMailsSent(); } @@ -216,7 +216,7 @@ void SwMailDispatcherListener_Impl::mailDelivered( ::rtl::Reference<MailDispatcher> /*xMailDispatcher*/, uno::Reference< mail::XMailMessage> xMailMessage) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; m_pSendMailDialog->DocumentSent( xMailMessage, true, 0 ); DeleteAttachments( xMailMessage ); } @@ -226,7 +226,7 @@ void SwMailDispatcherListener_Impl::mailDeliveryError( uno::Reference< mail::XMailMessage> xMailMessage, const rtl::OUString& sErrorMessage) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; m_pSendMailDialog->DocumentSent( xMailMessage, false, &sErrorMessage ); DeleteAttachments( xMailMessage ); } diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 4d179f2e28..01785d7224 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -5533,7 +5533,7 @@ void SwEditWin::SetChainMode( BOOL bOn ) uno::Reference< ::com::sun::star::accessibility::XAccessible > SwEditWin::CreateAccessible() { - vos::OGuard aGuard(Application::GetSolarMutex()); // this should have + SolarMutexGuard aGuard; // this should have // happend already!!! SwWrtShell *pSh = rView.GetWrtShellPtr(); OSL_ENSURE( pSh, "no writer shell, no accessible object" ); diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 520eeeac2c..5572f6fedb 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -1948,7 +1948,7 @@ BOOL SwPagePreView::HandleWheelCommands( const CommandEvent& rCEvt ) uno::Reference< ::com::sun::star::accessibility::XAccessible > SwPagePreViewWin::CreateAccessible() { - vos::OGuard aGuard(Application::GetSolarMutex()); // this should have + SolarMutexGuard aGuard; // this should have // happend already!!! OSL_ENSURE( GetViewShell() != NULL, "We need a view shell" ); diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx index 842d28a379..b2dec0f41a 100644 --- a/sw/source/ui/uiview/uivwimp.cxx +++ b/sw/source/ui/uiview/uivwimp.cxx @@ -269,7 +269,7 @@ SwScannerEventListener::~SwScannerEventListener() void SAL_CALL SwScannerEventListener::disposing( const EventObject& rEventObject) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; #if defined WIN || defined WNT || defined UNX if( pView ) pView->ScannerEventHdl( rEventObject ); @@ -289,7 +289,7 @@ void SAL_CALL SwClipboardChangeListener::changedContents( const CLIP_NMSPC::Clip throw ( RuntimeException ) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; if( pView ) { { diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index b79223ed6e..60b883b7a4 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -261,7 +261,7 @@ void SwXDocumentSettings::release () uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Sequence< uno::Type > aBaseTypes( 5 ); uno::Type* pBaseTypes = aBaseTypes.getArray(); @@ -280,7 +280,7 @@ uno::Sequence< uno::Type > SAL_CALL SwXDocumentSettings::getTypes( ) uno::Sequence< sal_Int8 > SAL_CALL SwXDocumentSettings::getImplementationId( ) throw (RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx index babca284f4..cd9e3db7ba 100644 --- a/sw/source/ui/uno/SwXFilterOptions.cxx +++ b/sw/source/ui/uno/SwXFilterOptions.cxx @@ -184,7 +184,7 @@ uno::Sequence< ::rtl::OUString > SwXFilterOptions::getSupportedServiceNames() uno::Reference<uno::XInterface> SAL_CALL SwXFilterOptions_createInstance( const uno::Reference<lang::XMultiServiceFactory>& ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwDLL::Init(); return (::cppu::OWeakObject*) new SwXFilterOptions; } diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx index c11a0de2b6..7ac1932f0d 100644 --- a/sw/source/ui/uno/dlelstnr.cxx +++ b/sw/source/ui/uno/dlelstnr.cxx @@ -100,7 +100,7 @@ void SwLinguServiceEventListener::processDictionaryListEvent( const DictionaryListEvent& rDicListEvent) throw( RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Int16 nEvt = rDicListEvent.nCondensedEvent; @@ -125,7 +125,7 @@ void SAL_CALL SwLinguServiceEventListener::processLinguServiceEvent( const LinguServiceEvent& rLngSvcEvent ) throw(RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bIsSpellWrong = 0 != (rLngSvcEvent.nEvent & SPELL_WRONG_WORDS_AGAIN); sal_Bool bIsSpellAll = 0 != (rLngSvcEvent.nEvent & SPELL_CORRECT_WORDS_AGAIN); @@ -155,7 +155,7 @@ void SAL_CALL SwLinguServiceEventListener::disposing( const EventObject& rEventObj ) throw(RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (xLngSvcMgr.is() && rEventObj.Source == xLngSvcMgr) xLngSvcMgr = 0; @@ -167,14 +167,14 @@ void SAL_CALL SwLinguServiceEventListener::queryTermination( const EventObject& /*rEventObj*/ ) throw(TerminationVetoException, RuntimeException) { - //vos::OGuard aGuard(Application::GetSolarMutex()); + //SolarMutexGuard aGuard; } void SAL_CALL SwLinguServiceEventListener::notifyTermination( const EventObject& rEventObj ) throw(RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if (xDesktop.is() && rEventObj.Source == xDesktop) { diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index 0c496bdec5..a69250f584 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -171,7 +171,7 @@ SwFilterDetect::~SwFilterDetect() } // can't check the type for external filters, so set the "dont" flag accordingly - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; //SfxFilterFlags nMust = SFX_FILTER_IMPORT, nDont = SFX_FILTER_NOTINSTALLED; SfxApplication* pApp = SFX_APP(); diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index 9b6c757d12..81faf76e50 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -75,7 +75,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwXAutoTextContainer_createInstance( const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception ) { //the module may not be loaded - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwDLL::Init(); static uno::Reference< uno::XInterface > xAText = (cppu::OWeakObject*)new SwXAutoTextContainer();; return xAText; @@ -112,7 +112,7 @@ sal_Int32 SwXAutoTextContainer::getCount(void) throw( uno::RuntimeException ) uno::Any SwXAutoTextContainer::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; sal_uInt16 nCount = pGlossaries->GetGroupCnt(); if ( 0 <= nIndex && nIndex < nCount ) @@ -137,7 +137,7 @@ sal_Bool SwXAutoTextContainer::hasElements(void) throw( uno::RuntimeException ) uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XAutoTextGroup > xGroup; if ( pGlossaries && hasByName( GroupName ) ) // group name already known? @@ -152,7 +152,7 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName) uno::Sequence< OUString > SwXAutoTextContainer::getElementNames(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_uInt16 nCount = pGlossaries->GetGroupCnt(); uno::Sequence< OUString > aGroupNames(nCount); @@ -172,7 +172,7 @@ uno::Sequence< OUString > SwXAutoTextContainer::getElementNames(void) throw( uno sal_Bool SwXAutoTextContainer::hasByName(const OUString& Name) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; String sGroupName( pGlossaries->GetCompleteGroupName( Name ) ); if(sGroupName.Len()) return sal_True; @@ -183,7 +183,7 @@ uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName( const OUString& aGroupName) throw( lang::IllegalArgumentException, container::ElementExistException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(hasByName(aGroupName)) throw container::ElementExistException(); //check for non-ASCII characters @@ -227,7 +227,7 @@ uno::Reference< text::XAutoTextGroup > SwXAutoTextContainer::insertNewByName( void SwXAutoTextContainer::removeByName(const OUString& aGroupName) throw( container::NoSuchElementException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; //zunaechst den Namen mit Pfad-Extension finden String sGroupName = pGlossaries->GetCompleteGroupName( aGroupName ); if(!sGroupName.Len()) @@ -291,7 +291,7 @@ SwXAutoTextGroup::~SwXAutoTextGroup() uno::Sequence< OUString > SwXAutoTextGroup::getTitles(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_uInt16 nCount = 0; SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0; if(pGlosGroup && !pGlosGroup->GetError()) @@ -313,7 +313,7 @@ void SwXAutoTextGroup::renameByName(const OUString& aElementName, throw( lang::IllegalArgumentException, container::ElementExistException, io::IOException, uno::RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // throw exception only if the programmatic name is to be changed into an existing name if(aNewElementName != aElementName && hasByName(aNewElementName)) throw container::ElementExistException(); @@ -384,7 +384,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const const OUString& aTitle, const uno::Reference< text::XTextRange > & xTextRange) throw( container::ElementExistException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(hasByName(aName)) throw container::ElementExistException(); if(!xTextRange.is()) @@ -465,7 +465,7 @@ uno::Reference< text::XAutoTextEntry > SwXAutoTextGroup::insertNewByName(const void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container::NoSuchElementException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0; if(pGlosGroup && !pGlosGroup->GetError()) { @@ -480,13 +480,13 @@ void SwXAutoTextGroup::removeByName(const OUString& aEntryName) throw( container OUString SwXAutoTextGroup::getName(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return sName; } void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( !pGlossaries ) throw uno::RuntimeException(); @@ -532,7 +532,7 @@ void SwXAutoTextGroup::setName(const OUString& rName) throw( uno::RuntimeExcepti sal_Int32 SwXAutoTextGroup::getCount(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; int nCount = 0; SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0; if(pGlosGroup && !pGlosGroup->GetError()) @@ -546,7 +546,7 @@ sal_Int32 SwXAutoTextGroup::getCount(void) throw( uno::RuntimeException ) uno::Any SwXAutoTextGroup::getByIndex(sal_Int32 nIndex) throw( lang::IndexOutOfBoundsException, lang::WrappedTargetException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Any aRet; sal_uInt16 nCount = 0; SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0; @@ -570,7 +570,7 @@ uno::Type SwXAutoTextGroup::getElementType(void) throw( uno::RuntimeException ) sal_Bool SwXAutoTextGroup::hasElements(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0; sal_uInt16 nCount = 0; if(pGlosGroup && !pGlosGroup->GetError()) @@ -585,7 +585,7 @@ sal_Bool SwXAutoTextGroup::hasElements(void) throw( uno::RuntimeException ) uno::Any SwXAutoTextGroup::getByName(const OUString& _rName) throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XAutoTextEntry > xEntry = pGlossaries->GetAutoTextEntry( m_sGroupName, sName, _rName, true ); OSL_ENSURE( xEntry.is(), "SwXAutoTextGroup::getByName: GetAutoTextEntry is fractious!" ); // we told it to create the object, so why didn't it? @@ -595,7 +595,7 @@ uno::Any SwXAutoTextGroup::getByName(const OUString& _rName) uno::Sequence< OUString > SwXAutoTextGroup::getElementNames(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_uInt16 nCount = 0; SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0; if(pGlosGroup && !pGlosGroup->GetError()) @@ -615,7 +615,7 @@ uno::Sequence< OUString > SwXAutoTextGroup::getElementNames(void) sal_Bool SwXAutoTextGroup::hasByName(const OUString& rName) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; sal_uInt16 nCount = 0; SwTextBlocks* pGlosGroup = pGlossaries ? pGlossaries->GetGroupDoc(m_sGroupName, sal_False) : 0; @@ -649,7 +649,7 @@ void SwXAutoTextGroup::setPropertyValue( throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName ); if(!pEntry) @@ -679,7 +679,7 @@ void SwXAutoTextGroup::setPropertyValue( uno::Any SwXAutoTextGroup::getPropertyValue(const OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName); if(!pEntry) @@ -781,7 +781,7 @@ SwXAutoTextEntry::SwXAutoTextEntry(SwGlossaries* pGlss, const String& rGroupName SwXAutoTextEntry::~SwXAutoTextEntry() { { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // ensure that any pending modifications are written implFlushDocument( true ); @@ -841,7 +841,7 @@ void SwXAutoTextEntry::Notify( SfxBroadcaster& _rBC, const SfxHint& _rHint ) void SwXAutoTextEntry::GetBodyText () { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; xDocSh = pGlossaries->EditGroupDoc ( sGroupName, sEntryName, FALSE ); OSL_ENSURE( xDocSh.Is(), "SwXAutoTextEntry::GetBodyText: unexpected: no doc returned by EditGroupDoc!" ); @@ -855,7 +855,7 @@ void SwXAutoTextEntry::GetBodyText () uno::Reference< text::XTextCursor > SwXAutoTextEntry::createTextCursor(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; EnsureBodyText(); return pBodyText->createTextCursor(); } @@ -863,14 +863,14 @@ uno::Reference< text::XTextCursor > SwXAutoTextEntry::createTextCursor(void) th uno::Reference< text::XTextCursor > SwXAutoTextEntry::createTextCursorByRange( const uno::Reference< text::XTextRange > & aTextPosition) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; EnsureBodyText(); return pBodyText->createTextCursorByRange ( aTextPosition ); } void SwXAutoTextEntry::insertString(const uno::Reference< text::XTextRange > & xRange, const OUString& aString, sal_Bool bAbsorb) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; EnsureBodyText(); pBodyText->insertString ( xRange, aString, bAbsorb ); } @@ -879,7 +879,7 @@ void SwXAutoTextEntry::insertControlCharacter(const uno::Reference< text::XTextR sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; EnsureBodyText(); pBodyText->insertControlCharacter ( xRange, nControlCharacter, bAbsorb ); } @@ -889,7 +889,7 @@ void SwXAutoTextEntry::insertTextContent( const uno::Reference< text::XTextContent > & xContent, sal_Bool bAbsorb) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; EnsureBodyText(); pBodyText->insertTextContent ( xRange, xContent, bAbsorb ); } @@ -898,49 +898,49 @@ void SwXAutoTextEntry::removeTextContent( const uno::Reference< text::XTextContent > & xContent) throw( container::NoSuchElementException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; EnsureBodyText(); pBodyText->removeTextContent ( xContent ); } uno::Reference< text::XText > SwXAutoTextEntry::getText(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XText > xRet = (text::XText*)this; return xRet; } uno::Reference< text::XTextRange > SwXAutoTextEntry::getStart(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; EnsureBodyText(); return pBodyText->getStart(); } uno::Reference< text::XTextRange > SwXAutoTextEntry::getEnd(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; EnsureBodyText(); return pBodyText->getEnd(); } OUString SwXAutoTextEntry::getString(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; EnsureBodyText(); return pBodyText->getString(); } void SwXAutoTextEntry::setString(const OUString& aString) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; EnsureBodyText(); pBodyText->setString( aString ); } void SwXAutoTextEntry::applyTo(const uno::Reference< text::XTextRange > & xTextRange)throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // ensure that any pending modifications are written // reason is that we're holding the _copy_ of the auto text, while the real auto text diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx index 57aecb7ead..387e0ef3d2 100644 --- a/sw/source/ui/uno/unodoc.cxx +++ b/sw/source/ui/uno/unodoc.cxx @@ -65,7 +65,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwTextDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory >&, const sal_uInt64 _nCreationFlags ) throw( uno::Exception ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SwDLL::Init(); SfxObjectShell* pShell = new SwDocShell( _nCreationFlags ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); @@ -94,7 +94,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwWebDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SwDLL::Init(); SfxObjectShell* pShell = new SwWebDocShell( SFX_CREATE_MODE_STANDARD ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); @@ -121,7 +121,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwGlobalDocument_createInstance( const uno::Reference< lang::XMultiServiceFactory > &) throw( uno::Exception ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SwDLL::Init(); SfxObjectShell* pShell = new SwGlobalDocShell( SFX_CREATE_MODE_STANDARD ); return uno::Reference< uno::XInterface >( pShell->GetModel() ); diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index 6d26eea216..853281609c 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -459,7 +459,7 @@ uno::Any SAL_CALL SwXMailMerge::execute( const uno::Sequence< beans::NamedValue >& rArguments ) throw (IllegalArgumentException, Exception, RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // // get property values to be used @@ -881,7 +881,7 @@ void SwXMailMerge::launchEvent( const PropertyChangeEvent &rEvt ) const uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXMailMerge::getPropertySetInfo( ) throw (RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; static Reference< XPropertySetInfo > aRef = pPropSet->getPropertySetInfo(); return aRef; } @@ -890,7 +890,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap()->getByName( rPropertyName ); if (!pCur) @@ -1045,7 +1045,7 @@ uno::Any SAL_CALL SwXMailMerge::getPropertyValue( const OUString& rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Any aRet; @@ -1100,7 +1100,7 @@ void SAL_CALL SwXMailMerge::addPropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& rListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (!bDisposing && rListener.is()) { const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap()->getByName( rPropertyName ); @@ -1116,7 +1116,7 @@ void SAL_CALL SwXMailMerge::removePropertyChangeListener( const uno::Reference< beans::XPropertyChangeListener >& rListener ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (!bDisposing && rListener.is()) { const SfxItemPropertySimpleEntry* pCur = pPropSet->getPropertyMap()->getByName( rPropertyName ); @@ -1149,7 +1149,7 @@ void SAL_CALL SwXMailMerge::removeVetoableChangeListener( void SAL_CALL SwXMailMerge::dispose() throw(RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (!bDisposing) { @@ -1166,7 +1166,7 @@ void SAL_CALL SwXMailMerge::addEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (!bDisposing && rxListener.is()) aEvtListeners.addInterface( rxListener ); } @@ -1175,7 +1175,7 @@ void SAL_CALL SwXMailMerge::removeEventListener( const Reference< XEventListener >& rxListener ) throw(RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (!bDisposing && rxListener.is()) aEvtListeners.removeInterface( rxListener ); } @@ -1184,7 +1184,7 @@ void SAL_CALL SwXMailMerge::addMailMergeEventListener( const uno::Reference< XMailMergeListener >& rxListener ) throw (RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (!bDisposing && rxListener.is()) aMergeListeners.addInterface( rxListener ); } @@ -1193,7 +1193,7 @@ void SAL_CALL SwXMailMerge::removeMailMergeEventListener( const uno::Reference< XMailMergeListener >& rxListener ) throw (RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (!bDisposing && rxListener.is()) aMergeListeners.removeInterface( rxListener ); } @@ -1201,14 +1201,14 @@ void SAL_CALL SwXMailMerge::removeMailMergeEventListener( OUString SAL_CALL SwXMailMerge::getImplementationName() throw(RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return SwXMailMerge_getImplementationName(); } sal_Bool SAL_CALL SwXMailMerge::supportsService( const OUString& rServiceName ) throw(RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return C2U( SN_MAIL_MERGE ) == rServiceName || C2U( SN_DATA_ACCESS_DESCRIPTOR ) == rServiceName; } @@ -1216,7 +1216,7 @@ sal_Bool SAL_CALL SwXMailMerge::supportsService( const OUString& rServiceName ) uno::Sequence< OUString > SAL_CALL SwXMailMerge::getSupportedServiceNames() throw(RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return SwXMailMerge_getSupportedServiceNames(); } @@ -1242,7 +1242,7 @@ uno::Reference< uno::XInterface > SAL_CALL SwXMailMerge_createInstance( const uno::Reference< XMultiServiceFactory > & /*rSMgr*/) throw( uno::Exception ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; //the module may not be loaded SwDLL::Init(); diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index 8c228da7b7..ca3e6aa52d 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -242,7 +242,7 @@ SwXModule::~SwXModule() Reference< XPropertySet > SwXModule::getViewSettings(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pxViewSettings) { ((SwXModule*)this)->pxViewSettings = new Reference< XPropertySet > ; @@ -254,7 +254,7 @@ Reference< XPropertySet > SwXModule::getViewSettings(void) throw( uno::RuntimeE Reference< XPropertySet > SwXModule::getPrintSettings(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!pxPrintSettings) { ((SwXModule*)this)->pxPrintSettings = new Reference< XPropertySet > ; diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx index a8c6eb62db..49db5131d7 100644 --- a/sw/source/ui/uno/unomodule.cxx +++ b/sw/source/ui/uno/unomodule.cxx @@ -58,7 +58,7 @@ uno::Sequence< rtl::OUString > SAL_CALL SwUnoModule_getSupportedServiceNames() t uno::Reference< uno::XInterface > SAL_CALL SwUnoModule_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; return uno::Reference< uno::XInterface >( dynamic_cast< frame::XDispatch * >(new SwUnoModule( rSMgr )), uno::UNO_QUERY ); } @@ -70,7 +70,7 @@ void SAL_CALL SwUnoModule::dispatchWithNotification( const util::URL& aURL, cons // asynchronous ... uno::Reference< uno::XInterface > xThis(static_cast< frame::XNotifyingDispatch* >(this)); - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SwDLL::Init(); const SfxSlot* pSlot = SW_MOD()->GetInterface()->GetSlot( aURL.Complete ); @@ -137,7 +137,7 @@ REFERENCE< XDISPATCH > SAL_CALL SwUnoModule::queryDispatch( { REFERENCE< XDISPATCH > xReturn; - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SwDLL::Init(); const SfxSlot* pSlot = SW_MOD()->GetInterface()->GetSlot( aURL.Complete ); if ( pSlot ) diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index 43d0301996..5d88f5d8df 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -455,7 +455,7 @@ void SwXTextDocument::GetNumberFormatter() Reference< XText > SwXTextDocument::getText(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!xBodyText.is()) @@ -468,14 +468,14 @@ Reference< XText > SwXTextDocument::getText(void) throw( RuntimeException ) void SwXTextDocument::reformat(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); } void SwXTextDocument::lockControllers(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(IsValid()) { UnoActionContext* pContext = new UnoActionContext(pDocShell->GetDoc()); @@ -487,7 +487,7 @@ void SwXTextDocument::lockControllers(void) throw( RuntimeException ) void SwXTextDocument::unlockControllers(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(aActionArr.Count()) { UnoActionContext* pContext = aActionArr.GetObject(0); @@ -500,7 +500,7 @@ void SwXTextDocument::unlockControllers(void) throw( RuntimeException ) sal_Bool SwXTextDocument::hasControllersLocked(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; return aActionArr.Count() > 0; } @@ -517,7 +517,7 @@ void SwXTextDocument::setCurrentController(const Reference< frame::XController > Reference< XInterface > SwXTextDocument::getCurrentSelection() throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< XInterface > xRef; if(IsValid()) { @@ -588,7 +588,7 @@ void SwXTextDocument::removeEventListener(const Reference< lang::XEventListener Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(IsValid()) { if(!pxXLineNumberingProperties) @@ -605,7 +605,7 @@ Reference< XPropertySet > SwXTextDocument::getLineNumberingProperties(void) Reference< XIndexReplace > SwXTextDocument::getChapterNumberingRules(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXChapterNumbering) @@ -618,7 +618,7 @@ Reference< XIndexReplace > SwXTextDocument::getChapterNumberingRules(void) Reference< XIndexAccess > SwXTextDocument::getNumberingRules(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXNumberingRules ) @@ -631,7 +631,7 @@ Reference< XIndexAccess > SwXTextDocument::getNumberingRules(void) throw( Runti Reference< XIndexAccess > SwXTextDocument::getFootnotes(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXFootnotes) @@ -645,7 +645,7 @@ Reference< XIndexAccess > SwXTextDocument::getFootnotes(void) throw( RuntimeExc Reference< XPropertySet > SAL_CALL SwXTextDocument::getFootnoteSettings(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXFootnoteSettings) @@ -658,7 +658,7 @@ Reference< XPropertySet > SAL_CALL Reference< XIndexAccess > SwXTextDocument::getEndnotes(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXEndnotes) @@ -671,7 +671,7 @@ Reference< XIndexAccess > SwXTextDocument::getEndnotes(void) throw( RuntimeExce Reference< XPropertySet > SwXTextDocument::getEndnoteSettings(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXEndnoteSettings) @@ -685,7 +685,7 @@ Reference< XPropertySet > SwXTextDocument::getEndnoteSettings(void) throw( Runt Reference< util::XReplaceDescriptor > SwXTextDocument::createReplaceDescriptor(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< util::XReplaceDescriptor > xRet = new SwXTextSearch; return xRet; } @@ -706,7 +706,7 @@ SwUnoCrsr* SwXTextDocument::CreateCursorForSearch(Reference< XTextCursor > & xC sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > & xDesc) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< XUnoTunnel > xDescTunnel(xDesc, UNO_QUERY); if(!IsValid() || !xDescTunnel.is() || !xDescTunnel->getSomething(SwXTextSearch::getUnoTunnelId())) throw RuntimeException(); @@ -779,7 +779,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor > Reference< util::XSearchDescriptor > SwXTextDocument::createSearchDescriptor(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< util::XSearchDescriptor > xRet = new SwXTextSearch; return xRet; @@ -915,7 +915,7 @@ Reference< XIndexAccess > SwXTextDocument::findAll(const Reference< util::XSearchDescriptor > & xDesc) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< XInterface > xTmp; sal_Int32 nResult = 0; Reference< XTextCursor > xCrsr; @@ -931,7 +931,7 @@ Reference< XIndexAccess > Reference< XInterface > SwXTextDocument::findFirst(const Reference< util::XSearchDescriptor > & xDesc) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< XInterface > xTmp; sal_Int32 nResult = 0; Reference< XTextCursor > xCrsr; @@ -954,7 +954,7 @@ Reference< XInterface > SwXTextDocument::findNext(const Reference< XInterface > const Reference< util::XSearchDescriptor > & xDesc) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< XInterface > xTmp; sal_Int32 nResult = 0; Reference< XTextCursor > xCrsr; @@ -979,7 +979,7 @@ Reference< XInterface > SwXTextDocument::findNext(const Reference< XInterface > Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Sequence< beans::PropertyValue > aSeq(9); if(IsValid()) { @@ -1058,7 +1058,7 @@ String lcl_CreateOutlineString( USHORT nIndex, void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue >& aSettings) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(IsValid()) { SwPagePreViewPrtData aData; @@ -1129,7 +1129,7 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOptions) throw( IllegalArgumentException, RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(IsValid()) { SfxViewFrame* pFrame = SfxViewFrame::LoadHiddenDocument( *pDocShell, 7 ); @@ -1215,7 +1215,7 @@ void SwXTextDocument::printPages(const Sequence< beans::PropertyValue >& xOption Reference< XNameAccess > SwXTextDocument::getReferenceMarks(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXReferenceMarks) @@ -1228,7 +1228,7 @@ Reference< XNameAccess > SwXTextDocument::getReferenceMarks(void) Reference< XEnumerationAccess > SwXTextDocument::getTextFields(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXTextFieldTypes) @@ -1242,7 +1242,7 @@ Reference< XEnumerationAccess > SwXTextDocument::getTextFields(void) throw( Run Reference< XNameAccess > SwXTextDocument::getTextFieldMasters(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXTextFieldMasters) @@ -1255,7 +1255,7 @@ Reference< XNameAccess > SwXTextDocument::getTextFieldMasters(void) Reference< XNameAccess > SwXTextDocument::getEmbeddedObjects(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXEmbeddedObjects) @@ -1268,7 +1268,7 @@ Reference< XNameAccess > SwXTextDocument::getEmbeddedObjects(void) throw( Runti Reference< XNameAccess > SwXTextDocument::getBookmarks(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXBookmarks) @@ -1281,7 +1281,7 @@ Reference< XNameAccess > SwXTextDocument::getBookmarks(void) throw( RuntimeExce Reference< XNameAccess > SwXTextDocument::getTextSections(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXTextSections) @@ -1294,7 +1294,7 @@ Reference< XNameAccess > SwXTextDocument::getTextSections(void) throw( RuntimeE Reference< XNameAccess > SwXTextDocument::getTextTables(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXTextTables) @@ -1307,7 +1307,7 @@ Reference< XNameAccess > SwXTextDocument::getTextTables(void) throw( RuntimeExc Reference< XNameAccess > SwXTextDocument::getGraphicObjects(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXGraphicObjects) @@ -1320,7 +1320,7 @@ Reference< XNameAccess > SwXTextDocument::getGraphicObjects(void) throw( Runtim Reference< XNameAccess > SwXTextDocument::getTextFrames(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXTextFrames) @@ -1333,7 +1333,7 @@ Reference< XNameAccess > SwXTextDocument::getTextFrames(void) throw( RuntimeExc Reference< XNameAccess > SwXTextDocument::getStyleFamilies(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXStyleFamilies) @@ -1347,7 +1347,7 @@ Reference< XNameAccess > SwXTextDocument::getStyleFamilies(void) throw( Runtime uno::Reference< style::XAutoStyles > SwXTextDocument::getAutoStyles( ) throw (uno::RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXAutoStyles) @@ -1361,7 +1361,7 @@ uno::Reference< style::XAutoStyles > SwXTextDocument::getAutoStyles( ) Reference< drawing::XDrawPage > SwXTextDocument::getDrawPage(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXDrawPage) @@ -1630,7 +1630,7 @@ void SwXTextDocument::InitNewDoc() Reference< XInterface > SwXTextDocument::createInstance(const OUString& rServiceName) throw( Exception, RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); Reference< XInterface > xRet; @@ -1819,7 +1819,7 @@ Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( Runt Reference< XIndexAccess > SwXTextDocument::getDocumentIndexes(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); if(!pxXDocumentIndexes) @@ -1841,7 +1841,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName); @@ -2017,7 +2017,7 @@ void SwXTextDocument::setPropertyValue(const OUString& rPropertyName, Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName) throw( UnknownPropertyException, WrappedTargetException, RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName); @@ -2225,7 +2225,7 @@ Reference< XEnumerationAccess > SwXTextDocument::getRedlines( ) throw(RuntimeEx void SwXTextDocument::refresh(void) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); SwWrtShell *pWrtShell = pDocShell->GetWrtShell(); @@ -2237,7 +2237,7 @@ void SwXTextDocument::refresh(void) throw( RuntimeException ) void SwXTextDocument::addRefreshListener(const Reference< util::XRefreshListener > & l) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( !IsValid() ) throw RuntimeException(); aRefreshCont.AddListener ( reinterpret_cast < const Reference < lang::XEventListener > &> ( l )); @@ -2246,14 +2246,14 @@ void SwXTextDocument::addRefreshListener(const Reference< util::XRefreshListener void SwXTextDocument::removeRefreshListener(const Reference< util::XRefreshListener > & l) throw( RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( !IsValid() || !aRefreshCont.RemoveListener ( reinterpret_cast < const Reference < lang::XEventListener > &> ( l ) ) ) throw RuntimeException(); } void SwXTextDocument::updateLinks( ) throw(RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); SwDoc* pDoc = pDocShell->GetDoc(); @@ -2269,7 +2269,7 @@ void SwXTextDocument::updateLinks( ) throw(RuntimeException) PropertyState SAL_CALL SwXTextDocument::getPropertyState( const OUString& rPropertyName ) throw (UnknownPropertyException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; PropertyState eRet = PropertyState_DIRECT_VALUE; if(!IsValid()) throw RuntimeException(); @@ -2302,7 +2302,7 @@ Sequence< PropertyState > SAL_CALL SwXTextDocument::getPropertyStates( const Seq void SAL_CALL SwXTextDocument::setPropertyToDefault( const OUString& rPropertyName ) throw (UnknownPropertyException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName); @@ -2317,7 +2317,7 @@ void SAL_CALL SwXTextDocument::setPropertyToDefault( const OUString& rPropertyNa Any SAL_CALL SwXTextDocument::getPropertyDefault( const OUString& rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); const SfxItemPropertySimpleEntry* pEntry = pPropSet->getPropertyMap()->getByName( rPropertyName); @@ -2494,7 +2494,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount( const uno::Sequence< beans::PropertyValue >& rxOptions ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); @@ -2645,7 +2645,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer( const uno::Sequence< beans::PropertyValue >& rxOptions ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); @@ -2830,7 +2830,7 @@ void SAL_CALL SwXTextDocument::render( const uno::Sequence< beans::PropertyValue >& rxOptions ) throw (IllegalArgumentException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); @@ -2996,7 +2996,7 @@ uno::Reference< text::XFlatParagraphIterator > SAL_CALL SwXTextDocument::getFlat uno::Reference< util::XCloneable > SwXTextDocument::createClone( ) throw (uno::RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!IsValid()) throw RuntimeException(); //create a new document - hidden - copy the storage and return it @@ -3028,7 +3028,7 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages( ::sal_Int16 nMaxCount ) throw (lang::IllegalArgumentException, uno::RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // possible canonical values for nScriptTypes diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 9cca72baf3..5b0f6e89e2 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -188,7 +188,7 @@ Sequence< uno::Type > SAL_CALL SwXTextView::getTypes( ) throw(uno::RuntimeExcep Sequence< sal_Int8 > SAL_CALL SwXTextView::getImplementationId( ) throw(uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; static Sequence< sal_Int8 > aId( 16 ); static sal_Bool bInit = sal_False; if(!bInit) @@ -265,7 +265,7 @@ uno::Any SAL_CALL SwXTextView::queryInterface( const uno::Type& aType ) sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArgumentException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< uno::XInterface > xInterface; if(GetView() && (aInterface >>= xInterface)) { @@ -510,7 +510,7 @@ sal_Bool SwXTextView::select(const uno::Any& aInterface) throw( lang::IllegalArg uno::Any SwXTextView::getSelection(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< uno::XInterface > aRef; if(GetView()) { @@ -616,7 +616,7 @@ void SwXTextView::addSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener > & rxListener) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< view::XSelectionChangeListener > * pInsert = new uno::Reference< view::XSelectionChangeListener > ; *pInsert = rxListener; aSelChangedListeners.Insert(pInsert, aSelChangedListeners.Count()); @@ -626,7 +626,7 @@ void SwXTextView::removeSelectionChangeListener( const uno::Reference< view::XSelectionChangeListener > & rxListener) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; view::XSelectionChangeListener* pLeft = rxListener.get(); for(sal_uInt16 i = 0; i < aSelChangedListeners.Count(); i++) { @@ -661,7 +661,7 @@ SdrObject* SwXTextView::GetControl( uno::Reference< awt::XControl > SwXTextView::getControl(const uno::Reference< awt::XControlModel > & xModel) throw( container::NoSuchElementException, uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< awt::XControl > xRet; GetControl(xModel, xRet); return xRet; @@ -669,7 +669,7 @@ uno::Reference< awt::XControl > SwXTextView::getControl(const uno::Reference< a uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormController( const uno::Reference< form::XForm >& _Form ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SwView* pView2 = GetView(); FmFormShell* pFormShell = pView2 ? pView2->GetFormShell() : NULL; @@ -685,7 +685,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormCo ::sal_Bool SAL_CALL SwXTextView::isFormDesignMode( ) throw (uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SwView* pView2 = GetView(); FmFormShell* pFormShell = pView2 ? pView2->GetFormShell() : NULL; return pFormShell ? pFormShell->IsDesignMode() : sal_True; @@ -693,7 +693,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormCo void SAL_CALL SwXTextView::setFormDesignMode( ::sal_Bool _DesignMode ) throw (RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SwView* pView2 = GetView(); FmFormShell* pFormShell = pView2 ? pView2->GetFormShell() : NULL; if ( pFormShell ) @@ -702,7 +702,7 @@ void SAL_CALL SwXTextView::setFormDesignMode( ::sal_Bool _DesignMode ) throw (Ru uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(GetView()) { if(!pxTextViewCursor) @@ -718,7 +718,7 @@ uno::Reference< text::XTextViewCursor > SwXTextView::getViewCursor(void) throw( uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { if(!pxViewSettings) @@ -734,7 +734,7 @@ uno::Reference< beans::XPropertySet > SwXTextView::getViewSettings(void) throw( Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAutomatic*/ ) throw(RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!GetView()) throw RuntimeException(); @@ -782,7 +782,7 @@ void SAL_CALL SwXTextView::setRubyList( const Sequence< Sequence< PropertyValue > >& rRubyList, sal_Bool /*bAutomatic*/ ) throw(RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(!GetView() || !rRubyList.getLength()) throw RuntimeException(); @@ -925,7 +925,7 @@ void SwXTextView::NotifyDBChanged() uno::Reference< beans::XPropertySetInfo > SAL_CALL SwXTextView::getPropertySetInfo( ) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; static uno::Reference< XPropertySetInfo > aRef = m_pPropSet->getPropertySetInfo(); return aRef; } @@ -934,7 +934,7 @@ void SAL_CALL SwXTextView::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; const SfxItemPropertySimpleEntry* pEntry = m_pPropSet->getPropertyMap()->getByName( rPropertyName ); if (!pEntry) throw UnknownPropertyException(); @@ -969,7 +969,7 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue( const OUString& rPropertyName ) throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Any aRet; @@ -1109,20 +1109,20 @@ sal_Bool SwXTextViewCursor::IsTextSelection( sal_Bool bAllowTables ) const sal_Bool SwXTextViewCursor::isVisible(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OSL_ENSURE(false, "not implemented"); return sal_True; } void SwXTextViewCursor::setVisible(sal_Bool /*bVisible*/) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OSL_ENSURE(false, "not implemented"); } awt::Point SwXTextViewCursor::getPosition(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; awt::Point aRet; if(m_pView) { @@ -1146,7 +1146,7 @@ awt::Point SwXTextViewCursor::getPosition(void) throw( uno::RuntimeException ) void SwXTextViewCursor::collapseToStart(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { if (!IsTextSelection()) @@ -1169,7 +1169,7 @@ void SwXTextViewCursor::collapseToStart(void) throw( uno::RuntimeException ) void SwXTextViewCursor::collapseToEnd(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { if (!IsTextSelection()) @@ -1192,7 +1192,7 @@ void SwXTextViewCursor::collapseToEnd(void) throw( uno::RuntimeException ) sal_Bool SwXTextViewCursor::isCollapsed(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1210,7 +1210,7 @@ sal_Bool SwXTextViewCursor::isCollapsed(void) throw( uno::RuntimeException ) sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1227,7 +1227,7 @@ sal_Bool SwXTextViewCursor::goLeft(sal_Int16 nCount, sal_Bool bExpand) throw( un sal_Bool SwXTextViewCursor::goRight(sal_Int16 nCount, sal_Bool bExpand) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1248,7 +1248,7 @@ void SwXTextViewCursor::gotoRange( sal_Bool bExpand) throw(RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView && xRange.is()) { if (!IsTextSelection()) @@ -1387,7 +1387,7 @@ void SwXTextViewCursor::gotoRange( void SwXTextViewCursor::gotoStart(sal_Bool bExpand) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { if (!IsTextSelection()) @@ -1401,7 +1401,7 @@ void SwXTextViewCursor::gotoStart(sal_Bool bExpand) throw( uno::RuntimeException void SwXTextViewCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { if (!IsTextSelection()) @@ -1415,7 +1415,7 @@ void SwXTextViewCursor::gotoEnd(sal_Bool bExpand) throw( uno::RuntimeException ) sal_Bool SwXTextViewCursor::jumpToFirstPage(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1435,7 +1435,7 @@ sal_Bool SwXTextViewCursor::jumpToFirstPage(void) throw( uno::RuntimeException ) sal_Bool SwXTextViewCursor::jumpToLastPage(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1456,7 +1456,7 @@ sal_Bool SwXTextViewCursor::jumpToLastPage(void) throw( uno::RuntimeException ) sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) bRet = m_pView->GetWrtShell().GotoPage(nPage, TRUE); @@ -1467,7 +1467,7 @@ sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) throw( uno::RuntimeExcep sal_Bool SwXTextViewCursor::jumpToNextPage(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) bRet = m_pView->GetWrtShell().SttNxtPg(); @@ -1478,7 +1478,7 @@ sal_Bool SwXTextViewCursor::jumpToNextPage(void) throw( uno::RuntimeException ) sal_Bool SwXTextViewCursor::jumpToPreviousPage(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) bRet = m_pView->GetWrtShell().EndPrvPg(); @@ -1489,7 +1489,7 @@ sal_Bool SwXTextViewCursor::jumpToPreviousPage(void) throw( uno::RuntimeExceptio sal_Bool SwXTextViewCursor::jumpToEndOfPage(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) bRet = m_pView->GetWrtShell().EndPg(); @@ -1500,7 +1500,7 @@ sal_Bool SwXTextViewCursor::jumpToEndOfPage(void) throw( uno::RuntimeException ) sal_Bool SwXTextViewCursor::jumpToStartOfPage(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) bRet = m_pView->GetWrtShell().SttPg(); @@ -1511,7 +1511,7 @@ sal_Bool SwXTextViewCursor::jumpToStartOfPage(void) throw( uno::RuntimeException sal_Int16 SwXTextViewCursor::getPage(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; short nRet = 0; if(m_pView) { @@ -1526,7 +1526,7 @@ sal_Int16 SwXTextViewCursor::getPage(void) throw( uno::RuntimeException ) sal_Bool SwXTextViewCursor::screenDown(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1542,7 +1542,7 @@ sal_Bool SwXTextViewCursor::screenDown(void) throw( uno::RuntimeException ) sal_Bool SwXTextViewCursor::screenUp(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1558,7 +1558,7 @@ sal_Bool SwXTextViewCursor::screenUp(void) throw( uno::RuntimeException ) uno::Reference< text::XText > SwXTextViewCursor::getText(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XText > xRet; if(m_pView) { @@ -1577,7 +1577,7 @@ uno::Reference< text::XText > SwXTextViewCursor::getText(void) throw( uno::Runt uno::Reference< text::XTextRange > SwXTextViewCursor::getStart(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; if(m_pView) { @@ -1596,7 +1596,7 @@ uno::Reference< text::XTextRange > SwXTextViewCursor::getStart(void) throw( uno uno::Reference< text::XTextRange > SwXTextViewCursor::getEnd(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; uno::Reference< text::XTextRange > xRet; if(m_pView) { @@ -1615,7 +1615,7 @@ uno::Reference< text::XTextRange > SwXTextViewCursor::getEnd(void) throw( uno:: OUString SwXTextViewCursor::getString(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OUString uRet; if(m_pView) { @@ -1646,7 +1646,7 @@ OUString SwXTextViewCursor::getString(void) throw( uno::RuntimeException ) void SwXTextViewCursor::setString(const OUString& aString) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { if (!IsTextSelection( sal_False )) @@ -1683,7 +1683,7 @@ void SwXTextViewCursor::setPropertyValue( const OUString& rPropertyName, const throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { SwWrtShell& rSh = m_pView->GetWrtShell(); @@ -1704,7 +1704,7 @@ void SwXTextViewCursor::setPropertyValue( const OUString& rPropertyName, const Any SwXTextViewCursor::getPropertyValue( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Any aRet; if(m_pView) { @@ -1744,7 +1744,7 @@ void SwXTextViewCursor::removeVetoableChangeListener( PropertyState SwXTextViewCursor::getPropertyState( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; PropertyState eState; if(m_pView) { @@ -1761,7 +1761,7 @@ PropertyState SwXTextViewCursor::getPropertyState( const OUString& rPropertyNam Sequence< PropertyState > SwXTextViewCursor::getPropertyStates( const Sequence< OUString >& rPropertyNames ) throw(UnknownPropertyException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Sequence< PropertyState > aRet; if(m_pView) { @@ -1776,7 +1776,7 @@ Sequence< PropertyState > SwXTextViewCursor::getPropertyStates( void SwXTextViewCursor::setPropertyToDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { SwWrtShell& rSh = m_pView->GetWrtShell(); @@ -1790,7 +1790,7 @@ Any SwXTextViewCursor::getPropertyDefault( const OUString& rPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException) { Any aRet; - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { SwWrtShell& rSh = m_pView->GetWrtShell(); @@ -1803,7 +1803,7 @@ Any SwXTextViewCursor::getPropertyDefault( const OUString& rPropertyName ) sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1820,7 +1820,7 @@ sal_Bool SwXTextViewCursor::goDown(sal_Int16 nCount, sal_Bool bExpand) throw( un sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1837,7 +1837,7 @@ sal_Bool SwXTextViewCursor::goUp(sal_Int16 nCount, sal_Bool bExpand) throw( uno: sal_Bool SwXTextViewCursor::isAtStartOfLine(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1853,7 +1853,7 @@ sal_Bool SwXTextViewCursor::isAtStartOfLine(void) throw( uno::RuntimeException ) sal_Bool SwXTextViewCursor::isAtEndOfLine(void) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sal_Bool bRet = sal_False; if(m_pView) { @@ -1869,7 +1869,7 @@ sal_Bool SwXTextViewCursor::isAtEndOfLine(void) throw( uno::RuntimeException ) void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { if (!IsTextSelection( sal_False )) @@ -1883,7 +1883,7 @@ void SwXTextViewCursor::gotoEndOfLine(sal_Bool bExpand) throw( uno::RuntimeExcep void SwXTextViewCursor::gotoStartOfLine(sal_Bool bExpand) throw( uno::RuntimeException ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if(m_pView) { if (!IsTextSelection( sal_False )) @@ -1972,7 +1972,7 @@ SwPaM* SwXTextViewCursor::GetPaM() uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransferable( ) throw (uno::RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; //force immediat shell update GetView()->StopShellTimer(); @@ -1996,7 +1996,7 @@ uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransfera void SAL_CALL SwXTextView::insertTransferable( const uno::Reference< datatransfer::XTransferable >& xTrans ) throw (datatransfer::UnsupportedFlavorException, uno::RuntimeException) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; //force immediat shell update GetView()->StopShellTimer(); |