diff options
75 files changed, 137 insertions, 138 deletions
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx index c6711f3fd113..84dcdd5a59c0 100644 --- a/starmath/source/accessibility.cxx +++ b/starmath/source/accessibility.cxx @@ -48,7 +48,7 @@ #include <vcl/window.hxx> #include <vcl/unohelp2.hxx> #include <tools/gen.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svl/itemset.hxx> #include <editeng/editobj.hxx> diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index 3804f1b1c951..d5da5c328c6f 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -59,7 +59,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <tools/urlobj.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <sot/storinfo.hxx> diff --git a/starmath/source/unodoc.cxx b/starmath/source/unodoc.cxx index 5d9d03e1d3b8..4f0205f5cd38 100644 --- a/starmath/source/unodoc.cxx +++ b/starmath/source/unodoc.cxx @@ -38,7 +38,7 @@ #include "smdll.hxx" #include "document.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index 9601980775fe..e7a7f4a7bfab 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -30,7 +30,7 @@ #include "precompiled_starmath.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/mutex.hxx> #include <sfx2/printer.hxx> #include <vcl/svapp.hxx> diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index 0c3755a4b0b1..93692b635357 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -31,7 +31,7 @@ #include <cppuhelper/weakref.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <rtl/ref.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svx/IAccessibleViewForwarder.hxx> #include <svx/IAccessibleParent.hxx> #include <tools/debug.hxx> @@ -88,8 +88,8 @@ typedef sal_uInt16 tAccessibleStates; class SwAccessibleMap : public accessibility::IAccessibleViewForwarder, public accessibility::IAccessibleParent { - mutable ::vos::OMutex maMutex; - ::vos::OMutex maEventMutex; + mutable ::osl::Mutex maMutex; + ::osl::Mutex maEventMutex; SwAccessibleContextMap_Impl *mpFrmMap; SwAccessibleShapeMap_Impl *mpShapeMap; SwShapeList_Impl *mpShapes; diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index c9b10814bde5..bfb8696617f1 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -954,7 +954,7 @@ #include "vcl/wintypes.hxx" #include "vcl/wrkwin.hxx" -#include "vos/mutex.hxx" +#include "osl/mutex.hxx" #include "rtl/ref.hxx" #include "xmloff/DocumentSettingsContext.hxx" diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx index c334faf288a6..28ea05d5a3cf 100644 --- a/sw/inc/unobaseclass.hxx +++ b/sw/inc/unobaseclass.hxx @@ -104,7 +104,7 @@ void ClientModify(SwClient* pClient, SfxPoolItem *pOld, SfxPoolItem *pNew); #include <boost/utility.hpp> #include <osl/diagnose.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> namespace sw { diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index 68705dd4196c..d0ba1db4e124 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -30,7 +30,7 @@ #include "precompiled_sw.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> @@ -123,7 +123,7 @@ sal_Bool SwAccessibleCell::_InvalidateMyCursorPos() sal_Bool bNew = IsSelected(); sal_Bool bOld; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bOld = bIsSelected; bIsSelected = bNew; } @@ -212,7 +212,7 @@ void SwAccessibleCell::_InvalidateCursorPos() sal_Bool SwAccessibleCell::HasCursor() { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); return bIsSelected; } diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index d55769b0fecf..5ecac81f9a89 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -46,7 +46,7 @@ #include <com/sun/star/accessibility/XAccessibleStateSet.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> @@ -106,7 +106,7 @@ void SwAccessibleContext::InitStates() void SwAccessibleContext::SetParent( SwAccessibleContext *pParent ) { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); uno::Reference < XAccessible > xParent( pParent ); xWeakParent = xParent; @@ -114,7 +114,7 @@ void SwAccessibleContext::SetParent( SwAccessibleContext *pParent ) uno::Reference< XAccessible > SwAccessibleContext::GetWeakParent() const { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); uno::Reference< XAccessible > xParent( xWeakParent ); return xParent; @@ -323,7 +323,7 @@ void SwAccessibleContext::Scrolled( const SwRect& rOldVisArea ) sal_Bool bIsOldShowingState; sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) ); { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bIsOldShowingState = bIsShowingState; bIsShowingState = bIsNewShowingState; } @@ -552,7 +552,7 @@ sal_Bool SwAccessibleContext::IsEditableState() { sal_Bool bRet; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bRet = bIsEditableState; } @@ -663,7 +663,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent ( // Remember the parent as weak ref. { - vos::OGuard aWeakParentGuard( aMutex ); + osl::MutexGuard aWeakParentGuard( aMutex ); xWeakParent = xAcc; } @@ -1110,7 +1110,7 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive ) // set defunc state (its not required to broadcast a state changed // event if the object is diposed afterwards) { - vos::OGuard aDefuncStateGuard( aMutex ); + osl::MutexGuard aDefuncStateGuard( aMutex ); bIsDefuncState = sal_True; } @@ -1179,7 +1179,7 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& ) sal_Bool bIsOldShowingState; sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) ); { - vos::OGuard aShowingStateGuard( aMutex ); + osl::MutexGuard aShowingStateGuard( aMutex ); bIsOldShowingState = bIsShowingState; bIsShowingState = bIsNewShowingState; } @@ -1336,7 +1336,7 @@ void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates ) sal_Bool bIsOldEditableState; sal_Bool bIsNewEditableState = IsEditable( pVSh ); { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bIsOldEditableState = bIsEditableState; bIsEditableState = bIsNewEditableState; } @@ -1350,7 +1350,7 @@ void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates ) sal_Bool bIsOldOpaqueState; sal_Bool bIsNewOpaqueState = IsOpaque( pVSh ); { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bIsOldOpaqueState = bIsOpaqueState; bIsOpaqueState = bIsNewOpaqueState; } diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 605b815f46e3..5bb7159e9066 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -71,7 +71,7 @@ class SwAccessibleContext : protected: mutable ::osl::Mutex aListenerMutex; - mutable ::vos::OMutex aMutex; + mutable ::osl::Mutex aMutex; private: diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 222080222d49..68a9e824e70a 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -39,7 +39,7 @@ #include <unotools/accessiblestatesethelper.hxx> #include <tools/link.hxx> #include <sfx2/viewsh.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <viewsh.hxx> #include <doc.hxx> diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index 96f823b31db8..2efd6cf6d78f 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -30,7 +30,7 @@ #include "precompiled_sw.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <unotools/accessiblestatesethelper.hxx> diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index 39c4d2039a73..b5ce138c7ada 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <unotools/accessiblestatesethelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <frmfmt.hxx> @@ -153,7 +153,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos() sal_Bool bOldSelected; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bOldSelected = bIsSelected; bIsSelected = bNewSelected; } @@ -196,7 +196,7 @@ void SwAccessibleFrameBase::_InvalidateFocus() sal_Bool bSelected; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bSelected = bIsSelected; } ASSERT( bSelected, "focus object should be selected" ); @@ -208,7 +208,7 @@ void SwAccessibleFrameBase::_InvalidateFocus() sal_Bool SwAccessibleFrameBase::HasCursor() { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); return bIsSelected; } diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index 049b2a0cf32c..6472f75e9fe5 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -30,7 +30,7 @@ #include "precompiled_sw.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <unotools/accessiblestatesethelper.hxx> diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index 93e49ebb8a38..cf681c0c6380 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -30,7 +30,7 @@ #include "precompiled_sw.hxx" #include <comphelper/accessiblekeybindinghelper.hxx> #include <swurl.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <ndtxt.hxx> #include <txtinet.hxx> diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 92bc4fa7e9c6..2d48e504e9ab 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -856,7 +856,7 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent ) void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent ) { - vos::OGuard aGuard( maEventMutex ); + osl::MutexGuard aGuard( maEventMutex ); if( !mpEvents ) mpEvents = new SwAccessibleEventList_Impl; @@ -1012,7 +1012,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection() sal_uInt16 nSelShapes = pFESh ? pFESh->IsObjSelected() : 0; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpShapeMap ) pShapes = mpShapeMap->Copy( nShapes, pFESh, &pSelShape ); } @@ -1063,7 +1063,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection() { ::rtl::Reference< SwAccessibleContext > xParentAccImpl; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { SwAccessibleContextMap_Impl::const_iterator aMapIter = @@ -1107,7 +1107,7 @@ void SwAccessibleMap::DoInvalidateShapeFocus() { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpShapeMap ) pShapes = mpShapeMap->Copy( nShapes, pFESh, &pSelShape ); } @@ -1157,7 +1157,7 @@ SwAccessibleMap::~SwAccessibleMap() { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { const SwRootFrm *pRootFrm = GetShell()->GetLayout(); @@ -1174,7 +1174,7 @@ SwAccessibleMap::~SwAccessibleMap() pAcc->Dispose( sal_True ); { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); #ifdef DBG_UTIL ASSERT( !mpFrmMap || mpFrmMap->empty(), "Frame map should be empty after disposing the root frame" ); @@ -1225,7 +1225,7 @@ SwAccessibleMap::~SwAccessibleMap() mpPreview = NULL; { - vos::OGuard aGuard( maEventMutex ); + osl::MutexGuard aGuard( maEventMutex ); #ifdef DBG_UTIL ASSERT( !(mpEvents || mpEventMap), "pending events" ); if( mpEvents ) @@ -1260,7 +1260,7 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView( sal_Bool bSetVisArea = sal_False; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( !mpFrmMap ) { @@ -1345,7 +1345,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm, sal_Bool bOldShapeSelected = sal_False; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( !mpFrmMap && bCreate ) mpFrmMap = new SwAccessibleContextMap_Impl; @@ -1489,7 +1489,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( uno::Reference < XAccessible > xOldCursorAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( !mpShapeMap && bCreate ) mpShapeMap = new SwAccessibleShapeMap_Impl( this ); @@ -1562,7 +1562,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( void SwAccessibleMap::RemoveContext( const SwFrm *pFrm ) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -1599,7 +1599,7 @@ void SwAccessibleMap::RemoveContext( const SwFrm *pFrm ) void SwAccessibleMap::RemoveContext( const SdrObject *pObj ) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpShapeMap ) { @@ -1644,7 +1644,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, ::rtl::Reference< ::accessibility::AccessibleShape > xShapeAccImpl; // get accessible context for frame { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); // First of all look for an accessible context for a frame if( aFrmOrObj.GetSwFrm() && mpFrmMap ) @@ -1708,7 +1708,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, // remove events stored for the frame { - vos::OGuard aGuard( maEventMutex ); + osl::MutexGuard aGuard( maEventMutex ); if( mpEvents ) { SwAccessibleEventMap_Impl::iterator aIter = @@ -1761,7 +1761,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm, ::rtl::Reference< SwAccessibleContext > xAccImpl; ::rtl::Reference< SwAccessibleContext > xParentAccImpl; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -1842,7 +1842,7 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm ) { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -1880,7 +1880,7 @@ void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm ) { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -1951,7 +1951,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm ) sal_Bool bOldShapeSelected = sal_False; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); xOldAcc = mxCursorContext; mxCursorContext = xAcc; // clear reference @@ -2008,7 +2008,7 @@ void SwAccessibleMap::InvalidateFocus() uno::Reference < XAccessible > xAcc; sal_Bool bShapeSelected; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); xAcc = mxCursorContext; bShapeSelected = mbShapeSelected; @@ -2029,7 +2029,7 @@ void SwAccessibleMap::InvalidateFocus() void SwAccessibleMap::SetCursorContext( const ::rtl::Reference < SwAccessibleContext >& rCursorContext ) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); uno::Reference < XAccessible > xAcc( rCursorContext.get() ); mxCursorContext = xAcc; } @@ -2072,7 +2072,7 @@ void SwAccessibleMap::_InvalidateRelationSet( const SwFrm* pFrm, { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -2133,7 +2133,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm ) { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -2179,7 +2179,7 @@ sal_Int32 SwAccessibleMap::GetChildIndex( const SwFrm& rParentFrm, { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -2225,7 +2225,7 @@ void SwAccessibleMap::UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages uno::Reference < XAccessible > xOldAcc; uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); xOldAcc = mxCursorContext; @@ -2255,7 +2255,7 @@ void SwAccessibleMap::InvalidatePreViewSelection( sal_uInt16 nSelPage ) uno::Reference < XAccessible > xOldAcc; uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); xOldAcc = mxCursorContext; @@ -2285,7 +2285,7 @@ sal_Bool SwAccessibleMap::IsPageSelected( const SwPageFrm *pPageFrm ) const void SwAccessibleMap::FireEvents() { { - vos::OGuard aGuard( maEventMutex ); + osl::MutexGuard aGuard( maEventMutex ); if( mpEvents ) { mpEvents->SetFiring(); @@ -2304,7 +2304,7 @@ void SwAccessibleMap::FireEvents() } } { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpShapes ) { delete mpShapes; @@ -2406,7 +2406,7 @@ sal_Bool SwAccessibleMap::ReplaceChild ( { const SdrObject *pObj = 0; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpShapeMap ) { SwAccessibleShapeMap_Impl::const_iterator aIter = mpShapeMap->begin(); @@ -2436,7 +2436,7 @@ sal_Bool SwAccessibleMap::ReplaceChild ( Dispose( 0, pObj, 0 ); { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( !mpShapeMap ) mpShapeMap = new SwAccessibleShapeMap_Impl( this ); @@ -2675,7 +2675,7 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas() void SwAccessibleMap::InvalidateTextSelectionOfAllParas() { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); // keep previously known selected paragraphs SwAccessibleSelectedParas_Impl* pPrevSelectedParas( mpSelectedParas ); diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index eca5093a68cc..e5790414e24c 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -30,7 +30,7 @@ #include "precompiled_sw.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index 80a1f6bf3fb2..0cee1c1f2b5e 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -85,7 +85,7 @@ void SwAccessiblePage::_InvalidateCursorPos() sal_Bool bOldSelected; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bOldSelected = bIsSelected; bIsSelected = bNewSelected; } @@ -114,7 +114,7 @@ void SwAccessiblePage::_InvalidateFocus() sal_Bool bSelected; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bSelected = bIsSelected; } ASSERT( bSelected, "focus object should be selected" ); @@ -147,7 +147,7 @@ SwAccessiblePage::~SwAccessiblePage() sal_Bool SwAccessiblePage::HasCursor() { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); return bIsSelected; } diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 16a973662101..f774805b12c2 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -39,7 +39,7 @@ #include <accmap.hxx> #include <fesh.hxx> #include <viewopt.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <rtl/ustrbuf.hxx> @@ -405,7 +405,7 @@ void SwAccessibleParagraph::_InvalidateContent( sal_Bool bVisibleDataFired ) sal_Bool bNewIsHeading = IsHeading(); sal_Bool bOldIsHeading; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bOldIsHeading = bIsHeading; if( bIsHeading != bNewIsHeading ) bIsHeading = bNewIsHeading; @@ -417,7 +417,7 @@ void SwAccessibleParagraph::_InvalidateContent( sal_Bool bVisibleDataFired ) ::rtl::OUString sNewDesc( GetDescription() ); ::rtl::OUString sOldDesc; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); sOldDesc = sDesc; if( sDesc != sNewDesc ) sDesc = sNewDesc; @@ -442,7 +442,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos() sal_Int32 nNew = GetCaretPos(); sal_Int32 nOld; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); nOld = nOldCaretPos; nOldCaretPos = nNew; } @@ -481,7 +481,7 @@ void SwAccessibleParagraph::_InvalidateFocus() { sal_Int32 nPos; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); nPos = nOldCaretPos; } ASSERT( nPos != -1, "focus object should be selected" ); @@ -532,7 +532,7 @@ SwAccessibleParagraph::~SwAccessibleParagraph() sal_Bool SwAccessibleParagraph::HasCursor() { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); return nOldCaretPos != -1; } @@ -838,7 +838,7 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary( CHECK_FOR_DEFUNC( XAccessibleContext ); - vos::OGuard aGuard2( aMutex ); + osl::MutexGuard aGuard2( aMutex ); if( !sDesc.getLength() ) sDesc = GetDescription(); @@ -1146,7 +1146,7 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition() sal_Int32 nRet = GetCaretPos(); { - vos::OGuard aOldCaretPosGuard( aMutex ); + osl::MutexGuard aOldCaretPosGuard( aMutex ); ASSERT( nRet == nOldCaretPos, "caret pos out of sync" ); nOldCaretPos = nRet; } diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index 1a69a1a37aef..70e3a246fdc4 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/uuid.h> #include <rtl/ustrbuf.hxx> diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 99a5556777d6..4383c1f7dfdc 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/accessibility/XAccessibleContext.hpp> #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx index db74cbf8bbc0..f13eb718c7bf 100644 --- a/sw/source/core/bastyp/SwSmartTagMgr.cxx +++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx @@ -30,7 +30,7 @@ #include "precompiled_sw.hxx" #include "SwSmartTagMgr.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <swmodule.hxx> diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx index 3d8374f68a2c..a6baec896d9b 100644 --- a/sw/source/core/doc/docchart.cxx +++ b/sw/source/core/doc/docchart.cxx @@ -53,7 +53,7 @@ #include <swtblfmt.hxx> #include <tblsel.hxx> #include <cellatr.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <unochart.hxx> diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx index 0b3867b6adce..c39ece11ede0 100644 --- a/sw/source/core/unocore/SwXTextDefaults.cxx +++ b/sw/source/core/unocore/SwXTextDefaults.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <SwXTextDefaults.hxx> diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index 4eeade5e9535..270d2287549f 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -30,7 +30,7 @@ #include "precompiled_sw.hxx" #include <unobookmark.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <TextCursorHelper.hxx> diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index 5953355a7618..b125081bace7 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/data/LabelOrigin.hpp> #include <cppuhelper/interfacecontainer.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svl/zforlist.hxx> // SvNumberFormatter diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index 680dd75f9ff6..23275d7fe206 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -48,7 +48,7 @@ #include <txtftn.hxx> #include <fmtpdsc.hxx> #include <pagedesc.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <com/sun/star/text/XTextTableCursor.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 977f565e7e3b..d9466327b126 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -68,7 +68,7 @@ #include <editeng/ulspitem.hxx> #include <svx/shapepropertynotifier.hxx> #include <crstate.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <comphelper/extract.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/makesequence.hxx> diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx index 6303e76e53e0..4c63cb601f25 100644 --- a/sw/source/core/unocore/unofield.cxx +++ b/sw/source/core/unocore/unofield.cxx @@ -88,7 +88,7 @@ #include <svx/dataaccessdescriptor.hxx> #define _SVSTDARR_STRINGS #include <svl/svstdarr.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <textapi.hxx> #include <editeng/outliner.hxx> diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx index c8c033b4714a..035f2986d7b0 100644 --- a/sw/source/core/unocore/unoflatpara.cxx +++ b/sw/source/core/unocore/unoflatpara.cxx @@ -34,7 +34,7 @@ #include <unobaseclass.hxx> #include <unoflatpara.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/text/TextMarkupType.hpp> #include <unotextmarkup.hxx> diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index b309e31ec1e7..0d2caab9bc2b 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -103,7 +103,7 @@ #include <frmatr.hxx> #include <ndtxt.hxx> #include <ndgrf.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <sfx2/printer.hxx> #include <SwStyleNameMapper.hxx> diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index f89abe39ff7f..1e6f98b63496 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -31,7 +31,7 @@ #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <comphelper/sequence.hxx> diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 1d48658f2c2b..4fb0bb166c70 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/text/XTextDocument.hpp> #include <tools/debug.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <editeng/unolingu.hxx> #include <com/sun/star/text/ChapterFormat.hpp> diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx index 86d4ecaebdc9..3e22dbbf13d7 100644 --- a/sw/source/core/unocore/unoobj.cxx +++ b/sw/source/core/unocore/unoobj.cxx @@ -106,7 +106,7 @@ #include <unoidx.hxx> #include <unoframe.hxx> #include <fmthdft.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <fmtflcnt.hxx> #define _SVSTDARR_USHORTS diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index d9d943927a7e..6bbb8fb44e1b 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -105,7 +105,7 @@ #include <unoidx.hxx> #include <unoframe.hxx> #include <fmthdft.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <fmtflcnt.hxx> #define _SVSTDARR_USHORTS diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 543d7410e900..26d148446d4a 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -42,7 +42,7 @@ #include <unocrsrhelper.hxx> #include <doc.hxx> #include <ndtxt.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <docsh.hxx> diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx index 32e56c649bad..ca2643495c63 100644 --- a/sw/source/core/unocore/unoport.cxx +++ b/sw/source/core/unocore/unoport.cxx @@ -31,7 +31,7 @@ #include <cmdid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svl/itemprop.hxx> diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx index 57dc4c363016..fadb1ec1e11f 100644 --- a/sw/source/core/unocore/unoportenum.cxx +++ b/sw/source/core/unocore/unoportenum.cxx @@ -58,7 +58,7 @@ #include <unoidx.hxx> #include <redline.hxx> #include <crsskip.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <set> diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index 10778257c1a9..de92d788f393 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/text/XTextTable.hpp> #include <rtl/ustrbuf.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <pagedesc.hxx> diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx index 42a08ada6d8a..5ceff5ba7d98 100644 --- a/sw/source/core/unocore/unoredlines.cxx +++ b/sw/source/core/unocore/unoredlines.cxx @@ -32,7 +32,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <tools/debug.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <unoredlines.hxx> diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index d946f3899724..448f7bb2edd6 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <unomid.h> diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 8828f17d1546..cbc48ebd4557 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -39,7 +39,7 @@ #include <editeng/xmlcnitm.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/lnkbase.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <fmtclds.hxx> #include <unotextrange.hxx> diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index a9f87468f35d..0007fe436eff 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -66,7 +66,7 @@ #include <editeng/flstitem.hxx> #include <vcl/metric.hxx> #include <svtools/ctrltool.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <editeng/unofdesc.hxx> diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index 0fd71924a278..d54a6768f66b 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -36,7 +36,7 @@ #include <unobaseclass.hxx> #include <unomid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include "editeng/unolingu.hxx" #include <com/sun/star/util/SearchOptions.hpp> diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index b73857cd7a02..e64397faa3dc 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -31,7 +31,7 @@ #include <svx/svxids.hrc> #include <hintids.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <svl/smplhint.hxx> #include <svtools/ctrltool.hxx> diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 99bbcf412527..335e1143c907 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -94,7 +94,7 @@ #include <editeng/keepitem.hxx> #include <fmtlsplt.hxx> #include <swundo.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <SwStyleNameMapper.hxx> #include <frmatr.hxx> #include <crsskip.hxx> diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index 17312e38c89f..ea247230d8bf 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -36,7 +36,7 @@ #include <rtl/uuid.h> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <comphelper/sequence.hxx> diff --git a/sw/source/core/unocore/unotextmarkup.cxx b/sw/source/core/unocore/unotextmarkup.cxx index 7302c67055ea..bfc0d1d7d5a6 100644 --- a/sw/source/core/unocore/unotextmarkup.cxx +++ b/sw/source/core/unocore/unotextmarkup.cxx @@ -30,7 +30,7 @@ #include "precompiled_sw.hxx" #include <unotextmarkup.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <SwSmartTagMgr.hxx> #include <com/sun/star/text/TextMarkupType.hpp> diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx index d2af13f87352..d4cf89c76269 100644 --- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx +++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx @@ -43,7 +43,7 @@ // for locking SolarMutex: svapp + mutex #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index d01e115cbb6c..e34873682072 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -66,7 +66,7 @@ // for locking SolarMutex: svapp + mutex #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> // --> OD 2007-03-30 #i73788# #include <pausethreadstarting.hxx> diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 12949ab8e7b4..1c73f942f031 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -69,7 +69,7 @@ // for locking SolarMutex: svapp + mutex #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <unotxdoc.hxx> // for initXForms() #include <xmloff/xmlmetai.hxx> diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx index 54efb24720cf..d98635056fe8 100644 --- a/sw/source/filter/xml/xmltbli.cxx +++ b/sw/source/filter/xml/xmltbli.cxx @@ -66,7 +66,7 @@ // for locking SolarMutex: svapp + mutex #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include "ndtxt.hxx" using ::rtl::OUString; diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx index 22d88cea4c85..ffeaa9230165 100644 --- a/sw/source/filter/xml/xmltexti.cxx +++ b/sw/source/filter/xml/xmltexti.cxx @@ -67,7 +67,7 @@ // for locking SolarMutex: svapp + mutex #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <svtools/embedhlp.hxx> diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx index 8bda1ae2be62..d1f1eff1354e 100644 --- a/sw/source/ui/dbui/dbmgr.cxx +++ b/sw/source/ui/dbui/dbmgr.cxx @@ -124,7 +124,7 @@ #include <sfx2/event.hxx> #include <vcl/msgbox.hxx> #include <svx/dataaccessdescriptor.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <rtl/textenc.h> #include <ndindex.hxx> #include <pam.hxx> @@ -2944,7 +2944,7 @@ SwConnectionDisposedListener_Impl::~SwConnectionDisposedListener_Impl() void SwConnectionDisposedListener_Impl::disposing( const EventObject& rSource ) throw (RuntimeException) { - SolarMutexGuard aGuard; + ::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 f132a1a56099..4cf314bf3111 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -51,7 +51,7 @@ #include <view.hxx> #include <wrtsh.hxx> #include <dbtree.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <helpid.h> diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx index 7a88d5fac98b..86692a639112 100644 --- a/sw/source/ui/dbui/mmoutputpage.cxx +++ b/sw/source/ui/dbui/mmoutputpage.cxx @@ -67,7 +67,7 @@ #include <com/sun/star/sdb/XColumn.hpp> #include <dbmgr.hxx> #include <swunohelper.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <shellio.hxx> #include <svtools/htmlcfg.hxx> #include <sfx2/event.hxx> diff --git a/sw/source/ui/dochdl/swdtflvr.cxx b/sw/source/ui/dochdl/swdtflvr.cxx index 91334f881a4f..b69102196b18 100644 --- a/sw/source/ui/dochdl/swdtflvr.cxx +++ b/sw/source/ui/dochdl/swdtflvr.cxx @@ -135,7 +135,7 @@ #include <SwRewriter.hxx> #include <undobj.hxx> #include <globals.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <swserv.hxx> diff --git a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx index c1f22d3d6f73..845de5f37315 100644 --- a/sw/source/ui/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/ui/docvw/SidebarTxtControlAcc.cxx @@ -181,7 +181,7 @@ class SidebarTxtControlAccessibleContext : public VCLXAccessibleComponent SidebarTxtControl& mrSidebarTxtControl; ::accessibility::AccessibleTextHelper* mpAccessibleTextHelper; - ::vos::OMutex maMutex; + ::osl::Mutex maMutex; void defunc(); }; @@ -212,7 +212,7 @@ void SidebarTxtControlAccessibleContext::defunc() sal_Int32 SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChildCount() throw (::com::sun::star::uno::RuntimeException) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); sal_Int32 nChildCount( 0 ); @@ -227,7 +227,7 @@ sal_Int32 SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChildCount() css::uno::Reference< css::accessibility::XAccessible > SAL_CALL SidebarTxtControlAccessibleContext::getAccessibleChild( sal_Int32 i ) throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException ) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); css::uno::Reference< css::accessibility::XAccessible > xChild; @@ -243,7 +243,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::addEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if ( mpAccessibleTextHelper ) { @@ -255,7 +255,7 @@ void SAL_CALL SidebarTxtControlAccessibleContext::removeEventListener ( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener) throw (css::uno::RuntimeException) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if ( mpAccessibleTextHelper ) { diff --git a/sw/source/ui/docvw/SidebarWinAcc.cxx b/sw/source/ui/docvw/SidebarWinAcc.cxx index ff3f7ae1d911..e55ce359dcc0 100644 --- a/sw/source/ui/docvw/SidebarWinAcc.cxx +++ b/sw/source/ui/docvw/SidebarWinAcc.cxx @@ -67,7 +67,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent void ChangeAnchor( const SwFrm* pAnchorFrm ) { - vos::OGuard aGuard(maMutex); + osl::MutexGuard aGuard(maMutex); mpAnchorFrm = pAnchorFrm; } @@ -75,7 +75,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() throw (css::uno::RuntimeException) { - vos::OGuard aGuard(maMutex); + osl::MutexGuard aGuard(maMutex); css::uno::Reference< css::accessibility::XAccessible > xAccParent; @@ -90,7 +90,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw (css::uno::RuntimeException) { - vos::OGuard aGuard(maMutex); + osl::MutexGuard aGuard(maMutex); sal_Int32 nIndex( -1 ); @@ -108,7 +108,7 @@ class SidebarWinAccessibleContext : public VCLXAccessibleComponent ViewShell& mrViewShell; const SwFrm* mpAnchorFrm; - ::vos::OMutex maMutex; + ::osl::Mutex maMutex; }; // ============================================================================= diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 80f17ce04a9d..ad3938cadebd 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -131,7 +131,7 @@ #include <pagedesc.hxx> #include <svtools/ruler.hxx> // #i23726# #include "formatclipboard.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <IMark.hxx> diff --git a/sw/source/ui/inc/unodispatch.hxx b/sw/source/ui/inc/unodispatch.hxx index f975ac07a69b..56b930b6fead 100644 --- a/sw/source/ui/inc/unodispatch.hxx +++ b/sw/source/ui/inc/unodispatch.hxx @@ -36,7 +36,7 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase3.hxx> #include <list> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> class SwView; @@ -50,7 +50,7 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3 class DispatchMutexLock_Impl { //::osl::MutexGuard aGuard; #102295# solar mutex has to be used currently - vos::OGuard aGuard; + osl::SolarMutexGuard aGuard; DispatchMutexLock_Impl(); public: DispatchMutexLock_Impl(SwXDispatchProviderInterceptor&); diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index 25448da4f9b2..7e54dd7ce12d 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -92,7 +92,7 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/uiview/uivwimp.cxx b/sw/source/ui/uiview/uivwimp.cxx index 8673adb599f5..51ff90209e9e 100644 --- a/sw/source/ui/uiview/uivwimp.cxx +++ b/sw/source/ui/uiview/uivwimp.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> #include <vcl/msgbox.hxx> diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx index 3fdde6934ca2..b0b59aa3c044 100644 --- a/sw/source/ui/uno/SwXDocumentSettings.cxx +++ b/sw/source/ui/uno/SwXDocumentSettings.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <sfx2/sfxbasecontroller.hxx> #include <SwXDocumentSettings.hxx> #include <SwXPrintPreviewSettings.hxx> diff --git a/sw/source/ui/uno/SwXFilterOptions.cxx b/sw/source/ui/uno/SwXFilterOptions.cxx index 9b01c9e58f92..a498e80a2e5e 100644 --- a/sw/source/ui/uno/SwXFilterOptions.cxx +++ b/sw/source/ui/uno/SwXFilterOptions.cxx @@ -32,7 +32,7 @@ #include <shellio.hxx> #include <swdll.hxx> #include <unoprnms.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/msgbox.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx index 47dcf9d31750..53359a88176b 100644 --- a/sw/source/ui/uno/dlelstnr.cxx +++ b/sw/source/ui/uno/dlelstnr.cxx @@ -40,7 +40,7 @@ #include <com/sun/star/uno/Reference.h> #include <comphelper/processfactory.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <tools/shl.hxx> #include "dlelstnr.hxx" diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx index 77ffb016ba05..fe14e63b02cd 100644 --- a/sw/source/ui/uno/swdetect.cxx +++ b/sw/source/ui/uno/swdetect.cxx @@ -52,7 +52,7 @@ #include <svl/eitem.hxx> #include <svl/stritem.hxx> #include <tools/urlobj.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <svtools/sfxecode.hxx> #include <svtools/ehdl.hxx> #include <sot/storinfo.hxx> diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx index 14e77d9ed296..8885ca9d82ea 100644 --- a/sw/source/ui/uno/unoatxt.cxx +++ b/sw/source/ui/uno/unoatxt.cxx @@ -33,7 +33,7 @@ #define _SVSTDARR_STRINGS #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/diagnose.h> #include <vcl/svapp.hxx> #include <svl/svstdarr.hxx> diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx index cb63448ed422..9bee47d7481c 100644 --- a/sw/source/ui/uno/unodispatch.cxx +++ b/sw/source/ui/uno/unodispatch.cxx @@ -44,7 +44,6 @@ using namespace ::com::sun::star; using namespace rtl; -using namespace vos; const char* cURLStart = ".uno:DataSourceBrowser/"; const char* cURLFormLetter = ".uno:DataSourceBrowser/FormLetter"; diff --git a/sw/source/ui/uno/unodoc.cxx b/sw/source/ui/uno/unodoc.cxx index 7d3e201ee078..30b8c0d79e87 100644 --- a/sw/source/ui/uno/unodoc.cxx +++ b/sw/source/ui/uno/unodoc.cxx @@ -37,7 +37,7 @@ #include "docsh.hxx" #include "globdoc.hxx" #include "wdocsh.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx index ab368ca396a1..44597ea0cab9 100644 --- a/sw/source/ui/uno/unomailmerge.cxx +++ b/sw/source/ui/uno/unomailmerge.cxx @@ -31,7 +31,7 @@ #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <osl/mutex.hxx> #include <svl/itemprop.hxx> #include <svl/urihelper.hxx> diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index f132497043ea..db20092bfb3f 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -43,7 +43,7 @@ #include <docsh.hxx> #include <wrtsh.hxx> #include <viewopt.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <com/sun/star/text/NotePrintMode.hpp> #include <doc.hxx> diff --git a/sw/source/ui/uno/unomodule.cxx b/sw/source/ui/uno/unomodule.cxx index d08596cb56dd..91a3d07098e9 100644 --- a/sw/source/ui/uno/unomodule.cxx +++ b/sw/source/ui/uno/unomodule.cxx @@ -38,7 +38,7 @@ #include <sfx2/objface.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/svapp.hxx> using namespace ::com::sun::star; diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index a097aed0d82f..5836c9770d31 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <vcl/image.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index 2a75f93200d9..d4765157b456 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -61,7 +61,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> #include <frmatr.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <IMark.hxx> #include <unotxdoc.hxx> #include <unodraw.hxx> |