summaryrefslogtreecommitdiff
path: root/sw/source/core/access
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/core/access')
-rw-r--r--sw/source/core/access/acccell.cxx8
-rw-r--r--sw/source/core/access/acccontext.cxx42
-rw-r--r--sw/source/core/access/accdoc.cxx26
-rw-r--r--sw/source/core/access/accembedded.cxx2
-rw-r--r--sw/source/core/access/accfootnote.cxx6
-rw-r--r--sw/source/core/access/accframebase.cxx4
-rw-r--r--sw/source/core/access/accgraphic.cxx2
-rw-r--r--sw/source/core/access/accheaderfooter.cxx8
-rw-r--r--sw/source/core/access/acchyperlink.cxx6
-rw-r--r--sw/source/core/access/accnotextframe.cxx6
-rw-r--r--sw/source/core/access/accpage.cxx4
-rw-r--r--sw/source/core/access/accpara.cxx66
-rw-r--r--sw/source/core/access/accpreview.cxx2
-rw-r--r--sw/source/core/access/accselectionhelper.cxx10
-rw-r--r--sw/source/core/access/acctable.cxx58
-rw-r--r--sw/source/core/access/acctextframe.cxx8
16 files changed, 129 insertions, 129 deletions
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 8d6994bf73d6..4c7c44901254 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -111,7 +111,7 @@ SwAccessibleCell::SwAccessibleCell( SwAccessibleMap *pInitMap,
: SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrm )
, bIsSelected( sal_False )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
OUString sBoxName( pCellFrm->GetTabBox()->GetName() );
SetName( sBoxName );
@@ -309,7 +309,7 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleCell::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId()
throw(uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static uno::Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
@@ -335,7 +335,7 @@ SwFrmFmt* SwAccessibleCell::GetTblBoxFormat() const
uno::Any SwAccessibleCell::getCurrentValue( )
throw( uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleValue );
uno::Any aAny;
@@ -346,7 +346,7 @@ uno::Any SwAccessibleCell::getCurrentValue( )
sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber )
throw( uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleValue );
double fValue = 0;
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index a7c0ec3f6358..9ee9e1b0fbdf 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -524,7 +524,7 @@ void SwAccessibleContext::FireStateChangedEvent( sal_Int16 nState,
void SwAccessibleContext::GetStates(
::utl::AccessibleStateSetHelper& rStateSet )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
// SHOWING
if( bIsShowingState )
@@ -576,7 +576,7 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM,
SwAccessibleContext::~SwAccessibleContext()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
DBG_MSG_CD( "destructed" )
RemoveFrmFromAccessibleMap();
@@ -593,7 +593,7 @@ uno::Reference< XAccessibleContext > SAL_CALL
sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleChildCount( void )
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -604,7 +604,7 @@ uno::Reference< XAccessible> SAL_CALL
SwAccessibleContext::getAccessibleChild( sal_Int32 nIndex )
throw (uno::RuntimeException, lang::IndexOutOfBoundsException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -648,7 +648,7 @@ uno::Reference< XAccessible> SAL_CALL
uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -673,7 +673,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent (
sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -725,7 +725,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
SwAccessibleContext::getAccessibleStateSet (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -741,7 +741,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL
lang::Locale SAL_CALL SwAccessibleContext::getLocale (void)
throw (IllegalAccessibleComponentStateException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
lang::Locale aLoc( Application::GetSettings().GetLocale() );
return aLoc;
@@ -755,7 +755,7 @@ void SAL_CALL SwAccessibleContext::addEventListener(
if (xListener.is())
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if (!nClientId)
nClientId = comphelper::AccessibleEventNotifier::registerClient( );
comphelper::AccessibleEventNotifier::addEventListener( nClientId, xListener );
@@ -770,7 +770,7 @@ void SAL_CALL SwAccessibleContext::removeEventListener(
if (xListener.is())
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( nClientId, xListener );
if ( !nListenerCount )
{
@@ -811,7 +811,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint
const awt::Point& aPoint )
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleComponent )
@@ -868,7 +868,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint
awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleComponent )
@@ -954,7 +954,7 @@ awt::Size SAL_CALL SwAccessibleContext::getSize()
void SAL_CALL SwAccessibleContext::grabFocus()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext );
@@ -1079,7 +1079,7 @@ void SwAccessibleContext::ScrolledInShape( const SdrObject* ,
void SwAccessibleContext::Dispose( sal_Bool bRecursive )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
ASSERT( GetFrm() && GetMap(), "already disposed" );
ASSERT( GetMap()->GetVisArea() == GetVisArea(),
@@ -1132,7 +1132,7 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive )
void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
sal_Bool bRecursive )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if ( IsShowing( *(GetMap()), rChildFrmOrObj ) ||
rChildFrmOrObj.AlwaysIncludeAsChild() ||
@@ -1172,7 +1172,7 @@ void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
ASSERT( GetFrm() && !GetFrm()->Frm().IsEmpty(), "context should have a size" );
@@ -1211,7 +1211,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
const SwAccessibleChild& rChildFrmOrObj,
const SwRect& rOldFrm )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
ASSERT( !rChildFrmOrObj.GetSwFrm() ||
!rChildFrmOrObj.GetSwFrm()->Frm().IsEmpty(),
@@ -1304,21 +1304,21 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
void SwAccessibleContext::InvalidateContent()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
_InvalidateContent( sal_False );
}
void SwAccessibleContext::InvalidateCursorPos()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
_InvalidateCursorPos();
}
void SwAccessibleContext::InvalidateFocus()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
_InvalidateFocus();
}
@@ -1460,7 +1460,7 @@ OUString SwAccessibleContext::GetResource( sal_uInt16 nResId,
{
String sStr;
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
sStr = SW_RES( nResId );
}
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 18153f1ca8c6..222080222d49 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -79,7 +79,7 @@ SwAccessibleDocumentBase::~SwAccessibleDocumentBase()
void SwAccessibleDocumentBase::SetVisArea()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
SwRect aOldVisArea( GetVisArea() );
const SwRect& rNewVisArea = GetMap()->GetVisArea();
@@ -97,7 +97,7 @@ void SwAccessibleDocumentBase::SetVisArea()
void SwAccessibleDocumentBase::AddChild( Window *pWin, sal_Bool bFireEvent )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
ASSERT( !mpChildWin, "only one child window is supported" );
if( !mpChildWin )
@@ -116,7 +116,7 @@ void SwAccessibleDocumentBase::AddChild( Window *pWin, sal_Bool bFireEvent )
void SwAccessibleDocumentBase::RemoveChild( Window *pWin )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
ASSERT( !mpChildWin || pWin == mpChildWin, "invalid child window to remove" );
if( mpChildWin && pWin == mpChildWin )
@@ -133,7 +133,7 @@ void SwAccessibleDocumentBase::RemoveChild( Window *pWin )
sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleChildCount( void )
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
// CHECK_FOR_DEFUNC is called by parent
@@ -149,7 +149,7 @@ uno::Reference< XAccessible> SAL_CALL
throw (uno::RuntimeException,
lang::IndexOutOfBoundsException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if( mpChildWin )
{
@@ -173,7 +173,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleDocumentBase::getAccessiblePar
sal_Int32 SAL_CALL SwAccessibleDocumentBase::getAccessibleIndexInParent (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
uno::Reference < XAccessibleContext > xAcc( mxParent->getAccessibleContext() );
uno::Reference < XAccessible > xThis( this );
@@ -196,7 +196,7 @@ OUString SAL_CALL SwAccessibleDocumentBase::getAccessibleDescription (void)
awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
Window *pWin = GetWindow();
@@ -213,7 +213,7 @@ awt::Rectangle SAL_CALL SwAccessibleDocumentBase::getBounds()
awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
Window *pWin = GetWindow();
@@ -229,7 +229,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
::com::sun::star::awt::Point SAL_CALL SwAccessibleDocumentBase::getLocationOnScreen()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
Window *pWin = GetWindow();
@@ -245,7 +245,7 @@ awt::Point SAL_CALL SwAccessibleDocumentBase::getLocation()
::com::sun::star::awt::Size SAL_CALL SwAccessibleDocumentBase::getSize()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
Window *pWin = GetWindow();
@@ -261,7 +261,7 @@ sal_Bool SAL_CALL SwAccessibleDocumentBase::containsPoint(
const awt::Point& aPoint )
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
Window *pWin = GetWindow();
@@ -278,7 +278,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleDocumentBase::getAccessibleAt
const awt::Point& aPoint )
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if( mpChildWin )
{
@@ -449,7 +449,7 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleDocument::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleDocument::getImplementationId()
throw(uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static uno::Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 4d327a5c4635..5ccbc03f3339 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -86,7 +86,7 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleEmbeddedObject::getSupportedServi
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementationId()
throw(uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static uno::Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 1613ae33c3c5..96f823b31db8 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -64,7 +64,7 @@ SwAccessibleFootnote::SwAccessibleFootnote(
bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE,
pFtnFrm )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
sal_uInt16 nResId = bIsEndnote ? STR_ACCESS_ENDNOTE_NAME
: STR_ACCESS_FOOTNOTE_NAME;
@@ -79,7 +79,7 @@ SwAccessibleFootnote::~SwAccessibleFootnote()
OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -138,7 +138,7 @@ Sequence< OUString > SAL_CALL SwAccessibleFootnote::getSupportedServiceNames()
Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId()
throw(RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index d73d16eb1553..7fd16bafe6c7 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -137,7 +137,7 @@ SwAccessibleFrameBase::SwAccessibleFrameBase(
SwAccessibleContext( pInitMap, nInitRole, pFlyFrm ),
bIsSelected( sal_False )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
@@ -269,7 +269,7 @@ void SwAccessibleFrameBase::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
void SwAccessibleFrameBase::Dispose( sal_Bool bRecursive )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if( GetRegisteredIn() )
pRegisteredIn->Remove( this );
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index 152f280425d6..4c389e2f85c1 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -86,7 +86,7 @@ Sequence< OUString > SAL_CALL SwAccessibleGraphic::getSupportedServiceNames()
Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId()
throw(RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index e12ac0ada51f..049b2a0cf32c 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -56,7 +56,7 @@ SwAccessibleHeaderFooter::SwAccessibleHeaderFooter(
const SwHeaderFrm* pHdFrm ) :
SwAccessibleContext( pInitMap, AccessibleRole::HEADER, pHdFrm )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
OUString sArg( OUString::valueOf( (sal_Int32)pHdFrm->GetPhyPageNum() ) );
SetName( GetResource( STR_ACCESS_HEADER_NAME, &sArg ) );
@@ -67,7 +67,7 @@ SwAccessibleHeaderFooter::SwAccessibleHeaderFooter(
const SwFooterFrm* pFtFrm ) :
SwAccessibleContext( pInitMap, AccessibleRole::FOOTER, pFtFrm )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
OUString sArg( OUString::valueOf( (sal_Int32)pFtFrm->GetPhyPageNum() ) );
SetName( GetResource( STR_ACCESS_FOOTER_NAME, &sArg ) );
@@ -80,7 +80,7 @@ SwAccessibleHeaderFooter::~SwAccessibleHeaderFooter()
OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -132,7 +132,7 @@ Sequence< OUString > SAL_CALL SwAccessibleHeaderFooter::getSupportedServiceNames
Sequence< sal_Int8 > SAL_CALL SwAccessibleHeaderFooter::getImplementationId()
throw(RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 2928a3114821..0733bc78c294 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -79,7 +79,7 @@ sal_Int32 SAL_CALL SwAccessibleHyperlink::getAccessibleActionCount()
sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
sal_Bool bRet = sal_False;
@@ -179,13 +179,13 @@ sal_Int32 SAL_CALL SwAccessibleHyperlink::getEndIndex()
sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( )
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
return xPara.isValid();
}
void SwAccessibleHyperlink::Invalidate()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
xPara = 0;
}
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index d77c5b88c7cb..eca5093a68cc 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -177,7 +177,7 @@ void SwAccessibleNoTextFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
void SwAccessibleNoTextFrame::Dispose( sal_Bool bRecursive )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if( aDepend.GetRegisteredIn() )
const_cast < SwModify *>( aDepend.GetRegisteredIn() )->Remove( &aDepend );
@@ -189,7 +189,7 @@ void SwAccessibleNoTextFrame::Dispose( sal_Bool bRecursive )
OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -205,7 +205,7 @@ OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName (void)
OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 09b255cdd222..0aefb144ed4e 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -133,7 +133,7 @@ SwAccessiblePage::SwAccessiblePage( SwAccessibleMap* pInitMap,
DBG_ASSERT( pInitMap != NULL, "need map" );
DBG_ASSERT( pFrame->IsPageFrm(), "need page frame" );
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
OUString sPage = OUString::valueOf(
static_cast<sal_Int32>(
@@ -178,7 +178,7 @@ Sequence<OUString> SwAccessiblePage::getSupportedServiceNames( )
Sequence< sal_Int8 > SAL_CALL SwAccessiblePage::getImplementationId()
throw(RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 4a18b15cdf39..eef3b9a5b45c 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -508,7 +508,7 @@ SwAccessibleParagraph::SwAccessibleParagraph(
, mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTxtFrm ) )
// <--
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
bIsHeading = IsHeading();
// --> OD 2004-09-27 #117970# - set an empty accessibility name for paragraphs
@@ -521,7 +521,7 @@ SwAccessibleParagraph::SwAccessibleParagraph(
SwAccessibleParagraph::~SwAccessibleParagraph()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
delete pPortionData;
delete pHyperTextData;
@@ -834,7 +834,7 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary(
::rtl::OUString SAL_CALL SwAccessibleParagraph::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext );
@@ -848,7 +848,7 @@ sal_Bool SwAccessibleParagraph::GetTextBoundary(
lang::Locale SAL_CALL SwAccessibleParagraph::getLocale (void)
throw (IllegalAccessibleComponentStateException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
if( !pTxtFrm )
@@ -871,7 +871,7 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale (void)
uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccessibleRelationSet()
throw ( uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext );
utl::AccessibleRelationSetHelper* pHelper = new utl::AccessibleRelationSetHelper();
@@ -908,7 +908,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
void SAL_CALL SwAccessibleParagraph::grabFocus()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext );
@@ -1121,7 +1121,7 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(uno:
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId()
throw(uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static uno::Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
@@ -1140,7 +1140,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleParagraph::getImplementationId()
sal_Int32 SwAccessibleParagraph::getCaretPosition()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1162,7 +1162,7 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition()
sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1195,7 +1195,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex )
sal_Unicode SwAccessibleParagraph::getCharacter( sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1219,7 +1219,7 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
const ::rtl::OUString& rText = GetString();
@@ -1464,7 +1464,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes(
const uno::Sequence< ::rtl::OUString >& aRequestedAttributes )
throw ( uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
tAccParaPropValMap aDefAttrSeq;
@@ -1645,7 +1645,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getRunAttributes(
throw ( lang::IndexOutOfBoundsException,
uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
{
@@ -1678,7 +1678,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1741,7 +1741,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
sal_Int32 SwAccessibleParagraph::getCharacterCount()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1751,7 +1751,7 @@ sal_Int32 SwAccessibleParagraph::getCharacterCount()
sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1828,7 +1828,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
::rtl::OUString SwAccessibleParagraph::getSelectedText()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1842,7 +1842,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
sal_Int32 SwAccessibleParagraph::getSelectionStart()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1854,7 +1854,7 @@ sal_Int32 SwAccessibleParagraph::getSelectionStart()
sal_Int32 SwAccessibleParagraph::getSelectionEnd()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1866,7 +1866,7 @@ sal_Int32 SwAccessibleParagraph::getSelectionEnd()
sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1902,7 +1902,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
::rtl::OUString SwAccessibleParagraph::getText()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1913,7 +1913,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
sal_Int32 nStartIndex, sal_Int32 nEndIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1930,7 +1930,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
/*accessibility::*/TextSegment SwAccessibleParagraph::getTextAtIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -1966,7 +1966,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
/*accessibility::*/TextSegment SwAccessibleParagraph::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -2010,7 +2010,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
/*accessibility::*/TextSegment SwAccessibleParagraph::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 nTextType ) throw (lang::IndexOutOfBoundsException, lang::IllegalArgumentException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
@@ -2052,7 +2052,7 @@ sal_Bool SwAccessibleParagraph::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
// select and copy (through dispatch mechanism)
setSelection( nStartIndex, nEndIndex );
@@ -2069,7 +2069,7 @@ sal_Bool SwAccessibleParagraph::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIn
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
CHECK_FOR_DEFUNC( XAccessibleEditableText );
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if( !IsEditableState() )
return sal_False;
@@ -2084,7 +2084,7 @@ sal_Bool SwAccessibleParagraph::pasteText( sal_Int32 nIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
CHECK_FOR_DEFUNC( XAccessibleEditableText );
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if( !IsEditableState() )
return sal_False;
@@ -2112,7 +2112,7 @@ sal_Bool SwAccessibleParagraph::replaceText(
const ::rtl::OUString& sReplacement )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleEditableText );
@@ -2174,7 +2174,7 @@ sal_Bool SwAccessibleParagraph::setAttributes(
const uno::Sequence<PropertyValue>& rAttributeSet )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleEditableText );
const ::rtl::OUString& rText = GetString();
@@ -2357,7 +2357,7 @@ const SwTxtAttr *SwHyperlinkIter_Impl::next()
sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleHypertext );
@@ -2379,7 +2379,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
SwAccessibleParagraph::getHyperLink( sal_Int32 nLinkIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleHypertext );
uno::Reference< XAccessibleHyperlink > xRet;
@@ -2434,7 +2434,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharIndex )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleHypertext );
// parameter checking
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index a8fa94b15703..20538d9ab97f 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -91,7 +91,7 @@ Sequence<OUString> SwAccessiblePreview::getSupportedServiceNames( )
Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId()
throw(RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 9298f2e29e26..ad29dc71c82f 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -97,7 +97,7 @@ void SwAccessibleSelectionHelper::selectAccessibleChild(
throw ( lang::IndexOutOfBoundsException,
RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
// Get the respective child as SwFrm (also do index checking), ...
const SwAccessibleChild aChild = rContext.GetChild( *(rContext.GetMap()),
@@ -127,7 +127,7 @@ sal_Bool SwAccessibleSelectionHelper::isAccessibleChildSelected(
throw ( lang::IndexOutOfBoundsException,
RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
// Get the respective child as SwFrm (also do index checking), ...
const SwAccessibleChild aChild = rContext.GetChild( *(rContext.GetMap()),
@@ -162,7 +162,7 @@ void SwAccessibleSelectionHelper::clearAccessibleSelection( )
void SwAccessibleSelectionHelper::selectAllAccessibleChildren( )
throw ( RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
// We can select only one. So iterate over the children to find
// the first we can select, and select it.
@@ -194,7 +194,7 @@ void SwAccessibleSelectionHelper::selectAllAccessibleChildren( )
sal_Int32 SwAccessibleSelectionHelper::getSelectedAccessibleChildCount( )
throw ( RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
sal_Int32 nCount = 0;
// Only one frame can be selected at a time, and we only frames
@@ -246,7 +246,7 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
throw ( lang::IndexOutOfBoundsException,
RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
// Since the index is relative to the selected children, and since
// there can be at most one selected frame child, the index must
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index cdc1bd9bc037..1a69a1a37aef 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -714,7 +714,7 @@ SwAccessibleTable::SwAccessibleTable(
SwAccessibleContext( pInitMap, AccessibleRole::TABLE, pTabFrm ),
mpTableData( 0 )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
@@ -736,7 +736,7 @@ SwAccessibleTable::SwAccessibleTable(
SwAccessibleTable::~SwAccessibleTable()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
delete mpTableData;
}
@@ -840,7 +840,7 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleTable::getTypes()
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTable::getImplementationId()
throw(uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static uno::Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
@@ -876,7 +876,7 @@ void SwAccessibleTable::ClearTableData()
OUString SAL_CALL SwAccessibleTable::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -886,7 +886,7 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleDescription (void)
sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowCount()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -896,7 +896,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowCount()
sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnCount( )
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -981,7 +981,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt(
{
sal_Int32 nExtend = -1;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1012,7 +1012,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt(
{
sal_Int32 nExtend = -1;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1066,7 +1066,7 @@ uno::Reference< XAccessibleTable > SAL_CALL
uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleRows()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1090,7 +1090,7 @@ uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleRows
uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleColumns()
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1113,7 +1113,7 @@ uno::Sequence< sal_Int32 > SAL_CALL SwAccessibleTable::getSelectedAccessibleColu
sal_Bool SAL_CALL SwAccessibleTable::isAccessibleRowSelected( sal_Int32 nRow )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1140,7 +1140,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleColumnSelected(
sal_Int32 nColumn )
throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1170,7 +1170,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleTable::getAccessibleCellAt(
{
uno::Reference< XAccessible > xRet;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1202,7 +1202,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleSelected(
{
sal_Bool bRet = sal_False;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1229,7 +1229,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex(
{
sal_Int32 nRet = -1;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1247,7 +1247,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex )
{
sal_Int32 nRet = -1;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1286,7 +1286,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn(
{
sal_Int32 nRet = -1;
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable )
@@ -1348,7 +1348,7 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleTable::getSupportedServiceNames()
void SwAccessibleTable::InvalidatePosOrSize( const SwRect& rOldBox )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if( HasTableData() )
GetTableData().SetTablePos( GetFrm()->Frm().Pos() );
@@ -1358,7 +1358,7 @@ void SwAccessibleTable::InvalidatePosOrSize( const SwRect& rOldBox )
void SwAccessibleTable::Dispose( sal_Bool bRecursive )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if( GetRegisteredIn() )
pRegisteredIn->Remove( this );
@@ -1369,7 +1369,7 @@ void SwAccessibleTable::Dispose( sal_Bool bRecursive )
void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
sal_Bool bRecursive )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
const SwFrm *pFrm = rChildFrmOrObj.GetSwFrm();
ASSERT( pFrm, "frame expected" );
@@ -1392,7 +1392,7 @@ void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChildFrmOrObj,
const SwRect& rOldBox )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
if( HasTableData() )
{
@@ -1431,7 +1431,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
sal_Int32 nChildIndex )
throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable );
// --> OD 2007-06-27 #i77106#
@@ -1538,7 +1538,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected(
throw ( lang::IndexOutOfBoundsException,
uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable );
// --> OD 2007-06-27 #i77106#
@@ -1552,7 +1552,7 @@ sal_Bool SAL_CALL SwAccessibleTable::isAccessibleChildSelected(
void SAL_CALL SwAccessibleTable::clearAccessibleSelection( )
throw ( uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable );
@@ -1579,7 +1579,7 @@ void SAL_CALL SwAccessibleTable::selectAllAccessibleChildren( )
sal_Int32 SAL_CALL SwAccessibleTable::getSelectedAccessibleChildCount( )
throw ( uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable );
// iterate over all children and count isAccessibleChildSelected()
@@ -1600,7 +1600,7 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTable::getSelectedAccessibleChi
throw ( lang::IndexOutOfBoundsException,
uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable );
// paremter checking (part 1): index lower 0
@@ -1629,7 +1629,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
throw ( lang::IndexOutOfBoundsException,
uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleTable );
SwCrsrShell* pCrsrShell = GetCrsrShell();
@@ -1684,7 +1684,7 @@ SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2
const SwTabFrm *pTabFrm )
: SwAccessibleTable( pMap2, pTabFrm )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
@@ -1733,7 +1733,7 @@ uno::Any SAL_CALL SwAccessibleTableColHeaders::queryInterface( const uno::Type&
sal_Int32 SAL_CALL SwAccessibleTableColHeaders::getAccessibleChildCount(void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 5bbb837aadf8..99a5556777d6 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -161,7 +161,7 @@ void SwAccessibleTextFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -176,7 +176,7 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void)
OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext )
@@ -213,7 +213,7 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleTextFrame::getSupportedServiceNam
uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTextFrame::getImplementationId()
throw(uno::RuntimeException)
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
static uno::Sequence< sal_Int8 > aId( 16 );
static sal_Bool bInit = sal_False;
if(!bInit)
@@ -255,7 +255,7 @@ AccessibleRelation SwAccessibleTextFrame::makeRelation( sal_Int16 nType, const S
uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleTextFrame::getAccessibleRelationSet( )
throw ( uno::RuntimeException )
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ SolarMutexGuard aGuard;
CHECK_FOR_DEFUNC( XAccessibleContext );
// get the frame, and insert prev/next relations into helper
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-26 03:17:38 +0000