diff options
28 files changed, 113 insertions, 113 deletions
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 176ae364bbe1..c8177943a3f2 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -207,7 +207,7 @@ Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount (void) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); // Usually a box has a text field and a list of items as its children. @@ -231,7 +231,7 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount (void) Reference<XAccessible> SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32 i) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if (i<0 || i>=getAccessibleChildCount()) @@ -311,7 +311,7 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) sal_Bool bNotify = sal_False; { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if (nIndex<0 || nIndex>=getAccessibleActionCount()) diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index bb1b9a9fcbec..accce8440c7e 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -133,7 +133,7 @@ void VCLXAccessibleList::clearItems() void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); // check if our list should be visible @@ -394,7 +394,7 @@ Reference<XAccessibleContext> SAL_CALL sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount (void) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); sal_Int32 nCount = 0; @@ -408,7 +408,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount (void) Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int32 i) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( i < 0 || i >= getAccessibleChildCount() ) @@ -459,7 +459,7 @@ sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole (void) sal_Bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); sal_Bool bInside = sal_False; @@ -478,7 +478,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt::Point& rPoint ) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); Reference< XAccessible > xChild; @@ -543,7 +543,7 @@ void VCLXAccessibleList::UpdateVisibleLineCount() // ----------------------------------------------------------------------------- void VCLXAccessibleList::UpdateEntryRange_Impl() { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); sal_Int32 nTop = m_nLastTopEntry; @@ -594,7 +594,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(USHORT) uno::Any aOldValue, aNewValue; { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); Reference< XAccessible > xNewAcc; @@ -658,7 +658,7 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) sal_Bool bNotify = sal_False; { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( m_pListBoxHelper ) @@ -680,7 +680,7 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) // ----------------------------------------------------------------------------- sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); sal_Bool bRet = sal_False; @@ -698,7 +698,7 @@ void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeExc sal_Bool bNotify = sal_False; { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( m_pListBoxHelper ) @@ -717,7 +717,7 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (Runtime sal_Bool bNotify = sal_False; { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( m_pListBoxHelper ) @@ -739,7 +739,7 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (Runtime // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); sal_Int32 nCount = 0; @@ -750,7 +750,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) throw // ----------------------------------------------------------------------------- Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( m_pListBoxHelper ) @@ -767,7 +767,7 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh sal_Bool bNotify = sal_False; { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if ( m_pListBoxHelper ) @@ -821,7 +821,7 @@ awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException) awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); awt::Point aPos; diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 5c2635b6053b..f84188ba8155 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -341,7 +341,7 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleS // ----------------------------------------------------------------------------- Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return implGetLocale(); @@ -351,7 +351,7 @@ Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw (IllegalAccessibleCo // ----------------------------------------------------------------------------- sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoint ) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); sal_Bool bInside = sal_False; @@ -371,7 +371,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleAtPoint( // ----------------------------------------------------------------------------- awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); awt::Rectangle aRect; @@ -383,7 +383,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) throw (RuntimeExce // ----------------------------------------------------------------------------- awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); Point aPoint(0,0); @@ -397,7 +397,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) throw (RuntimeExcept // ----------------------------------------------------------------------------- awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); Point aPoint(0,0); @@ -412,7 +412,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (Runti // ----------------------------------------------------------------------------- awt::Size SAL_CALL VCLXAccessibleListItem::getSize( ) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); Size aSize; @@ -436,7 +436,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getCaretPosition() throw (RuntimeExce // ----------------------------------------------------------------------------- sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) ) @@ -447,7 +447,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) t // ----------------------------------------------------------------------------- sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return OCommonAccessibleText::getCharacter( nIndex ); @@ -455,7 +455,7 @@ sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) th // ----------------------------------------------------------------------------- Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< ::rtl::OUString >& ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); ::rtl::OUString sText( implGetText() ); @@ -467,7 +467,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttribute // ----------------------------------------------------------------------------- awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); ::rtl::OUString sText( implGetText() ); @@ -488,7 +488,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return OCommonAccessibleText::getCharacterCount(); @@ -496,7 +496,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeExc // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nIndex = -1; @@ -515,7 +515,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return OCommonAccessibleText::getSelectedText(); @@ -523,7 +523,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return OCommonAccessibleText::getSelectionStart(); @@ -531,7 +531,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeExc // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return OCommonAccessibleText::getSelectionEnd(); @@ -539,7 +539,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeExcep // ----------------------------------------------------------------------------- sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) ) @@ -550,7 +550,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return OCommonAccessibleText::getText(); @@ -558,7 +558,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); @@ -566,7 +566,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s // ----------------------------------------------------------------------------- ::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::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 aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType ); @@ -574,7 +574,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s // ----------------------------------------------------------------------------- ::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::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 aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType ); @@ -582,7 +582,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s // ----------------------------------------------------------------------------- ::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::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 aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType ); @@ -590,7 +590,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s // ----------------------------------------------------------------------------- sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); checkIndex_Impl( nStartIndex, m_sEntryText ); diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index e69f542c618e..c204a6ea7109 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -193,7 +193,7 @@ namespace basctl //-------------------------------------------------------------------- void SAL_CALL DocumentEventNotifier_Impl::disposing( const csslang::EventObject& /*Event*/ ) throw (RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if ( !impl_isDisposed_nothrow() ) diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index f72628db8e2a..456d9eb89e35 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -70,13 +70,13 @@ uno::Any SAL_CALL SIDEModel::queryInterface( const uno::Type& rType ) throw(uno: void SAL_CALL SIDEModel::acquire() throw() { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OWeakObject::acquire(); } void SAL_CALL SIDEModel::release() throw() { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OWeakObject::release(); } @@ -121,7 +121,7 @@ uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static(void) uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance( const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; BasicIDEDLL::Init(); SfxObjectShell* pShell = new BasicDocShell(); return uno::Reference< uno::XInterface >( pShell->GetModel() ); diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx index c7f1b2fa65a3..9364cb2f5d4c 100644 --- a/basctl/source/dlged/dlgedclip.cxx +++ b/basctl/source/dlged/dlgedclip.cxx @@ -89,7 +89,7 @@ sal_Bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor& lFlavor, c Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; if ( !isDataFlavorSupported( rFlavor ) ) throw UnsupportedFlavorException(); @@ -112,7 +112,7 @@ Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor ) Sequence< DataFlavor > SAL_CALL DlgEdTransferableImpl::getTransferDataFlavors( ) throw(RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; return m_SeqFlavors; } @@ -121,7 +121,7 @@ Sequence< DataFlavor > SAL_CALL DlgEdTransferableImpl::getTransferDataFlavors( sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor& rFlavor ) throw(RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; sal_Bool bRet = sal_False; @@ -142,7 +142,7 @@ sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw(RuntimeException) { - const ::vos::OGuard aGuard( Application::GetSolarMutex() ); + const SolarMutexGuard aGuard; m_SeqFlavors = Sequence< DataFlavor >(); m_SeqData = Sequence< Any >(); diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 18177096d2a4..7cf48b0c1821 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -770,7 +770,7 @@ void FmSearchDialog::OnFound(const ::com::sun::star::uno::Any& aCursorPos, sal_I //------------------------------------------------------------------------ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // diese eine Methode Thread-sicher machen (das ist ein Overkill, die ganze restliche Applikation dafuer zu blockieren, // aber im Augenblick haben wir kein anderes Sicherheitskonpzept) diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 97d8f17803ae..c2070261e7b1 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -137,7 +137,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, BOOL bRecursive ) { { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; mpProgress->SetDirectory( rStartURL ); mpProgress->Sync(); @@ -192,7 +192,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL, String(aFoundURL.GetExtension().toAsciiLowerCase()) ) != rFormats.end() ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; mpBrowser->aFoundList.Insert( new String( aFoundURL.GetMainURL( INetURLObject::NO_DECODE ) ), @@ -305,7 +305,7 @@ void SAL_CALL TakeThread::run() GalleryProgress* pStatusProgress; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pStatusProgress = new GalleryProgress; nEntries = mpBrowser->bTakeAll ? mpBrowser->aLbxFound.GetEntryCount() : mpBrowser->aLbxFound.GetSelectEntryCount(); pThm->LockBroadcaster(); @@ -323,7 +323,7 @@ void SAL_CALL TakeThread::run() mrTakenList.Insert( (void*) (ULONG)nPos, LIST_APPEND ); { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; mpProgress->SetFile( aURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ) ); pStatusProgress->Update( i, nEntries - 1 ); @@ -333,7 +333,7 @@ void SAL_CALL TakeThread::run() } { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; pThm->UnlockBroadcaster(); delete pStatusProgress; diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index 2a3c12feb75c..c491d0d203fc 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -1647,7 +1647,7 @@ SvxScriptErrorDialog::SvxScriptErrorDialog( Window* , ::com::sun::star::uno::Any aException ) : m_sMessage() { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; m_sMessage = GetErrorMessage( aException ); } diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index c2f8f46491ca..db46e5d9f8d6 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -287,7 +287,7 @@ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUS { //! - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; m_pBibMod = OpenBibModul(); String aURLStr( rURL ); @@ -310,7 +310,7 @@ void BibliographyLoader::loadView(const Reference< XFrame > & rFrame, const rtl: const Sequence< PropertyValue >& /*rArgs*/, const Reference< XLoadEventListener > & rListener) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; //! if(!m_pBibMod) m_pBibMod = OpenBibModul(); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 14ccb60b4a0c..74882f812493 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -186,7 +186,7 @@ void BibFrameCtrl_Impl::frameAction(const FrameActionEvent& aEvent) throw( uno:: void BibFrameCtrl_Impl::disposing( const lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if ( pController ) pController->getFrame()->removeFrameActionListener( this ); } @@ -441,7 +441,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen { if ( !bDisposing ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window* pParent = VCLUnoHelper::GetWindow( xWindow ); WaitObject aWaitObject( pParent ); diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx index cc24bd56eca7..e019b7b50392 100644 --- a/extensions/source/bibliography/toolbar.cxx +++ b/extensions/source/bibliography/toolbar.cxx @@ -74,7 +74,7 @@ void BibToolBarListener::statusChanged(const ::com::sun::star::frame::FeatureSta { if(rEvt.FeatureURL.Complete == aCommand) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; pToolBar->EnableItem(nIndex,rEvt.IsEnabled); ::com::sun::star::uno::Any aState=rEvt.State; @@ -109,7 +109,7 @@ void BibTBListBoxListener::statusChanged(const ::com::sun::star::frame::FeatureS { if(rEvt.FeatureURL.Complete == GetCommand()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; pToolBar->EnableSourceList(rEvt.IsEnabled); Any aState = rEvt.State; @@ -149,7 +149,7 @@ void BibTBQueryMenuListener::statusChanged(const frame::FeatureStateEvent& rEvt) { if(rEvt.FeatureURL.Complete == GetCommand()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; pToolBar->EnableSourceList(rEvt.IsEnabled); uno::Any aState=rEvt.State; @@ -187,7 +187,7 @@ void BibTBEditListener::statusChanged(const frame::FeatureStateEvent& rEvt)throw { if(rEvt.FeatureURL.Complete == GetCommand()) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; pToolBar->EnableQuery(rEvt.IsEnabled); uno::Any aState=rEvt.State; diff --git a/extensions/source/oooimprovecore/core.cxx b/extensions/source/oooimprovecore/core.cxx index 2caac938de28..8310c5164128 100644 --- a/extensions/source/oooimprovecore/core.cxx +++ b/extensions/source/oooimprovecore/core.cxx @@ -133,7 +133,7 @@ namespace oooimprovecore else help_url = OUString::createFromAscii("http://www.openoffice.org"); { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; SfxAllItemSet aSet( SFX_APP()->GetPool() ); aSet.Put( SfxStringItem( SID_CURRENT_URL, help_url ) ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx index ad44f2585b2c..6ba05e432185 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -244,7 +244,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL PropertyControlContext_Impl::dispose() { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( impl_isDisposed_nothrow() ) return; @@ -255,7 +255,7 @@ namespace pcr //-------------------------------------------------------------------- void PropertyControlContext_Impl::setNotificationMode( NotifcationMode _eMode ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; m_eMode = _eMode; } @@ -265,7 +265,7 @@ namespace pcr ::comphelper::AnyEventRef pEvent; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; impl_checkAlive_throw(); pEvent = new ControlEvent( _rxControl, _eType ); @@ -315,7 +315,7 @@ namespace pcr //-------------------------------------------------------------------- void PropertyControlContext_Impl::processEvent( const ::comphelper::AnyEvent& _rEvent ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( impl_isDisposed_nothrow() ) return; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index f4791a316137..16fedd434cad 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -283,7 +283,7 @@ namespace pcr //-------------------------------------------------------------------- void SAL_CALL OPropertyBrowserController::inspect( const Sequence< Reference< XInterface > >& _rObjects ) throw (com::sun::star::util::VetoException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bSuspendingPropertyHandlers || !suspendAll_nothrow() ) @@ -371,7 +371,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::attachFrame( const Reference< XFrame >& _rxFrame ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if (_rxFrame.is() && haveView()) @@ -536,7 +536,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::dispose( ) throw(RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; // stop inspecting the current object stopInspection( false ); @@ -1724,7 +1724,7 @@ namespace pcr //------------------------------------------------------------------------ void SAL_CALL OPropertyBrowserController::setHelpSectionText( const ::rtl::OUString& _rHelpText ) throw (NoSupportException, RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if ( !haveView() ) diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx index 946f24ddec16..0da4c9d68779 100644 --- a/extensions/source/resource/resource.cxx +++ b/extensions/source/resource/resource.cxx @@ -157,7 +157,7 @@ Sequence< OUString > ResourceService::getSupportedServiceNames_Static(void) thro // ResourceService Reference< XTypeConverter > ResourceService::getTypeConverter() const { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( xSMgr.is() ) { Reference< XTypeConverter > xConv( xSMgr->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter" ))), UNO_QUERY ); @@ -169,7 +169,7 @@ Reference< XTypeConverter > ResourceService::getTypeConverter() const // ResourceService Reference< XInvocation > ResourceService::getDefaultInvocation() const { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; /* f�hrt zur Zeit noch zu einer rekursion if( xSMgr.is() ) { @@ -256,7 +256,7 @@ Any SAL_CALL ResourceService::invoke Reference< XTypeConverter > xC = getTypeConverter(); bool bGetBranch = FunctionName.equalsAscii( "getString" ) || FunctionName.equalsAscii( "getStrings" ); - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; for( sal_Int32 n = 0; n < nElements; n++ ) { sal_Int32 nId = 0; @@ -310,7 +310,7 @@ Any SAL_CALL ResourceService::invoke if( Params.getLength() != 1 ) throw IllegalArgumentException(); Reference< XTypeConverter > xC = getTypeConverter(); - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; sal_Int32 nId = 0; if( !(Params.getConstArray()[0] >>= nId) ) @@ -384,7 +384,7 @@ void SAL_CALL ResourceService::setValue(const OUString& PropertyName, const Any& throw CannotConvertException(); } - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; OStringBuffer aBuf( aName.getLength()+8 ); aBuf.append( OUStringToOString( aName, osl_getThreadTextEncoding() ) ); ResMgr * pRM = ResMgr::CreateResMgr( aBuf.getStr() ); @@ -409,7 +409,7 @@ void SAL_CALL ResourceService::setValue(const OUString& PropertyName, const Any& Any SAL_CALL ResourceService::getValue(const OUString& PropertyName) throw(UnknownPropertyException, RuntimeException) { - OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( PropertyName.equalsAscii("FileName" )) return makeAny( aFileName ); diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 2ebaa0feac93..e14d490f5bb0 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -376,7 +376,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl ) if ( ! mbShowMenuIcon ) return; - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; MenuBar *pActiveMBar = pSysWin->GetMenuBar(); if ( ( pSysWin != mpIconSysWin ) || ( pActiveMBar != mpIconMBar ) ) @@ -428,7 +428,7 @@ void UpdateCheckUI::AddMenuBarIcon( SystemWindow *pSysWin, bool bAddEventHdl ) void SAL_CALL UpdateCheckUI::notifyEvent(const document::EventObject& rEvent) throw (uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if( rEvent.EventName.compareToAscii( RTL_CONSTASCII_STRINGPARAM("OnPrepareViewClosing") ) == 0 ) { @@ -455,7 +455,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName, throw( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; rtl::OUString aString; @@ -519,7 +519,7 @@ void UpdateCheckUI::setPropertyValue(const rtl::OUString& rPropertyName, uno::Any UpdateCheckUI::getPropertyValue(const rtl::OUString& rPropertyName) throw( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; uno::Any aRet; @@ -612,7 +612,7 @@ BubbleWindow * UpdateCheckUI::GetBubbleWindow() //------------------------------------------------------------------------------ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; maWaitTimer.Stop(); maTimeoutTimer.Stop(); @@ -645,7 +645,7 @@ void UpdateCheckUI::RemoveBubbleWindow( bool bRemoveIcon ) // ----------------------------------------------------------------------- IMPL_LINK( UpdateCheckUI, ClickHdl, USHORT*, EMPTYARG ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; maWaitTimer.Stop(); if ( mpBubbleWin ) @@ -679,7 +679,7 @@ IMPL_LINK( UpdateCheckUI, HighlightHdl, MenuBar::MenuBarButtonCallbackArg*, pDat // ----------------------------------------------------------------------- IMPL_LINK( UpdateCheckUI, WaitTimeOutHdl, Timer*, EMPTYARG ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; mpBubbleWin = GetBubbleWindow(); @@ -702,7 +702,7 @@ IMPL_LINK( UpdateCheckUI, TimeOutHdl, Timer*, EMPTYARG ) // ----------------------------------------------------------------------- IMPL_LINK( UpdateCheckUI, UserEventHdl, UpdateCheckUI*, EMPTYARG ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window *pTopWin = Application::GetFirstTopLevelWindow(); Window *pActiveWin = Application::GetActiveTopWindow(); @@ -739,7 +739,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) if ( VCLEVENT_OBJECT_DYING == nEventID ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( mpIconSysWin == pEvent->GetWindow() ) { mpIconSysWin->RemoveEventListener( maWindowEventHdl ); @@ -748,7 +748,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) } else if ( VCLEVENT_WINDOW_MENUBARADDED == nEventID ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window *pWindow = pEvent->GetWindow(); if ( pWindow ) { @@ -761,7 +761,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) } else if ( VCLEVENT_WINDOW_MENUBARREMOVED == nEventID ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; MenuBar *pMBar = (MenuBar*) pEvent->GetData(); if ( pMBar && ( pMBar == mpIconMBar ) ) RemoveBubbleWindow( true ); @@ -769,7 +769,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent*, pEvent ) else if ( ( nEventID == VCLEVENT_WINDOW_MOVE ) || ( nEventID == VCLEVENT_WINDOW_RESIZE ) ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( ( mpIconSysWin == pEvent->GetWindow() ) && ( mpBubbleWin != NULL ) && ( mpIconMBar != NULL ) ) { @@ -792,7 +792,7 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent *, pEvent) case VCLEVENT_WINDOW_SHOW: case VCLEVENT_WINDOW_ACTIVATE: case VCLEVENT_WINDOW_GETFOCUS: { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Window *pWindow = static_cast< VclWindowEvent * >(pEvent)->GetWindow(); if ( pWindow && pWindow->IsTopWindow() ) @@ -845,7 +845,7 @@ BubbleWindow::~BubbleWindow() //------------------------------------------------------------------------------ void BubbleWindow::Resize() { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; FloatingWindow::Resize(); @@ -888,7 +888,7 @@ void BubbleWindow::SetTitleAndText( const XubString& rTitle, //------------------------------------------------------------------------------ void BubbleWindow::Paint( const Rectangle& ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; LineInfo aThickLine( LINE_SOLID, 2 ); @@ -934,7 +934,7 @@ void BubbleWindow::MouseButtonDown( const MouseEvent& ) //------------------------------------------------------------------------------ void BubbleWindow::Show( BOOL bVisible, USHORT nFlags ) { - vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if ( !bVisible ) { diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx index 163144815a16..1dd34d151fe1 100644 --- a/forms/source/component/Button.cxx +++ b/forms/source/component/Button.cxx @@ -518,7 +518,7 @@ void OButtonControl::actionPerformed_Impl( sal_Bool _bNotifyListener, const ::co if ( !approveAction() ) return; - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; dispatch( nFeatureId ); return; } diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx index 71151f7753bc..fccd544d99f6 100644 --- a/forms/source/component/DatabaseForm.cxx +++ b/forms/source/component/DatabaseForm.cxx @@ -2227,7 +2227,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: ::rtl::OUString aTargetName; Reference< XModel > xModel; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // starform->Forms Reference<XChild> xParent(m_xParent, UNO_QUERY); @@ -2262,7 +2262,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: { ::rtl::OUString aData; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; aData = GetDataURLEncoded( Control, MouseEvt ); } @@ -2309,7 +2309,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: ::rtl::OUString aContentType; Sequence<sal_Int8> aData; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; aData = GetDataMultiPartEncoded(Control, MouseEvt, aContentType); } if (!aData.getLength()) @@ -2334,7 +2334,7 @@ void ODatabaseForm::submit_impl(const Reference<XControl>& Control, const ::com: { ::rtl::OUString aData; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; aData = GetDataTextEncoded( Reference<XControl> (), MouseEvt ); } diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index 5c40675335b8..d7e075826209 100644 --- a/forms/source/component/FormattedField.cxx +++ b/forms/source/component/FormattedField.cxx @@ -693,7 +693,7 @@ void OFormattedModel::loaded(const EventObject& rEvent) throw ( ::com::sun::star // the only "clean" solution for me. // FS - 69603 - 02.11.99 - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; OEditBaseModel::loaded(rEvent); } diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx index 7db87b58b877..c0f2c87b2a64 100644 --- a/forms/source/component/ImageButton.cxx +++ b/forms/source/component/ImageButton.cxx @@ -231,7 +231,7 @@ Any SAL_CALL OImageButtonControl::queryAggregation(const Type& _rType) throw (Ru //------------------------------------------------------------------------------ void OImageButtonControl::mousePressed(const awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; if (e.Buttons != awt::MouseButton::LEFT) return; diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx index 921d31cbc2c6..6caf6f4b530a 100644 --- a/forms/source/component/ImageControl.cxx +++ b/forms/source/component/ImageControl.cxx @@ -906,7 +906,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow() const //------------------------------------------------------------------------------ void OImageControlControl::mousePressed(const ::com::sun::star::awt::MouseEvent& e) throw ( ::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (e.Buttons != MouseButton::LEFT) return; diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx index a295d13c5485..2619c4e094b8 100644 --- a/forms/source/component/clickableimage.cxx +++ b/forms/source/component/clickableimage.cxx @@ -213,7 +213,7 @@ namespace frm Reference< XInterface > xModelsParent; FormButtonType eButtonType = FormButtonType_PUSH; { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; // Parent holen Reference<XFormComponent> xComp(getModel(), UNO_QUERY); @@ -261,7 +261,7 @@ namespace frm case FormButtonType_URL: { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Reference< XModel > xModel = getXModel(xModelsParent); if (!xModel.is()) diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 09d9b5285923..266225310ee8 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -224,7 +224,7 @@ namespace frm return; } - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (!getPeer().is()) { @@ -400,7 +400,7 @@ namespace frm //-------------------------------------------------------------------- void SAL_CALL ORichTextPeer::draw( sal_Int32 _nX, sal_Int32 _nY ) throw(::com::sun::star::uno::RuntimeException) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; RichTextControl* pControl = static_cast< RichTextControl* >( GetWindow() ); if ( !pControl ) diff --git a/forms/source/richtext/richtextengine.cxx b/forms/source/richtext/richtextengine.cxx index 5d615e00b942..4e251ec53115 100644 --- a/forms/source/richtext/richtextengine.cxx +++ b/forms/source/richtext/richtextengine.cxx @@ -95,7 +95,7 @@ namespace frm { RichTextEngine* pClone( NULL ); { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; EditTextObject* pMyText = CreateTextObject(); OSL_ENSURE( pMyText, "RichTextEngine::Clone: CreateTextObject returned nonsense!" ); diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx index 4bef0deb2d99..42accca83e79 100644 --- a/forms/source/richtext/richtextmodel.cxx +++ b/forms/source/richtext/richtextmodel.cxx @@ -507,7 +507,7 @@ namespace frm { if ( m_pEngine.get() ) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; m_bSettingEngineText = true; m_pEngine->SetText( _rText ); m_bSettingEngineText = false; diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index b1d7e01f837b..78190b19ae7a 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -471,7 +471,7 @@ namespace frm //-------------------------------------------------------------------- void SAL_CALL FormOperations::execute( ::sal_Int16 _nFeature ) throw (RuntimeException, IllegalArgumentException, SQLException, WrappedTargetException) { - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; MethodGuard aGuard( *this ); if ( ( _nFeature != FormFeature::DeleteRecord ) && ( _nFeature != FormFeature::UndoRecordChanges ) ) @@ -744,7 +744,7 @@ namespace frm return; } - ::vos::OGuard aSolarGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarGuard; MethodGuard aGuard( *this ); // at the moment we have only one feature which supports execution parameters diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx index c4fb971700f8..673501803f29 100644 --- a/forms/source/solar/component/navbarcontrol.cxx +++ b/forms/source/solar/component/navbarcontrol.cxx @@ -165,7 +165,7 @@ namespace frm //------------------------------------------------------------------ void SAL_CALL ONavigationBarControl::createPeer( const Reference< XToolkit >& /*_rToolkit*/, const Reference< XWindowPeer >& _rParentPeer ) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; if (!getPeer().is()) { @@ -336,7 +336,7 @@ namespace frm //------------------------------------------------------------------ void SAL_CALL ONavigationBarPeer::setProperty( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; NavigationToolBar* pNavBar = static_cast< NavigationToolBar* >( GetWindow() ); if ( !pNavBar ) @@ -417,7 +417,7 @@ namespace frm //------------------------------------------------------------------ Any SAL_CALL ONavigationBarPeer::getProperty( const ::rtl::OUString& _rPropertyName ) throw( RuntimeException ) { - ::vos::OGuard aGuard( Application::GetSolarMutex() ); + SolarMutexGuard aGuard; Any aReturn; NavigationToolBar* pNavBar = static_cast< NavigationToolBar* >( GetWindow() ); |