diff options
Diffstat (limited to 'sw/source/core/access')
49 files changed, 707 insertions, 954 deletions
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index f4cf864b7217..dbd1b5196593 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,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> @@ -99,8 +100,8 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) if( IsSelected() ) { rStateSet.AddState( AccessibleStateType::SELECTED ); - ASSERT( bIsSelected, "bSelected out of sync" ); - ::vos::ORef < SwAccessibleContext > xThis( this ); + OSL_ENSURE( bIsSelected, "bSelected out of sync" ); + ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } } @@ -110,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 ); @@ -122,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; } @@ -130,7 +131,7 @@ sal_Bool SwAccessibleCell::_InvalidateMyCursorPos() { // remember that object as the one that has the caret. This is // neccessary to notify that object if the cursor leaves it. - ::vos::ORef < SwAccessibleContext > xThis( this ); + ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } @@ -155,14 +156,14 @@ sal_Bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm ) { if( rLower.IsAccessible( GetMap()->GetShell()->IsPreView() ) ) { - ::vos::ORef< SwAccessibleContext > xAccImpl( + ::rtl::Reference< SwAccessibleContext > xAccImpl( GetMap()->GetContextImpl( pLower, sal_False ) ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) { - ASSERT( xAccImpl->GetFrm()->IsCellFrm(), - "table child is not a cell frame" ) + OSL_ENSURE( xAccImpl->GetFrm()->IsCellFrm(), + "table child is not a cell frame" ); bChanged |= static_cast< SwAccessibleCell *>( - xAccImpl.getBodyPtr() )->_InvalidateMyCursorPos(); + xAccImpl.get() )->_InvalidateMyCursorPos(); } else bChanged = sal_True; // If the context is not know we @@ -185,7 +186,7 @@ void SwAccessibleCell::_InvalidateCursorPos() { const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() ); - ASSERT( pParent->IsTabFrm(), "parent is not a tab frame" ); + OSL_ENSURE( pParent->IsTabFrm(), "parent is not a tab frame" ); const SwTabFrm *pTabFrm = static_cast< const SwTabFrm * >( pParent ); if( pTabFrm->IsFollow() ) pTabFrm = pTabFrm->FindMaster(); @@ -195,9 +196,9 @@ void SwAccessibleCell::_InvalidateCursorPos() sal_Bool bChanged = _InvalidateChildrenCursorPos( pTabFrm ); if( bChanged ) { - ::vos::ORef< SwAccessibleContext > xAccImpl( + ::rtl::Reference< SwAccessibleContext > xAccImpl( GetMap()->GetContextImpl( pTabFrm, sal_False ) ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) { AccessibleEventObject aEvent; aEvent.EventId = AccessibleEventId::SELECTION_CHANGED; @@ -211,7 +212,7 @@ void SwAccessibleCell::_InvalidateCursorPos() sal_Bool SwAccessibleCell::HasCursor() { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); return bIsSelected; } @@ -254,9 +255,9 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleCell::getSupportedServiceNames() void SwAccessibleCell::Dispose( sal_Bool bRecursive ) { const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() ); - ::vos::ORef< SwAccessibleContext > xAccImpl( + ::rtl::Reference< SwAccessibleContext > xAccImpl( GetMap()->GetContextImpl( pParent, sal_False ) ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) xAccImpl->DisposeChild( SwAccessibleChild(GetFrm()), bRecursive ); SwAccessibleContext::Dispose( bRecursive ); } @@ -264,9 +265,9 @@ void SwAccessibleCell::Dispose( sal_Bool bRecursive ) void SwAccessibleCell::InvalidatePosOrSize( const SwRect& rOldBox ) { const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() ); - ::vos::ORef< SwAccessibleContext > xAccImpl( + ::rtl::Reference< SwAccessibleContext > xAccImpl( GetMap()->GetContextImpl( pParent, sal_False ) ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) xAccImpl->InvalidateChildPosOrSize( SwAccessibleChild(GetFrm()), rOldBox ); SwAccessibleContext::InvalidatePosOrSize( rOldBox ); } @@ -308,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) @@ -334,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; @@ -345,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; @@ -373,3 +374,5 @@ uno::Any SwAccessibleCell::getMinimumValue( ) aAny <<= -DBL_MAX; return aAny; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx index db3d7d5fd5cb..0983f8ccc4d1 100644 --- a/sw/source/core/access/acccell.hxx +++ b/sw/source/core/access/acccell.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -135,3 +136,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 1b5e66071b84..f8820f56039a 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,14 +39,13 @@ #endif // #if (OSL_DEBUG_LEVEL > 1) && defined TEST_MIB #include <tools/debug.hxx> #include <vcl/window.hxx> -#include <errhdl.hxx> #include <swtypes.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #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> @@ -105,7 +105,7 @@ void SwAccessibleContext::InitStates() void SwAccessibleContext::SetParent( SwAccessibleContext *pParent ) { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); uno::Reference < XAccessible > xParent( pParent ); xWeakParent = xParent; @@ -113,7 +113,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; @@ -126,11 +126,11 @@ Window *SwAccessibleContext::GetWindow() if( GetMap() ) { const ViewShell *pVSh = GetMap()->GetShell(); - ASSERT( pVSh, "no view shell" ); + OSL_ENSURE( pVSh, "no view shell" ); if( pVSh ) pWin = pVSh->GetWin(); - ASSERT( pWin, "no window" ); + OSL_ENSURE( pWin, "no window" ); } return pWin; @@ -141,7 +141,7 @@ SwCrsrShell* SwAccessibleContext::GetCrsrShell() { SwCrsrShell* pCrsrShell; ViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0; - ASSERT( pViewShell, "no view shell" ); + OSL_ENSURE( pViewShell, "no view shell" ); if( pViewShell && pViewShell->ISA( SwCrsrShell ) ) pCrsrShell = static_cast<SwCrsrShell*>( pViewShell ); else @@ -155,7 +155,7 @@ const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const // just like non-const GetCrsrShell const SwCrsrShell* pCrsrShell; const ViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0; - ASSERT( pViewShell, "no view shell" ); + OSL_ENSURE( pViewShell, "no view shell" ); if( pViewShell && pViewShell->ISA( SwCrsrShell ) ) pCrsrShell = static_cast<const SwCrsrShell*>( pViewShell ); else @@ -225,13 +225,13 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, { if ( rLower.GetSwFrm() ) { - ASSERT( !rLower.AlwaysIncludeAsChild(), + OSL_ENSURE( !rLower.AlwaysIncludeAsChild(), "<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" ); const SwFrm* pLower( rLower.GetSwFrm() ); - ::vos::ORef< SwAccessibleContext > xAccImpl = + ::rtl::Reference< SwAccessibleContext > xAccImpl = GetMap()->GetContextImpl( pLower, SCROLLED_OUT == eAction || SCROLLED_IN == eAction ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) { switch( eAction ) { @@ -258,14 +258,14 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, } else if ( rLower.GetDrawObject() ) { - ASSERT( !rLower.AlwaysIncludeAsChild(), + OSL_ENSURE( !rLower.AlwaysIncludeAsChild(), "<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" ); - ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl = + ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl = GetMap()->GetContextImpl( rLower.GetDrawObject(), this, SCROLLED_OUT == eAction || SCROLLED_IN == eAction ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) { switch( eAction ) { @@ -277,7 +277,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, break; case SCROLLED_IN: ScrolledInShape( rLower.GetDrawObject(), - xAccImpl.getBodyPtr() ); + xAccImpl.get() ); break; case SCROLLED_OUT: { @@ -285,7 +285,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, ::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, GetMap() ); DisposeShape( rLower.GetDrawObject(), - xAccImpl.getBodyPtr() ); + xAccImpl.get() ); } break; case NONE: @@ -296,7 +296,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm, else if ( rLower.GetWindow() ) { // nothing to do - as such children are always included as children. - ASSERT( rLower.AlwaysIncludeAsChild(), + OSL_ENSURE( rLower.AlwaysIncludeAsChild(), "<SwAccessibleContext::ChildrenScrolled(..)> - not always included child not considered!" ); } } @@ -322,7 +322,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; } @@ -346,24 +346,24 @@ void SwAccessibleContext::ScrolledIn() // This accessible should be freshly created, because it // was not visisble before. Therefor, its vis area must already // reflect the scrolling. - ASSERT( GetVisArea() == GetMap()->GetVisArea(), + OSL_ENSURE( GetVisArea() == GetMap()->GetVisArea(), "Vis area of child is wrong. Did it exist already?" ); // Send child event at parent. That's all we have to do here. const SwFrm* pParent = GetParent(); - ::vos::ORef< SwAccessibleContext > xParentImpl( + ::rtl::Reference< SwAccessibleContext > xParentImpl( GetMap()->GetContextImpl( pParent, sal_False ) ); uno::Reference < XAccessibleContext > xThis( this ); - if( xParentImpl.isValid() ) + if( xParentImpl.is() ) { - SetParent( xParentImpl.getBodyPtr() ); + SetParent( xParentImpl.get() ); AccessibleEventObject aEvent; aEvent.EventId = AccessibleEventId::CHILD; aEvent.NewValue <<= xThis; xParentImpl->FireAccessibleEvent( aEvent ); - DBG_MSG_PARAM( "AccessibleChild (added)", xChildImpl.getBodyPtr() ); + DBG_MSG_PARAM( "AccessibleChild (added)", xChildImpl.get() ); if( HasCursor() ) { @@ -398,7 +398,7 @@ void SwAccessibleContext::ScrolledOut( const SwRect& rOldVisArea ) Dispose( sal_True ); } -// --> OD 2005-12-12 #i27301# - use new type definition for <_nStates> +// #i27301# - use new type definition for <_nStates> void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm, tAccessibleStates _nStates ) { @@ -411,10 +411,10 @@ void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm, const SwFrm* pLower = rLower.GetSwFrm(); if( pLower ) { - ::vos::ORef< SwAccessibleContext > xAccImpl; + ::rtl::Reference< SwAccessibleContext > xAccImpl; if( rLower.IsAccessible( GetShell()->IsPreView() ) ) xAccImpl = GetMap()->GetContextImpl( pLower, sal_False ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) xAccImpl->InvalidateStates( _nStates ); else InvalidateChildrenStates( pLower, _nStates ); @@ -444,21 +444,21 @@ void SwAccessibleContext::DisposeChildren( const SwFrm *pFrm, const SwFrm* pLower = rLower.GetSwFrm(); if( pLower ) { - ::vos::ORef< SwAccessibleContext > xAccImpl; + ::rtl::Reference< SwAccessibleContext > xAccImpl; if( rLower.IsAccessible( GetShell()->IsPreView() ) ) xAccImpl = GetMap()->GetContextImpl( pLower, sal_False ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) xAccImpl->Dispose( bRecursive ); else if( bRecursive ) DisposeChildren( pLower, bRecursive ); } else if ( rLower.GetDrawObject() ) { - ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl( + ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl( GetMap()->GetContextImpl( rLower.GetDrawObject(), this, sal_False ) ); - if( xAccImpl.isValid() ) - DisposeShape( rLower.GetDrawObject(), xAccImpl.getBodyPtr() ); + if( xAccImpl.is() ) + DisposeShape( rLower.GetDrawObject(), xAccImpl.get() ); } else if ( rLower.GetWindow() ) { @@ -482,7 +482,7 @@ void SwAccessibleContext::_InvalidateFocus() void SwAccessibleContext::FireAccessibleEvent( AccessibleEventObject& rEvent ) { - ASSERT( GetFrm(), "fire event for diposed frame?" ); + OSL_ENSURE( GetFrm(), "fire event for diposed frame?" ); if( !GetFrm() ) return; @@ -523,7 +523,7 @@ void SwAccessibleContext::FireStateChangedEvent( sal_Int16 nState, void SwAccessibleContext::GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; // SHOWING if( bIsShowingState ) @@ -551,7 +551,7 @@ sal_Bool SwAccessibleContext::IsEditableState() { sal_Bool bRet; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bRet = bIsEditableState; } @@ -575,7 +575,7 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *pM, SwAccessibleContext::~SwAccessibleContext() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; DBG_MSG_CD( "destructed" ) RemoveFrmFromAccessibleMap(); @@ -592,7 +592,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 ) @@ -603,7 +603,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 ) @@ -620,21 +620,21 @@ uno::Reference< XAccessible> SAL_CALL uno::Reference< XAccessible > xChild; if( aChild.GetSwFrm() ) { - ::vos::ORef < SwAccessibleContext > xChildImpl( + ::rtl::Reference < SwAccessibleContext > xChildImpl( GetMap()->GetContextImpl( aChild.GetSwFrm(), !bDisposing ) ); - if( xChildImpl.isValid() ) + if( xChildImpl.is() ) { xChildImpl->SetParent( this ); - xChild = xChildImpl.getBodyPtr(); + xChild = xChildImpl.get(); } } else if ( aChild.GetDrawObject() ) { - ::vos::ORef < ::accessibility::AccessibleShape > xChildImpl( + ::rtl::Reference < ::accessibility::AccessibleShape > xChildImpl( GetMap()->GetContextImpl( aChild.GetDrawObject(), this, !bDisposing ) ); - if( xChildImpl.isValid() ) - xChild = xChildImpl.getBodyPtr(); + if( xChildImpl.is() ) + xChild = xChildImpl.get(); } else if ( aChild.GetWindow() ) { @@ -647,22 +647,22 @@ 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 ) const SwFrm *pUpper = GetParent(); - ASSERT( pUpper != 0 || bDisposing, "no upper found" ); + OSL_ENSURE( pUpper != 0 || bDisposing, "no upper found" ); uno::Reference< XAccessible > xAcc; if( pUpper ) xAcc = GetMap()->GetContext( pUpper, !bDisposing ); - ASSERT( xAcc.is() || bDisposing, "no parent found" ); + OSL_ENSURE( xAcc.is() || bDisposing, "no parent found" ); // Remember the parent as weak ref. { - vos::OGuard aWeakParentGuard( aMutex ); + osl::MutexGuard aWeakParentGuard( aMutex ); xWeakParent = xAcc; } @@ -672,20 +672,20 @@ 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 ) const SwFrm *pUpper = GetParent(); - ASSERT( pUpper != 0 || bDisposing, "no upper found" ); + OSL_ENSURE( pUpper != 0 || bDisposing, "no upper found" ); sal_Int32 nIndex = -1; if( pUpper ) { - ::vos::ORef < SwAccessibleContext > xAccImpl( + ::rtl::Reference < SwAccessibleContext > xAccImpl( GetMap()->GetContextImpl( pUpper, !bDisposing ) ); - ASSERT( xAccImpl.isValid() || bDisposing, "no parent found" ); - if( xAccImpl.isValid() ) + OSL_ENSURE( xAccImpl.is() || bDisposing, "no parent found" ); + if( xAccImpl.is() ) nIndex = xAccImpl->GetChildIndex( *(GetMap()), SwAccessibleChild(GetFrm()) ); } @@ -701,7 +701,7 @@ sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole (void) OUString SAL_CALL SwAccessibleContext::getAccessibleDescription (void) throw (uno::RuntimeException) { - ASSERT( !this, "description needs to be overloaded" ); + OSL_ENSURE( !this, "description needs to be overloaded" ); THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overloaded)" ); } @@ -724,7 +724,7 @@ uno::Reference<XAccessibleStateSet> SAL_CALL SwAccessibleContext::getAccessibleStateSet (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -740,7 +740,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; @@ -754,7 +754,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 ); @@ -769,7 +769,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 ) { @@ -810,7 +810,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 ) @@ -867,12 +867,12 @@ 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 ) const SwFrm *pParent = GetParent(); - ASSERT( pParent, "no Parent found" ); + OSL_ENSURE( pParent, "no Parent found" ); Window *pWin = GetWindow(); CHECK_FOR_WINDOW( XAccessibleComponent, pWin && pParent ) @@ -882,10 +882,10 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative) if( GetFrm()->IsPageFrm() && static_cast < const SwPageFrm * >( GetFrm() )->IsEmptyPage() ) { - ASSERT( GetShell()->IsPreView(), "empty page accessible?" ); + OSL_ENSURE( GetShell()->IsPreView(), "empty page accessible?" ); if( GetShell()->IsPreView() ) { - // OD 15.01.2003 #103492# - adjust method call <GetMap()->GetPreViewPageSize()> + // adjust method call <GetMap()->GetPreViewPageSize()> sal_uInt16 nPageNum = static_cast < const SwPageFrm * >( GetFrm() )->GetPhyPageNum(); aLogBounds.SSize( GetMap()->GetPreViewPageSize( nPageNum ) ); @@ -953,7 +953,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 ); @@ -1015,7 +1015,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground() OUString SAL_CALL SwAccessibleContext::getImplementationName() throw( uno::RuntimeException ) { - ASSERT( !this, "implementation name needs to be overloaded" ); + OSL_ENSURE( !this, "implementation name needs to be overloaded" ); THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "implementation name needs to be overloaded" ) } @@ -1024,27 +1024,27 @@ sal_Bool SAL_CALL SwAccessibleContext::supportsService (const ::rtl::OUString& ) throw (uno::RuntimeException) { - ASSERT( !this, "supports service needs to be overloaded" ); + OSL_ENSURE( !this, "supports service needs to be overloaded" ); THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supports service needs to be overloaded" ) } uno::Sequence< OUString > SAL_CALL SwAccessibleContext::getSupportedServiceNames() throw( uno::RuntimeException ) { - ASSERT( !this, "supported services names needs to be overloaded" ); + OSL_ENSURE( !this, "supported services names needs to be overloaded" ); THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supported services needs to be overloaded" ) } void SwAccessibleContext::DisposeShape( const SdrObject *pObj, ::accessibility::AccessibleShape *pAccImpl ) { - ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl( pAccImpl ); - if( !xAccImpl.isValid() ) + ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl( pAccImpl ); + if( !xAccImpl.is() ) xAccImpl = GetMap()->GetContextImpl( pObj, this, sal_True ); AccessibleEventObject aEvent; aEvent.EventId = AccessibleEventId::CHILD; - uno::Reference< XAccessible > xAcc( xAccImpl.getBodyPtr() ); + uno::Reference< XAccessible > xAcc( xAccImpl.get() ); aEvent.OldValue <<= xAcc; FireAccessibleEvent( aEvent ); @@ -1078,10 +1078,10 @@ 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(), + OSL_ENSURE( GetFrm() && GetMap(), "already disposed" ); + OSL_ENSURE( GetMap()->GetVisArea() == GetVisArea(), "invalid vis area for dispose" ); bDisposing = sal_True; @@ -1109,7 +1109,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; } @@ -1131,7 +1131,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() || @@ -1142,18 +1142,18 @@ void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj, // get notified of the movement. if( rChildFrmOrObj.GetSwFrm() ) { - ::vos::ORef< SwAccessibleContext > xAccImpl = + ::rtl::Reference< SwAccessibleContext > xAccImpl = GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm(), sal_True ); xAccImpl->Dispose( bRecursive ); } else if ( rChildFrmOrObj.GetDrawObject() ) { - ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl = + ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl = GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(), this, sal_True ); DisposeShape( rChildFrmOrObj.GetDrawObject(), - xAccImpl.getBodyPtr() ); + xAccImpl.get() ); } else if ( rChildFrmOrObj.GetWindow() ) { @@ -1171,14 +1171,14 @@ 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" ); + OSL_ENSURE( GetFrm() && !GetFrm()->Frm().IsEmpty(), "context should have a size" ); sal_Bool bIsOldShowingState; sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) ); { - vos::OGuard aShowingStateGuard( aMutex ); + osl::MutexGuard aShowingStateGuard( aMutex ); bIsOldShowingState = bIsShowingState; bIsShowingState = bIsNewShowingState; } @@ -1210,9 +1210,9 @@ void SwAccessibleContext::InvalidateChildPosOrSize( const SwAccessibleChild& rChildFrmOrObj, const SwRect& rOldFrm ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; - ASSERT( !rChildFrmOrObj.GetSwFrm() || + OSL_ENSURE( !rChildFrmOrObj.GetSwFrm() || !rChildFrmOrObj.GetSwFrm()->Frm().IsEmpty(), "child context should have a size" ); @@ -1235,26 +1235,25 @@ void SwAccessibleContext::InvalidateChildPosOrSize( if( rChildFrmOrObj.GetSwFrm() ) { // The frame becomes visible. A child event must be send. - ::vos::ORef< SwAccessibleContext > xAccImpl = + ::rtl::Reference< SwAccessibleContext > xAccImpl = GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm(), sal_True ); xAccImpl->ScrolledIn(); } else if ( rChildFrmOrObj.GetDrawObject() ) { - ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl = + ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl = GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(), this, sal_True ); - // --> OD 2004-11-29 #i37790# - if ( xAccImpl.isValid() ) + // #i37790# + if ( xAccImpl.is() ) { ScrolledInShape( rChildFrmOrObj.GetDrawObject(), - xAccImpl.getBodyPtr() ); + xAccImpl.get() ); } else { - ASSERT( false , - "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - no accessible shape found." ); + OSL_FAIL( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - no accessible shape found." ); } // <-- } @@ -1278,7 +1277,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize( { if( rChildFrmOrObj.GetSwFrm() ) { - ::vos::ORef< SwAccessibleContext > xAccImpl = + ::rtl::Reference< SwAccessibleContext > xAccImpl = GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm(), sal_True ); xAccImpl->SetParent( this ); @@ -1286,16 +1285,15 @@ void SwAccessibleContext::InvalidateChildPosOrSize( } else if ( rChildFrmOrObj.GetDrawObject() ) { - ::vos::ORef< ::accessibility::AccessibleShape > xAccImpl = + ::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl = GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(), this, sal_True ); DisposeShape( rChildFrmOrObj.GetDrawObject(), - xAccImpl.getBodyPtr() ); + xAccImpl.get() ); } else if ( rChildFrmOrObj.GetWindow() ) { - ASSERT( false, - "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <Window>." ); + OSL_FAIL( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <Window>." ); } } } @@ -1303,26 +1301,26 @@ 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(); } -// --> OD 2005-12-12 #i27301# - use new type definition for <_nStates> +// #i27301# - use new type definition for <_nStates> void SwAccessibleContext::InvalidateStates( tAccessibleStates _nStates ) { if( GetMap() ) @@ -1335,7 +1333,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; } @@ -1349,7 +1347,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; } @@ -1373,12 +1371,7 @@ void SwAccessibleContext::InvalidateRelation( sal_uInt16 nType ) FireAccessibleEvent( aEvent ); } -/** text selection has changed - - OD 2005-12-14 #i27301# - - @author OD -*/ +/** #i27301# - text selection has changed */ void SwAccessibleContext::InvalidateTextSelection() { AccessibleEventObject aEvent; @@ -1387,12 +1380,7 @@ void SwAccessibleContext::InvalidateTextSelection() FireAccessibleEvent( aEvent ); } -/** attributes has changed - - OD 2009-01-06 #i88069# - - @author OD -*/ +/** #i88069# - attributes has changed */ void SwAccessibleContext::InvalidateAttr() { AccessibleEventObject aEvent; @@ -1459,7 +1447,7 @@ OUString SwAccessibleContext::GetResource( sal_uInt16 nResId, { String sStr; { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; sStr = SW_RES( nResId ); } @@ -1501,12 +1489,7 @@ bool SwAccessibleContext::HasAdditionalAccessibleChildren() return bRet; } -/** get additional accessible child by index - - OD 2010-01-27 #i88070# - - @author OD -*/ +/** #i88070# - get additional accessible child by index */ Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32 nIndex ) { Window* pAdditionalAccessibleChild( 0 ); @@ -1524,12 +1507,7 @@ Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32 nInde return pAdditionalAccessibleChild; } -/** get all additional accessible children - - OD 2010-01-27 #i88070# - - @author OD -*/ +/** #i88070# - get all additional accessible children */ void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< Window* >* pChildren ) { if ( GetFrm()->IsTxtFrm() ) @@ -1602,3 +1580,5 @@ void lcl_SwAccessibleContext_DbgMsg( SwAccessibleContext *pThisAcc, aStrm.Flush(); } #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx index 8bad4ab9074b..d9fd0e113d55 100644 --- a/sw/source/core/access/acccontext.hxx +++ b/sw/source/core/access/acccontext.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,7 +71,7 @@ class SwAccessibleContext : protected: mutable ::osl::Mutex aListenerMutex; - mutable ::vos::OMutex aMutex; + mutable ::osl::Mutex aMutex; private: @@ -95,11 +96,9 @@ private: // Are we currently disposing that object (protected by solar mutex)? sal_Bool bDisposing : 1; - // --> OD 2008-03-10 #i85634# - // boolean, indicating if the accessible context is in general registered at - // the accessible map. + // #i85634# - boolean, indicating if the accessible context is + // in general registered at the accessible map. bool bRegisteredAtAccessibleMap; - // <-- void InitStates(); @@ -154,7 +153,7 @@ protected: // Invalidate the states of all children of the specified SwFrm. The // SwFrm might belong the the current object or to any child or grandchild! - // --> OD 2005-12-12 #i27301# - use new type definition for <_nStates> + // #i27301# - use new type definition for <_nStates> void InvalidateChildrenStates( const SwFrm* _pFrm, tAccessibleStates _nStates ); // <-- @@ -197,13 +196,12 @@ protected: getBoundsImpl(sal_Bool bRelative) throw (::com::sun::star::uno::RuntimeException); - // --> OD 2008-03-10 #i85634# + // #i85634# inline void NotRegisteredAtAccessibleMap() { bRegisteredAtAccessibleMap = false; } void RemoveFrmFromAccessibleMap(); - // <-- virtual ~SwAccessibleContext(); @@ -364,48 +362,23 @@ public: void InvalidateFocus(); // Check states - // --> OD 2005-12-12 #i27301# - use new type definition for <_nStates> + // #i27301# - use new type definition for <_nStates> void InvalidateStates( tAccessibleStates _nStates ); - // <-- // the XAccessibleRelationSet may have changed void InvalidateRelation( sal_uInt16 nType ); - /** text selection has changed - - OD 2005-12-14 #i27301# - - @author OD - */ - void InvalidateTextSelection(); - - /** attributes has changed - - OD 2009-01-06 #i88069# - - @author OD - */ - void InvalidateAttr(); + void InvalidateTextSelection(); // #i27301# - text selection has changed + void InvalidateAttr(); // #i88069# - attributes has changed bool HasAdditionalAccessibleChildren(); - /** get additional child by index - - OD 2010-01-27 #i88070# - - @author OD - */ + // #i88070# - get additional child by index Window* GetAdditionalAccessibleChild( const sal_Int32 nIndex ); - /** get all additional accessible children - - OD 2010-01-27 #i88070# - - @author OD - */ + // #i88070# - get all additional accessible children void GetAdditionalAccessibleChildren( std::vector< Window* >* pChildren ); - const ::rtl::OUString& GetName() const { return sName; } virtual sal_Bool HasCursor(); // required by map to remember that object @@ -457,3 +430,4 @@ const sal_Char sMissingWindow[] = "window is missing"; } #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 08de7edba46f..bad6b1b4f5ab 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,15 +39,13 @@ #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> #include <accmap.hxx> #include <accdoc.hxx> -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <pagefrm.hxx> const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextDocumentView"; @@ -80,27 +79,25 @@ SwAccessibleDocumentBase::~SwAccessibleDocumentBase() void SwAccessibleDocumentBase::SetVisArea() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; SwRect aOldVisArea( GetVisArea() ); const SwRect& rNewVisArea = GetMap()->GetVisArea(); if( aOldVisArea != rNewVisArea ) { SwAccessibleFrame::SetVisArea( GetMap()->GetVisArea() ); - // --> OD 2007-12-07 #i58139# - // showing state of document view needs also be updated. + // #i58139# - showing state of document view needs also be updated. // Thus, call method <Scrolled(..)> instead of <ChildrenScrolled(..)> // ChildrenScrolled( GetFrm(), aOldVisArea ); Scrolled( aOldVisArea ); - // <-- } } void SwAccessibleDocumentBase::AddChild( Window *pWin, sal_Bool bFireEvent ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; - ASSERT( !mpChildWin, "only one child window is supported" ); + OSL_ENSURE( !mpChildWin, "only one child window is supported" ); if( !mpChildWin ) { mpChildWin = pWin; @@ -117,9 +114,9 @@ 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" ); + OSL_ENSURE( !mpChildWin || pWin == mpChildWin, "invalid child window to remove" ); if( mpChildWin && pWin == mpChildWin ) { AccessibleEventObject aEvent; @@ -134,7 +131,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 @@ -150,7 +147,7 @@ uno::Reference< XAccessible> SAL_CALL throw (uno::RuntimeException, lang::IndexOutOfBoundsException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( mpChildWin ) { @@ -174,7 +171,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 ); @@ -197,7 +194,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(); @@ -214,7 +211,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(); @@ -230,7 +227,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(); @@ -246,7 +243,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(); @@ -262,7 +259,7 @@ sal_Bool SAL_CALL SwAccessibleDocumentBase::containsPoint( const awt::Point& aPoint ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window *pWin = GetWindow(); @@ -279,7 +276,7 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleDocumentBase::getAccessibleAt const awt::Point& aPoint ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( mpChildWin ) { @@ -339,7 +336,7 @@ SwAccessibleDocument::~SwAccessibleDocument() void SwAccessibleDocument::Dispose( sal_Bool bRecursive ) { - ASSERT( GetFrm() && GetMap(), "already disposed" ); + OSL_ENSURE( GetFrm() && GetMap(), "already disposed" ); Window *pWin = GetMap() ? GetMap()->GetShell()->GetWin() : 0; if( pWin ) @@ -450,7 +447,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) @@ -505,7 +502,7 @@ uno::Reference<XAccessible> SwAccessibleDocument::getSelectedAccessibleChild( return maSelectionHelper.getSelectedAccessibleChild(nSelectedChildIndex); } -// --> OD 2004-11-16 #111714# - index has to be treated as global child index. +// index has to be treated as global child index. void SwAccessibleDocument::deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, @@ -513,3 +510,5 @@ void SwAccessibleDocument::deselectAccessibleChild( { maSelectionHelper.deselectAccessibleChild( nChildIndex ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accdoc.hxx b/sw/source/core/access/accdoc.hxx index 3e2153876219..2a4e125b7fb4 100644 --- a/sw/source/core/access/accdoc.hxx +++ b/sw/source/core/access/accdoc.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,9 +27,7 @@ ************************************************************************/ #ifndef _ACCDOC_HXX #define _ACCDOC_HXX -#ifndef _ACCCONTEXT_HXX #include "acccontext.hxx" -#endif #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <accselectionhelper.hxx> @@ -197,7 +196,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - // --> OD 2004-11-16 #111714# - index has to be treated as global child index. + // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, @@ -211,3 +210,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 33a32dc5c9ca..5ccbc03f3339 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,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) @@ -95,3 +96,5 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementation } return aId; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx index cd7205293ed0..94f8e2d43c20 100644 --- a/sw/source/core/access/accembedded.hxx +++ b/sw/source/core/access/accembedded.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx index 1fb553d58120..2efd6cf6d78f 100644 --- a/sw/source/core/access/accfootnote.cxx +++ b/sw/source/core/access/accfootnote.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,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> @@ -41,9 +42,7 @@ #include <viewsh.hxx> #include <accmap.hxx> #include "accfootnote.hxx" -#ifndef _ACCESS_HRC #include "access.hrc" -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -65,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; @@ -80,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 ) @@ -139,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) @@ -155,3 +154,5 @@ sal_Bool SwAccessibleFootnote::IsEndnote( const SwFtnFrm *pFtnFrm ) const SwTxtFtn *pTxtFtn = pFtnFrm ->GetAttr(); return pTxtFtn && pTxtFtn->GetFtn().IsEndNote() ; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx index 1c7330bc694d..521247685a16 100644 --- a/sw/source/core/access/accfootnote.hxx +++ b/sw/source/core/access/accfootnote.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -86,3 +87,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx index 043e40bb943b..c19c7cf8ef1d 100644 --- a/sw/source/core/access/accframe.cxx +++ b/sw/source/core/access/accframe.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,7 +37,6 @@ #include <rootfrm.hxx> #include <txtfrm.hxx> #include <sectfrm.hxx> -#include <pagefrm.hxx> #include <section.hxx> #include <viewsh.hxx> #include <viewopt.hxx> @@ -254,7 +254,7 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea, aRet = GetChildAtPixel( rVisArea, *(rLower.GetSwFrm()), rPixPos, bInPagePreview, rAccMap ); } - aRIter++; + ++aRIter; } } else @@ -360,7 +360,7 @@ sal_Bool SwAccessibleFrame::IsEditable( ViewShell *pVSh ) const if( !pFrm ) return sal_False; - ASSERT( pVSh, "no view shell" ); + OSL_ENSURE( pVSh, "no view shell" ); if( pVSh && (pVSh->GetViewOptions()->IsReadonly() || pVSh->IsPreView()) ) return sal_False; @@ -377,7 +377,7 @@ sal_Bool SwAccessibleFrame::IsOpaque( ViewShell *pVSh ) const if( !aFrm.GetSwFrm() ) return sal_False; - ASSERT( pVSh, "no view shell" ); + OSL_ENSURE( pVSh, "no view shell" ); if( !pVSh ) return sal_False; @@ -396,10 +396,8 @@ sal_Bool SwAccessibleFrame::IsOpaque( ViewShell *pVSh ) const rBack.GetGraphicPos() != GPOS_NONE ) return sal_True; - /// OD 20.08.2002 #99657# - /// If a fly frame has a transparent background color, we have - /// to consider the background. - /// But a background color "no fill"/"auto fill" has *not* to be considered. + // If a fly frame has a transparent background color, we have to consider the background. + // But a background color "no fill"/"auto fill" has *not* to be considered. if( pFrm->IsFlyFrm() && (rBack.GetColor().GetTransparency() != 0) && (rBack.GetColor() != COL_TRANSPARENT) @@ -495,3 +493,4 @@ sal_Bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap, return IsShowing( rFrmOrObj.GetBox( rAccMap ) ); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx index 48da1bdbb9cb..7aa7e42f9e0c 100644 --- a/sw/source/core/access/accframe.hxx +++ b/sw/source/core/access/accframe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -51,8 +52,7 @@ class SwAccessibleFrame const sal_Bool mbIsInPagePreview; protected: - // --> OD 2007-06-29 #i77106# - // method needs to be called by new class <SwAccessibleTableColHeaders> + // #i77106# - method needs to be called by new class <SwAccessibleTableColHeaders> static sal_Int32 GetChildCount( SwAccessibleMap& rAccMap, const SwRect& rVisArea, const SwFrm *pFrm, @@ -173,3 +173,4 @@ inline const SwFrm *SwAccessibleFrame::GetParent() const #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx index 91cbe0b9324f..f96b050260b6 100644 --- a/sw/source/core/access/accframebase.cxx +++ b/sw/source/core/access/accframebase.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -32,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> @@ -89,8 +90,8 @@ void SwAccessibleFrameBase::GetStates( if( IsSelected() ) { rStateSet.AddState( AccessibleStateType::SELECTED ); - ASSERT( bIsSelected, "bSelected out of sync" ); - ::vos::ORef < SwAccessibleContext > xThis( this ); + OSL_ENSURE( bIsSelected, "bSelected out of sync" ); + ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); Window *pWin = GetWindow(); @@ -136,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 ); @@ -152,7 +153,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos() sal_Bool bOldSelected; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bOldSelected = bIsSelected; bIsSelected = bNewSelected; } @@ -161,7 +162,7 @@ void SwAccessibleFrameBase::_InvalidateCursorPos() { // remember that object as the one that has the caret. This is // neccessary to notify that object if the cursor leaves it. - ::vos::ORef < SwAccessibleContext > xThis( this ); + ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } @@ -195,10 +196,10 @@ void SwAccessibleFrameBase::_InvalidateFocus() sal_Bool bSelected; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bSelected = bIsSelected; } - ASSERT( bSelected, "focus object should be selected" ); + OSL_ENSURE( bSelected, "focus object should be selected" ); FireStateChangedEvent( AccessibleStateType::FOCUSED, pWin->HasFocus() && bSelected ); @@ -207,7 +208,7 @@ void SwAccessibleFrameBase::_InvalidateFocus() sal_Bool SwAccessibleFrameBase::HasCursor() { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); return bIsSelected; } @@ -226,16 +227,16 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem * if( pFlyFrm ) { const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt(); - ASSERT( pFrmFmt == GetRegisteredIn(), "invalid frame" ); + OSL_ENSURE( pFrmFmt == GetRegisteredIn(), "invalid frame" ); OUString sOldName( GetName() ); - ASSERT( !pOld || + OSL_ENSURE( !pOld || static_cast < const SwStringMsgPoolItem * >( pOld )->GetString() == String( sOldName ), "invalid old name" ); const String& rNewName = pFrmFmt->GetName(); SetName( rNewName ); - ASSERT( !pNew || + OSL_ENSURE( !pNew || static_cast < const SwStringMsgPoolItem * >( pNew )->GetString() == rNewName, "invalid new name" ); @@ -270,10 +271,12 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem * void SwAccessibleFrameBase::Dispose( sal_Bool bRecursive ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( GetRegisteredIn() ) GetRegisteredInNonConst()->Remove( this ); SwAccessibleContext::Dispose( bRecursive ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx index 551f8b452621..8ac7f2e2e0c6 100644 --- a/sw/source/core/access/accframebase.hxx +++ b/sw/source/core/access/accframebase.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,3 +70,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx index 66f41e2d7ec1..6b3f73c713b3 100644 --- a/sw/source/core/access/accfrmobj.cxx +++ b/sw/source/core/access/accfrmobj.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -97,7 +98,7 @@ SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm, { Init( pWindow ); } - ASSERT( (!pFrm || pFrm == mpFrm) && + OSL_ENSURE( (!pFrm || pFrm == mpFrm) && (!pDrawObj || pDrawObj == mpDrawObj) && (!pWindow || pWindow == mpWindow), "invalid frame/object/window combination" ); @@ -346,7 +347,7 @@ const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const { // For FLY_AS_CHAR the parent is the anchor pParent = pFly->GetAnchorFrm(); - ASSERT( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ), + OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ), "parent is not accessible" ); } else @@ -373,16 +374,16 @@ const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const { const SwDrawContact *pContact = static_cast< const SwDrawContact* >( GetUserCall( mpDrawObj ) ); - ASSERT( pContact, "sdr contact is missing" ); + OSL_ENSURE( pContact, "sdr contact is missing" ); if( pContact ) { const SwFrmFmt *pFrmFmt = pContact->GetFmt(); - ASSERT( pFrmFmt, "frame format is missing" ); + OSL_ENSURE( pFrmFmt, "frame format is missing" ); if( pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() ) { // For FLY_AS_CHAR the parent is the anchor pParent = pContact->GetAnchorFrm(); - ASSERT( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ), + OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ), "parent is not accessible" ); } @@ -426,3 +427,4 @@ const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const } } // eof of namespace sw::access +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx index 76113c62eae3..8b196711277e 100644 --- a/sw/source/core/access/accfrmobj.hxx +++ b/sw/source/core/access/accfrmobj.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -73,10 +74,7 @@ class SwAccessibleChild SwRect GetBounds( const SwAccessibleMap& rAccMap ) const; /** indicating, if accessible child is included even, if the corresponding - object is not visible. - - @author OD - */ + object is not visible. */ bool AlwaysIncludeAsChild() const; private: @@ -93,3 +91,5 @@ class SwAccessibleChild } } // eof of namespace sw::access #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx index 11834ee89963..e7fd8644da77 100644 --- a/sw/source/core/access/accfrmobjmap.cxx +++ b/sw/source/core/access/accfrmobjmap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -70,7 +71,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea, if ( rFrm.IsPageFrm() ) { - ASSERT( bVisibleChildrenOnly, "page frame within tab frame???" ); + OSL_ENSURE( bVisibleChildrenOnly, "page frame within tab frame???" ); const SwPageFrm *pPgFrm = static_cast< const SwPageFrm * >( &rFrm ); const SwSortedObjs *pObjs = pPgFrm->GetSortedObjs(); @@ -105,11 +106,11 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea, } { - ::vos::ORef < SwAccessibleContext > xAccImpl = + ::rtl::Reference < SwAccessibleContext > xAccImpl = rAccMap.GetContextImpl( &rFrm, sal_False ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) { - SwAccessibleContext* pAccImpl = xAccImpl.getBodyPtr(); + SwAccessibleContext* pAccImpl = xAccImpl.get(); if ( pAccImpl && pAccImpl->HasAdditionalAccessibleChildren() ) { @@ -166,3 +167,5 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea, ( rFrm.IsTxtFrm() && rFrm.GetDrawObjs() ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx index 91365ed9c258..441202e6acb9 100644 --- a/sw/source/core/access/accfrmobjmap.hxx +++ b/sw/source/core/access/accfrmobjmap.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -94,3 +95,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx index 2f3e8399187a..846e06a0435c 100644 --- a/sw/source/core/access/accfrmobjslist.cxx +++ b/sw/source/core/access/accfrmobjslist.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -72,11 +73,11 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator( } if ( !aCurr.IsValid() ) { - ::vos::ORef < SwAccessibleContext > xAccImpl = + ::rtl::Reference < SwAccessibleContext > xAccImpl = rAccMap.GetContextImpl( &rFrm, sal_False ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) { - SwAccessibleContext* pAccImpl = xAccImpl.getBodyPtr(); + SwAccessibleContext* pAccImpl = xAccImpl.get(); aCurr = SwAccessibleChild( pAccImpl->GetAdditionalAccessibleChild( 0 ) ); ++nNextObj; } @@ -138,11 +139,11 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne } if ( !aCurr.IsValid() ) { - ::vos::ORef < SwAccessibleContext > xAccImpl = + ::rtl::Reference < SwAccessibleContext > xAccImpl = rList.GetAccMap().GetContextImpl( &rFrm, sal_False ); - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) { - SwAccessibleContext* pAccImpl = xAccImpl.getBodyPtr(); + SwAccessibleContext* pAccImpl = xAccImpl.get(); aCurr = SwAccessibleChild( pAccImpl->GetAdditionalAccessibleChild( nNextObj - nObjsCount ) ); ++nNextObj; } @@ -171,3 +172,4 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::op return rList.IsVisibleChildrenOnly() ? next_visible() : next(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx index f81cfc85a9d7..78052177fbac 100644 --- a/sw/source/core/access/accfrmobjslist.hxx +++ b/sw/source/core/access/accfrmobjslist.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -143,3 +144,5 @@ public: }; #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx index 40888f4b3738..4c389e2f85c1 100644 --- a/sw/source/core/access/accgraphic.cxx +++ b/sw/source/core/access/accgraphic.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -85,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) @@ -95,3 +96,5 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleGraphic::getImplementationId() } return aId; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx index aa64ee0df7e1..18c0f67b68dc 100644 --- a/sw/source/core/access/accgraphic.hxx +++ b/sw/source/core/access/accgraphic.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,3 +68,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx index dada1083c810..6472f75e9fe5 100644 --- a/sw/source/core/access/accheaderfooter.cxx +++ b/sw/source/core/access/accheaderfooter.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,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> @@ -37,9 +38,7 @@ #include <vcl/svapp.hxx> #include <hffrm.hxx> #include "accheaderfooter.hxx" -#ifndef _ACCESS_HRC #include "access.hrc" -#endif using namespace ::com::sun::star; using namespace ::com::sun::star::lang; @@ -57,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 ) ); @@ -68,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 ) ); @@ -81,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 ) @@ -133,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) @@ -143,3 +142,5 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleHeaderFooter::getImplementationId() } return aId; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx index 8a0bbb84b6e5..210657e7602a 100644 --- a/sw/source/core/access/accheaderfooter.hxx +++ b/sw/source/core/access/accheaderfooter.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,9 +27,7 @@ ************************************************************************/ #ifndef _ACCHEADERFOOTER_HXX #define _ACCHEADERFOOTER_HXX -#ifndef _ACCCONTEXT_HXX #include "acccontext.hxx" -#endif class SwHeaderFrm; class SwFooterFrm; @@ -83,3 +82,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx index 6d252488c792..6b239b04e0e2 100644 --- a/sw/source/core/access/acchyperlink.cxx +++ b/sw/source/core/access/acchyperlink.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,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> @@ -52,7 +53,7 @@ SwAccessibleHyperlink::SwAccessibleHyperlink( sal_uInt16 nHPos, const SwTxtAttr *SwAccessibleHyperlink::GetTxtAttr() const { const SwTxtAttr *pTxtAttr = 0; - if( xPara.isValid() && xPara->GetMap() ) + if( xPara.is() && xPara->GetMap() ) { const SwTxtNode *pTxtNd = xPara->GetTxtNode(); const SwpHints *pHints = pTxtNd->GetpSwpHints(); @@ -78,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; @@ -93,7 +94,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex ) { LoadURL( rINetFmt.GetValue(), pVSh, URLLOAD_NOFILTER, &rINetFmt.GetTargetFrame() ); - ASSERT( pTxtAttr == rINetFmt.GetTxtINetFmt(), + OSL_ENSURE( pTxtAttr == rINetFmt.GetTxtINetFmt(), "lost my txt attr" ); const SwTxtINetFmt* pTxtAttr2 = rINetFmt.GetTxtINetFmt(); if( pTxtAttr2 ) @@ -178,13 +179,14 @@ sal_Int32 SAL_CALL SwAccessibleHyperlink::getEndIndex() sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( ) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); - return xPara.isValid(); + SolarMutexGuard aGuard; + return xPara.is(); } void SwAccessibleHyperlink::Invalidate() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; xPara = 0; } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx index ed81feb9deb3..ecbaff3ec383 100644 --- a/sw/source/core/access/acchyperlink.hxx +++ b/sw/source/core/access/acchyperlink.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,7 +28,7 @@ #ifndef _ACCHYPERLINK_HXX #define _ACCHYPERLINK_HXX #include <com/sun/star/accessibility/XAccessibleHyperlink.hpp> -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #include <cppuhelper/implbase1.hxx> #include <fmtinfmt.hxx> @@ -41,7 +42,7 @@ class SwAccessibleHyperlink : friend class SwAccessibleParagraph; friend class SwAccessibleHyperTextData; sal_uInt16 nHintPos; - ::vos::ORef< SwAccessibleParagraph > xPara; + ::rtl::Reference< SwAccessibleParagraph > xPara; sal_Int32 nStartIdx; sal_Int32 nEndIdx; @@ -89,3 +90,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acchypertextdata.cxx b/sw/source/core/access/acchypertextdata.cxx index 5a6193489255..2e233522aa64 100644 --- a/sw/source/core/access/acchypertextdata.cxx +++ b/sw/source/core/access/acchypertextdata.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -53,3 +54,5 @@ SwAccessibleHyperTextData::~SwAccessibleHyperTextData() ++aIter; } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx index fde1809fef1b..d3d49e4e211b 100644 --- a/sw/source/core/access/acchypertextdata.hxx +++ b/sw/source/core/access/acchypertextdata.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -49,3 +50,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx index 6684354ef7ac..a3294bc2aa01 100644 --- a/sw/source/core/access/accmap.cxx +++ b/sw/source/core/access/accmap.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,7 +30,7 @@ #include "precompiled_sw.hxx" -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #include <cppuhelper/weakref.hxx> #include <vcl/window.hxx> #include <svx/svdmodel.hxx> @@ -95,12 +96,12 @@ class SwAccessibleContextMap_Impl: public _SwAccessibleContextMap_Impl { public: -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 sal_Bool mbLocked; #endif SwAccessibleContextMap_Impl() -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 : mbLocked( sal_False ) #endif {} @@ -155,10 +156,6 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster& /*rBC*/, { // do not broadcast notifications for writer fly frames, because there // are no shapes that need to know about them. - // OD 01.07.2003 #110554# - correct condition in order not to broadcast - // notifications for writer fly frames. - // OD 01.07.2003 #110554# - do not broadcast notifications for plane - // <SdrObject>objects const SdrHint *pSdrHint = PTR_CAST( SdrHint, &rHint ); if ( !pSdrHint || ( pSdrHint->GetObject() && @@ -169,7 +166,7 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster& /*rBC*/, return; } - ASSERT( mpDrawModel, "draw model listener is disposed" ); + OSL_ENSURE( mpDrawModel, "draw model listener is disposed" ); if( !mpDrawModel ) return; @@ -192,7 +189,7 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster& /*rBC*/, #if OSL_DEBUG_LEVEL > 1 ByteString aError( "Runtime exception caught while notifying shape.:\n" ); aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); - DBG_ERROR( aError.GetBuffer() ); + OSL_FAIL( aError.GetBuffer() ); #endif } } @@ -213,7 +210,7 @@ struct SwShapeFunc } }; typedef ::std::map < const SdrObject *, uno::WeakReference < XAccessible >, SwShapeFunc > _SwAccessibleShapeMap_Impl; -typedef ::std::pair < const SdrObject *, ::vos::ORef < ::accessibility::AccessibleShape > > SwAccessibleObjShape_Impl; +typedef ::std::pair < const SdrObject *, ::rtl::Reference < ::accessibility::AccessibleShape > > SwAccessibleObjShape_Impl; class SwAccessibleShapeMap_Impl: public _SwAccessibleShapeMap_Impl @@ -222,22 +219,20 @@ class SwAccessibleShapeMap_Impl: public _SwAccessibleShapeMap_Impl public: -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 sal_Bool mbLocked; #endif SwAccessibleShapeMap_Impl( SwAccessibleMap *pMap ) -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 : mbLocked( sal_False ) #endif { maInfo.SetSdrView( pMap->GetShell()->GetDrawView() ); maInfo.SetWindow( pMap->GetShell()->GetWin() ); maInfo.SetViewForwarder( pMap ); - // --> OD 2005-08-08 #i52858# - method name changed uno::Reference < document::XEventBroadcaster > xModelBroadcaster = new SwDrawModellListener_Impl( pMap->GetShell()->getIDocumentDrawModelAccess()->GetOrCreateDrawModel() ); - // <-- maInfo.SetControllerBroadcaster( xModelBroadcaster ); } @@ -302,7 +297,7 @@ SwAccessibleObjShape_Impl } ++aIter; } - ASSERT( pSelShape == pShape, "copying shapes went wrong!" ); + OSL_ENSURE( pSelShape == pShape, "copying shapes went wrong!" ); } if( pSelStart ) @@ -331,9 +326,7 @@ private: // the same as xAcc for any other // event type EventType meType; // The event type - // --> OD 2005-12-12 #i27301# - use new type definition for <mnStates> tAccessibleStates mnStates; // check states or update caret pos - // <-- SwAccessibleEvent_Impl& operator==( const SwAccessibleEvent_Impl& ); @@ -353,7 +346,7 @@ public: meType( eT ), mnStates( 0 ) { - ASSERT( SwAccessibleEvent_Impl::DISPOSE == meType, + OSL_ENSURE( SwAccessibleEvent_Impl::DISPOSE == meType, "wrong event constructor, DISPOSE only" ); } @@ -361,7 +354,7 @@ public: : meType( eT ), mnStates( 0 ) { - ASSERT( SwAccessibleEvent_Impl::SHAPE_SELECTION == meType, + OSL_ENSURE( SwAccessibleEvent_Impl::SHAPE_SELECTION == meType, "wrong event constructor, SHAPE_SELECTION only" ); } @@ -375,12 +368,11 @@ public: meType( eT ), mnStates( 0 ) { - ASSERT( SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType || + OSL_ENSURE( SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType || SwAccessibleEvent_Impl::POS_CHANGED == meType, "wrong event constructor, (CHILD_)POS_CHANGED only" ); } - // --> OD 2005-12-12 #i27301# - use new type definition for parameter <_nStates> SwAccessibleEvent_Impl( EventType eT, SwAccessibleContext *pA, const SwAccessibleChild& rFrmOrObj, @@ -390,7 +382,7 @@ public: meType( eT ), mnStates( _nStates ) { - ASSERT( SwAccessibleEvent_Impl::CARET_OR_STATES == meType, + OSL_ENSURE( SwAccessibleEvent_Impl::CARET_OR_STATES == meType, "wrong event constructor, CARET_OR_STATES only" ); } @@ -404,10 +396,10 @@ public: return meType; } - inline ::vos::ORef < SwAccessibleContext > GetContext() const + inline ::rtl::Reference < SwAccessibleContext > GetContext() const { uno::Reference < XAccessible > xTmp( mxAcc ); - ::vos::ORef < SwAccessibleContext > xAccImpl( + ::rtl::Reference < SwAccessibleContext > xAccImpl( static_cast<SwAccessibleContext*>( xTmp.get() ) ); return xAccImpl; @@ -429,12 +421,10 @@ public: } // <SetStates(..)> only used in method <SwAccessibleMap::AppendEvent(..)> - // --> OD 2005-12-12 #i27301# - use new type definition for parameter <_nStates> inline void SetStates( tAccessibleStates _nStates ) { mnStates |= _nStates; } - // <-- inline sal_Bool IsUpdateCursorPos() const { @@ -448,32 +438,26 @@ public: { return (mnStates & ACC_STATE_RELATION_MASK) != 0; } - // --> OD 2005-12-12 #i27301# - new event TEXT_SELECTION_CHANGED inline sal_Bool IsInvalidateTextSelection() const { return ( mnStates & ACC_STATE_TEXT_SELECTION_CHANGED ) != 0; } - // <-- - // --> OD 2009-01-07 #i88069# - new event TEXT_ATTRIBUTE_CHANGED + inline sal_Bool IsInvalidateTextAttrs() const { return ( mnStates & ACC_STATE_TEXT_ATTRIBUTE_CHANGED ) != 0; } - // <-- - // --> OD 2005-12-12 #i27301# - use new type definition <tAccessibleStates> - // for return value + inline tAccessibleStates GetStates() const { return mnStates & ACC_STATE_MASK; } - // <-- - // --> OD 2005-12-12 #i27301# - use new type definition <tAccessibleStates> - // for return value + inline tAccessibleStates GetAllStates() const { return mnStates; } - // <-- + }; //------------------------------------------------------------------------------ @@ -548,9 +532,7 @@ class SwAccessibleEventMap_Impl: public _SwAccessibleEventMap_Impl }; //------------------------------------------------------------------------------ -// --> OD 2005-12-13 #i27301# - map containing the accessible paragraph, which -// have a selection. Needed to keep this information to submit corresponding -// TEXT_SELECTION_CHANGED events. + struct SwAccessibleParaSelection { xub_StrLen nStartOfSelection; @@ -578,7 +560,6 @@ typedef ::std::map< uno::WeakReference < XAccessible >, class SwAccessibleSelectedParas_Impl: public _SwAccessibleSelectedParas_Impl {}; -// <-- // helper class that stores preview data class SwAccPreviewData @@ -594,10 +575,6 @@ class SwAccPreviewData /** adjust logic page retangle to its visible part - OD 17.01.2003 #103492# - - @author OD - @param _iorLogicPgSwRect input/output parameter - reference to the logic page rectangle, which has to be adjusted. @@ -618,16 +595,12 @@ public: SwAccPreviewData(); ~SwAccPreviewData(); - // OD 14.01.2003 #103492# - complete re-factoring of method due to new - // page/print preview functionality. void Update( const SwAccessibleMap& rAccMap, const std::vector<PrevwPage*>& _rPrevwPages, const Fraction& _rScale, const SwPageFrm* _pSelectedPageFrm, const Size& _rPrevwWinSize ); - // OD 14.01.2003 #103492# - complete re-factoring of method due to new - // page/print preview functionality. void InvalidateSelection( const SwPageFrm* _pSelectedPageFrm ); const SwRect& GetVisArea() const; @@ -638,7 +611,6 @@ public: * proper position. rPoint identifies the page for which the * MapMode should be adjusted. If bFromPreview is true, rPoint is * a preview coordinate; else it's a document coordinate. */ - // OD 17.01.2003 #103492# - delete unused 3rd parameter. void AdjustMapMode( MapMode& rMapMode, const Point& rPoint ) const; @@ -656,8 +628,6 @@ SwAccPreviewData::~SwAccPreviewData() { } -// OD 13.01.2003 #103492# - complete re-factoring of method due to new page/print -// preview functionality. void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap, const std::vector<PrevwPage*>& _rPrevwPages, const Fraction& _rScale, @@ -707,12 +677,10 @@ void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap, } } -// OD 16.01.2003 #103492# - complete re-factoring of method due to new page/print -// preview functionality. void SwAccPreviewData::InvalidateSelection( const SwPageFrm* _pSelectedPageFrm ) { mpSelPage = _pSelectedPageFrm; - ASSERT( mpSelPage, "selected page not found" ); + OSL_ENSURE( mpSelPage, "selected page not found" ); } struct ContainsPredicate @@ -759,12 +727,7 @@ void SwAccPreviewData::DisposePage(const SwPageFrm *pPageFrm ) mpSelPage = 0; } -/** adjust logic page retangle to its visible part - - OD 17.01.2003 #103492# - - @author OD -*/ +// adjust logic page retangle to its visible part void SwAccPreviewData::AdjustLogicPgRectToVisibleArea( SwRect& _iorLogicPgSwRect, const SwRect& _rPrevwPgSwRect, @@ -828,20 +791,18 @@ static sal_Bool AreInSameTable( const uno::Reference< XAccessible >& rAcc, void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent ) { - ::vos::ORef < SwAccessibleContext > xAccImpl( rEvent.GetContext() ); + ::rtl::Reference < SwAccessibleContext > xAccImpl( rEvent.GetContext() ); if( SwAccessibleEvent_Impl::SHAPE_SELECTION == rEvent.GetType() ) { DoInvalidateShapeSelection(); } - else if( xAccImpl.isValid() && xAccImpl->GetFrm() ) + else if( xAccImpl.is() && xAccImpl->GetFrm() ) { - // --> OD 2009-01-07 #i88069# if ( rEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE && rEvent.IsInvalidateTextAttrs() ) { xAccImpl->InvalidateAttr(); } - // <-- switch( rEvent.GetType() ) { case SwAccessibleEvent_Impl::INVALID_CONTENT: @@ -855,14 +816,12 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent ) rEvent.GetOldBox() ); break; case SwAccessibleEvent_Impl::DISPOSE: - ASSERT( xAccImpl.isValid(), + OSL_ENSURE( xAccImpl.is(), "dispose event has been stored" ); break; - // --> OD 2009-01-06 #i88069# case SwAccessibleEvent_Impl::INVALID_ATTR: // nothing to do here - handled above break; - // <-- default: break; } @@ -874,7 +833,6 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent ) xAccImpl->InvalidateStates( rEvent.GetStates() ); if( rEvent.IsInvalidateRelation() ) { - // --> OD 2005-12-01 #i27138# // both events CONTENT_FLOWS_FROM_RELATION_CHANGED and // CONTENT_FLOWS_TO_RELATION_CHANGED are possible if ( rEvent.GetAllStates() & ACC_STATE_RELATION_FROM ) @@ -887,21 +845,19 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent ) xAccImpl->InvalidateRelation( AccessibleEventId::CONTENT_FLOWS_TO_RELATION_CHANGED ); } - // <-- } - // --> OD 2005-12-12 #i27301# - submit event TEXT_SELECTION_CHANGED + if ( rEvent.IsInvalidateTextSelection() ) { xAccImpl->InvalidateTextSelection(); } - // <-- } } } void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent ) { - vos::OGuard aGuard( maEventMutex ); + osl::MutexGuard aGuard( maEventMutex ); if( !mpEvents ) mpEvents = new SwAccessibleEventList_Impl; @@ -912,7 +868,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent ) { // While events are fired new ones are generated. They have to be fired // now. This does not work for DISPOSE events! - ASSERT( rEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE, + OSL_ENSURE( rEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE, "dispose event while firing events" ); FireEvent( rEvent ); } @@ -924,7 +880,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent ) if( aIter != mpEventMap->end() ) { SwAccessibleEvent_Impl aEvent( *(*aIter).second ); - ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE, + OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE, "dispose events should not be stored" ); sal_Bool bAppendEvent = sal_True; switch( rEvent.GetType() ) @@ -933,7 +889,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent ) // A CARET_OR_STATES event is added to any other // event only. It is broadcasted after any other event, so the // event should be put to the back. - ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED, + OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED, "invalid event combination" ); aEvent.SetStates( rEvent.GetAllStates() ); break; @@ -943,7 +899,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent ) // POS_CHANGED event. // Therefor, the event's type has to be adapted and the event // has to be put at the end. - ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED, + OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED, "invalid event combination" ); if( aEvent.GetType() == SwAccessibleEvent_Impl::CARET_OR_STATES ) aEvent.SetType( SwAccessibleEvent_Impl::INVALID_CONTENT ); @@ -953,7 +909,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent ) // flags) as well as INVALID_CONTENT. The old box position // has to be stored however if the old event is not a // POS_CHANGED itself. - ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED, + OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED, "invalid event combination" ); if( aEvent.GetType() != SwAccessibleEvent_Impl::POS_CHANGED ) aEvent.SetOldBox( rEvent.GetOldBox() ); @@ -964,11 +920,11 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent ) // events. The only action that needs to be done again is // to put the old event to the back. The new one cannot be used, // because we are interested in the old frame bounds. - ASSERT( aEvent.GetType() == SwAccessibleEvent_Impl::CHILD_POS_CHANGED, + OSL_ENSURE( aEvent.GetType() == SwAccessibleEvent_Impl::CHILD_POS_CHANGED, "invalid event combination" ); break; case SwAccessibleEvent_Impl::SHAPE_SELECTION: - ASSERT( aEvent.GetType() == SwAccessibleEvent_Impl::SHAPE_SELECTION, + OSL_ENSURE( aEvent.GetType() == SwAccessibleEvent_Impl::SHAPE_SELECTION, "invalid event combination" ); break; case SwAccessibleEvent_Impl::DISPOSE: @@ -978,12 +934,10 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent ) // remove all events for the frame in question. bAppendEvent = sal_False; break; - // --> OD 2009-01-06 #i88069# case SwAccessibleEvent_Impl::INVALID_ATTR: - ASSERT( aEvent.GetType() == SwAccessibleEvent_Impl::INVALID_ATTR, + OSL_ENSURE( aEvent.GetType() == SwAccessibleEvent_Impl::INVALID_ATTR, "invalid event combination" ); break; - // <-- } if( bAppendEvent ) { @@ -1010,8 +964,8 @@ void SwAccessibleMap::InvalidateCursorPosition( { SwAccessibleContext *pAccImpl = static_cast< SwAccessibleContext *>( rAcc.get() ); - ASSERT( pAccImpl, "no caret context" ); - ASSERT( pAccImpl->GetFrm(), "caret context is disposed" ); + OSL_ENSURE( pAccImpl, "no caret context" ); + OSL_ENSURE( pAccImpl->GetFrm(), "caret context is disposed" ); if( GetShell()->ActionPend() ) { SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::CARET_OR_STATES, @@ -1059,7 +1013,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 ); } @@ -1072,7 +1026,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection() SwAccessibleObjShape_Impl *pShape = pShapes; while( nShapes ) { - if( pShape->second.isValid() ) + if( pShape->second.is() ) { sal_Bool bChanged; if( pShape >= pSelShape ) @@ -1108,9 +1062,9 @@ void SwAccessibleMap::DoInvalidateShapeSelection() ::std::list< const SwFrm * >::const_iterator aEndIter = aParents.end(); while( aIter != aEndIter ) { - ::vos::ORef< SwAccessibleContext > xParentAccImpl; + ::rtl::Reference< SwAccessibleContext > xParentAccImpl; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { SwAccessibleContextMap_Impl::const_iterator aMapIter = @@ -1123,7 +1077,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection() } } } - if( xParentAccImpl.isValid() ) + if( xParentAccImpl.is() ) { AccessibleEventObject aEvent; aEvent.EventId = AccessibleEventId::SELECTION_CHANGED; @@ -1154,7 +1108,7 @@ void SwAccessibleMap::DoInvalidateShapeFocus() { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpShapeMap ) pShapes = mpShapeMap->Copy( nShapes, pFESh, &pSelShape ); } @@ -1166,7 +1120,7 @@ void SwAccessibleMap::DoInvalidateShapeFocus() SwAccessibleObjShape_Impl *pShape = pShapes; while( nShapes ) { - if( pShape->second.isValid() ) + if( pShape->second.is() ) { if( bFocused && pShape >= pSelShape ) pShape->second->SetState( AccessibleStateType::FOCUSED ); @@ -1189,9 +1143,7 @@ SwAccessibleMap::SwAccessibleMap( ViewShell *pSh ) : mpShapes( 0 ), mpEvents( 0 ), mpEventMap( 0 ), - // --> OD 2005-12-13 #i27301# mpSelectedParas( 0 ), - // <-- mpVSh( pSh ), mpPreview( 0 ), mnPara( 1 ), @@ -1206,7 +1158,7 @@ SwAccessibleMap::~SwAccessibleMap() { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { const SwRootFrm *pRootFrm = GetShell()->GetLayout(); @@ -1223,9 +1175,9 @@ SwAccessibleMap::~SwAccessibleMap() pAcc->Dispose( sal_True ); { - vos::OGuard aGuard( maMutex ); -#ifdef DBG_UTIL - ASSERT( !mpFrmMap || mpFrmMap->empty(), + osl::MutexGuard aGuard( maMutex ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( !mpFrmMap || mpFrmMap->empty(), "Frame map should be empty after disposing the root frame" ); if( mpFrmMap ) { @@ -1242,7 +1194,7 @@ SwAccessibleMap::~SwAccessibleMap() ++aIter; } } - ASSERT( !mpShapeMap || mpShapeMap->empty(), + OSL_ENSURE( !mpShapeMap || mpShapeMap->empty(), "Object map should be empty after disposing the root frame" ); if( mpShapeMap ) { @@ -1266,19 +1218,17 @@ SwAccessibleMap::~SwAccessibleMap() mpShapeMap = 0; delete mpShapes; mpShapes = 0; - // --> OD 2005-12-13 #i27301# delete mpSelectedParas; mpSelectedParas = 0; - // <-- } delete mpPreview; mpPreview = NULL; { - vos::OGuard aGuard( maEventMutex ); -#ifdef DBG_UTIL - ASSERT( !(mpEvents || mpEventMap), "pending events" ); + osl::MutexGuard aGuard( maEventMutex ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( !(mpEvents || mpEventMap), "pending events" ); if( mpEvents ) { SwAccessibleEventList_Impl::iterator aIter = mpEvents->begin(); @@ -1311,18 +1261,18 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView( sal_Bool bSetVisArea = sal_False; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( !mpFrmMap ) { mpFrmMap = new SwAccessibleContextMap_Impl; -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 mpFrmMap->mbLocked = sal_False; #endif } -#ifdef DBG_UTIL - ASSERT( !mpFrmMap->mbLocked, "Map is locked" ); +#if OSL_DEBUG_LEVEL > 1 + OSL_ENSURE( !mpFrmMap->mbLocked, "Map is locked" ); mpFrmMap->mbLocked = sal_True; #endif @@ -1353,7 +1303,7 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView( } } -#ifdef DBG_UTIL +#if OSL_DEBUG_LEVEL > 1 mpFrmMap->mbLocked = sal_False; #endif } @@ -1373,8 +1323,6 @@ uno::Reference< XAccessible > SwAccessibleMap::GetDocumentView( ) return _GetDocumentView( sal_False ); } -// OD 14.01.2003 #103492# - complete re-factoring of method due to new page/print -// preview functionality. uno::Reference<XAccessible> SwAccessibleMap::GetDocumentPreview( const std::vector<PrevwPage*>& _rPrevwPages, const Fraction& _rScale, @@ -1398,7 +1346,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; @@ -1471,7 +1419,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm, } xAcc = pAcc; - ASSERT( xAcc.is(), "unknown frame type" ); + OSL_ENSURE( xAcc.is(), "unknown frame type" ); if( xAcc.is() ) { if( aIter != mpFrmMap->end() ) @@ -1521,13 +1469,13 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm, return xAcc; } -::vos::ORef < SwAccessibleContext > SwAccessibleMap::GetContextImpl( +::rtl::Reference < SwAccessibleContext > SwAccessibleMap::GetContextImpl( const SwFrm *pFrm, sal_Bool bCreate ) { uno::Reference < XAccessible > xAcc( GetContext( pFrm, bCreate ) ); - ::vos::ORef < SwAccessibleContext > xAccImpl( + ::rtl::Reference < SwAccessibleContext > xAccImpl( static_cast< SwAccessibleContext * >( xAcc.get() ) ); return xAccImpl; @@ -1542,7 +1490,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 ); @@ -1572,7 +1520,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( } xAcc = pAcc; - ASSERT( xAcc.is(), "unknown shape type" ); + OSL_ENSURE( xAcc.is(), "unknown shape type" ); if( xAcc.is() ) { pAcc->Init(); @@ -1599,14 +1547,14 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( return xAcc; } -::vos::ORef < ::accessibility::AccessibleShape > SwAccessibleMap::GetContextImpl( +::rtl::Reference < ::accessibility::AccessibleShape > SwAccessibleMap::GetContextImpl( const SdrObject *pObj, SwAccessibleContext *pParentImpl, sal_Bool bCreate ) { uno::Reference < XAccessible > xAcc( GetContext( pObj, pParentImpl, bCreate ) ); - ::vos::ORef < ::accessibility::AccessibleShape > xAccImpl( + ::rtl::Reference < ::accessibility::AccessibleShape > xAccImpl( static_cast< ::accessibility::AccessibleShape* >( xAcc.get() ) ); return xAccImpl; @@ -1615,7 +1563,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( void SwAccessibleMap::RemoveContext( const SwFrm *pFrm ) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -1633,7 +1581,7 @@ void SwAccessibleMap::RemoveContext( const SwFrm *pFrm ) { SwAccessibleContext *pOldAccImpl = static_cast< SwAccessibleContext *>( xOldAcc.get() ); - ASSERT( pOldAccImpl->GetFrm(), "old caret context is disposed" ); + OSL_ENSURE( pOldAccImpl->GetFrm(), "old caret context is disposed" ); if( pOldAccImpl->GetFrm() == pFrm ) { xOldAcc.clear(); // get an empty ref @@ -1652,7 +1600,7 @@ void SwAccessibleMap::RemoveContext( const SwFrm *pFrm ) void SwAccessibleMap::RemoveContext( const SdrObject *pObj ) { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpShapeMap ) { @@ -1687,17 +1635,17 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, // because that's the one that is evaluated in the layout. The frame // might not be accessible anyway. That's the case for cell frames that // contain further cells. - ASSERT( !aFrmOrObj.GetSwFrm() || aFrmOrObj.GetSwFrm()->IsAccessibleFrm(), + OSL_ENSURE( !aFrmOrObj.GetSwFrm() || aFrmOrObj.GetSwFrm()->IsAccessibleFrm(), "non accessible frame should be disposed" ); if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) ) { - ::vos::ORef< SwAccessibleContext > xAccImpl; - ::vos::ORef< SwAccessibleContext > xParentAccImpl; - ::vos::ORef< ::accessibility::AccessibleShape > xShapeAccImpl; + ::rtl::Reference< SwAccessibleContext > xAccImpl; + ::rtl::Reference< SwAccessibleContext > xParentAccImpl; + ::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 ) @@ -1711,7 +1659,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, static_cast< SwAccessibleContext *>( xAcc.get() ); } } - if( !xAccImpl.isValid() && mpFrmMap ) + if( !xAccImpl.is() && mpFrmMap ) { // If there is none, look if the parent is accessible. const SwFrm *pParent = @@ -1730,7 +1678,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, } } } - if( !xParentAccImpl.isValid() && !aFrmOrObj.GetSwFrm() && + if( !xParentAccImpl.is() && !aFrmOrObj.GetSwFrm() && mpShapeMap ) { SwAccessibleShapeMap_Impl::iterator aIter = @@ -1743,7 +1691,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, } } if( pObj && GetShell()->ActionPend() && - (xParentAccImpl.isValid() || xShapeAccImpl.isValid()) ) + (xParentAccImpl.is() || xShapeAccImpl.is()) ) { // Keep a reference to the XShape to avoid that it // is deleted with a SwFrmFmt::Modify. @@ -1761,7 +1709,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 = @@ -1779,11 +1727,11 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, // the frame. If the frame is no context for it but disposing should // take place recursive, the frame's children have to be disposed // anyway, so we have to create the context then. - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) { xAccImpl->Dispose( bRecursive ); } - else if( xParentAccImpl.isValid() ) + else if( xParentAccImpl.is() ) { // If the frame is a cell frame, the table must be notified. // If we are in an action, a table model change event will @@ -1792,7 +1740,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm, xParentAccImpl->DisposeChild( aFrmOrObj, bRecursive ); } - else if( xShapeAccImpl.isValid() ) + else if( xShapeAccImpl.is() ) { RemoveContext( aFrmOrObj.GetDrawObject() ); xShapeAccImpl->dispose(); @@ -1811,10 +1759,10 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm, SwAccessibleChild aFrmOrObj( pFrm, pObj, pWindow ); if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) ) { - ::vos::ORef< SwAccessibleContext > xAccImpl; - ::vos::ORef< SwAccessibleContext > xParentAccImpl; + ::rtl::Reference< SwAccessibleContext > xAccImpl; + ::rtl::Reference< SwAccessibleContext > xParentAccImpl; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -1831,7 +1779,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm, static_cast< SwAccessibleContext *>( xAcc.get() ); } } - if( !xAccImpl.isValid() ) + if( !xAccImpl.is() ) { // Otherwise we look if the parent is accessible. // If not, there is nothing to do. @@ -1854,12 +1802,12 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm, } } - if( xAccImpl.isValid() ) + if( xAccImpl.is() ) { if( GetShell()->ActionPend() ) { SwAccessibleEvent_Impl aEvent( - SwAccessibleEvent_Impl::POS_CHANGED, xAccImpl.getBodyPtr(), + SwAccessibleEvent_Impl::POS_CHANGED, xAccImpl.get(), aFrmOrObj, rOldBox ); AppendEvent( aEvent ); } @@ -1869,13 +1817,13 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm, xAccImpl->InvalidatePosOrSize( rOldBox ); } } - else if( xParentAccImpl.isValid() ) + else if( xParentAccImpl.is() ) { if( GetShell()->ActionPend() ) { SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::CHILD_POS_CHANGED, - xParentAccImpl.getBodyPtr(), aFrmOrObj, rOldBox ); + xParentAccImpl.get(), aFrmOrObj, rOldBox ); AppendEvent( aEvent ); } else @@ -1895,7 +1843,7 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm ) { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -1926,7 +1874,6 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm ) } } -// --> OD 2009-01-06 #i88069# void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm ) { SwAccessibleChild aFrmOrObj( &rTxtFrm ); @@ -1934,7 +1881,7 @@ void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm ) { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -1964,7 +1911,6 @@ void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm ) } } } -// <-- void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm ) { @@ -1981,16 +1927,15 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm ) } else if( pVSh->ISA( SwFEShell ) ) { - sal_uInt16 nObjCount; const SwFEShell *pFESh = static_cast< const SwFEShell * >( pVSh ); const SwFrm *pFlyFrm = pFESh->GetCurrFlyFrm(); if( pFlyFrm ) { - ASSERT( !pFrm || pFrm->FindFlyFrm() == pFlyFrm, + OSL_ENSURE( !pFrm || pFrm->FindFlyFrm() == pFlyFrm, "cursor is not contained in fly frame" ); aFrmOrObj = pFlyFrm; } - else if( (nObjCount = pFESh->IsObjSelected()) > 0 ) + else if( pFESh->IsObjSelected() > 0 ) { bShapeSelected = sal_True; aFrmOrObj = static_cast<const SwFrm *>( 0 ); @@ -1998,7 +1943,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm ) } } - ASSERT( bShapeSelected || aFrmOrObj.IsAccessible(GetShell()->IsPreView()), + OSL_ENSURE( bShapeSelected || aFrmOrObj.IsAccessible(GetShell()->IsPreView()), "frame is not accessible" ); uno::Reference < XAccessible > xOldAcc; @@ -2006,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 @@ -2063,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; @@ -2082,14 +2027,13 @@ void SwAccessibleMap::InvalidateFocus() } void SwAccessibleMap::SetCursorContext( - const ::vos::ORef < SwAccessibleContext >& rCursorContext ) + const ::rtl::Reference < SwAccessibleContext >& rCursorContext ) { - vos::OGuard aGuard( maMutex ); - uno::Reference < XAccessible > xAcc( rCursorContext.getBodyPtr() ); + osl::MutexGuard aGuard( maMutex ); + uno::Reference < XAccessible > xAcc( rCursorContext.get() ); mxCursorContext = xAcc; } -// --> OD 2005-12-12 #i27301# - use new type definition for <_nStates> void SwAccessibleMap::InvalidateStates( tAccessibleStates _nStates, const SwFrm* _pFrm ) { @@ -2118,7 +2062,6 @@ void SwAccessibleMap::InvalidateStates( tAccessibleStates _nStates, pAccImpl->InvalidateStates( _nStates ); } } -// <-- void SwAccessibleMap::_InvalidateRelationSet( const SwFrm* pFrm, sal_Bool bFrom ) @@ -2129,7 +2072,7 @@ void SwAccessibleMap::_InvalidateRelationSet( const SwFrm* pFrm, { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -2174,24 +2117,14 @@ void SwAccessibleMap::InvalidateRelationSet( const SwFrm* pMaster, _InvalidateRelationSet( pFollow, sal_True ); } -/** invalidation CONTENT_FLOW_FROM/_TO relation of a paragraph - - OD 2005-12-01 #i27138# - - @author OD -*/ +// invalidation of CONTENT_FLOW_FROM/_TO relation of a paragraph void SwAccessibleMap::InvalidateParaFlowRelation( const SwTxtFrm& _rTxtFrm, const bool _bFrom ) { _InvalidateRelationSet( &_rTxtFrm, _bFrom ); } -/** invalidation of text selection of a paragraph - - OD 2005-12-12 #i27301# - - @author OD -*/ +// invalidation of text selection of a paragraph void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm ) { // first, see if this frame is accessible, and if so, get the respective @@ -2200,7 +2133,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm ) { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -2246,7 +2179,7 @@ sal_Int32 SwAccessibleMap::GetChildIndex( const SwFrm& rParentFrm, { uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpFrmMap ) { @@ -2272,9 +2205,6 @@ sal_Int32 SwAccessibleMap::GetChildIndex( const SwFrm& rParentFrm, return nIndex; } - -// OD 15.01.2003 #103492# - complete re-factoring of method due to new page/print -// preview functionality. void SwAccessibleMap::UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages, const Fraction& _rScale, const SwPageFrm* _pSelectedPageFrm, @@ -2283,20 +2213,19 @@ void SwAccessibleMap::UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages DBG_ASSERT( GetShell()->IsPreView(), "no preview?" ); DBG_ASSERT( mpPreview != NULL, "no preview data?" ); - // OD 15.01.2003 #103492# - adjustments for changed method signature mpPreview->Update( *this, _rPrevwPages, _rScale, _pSelectedPageFrm, _rPrevwWinSize ); // propagate change of VisArea through the document's // accessibility tree; this will also send appropriate scroll // events SwAccessibleContext* pDoc = - GetContextImpl( GetShell()->GetLayout() ).getBodyPtr(); + GetContextImpl( GetShell()->GetLayout() ).get(); static_cast<SwAccessibleDocumentBase*>( pDoc )->SetVisArea(); uno::Reference < XAccessible > xOldAcc; uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); xOldAcc = mxCursorContext; @@ -2321,13 +2250,12 @@ void SwAccessibleMap::InvalidatePreViewSelection( sal_uInt16 nSelPage ) DBG_ASSERT( GetShell()->IsPreView(), "no preview?" ); DBG_ASSERT( mpPreview != NULL, "no preview data?" ); - // OD 16.01.2003 #103492# - changed metthod call due to method signature change. mpPreview->InvalidateSelection( GetShell()->GetLayout()->GetPageByPageNum( nSelPage ) ); uno::Reference < XAccessible > xOldAcc; uno::Reference < XAccessible > xAcc; { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); xOldAcc = mxCursorContext; @@ -2357,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(); @@ -2376,7 +2304,7 @@ void SwAccessibleMap::FireEvents() } } { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); if( mpShapes ) { delete mpShapes; @@ -2411,7 +2339,6 @@ Point SwAccessibleMap::LogicToPixel( const Point& rPoint ) const Window *pWin = GetShell()->GetWin(); if( pWin ) { - // OD 16.01.2003 #103492# - get mapping mode for LogicToPixel conversion MapMode aMapMode; GetMapMode( aPoint, aMapMode ); aPoint = pWin->LogicToPixel( aPoint, aMapMode ); @@ -2428,7 +2355,6 @@ Size SwAccessibleMap::LogicToPixel( const Size& rSize ) const Size aSize( OutputDevice::LogicToLogic( rSize, aSrc, aDest ) ); if( GetShell()->GetWin() ) { - // OD 16.01.2003 #103492# - get mapping mode for LogicToPixel conversion MapMode aMapMode; GetMapMode( Point(0,0), aMapMode ); aSize = GetShell()->GetWin()->LogicToPixel( aSize, aMapMode ); @@ -2444,7 +2370,6 @@ Point SwAccessibleMap::PixelToLogic( const Point& rPoint ) const if( pWin ) { aPoint = pWin->ScreenToOutputPixel( rPoint ); - // OD 16.01.2003 #103492# - get mapping mode for PixelToLogic conversion MapMode aMapMode; GetMapMode( aPoint, aMapMode ); aPoint = pWin->PixelToLogic( aPoint, aMapMode ); @@ -2461,7 +2386,6 @@ Size SwAccessibleMap::PixelToLogic( const Size& rSize ) const Size aSize; if( GetShell()->GetWin() ) { - // OD 16.01.2003 #103492# - get mapping mode for PixelToLogic conversion MapMode aMapMode; GetMapMode( Point(0,0), aMapMode ); aSize = GetShell()->GetWin()->PixelToLogic( rSize, aMapMode ); @@ -2482,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(); @@ -2512,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 ); @@ -2556,7 +2480,6 @@ Point SwAccessibleMap::PixelToCore( const Point& rPoint ) const Point aPoint; if( GetShell()->GetWin() ) { - // OD 15.01.2003 #103492# - replace <PreviewAdjust(..)> by <GetMapMode(..)> MapMode aMapMode; GetMapMode( rPoint, aMapMode ); aPoint = GetShell()->GetWin()->PixelToLogic( rPoint, aMapMode ); @@ -2602,7 +2525,6 @@ Rectangle SwAccessibleMap::CoreToPixel( const Rectangle& rRect ) const Rectangle aRect; if( GetShell()->GetWin() ) { - // OD 15.01.2003 #103492# - replace <PreviewAdjust(..)> by <GetMapMode(..)> MapMode aMapMode; GetMapMode( rRect.TopLeft(), aMapMode ); aRect = GetShell()->GetWin()->LogicToPixel( rRect, aMapMode ); @@ -2616,15 +2538,11 @@ Rectangle SwAccessibleMap::CoreToPixel( const Rectangle& rRect ) const /** get mapping mode for LogicToPixel and PixelToLogic conversions - OD 15.01.2003 #103492# - Replacement method <PreviewAdjust(..)> by new method <GetMapMode>. Method returns mapping mode of current output device and adjusts it, if the shell is in page/print preview. Necessary, because <PreviewAdjust(..)> changes mapping mode at current output device for mapping logic document positions to page preview window positions and vice versa and doesn't take care to recover its changes. - - @author OD */ void SwAccessibleMap::GetMapMode( const Point& _rPoint, MapMode& _orMapMode ) const @@ -2639,12 +2557,6 @@ void SwAccessibleMap::GetMapMode( const Point& _rPoint, _orMapMode = aMapMode; } -/** get size of a dedicated preview page - - OD 15.01.2003 #103492# - - @author OD -*/ Size SwAccessibleMap::GetPreViewPageSize( sal_uInt16 _nPrevwPageNum ) const { DBG_ASSERT( mpVSh->IsPreView(), "no page preview accessible." ); @@ -2662,11 +2574,7 @@ Size SwAccessibleMap::GetPreViewPageSize( sal_uInt16 _nPrevwPageNum ) const /** method to build up a new data structure of the accessible pararaphs, which have a selection - - OD 2005-12-13 #i27301# Important note: method has to used inside a mutual exclusive section - - @author OD */ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas() { @@ -2757,15 +2665,9 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas() return pRetSelectedParas; } -/** invalidation of text selection of all paragraphs - - OD 2005-12-13 #i27301# - - @author OD -*/ void SwAccessibleMap::InvalidateTextSelectionOfAllParas() { - vos::OGuard aGuard( maMutex ); + osl::MutexGuard aGuard( maMutex ); // keep previously known selected paragraphs SwAccessibleSelectedParas_Impl* pPrevSelectedParas( mpSelectedParas ); @@ -2818,13 +2720,13 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas() uno::Reference < XAccessible > xAcc( (*aIter).first ); if ( xAcc.is() ) { - ::vos::ORef < SwAccessibleContext > xAccImpl( + ::rtl::Reference < SwAccessibleContext > xAccImpl( static_cast<SwAccessibleContext*>( xAcc.get() ) ); - if ( xAccImpl.isValid() && xAccImpl->GetFrm() ) + if ( xAccImpl.is() && xAccImpl->GetFrm() ) { const SwTxtFrm* pTxtFrm( dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) ); - ASSERT( pTxtFrm, + OSL_ENSURE( pTxtFrm, "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexcepted type of frame" ); if ( pTxtFrm ) { @@ -2846,13 +2748,13 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas() uno::Reference < XAccessible > xAcc( (*aIter).first ); if ( xAcc.is() ) { - ::vos::ORef < SwAccessibleContext > xAccImpl( + ::rtl::Reference < SwAccessibleContext > xAccImpl( static_cast<SwAccessibleContext*>( xAcc.get() ) ); - if ( xAccImpl.isValid() && xAccImpl->GetFrm() ) + if ( xAccImpl.is() && xAccImpl->GetFrm() ) { const SwTxtFrm* pTxtFrm( dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) ); - ASSERT( pTxtFrm, + OSL_ENSURE( pTxtFrm, "<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexcepted type of frame" ); if ( pTxtFrm ) { @@ -2876,3 +2778,4 @@ const SwRect& SwAccessibleMap::GetVisArea() const : GetShell()->VisArea(); } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index 8764feff8d74..6777b63f23a5 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -29,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> @@ -39,9 +40,7 @@ #include <ndnotxt.hxx> #include <flyfrm.hxx> #include <cntfrm.hxx> -// --> OD 2009-07-14 #i73249# -#include <hints.hxx> -// <-- +#include <hints.hxx> //#i73249# #include "accnotextframe.hxx" using namespace ::com::sun::star; @@ -72,7 +71,7 @@ SwAccessibleNoTextFrame::SwAccessibleNoTextFrame( msDesc() { const SwNoTxtNode* pNd = GetNoTxtNode(); - // --> OD 2009-07-14 #i73249# + // #i73249# // consider new attributes Title and Description if( pNd ) { @@ -95,7 +94,7 @@ SwAccessibleNoTextFrame::~SwAccessibleNoTextFrame() void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) { const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ; - // --> OD 2009-07-14 #i73249# + // #i73249# // suppress handling of RES_NAME_CHANGED in case that attribute Title is // used as the accessible name. if ( nWhich != RES_NAME_CHANGED || @@ -105,10 +104,10 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem } const SwNoTxtNode *pNd = GetNoTxtNode(); - ASSERT( pNd == aDepend.GetRegisteredIn(), "invalid frame" ); + OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), "invalid frame" ); switch( nWhich ) { - // --> OD 2009-07-14 #i73249# + // #i73249# case RES_TITLE_CHANGED: { const String& sOldTitle( @@ -157,26 +156,12 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem } } break; - // <-- - /* - case RES_OBJECTDYING: - if( aDepend.GetRegisteredIn() == - static_cast< SwModify *>( static_cast< SwPtrMsgPoolItem * >( pOld )->pObject ) ) - const_cast < SwModify *>( aDepend.GetRegisteredIn()->Remove( aDepend ); - break; - - case RES_FMT_CHG: - if( static_cast< SwFmtChg * >(pNew)->pChangedFmt == GetRegisteredIn() && - static_cast< SwFmtChg * >(pOld)->pChangedFmt->IsFmtInDTOR() ) - GetRegisteredIn()->Remove( this ); - break; - */ } } void SwAccessibleNoTextFrame::Dispose( sal_Bool bRecursive ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( aDepend.GetRegisteredIn() ) const_cast < SwModify *>( aDepend.GetRegisteredIn() )->Remove( &aDepend ); @@ -184,11 +169,11 @@ void SwAccessibleNoTextFrame::Dispose( sal_Bool bRecursive ) SwAccessibleFrameBase::Dispose( bRecursive ); } -// --> OD 2009-07-14 #i73249# +// #i73249# OUString SAL_CALL SwAccessibleNoTextFrame::getAccessibleName (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -204,7 +189,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 ) @@ -273,3 +258,5 @@ sal_Int32 SAL_CALL SwAccessibleNoTextFrame::getAccessibleImageWidth( ) { return getSize().Width; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx index e07d9ff0ffc0..ce4ef672c110 100644 --- a/sw/source/core/access/accnotextframe.hxx +++ b/sw/source/core/access/accnotextframe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -36,9 +37,7 @@ class SwAccessibleNoTextFrame : public SwAccessibleFrameBase, public ::com::sun::star::accessibility::XAccessibleImage { SwDepend aDepend; - // --> OD 2009-07-14 #i73249# - ::rtl::OUString msTitle; - // <-- + ::rtl::OUString msTitle; // #i73249# ::rtl::OUString msDesc; protected: @@ -57,8 +56,7 @@ public: //===== XAccessibleContext ============================================== - // --> OD 2009-07-14 #i73249# - /// Return the object's current name. + // #i73249# - Return the object's current name. virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); @@ -108,3 +106,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx index d5feca2e0ba9..2b5886e026d2 100644 --- a/sw/source/core/access/accpage.cxx +++ b/sw/source/core/access/accpage.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,9 +38,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include "accpage.hxx" -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <pagefrm.hxx> using namespace ::com::sun::star; @@ -70,8 +69,8 @@ void SwAccessiblePage::GetStates( // FOCUSED if( IsSelected() ) { - ASSERT( bIsSelected, "bSelected out of sync" ); - ::vos::ORef < SwAccessibleContext > xThis( this ); + OSL_ENSURE( bIsSelected, "bSelected out of sync" ); + ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); Window *pWin = GetWindow(); @@ -86,7 +85,7 @@ void SwAccessiblePage::_InvalidateCursorPos() sal_Bool bOldSelected; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bOldSelected = bIsSelected; bIsSelected = bNewSelected; } @@ -95,7 +94,7 @@ void SwAccessiblePage::_InvalidateCursorPos() { // remember that object as the one that has the caret. This is // neccessary to notify that object if the cursor leaves it. - ::vos::ORef < SwAccessibleContext > xThis( this ); + ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } @@ -115,10 +114,10 @@ void SwAccessiblePage::_InvalidateFocus() sal_Bool bSelected; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); bSelected = bIsSelected; } - ASSERT( bSelected, "focus object should be selected" ); + OSL_ENSURE( bSelected, "focus object should be selected" ); FireStateChangedEvent( AccessibleStateType::FOCUSED, pWin->HasFocus() && bSelected ); @@ -134,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>( @@ -148,7 +147,7 @@ SwAccessiblePage::~SwAccessiblePage() sal_Bool SwAccessiblePage::HasCursor() { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); return bIsSelected; } @@ -179,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) @@ -198,3 +197,5 @@ OUString SwAccessiblePage::getAccessibleDescription( ) OUString sArg( GetFormattedPageNumber() ); return GetResource( STR_ACCESS_PAGE_DESC, &sArg ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accpage.hxx b/sw/source/core/access/accpage.hxx index f8972060ecb3..ebb96cf8948f 100644 --- a/sw/source/core/access/accpage.hxx +++ b/sw/source/core/access/accpage.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,9 +28,7 @@ #ifndef _ACCPAGE_HXX #define _ACCPAGE_HXX -#ifndef _ACCCONTEXT_HXX #include "acccontext.hxx" -#endif /** @@ -97,3 +96,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index ec8ab7a7c703..f515494d234d 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,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> @@ -61,7 +62,6 @@ #include <unotools/charclass.hxx> // for GetWordBoundary // for get/setCharacterAttribute(...) #include <unocrsr.hxx> -//#include <unoobj.hxx> #include <unoport.hxx> #include <doc.hxx> #include <crsskip.hxx> @@ -78,13 +78,11 @@ #include <viewimp.hxx> #include <boost/scoped_ptr.hpp> #include <textmarkuphelper.hxx> -// --> OD 2010-02-22 #i10825# +// #i10825# #include <parachangetrackinginfo.hxx> #include <com/sun/star/text/TextMarkupType.hpp> // <-- -// --> OD 2010-03-08 #i92233# -#include <comphelper/stlunosequence.hxx> -// <-- +#include <comphelper/stlunosequence.hxx> // #i92233# #include <algorithm> @@ -128,9 +126,7 @@ const SwTxtNode* SwAccessibleParagraph::GetTxtNode() const ::rtl::OUString SwAccessibleParagraph::GetDescription() { - // --> OD 2004-09-29 #117933# - provide empty description for paragraphs - return ::rtl::OUString(); - // <-- + return ::rtl::OUString(); // provide empty description for paragraphs } sal_Int32 SwAccessibleParagraph::GetCaretPos() @@ -138,9 +134,9 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos() sal_Int32 nRet = -1; // get the selection's point, and test whether it's in our node - // --> OD 2005-12-20 #i27301# - consider adjusted method signature + // #i27301# - consider adjusted method signature SwPaM* pCaret = GetCursor( false ); // caret is first PaM in PaM-ring - // <-- + if( pCaret != NULL ) { const SwTxtNode* pNode = GetTxtNode(); @@ -155,7 +151,6 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos() if( GetPortionData().IsValidCorePosition( nIndex ) ) { // Yes, it's us! - // --> OD 2006-10-19 #70538# // consider that cursor/caret is in front of the list label if ( pCaret->IsInFrontOfLabel() ) { @@ -165,7 +160,6 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos() { nRet = GetPortionData().GetAccessiblePosition( nIndex ); } - // <-- DBG_ASSERT( nRet >= 0, "invalid cursor?" ); DBG_ASSERT( nRet <= GetPortionData().GetAccessibleString(). @@ -188,9 +182,7 @@ sal_Bool SwAccessibleParagraph::GetSelection( nEnd = -1; // get the selection, and test whether it affects our text node - // --> OD 2005-12-20 #i27301# - consider adjusted method signature - SwPaM* pCrsr = GetCursor( true ); - // <-- + SwPaM* pCrsr = GetCursor( true ); // #i27301# - consider adjusted method signature if( pCrsr != NULL ) { // get SwPosition for my node @@ -309,16 +301,15 @@ sal_Bool SwAccessibleParagraph::GetSelection( return bRet; } -// --> OD 2005-12-20 #i27301# - new parameter <_bForSelection> +// #i27301# - new parameter <_bForSelection> SwPaM* SwAccessibleParagraph::GetCursor( const bool _bForSelection ) { // get the cursor shell; if we don't have any, we don't have a // cursor/selection either SwPaM* pCrsr = NULL; SwCrsrShell* pCrsrShell = SwAccessibleParagraph::GetCrsrShell(); - // --> OD 2005-12-20 #i27301# - // - if cursor is retrieved for selection, the cursors for a table selection - // has to be returned. + // #i27301# - if cursor is retrieved for selection, the cursors for + // a table selection has to be returned. if ( pCrsrShell != NULL && ( _bForSelection || !pCrsrShell->IsTableMode() ) ) // <-- @@ -360,9 +351,7 @@ void SwAccessibleParagraph::GetStates( rStateSet.AddState( AccessibleStateType::FOCUSABLE ); // FOCUSED (simulates node index of cursor) - // --> OD 2005-12-20 #i27301# - consider adjusted method signature - SwPaM* pCaret = GetCursor( false ); - // <-- + SwPaM* pCaret = GetCursor( false ); // #i27301# - consider adjusted method signature const SwTxtNode* pTxtNd = GetTxtNode(); if( pCaret != 0 && pTxtNd != 0 && pTxtNd->GetIndex() == pCaret->GetPoint()->nNode.GetIndex() && @@ -371,7 +360,7 @@ void SwAccessibleParagraph::GetStates( Window *pWin = GetWindow(); if( pWin && pWin->HasFocus() ) rStateSet.AddState( AccessibleStateType::FOCUSED ); - ::vos::ORef < SwAccessibleContext > xThis( this ); + ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } } @@ -405,7 +394,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 +406,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 +431,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos() sal_Int32 nNew = GetCaretPos(); sal_Int32 nOld; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); nOld = nOldCaretPos; nOldCaretPos = nNew; } @@ -450,7 +439,7 @@ void SwAccessibleParagraph::_InvalidateCursorPos() { // remember that object as the one that has the caret. This is // neccessary to notify that object if the cursor leaves it. - ::vos::ORef < SwAccessibleContext > xThis( this ); + ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } @@ -481,10 +470,10 @@ void SwAccessibleParagraph::_InvalidateFocus() { sal_Int32 nPos; { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); nPos = nOldCaretPos; } - ASSERT( nPos != -1, "focus object should be selected" ); + OSL_ENSURE( nPos != -1, "focus object should be selected" ); FireStateChangedEvent( AccessibleStateType::FOCUSED, pWin->HasFocus() && nPos != -1 ); @@ -494,9 +483,7 @@ void SwAccessibleParagraph::_InvalidateFocus() SwAccessibleParagraph::SwAccessibleParagraph( SwAccessibleMap& rInitMap, const SwTxtFrm& rTxtFrm ) - // --> OD 2010-02-24 #i108125# - : SwClient( const_cast<SwTxtNode*>(rTxtFrm.GetTxtNode()) ) - // <-- + : SwClient( const_cast<SwTxtNode*>(rTxtFrm.GetTxtNode()) ) // #i108125# , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTxtFrm ) , sDesc() , pPortionData( NULL ) @@ -504,16 +491,12 @@ SwAccessibleParagraph::SwAccessibleParagraph( , nOldCaretPos( -1 ) , bIsHeading( sal_False ) , aSelectionHelper( *this ) - // --> OD 2010-02-19 #i108125# - , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTxtFrm ) ) - // <-- + , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTxtFrm ) ) // #i108125# { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; bIsHeading = IsHeading(); - // --> OD 2004-09-27 #117970# - set an empty accessibility name for paragraphs - SetName( ::rtl::OUString() ); - // <-- + SetName( ::rtl::OUString() ); // set an empty accessibility name for paragraphs // If this object has the focus, then it is remembered by the map itself. nOldCaretPos = GetCaretPos(); @@ -521,18 +504,16 @@ SwAccessibleParagraph::SwAccessibleParagraph( SwAccessibleParagraph::~SwAccessibleParagraph() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; delete pPortionData; delete pHyperTextData; - // --> OD 2010-02-22 #i108125# - delete mpParaChangeTrackInfo; - // <-- + delete mpParaChangeTrackInfo; // #i108125# } sal_Bool SwAccessibleParagraph::HasCursor() { - vos::OGuard aGuard( aMutex ); + osl::MutexGuard aGuard( aMutex ); return nOldCaretPos != -1; } @@ -834,11 +815,11 @@ 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 ); - vos::OGuard aGuard2( aMutex ); + osl::MutexGuard aGuard2( aMutex ); if( !sDesc.getLength() ) sDesc = GetDescription(); @@ -848,7 +829,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 ) @@ -862,22 +843,17 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale (void) return aLoc; } -/** paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO - - OD 2005-12-02 #i27138# - - @author OD -*/ +/** #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO */ 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(); const SwTxtFrm* pTxtFrm = dynamic_cast<const SwTxtFrm*>(GetFrm()); - ASSERT( pTxtFrm, + OSL_ENSURE( pTxtFrm, "<SwAccessibleParagraph::getAccessibleRelationSet()> - missing text frame"); if ( pTxtFrm ) { @@ -908,15 +884,13 @@ 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 ); // get cursor shell SwCrsrShell *pCrsrSh = GetCrsrShell(); - // --> OD 2005-12-20 #i27301# - consider new method signature - SwPaM *pCrsr = GetCursor( false ); - // <-- + SwPaM *pCrsr = GetCursor( false ); // #i27301# - consider new method signature const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() ); const SwTxtNode* pTxtNd = pTxtFrm->GetTxtNode(); @@ -945,7 +919,7 @@ void SAL_CALL SwAccessibleParagraph::grabFocus() /* <-#i13955# */ } -// --> OD 2007-01-17 #i71385# +// #i71385# bool lcl_GetBackgroundColor( Color & rColor, const SwFrm* pFrm, SwCrsrShell* pCrsrSh ) @@ -1064,7 +1038,7 @@ uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType ) uno::Reference<XAccessibleHypertext> aAccHyp = this; aRet <<= aAccHyp; } - // --> OD 2006-07-13 #i63870# + // #i63870# // add interface com::sun:star:accessibility::XAccessibleTextAttributes else if ( rType == ::getCppuType((uno::Reference<XAccessibleTextAttributes> *)0) ) { @@ -1072,7 +1046,7 @@ uno::Any SwAccessibleParagraph::queryInterface( const uno::Type& rType ) aRet <<= aAccTextAttr; } // <-- - // --> OD 2008-06-10 #i89175# + // #i89175# // add interface com::sun:star:accessibility::XAccessibleTextMarkup else if ( rType == ::getCppuType((uno::Reference<XAccessibleTextMarkup> *)0) ) { @@ -1100,10 +1074,9 @@ uno::Sequence< uno::Type > SAL_CALL SwAccessibleParagraph::getTypes() throw(uno: uno::Sequence< uno::Type > aTypes( SwAccessibleContext::getTypes() ); sal_Int32 nIndex = aTypes.getLength(); - // --> OD 2006-07-13 #i63870# - // add type accessibility::XAccessibleTextAttributes - // --> OD 2008-06-10 #i89175# - // add type accessibility::XAccessibleTextMarkup and accessibility::XAccessibleMultiLineText + // #i63870# - add type accessibility::XAccessibleTextAttributes + // #i89175# - add type accessibility::XAccessibleTextMarkup and + // accessibility::XAccessibleMultiLineText aTypes.realloc( nIndex + 6 ); uno::Type* pTypes = aTypes.getArray(); @@ -1121,7 +1094,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,19 +1113,19 @@ 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 ); sal_Int32 nRet = GetCaretPos(); { - vos::OGuard aOldCaretPosGuard( aMutex ); - ASSERT( nRet == nOldCaretPos, "caret pos out of sync" ); + osl::MutexGuard aOldCaretPosGuard( aMutex ); + OSL_ENSURE( nRet == nOldCaretPos, "caret pos out of sync" ); nOldCaretPos = nRet; } if( -1 != nRet ) { - ::vos::ORef < SwAccessibleContext > xThis( this ); + ::rtl::Reference < SwAccessibleContext > xThis( this ); GetMap()->SetCursorContext( xThis ); } @@ -1162,7 +1135,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 +1168,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 ); @@ -1210,16 +1183,15 @@ sal_Unicode SwAccessibleParagraph::getCharacter( sal_Int32 nIndex ) throw lang::IndexOutOfBoundsException(); } -// --> OD 2006-07-20 #i63870# -// re-implement method on behalf of methods <_getDefaultAttributesImpl(..)> and -// <_getRunAttributesImpl(..)> +// #i63870# - re-implement method on behalf of methods +// <_getDefaultAttributesImpl(..)> and <_getRunAttributesImpl(..)> uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes( sal_Int32 nIndex, const uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this ); const ::rtl::OUString& rText = GetString(); @@ -1256,41 +1228,10 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes( ++i; } -// // create a (dummy) text portion for the sole purpose of calling -// // getPropertyValues on it -// Reference<XMultiPropertySet> xPortion = CreateUnoPortion( nIndex, nIndex + 1 ); - -// // get values -// Sequence<OUString> aNames = getAttributeNames(); -// sal_Int32 nLength = aNames.getLength(); -// Sequence<Any> aAnys( nLength ); -// aAnys = xPortion->getPropertyValues( aNames ); - -// // copy names + anys into return sequence -// Sequence<PropertyValue> aValues( aNames.getLength() ); -// const OUString* pNames = aNames.getConstArray(); -// const Any* pAnys = aAnys.getConstArray(); -// PropertyValue* pValues = aValues.getArray(); -// for( sal_Int32 i = 0; i < nLength; i++ ) -// { -// PropertyValue& rValue = pValues[i]; -// rValue.Name = pNames[i]; -// rValue.Value = pAnys[i]; -// rValue.Handle = -1; // handle not supported -// rValue.State = PropertyState_DIRECT_VALUE; // states not supported -// } - -// // adjust background color if we're in a gray portion -// DBG_ASSERT( pValues[CHAR_BACK_COLOR_POS].Name. -// equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("CharBackColor")), -// "Please adjust CHAR_BACK_COLOR_POS constant." ); -// if( GetPortionData().IsInGrayPortion( nIndex ) ) -// pValues[CHAR_BACK_COLOR_POS].Value <<= SwViewOption::GetFieldShadingsColor().GetColor(); - return aValues; } -// --> OD 2006-07-11 #i63870# +// #i63870# void SwAccessibleParagraph::_getDefaultAttributesImpl( const uno::Sequence< ::rtl::OUString >& aRequestedAttributes, tAccParaPropValMap& rDefAttrSeq, @@ -1313,9 +1254,8 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( RES_CHRATR_BEGIN, RES_CHRATR_END - 1, 0 ) ); } - // --> OD 2007-11-12 #i82637# - // From the perspective of the a11y API the default character attributes - // are the character attributes, which are set at the paragraph style + // #i82637# - From the perspective of the a11y API the default character + // attributes are the character attributes, which are set at the paragraph style // of the paragraph. The character attributes set at the automatic paragraph // style of the paragraph are treated as run attributes. // pTxtNode->SwCntntNode::GetAttr( *pSet ); @@ -1330,7 +1270,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( pSet->Put( aParaSet ); } // get default character attributes and merge these into <pSet> - ASSERT( pTxtNode->GetTxtColl(), + OSL_ENSURE( pTxtNode->GetTxtColl(), "<SwAccessibleParagraph::_getDefaultAttributesImpl(..)> - missing paragraph style. Serious defect, please inform OD!" ); if ( pTxtNode->GetTxtColl() ) { @@ -1368,7 +1308,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( ++aPropIt; } - // --> OD 2007-01-15 #i72800# + // #i72800# // add property value entry for the paragraph style if ( !bOnlyCharAttrs && pTxtNode->GetTxtColl() ) { @@ -1389,7 +1329,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl( } // <-- - // --> OD 2007-01-15 #i73371# + // #i73371# // resolve value text::WritingMode2::PAGE of property value entry WritingMode if ( !bOnlyCharAttrs && GetFrm() ) { @@ -1464,14 +1404,14 @@ 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; _getDefaultAttributesImpl( aRequestedAttributes, aDefAttrSeq ); - // --> OD 2010-03-08 #i92233# - static rtl::OUString sMMToPixelRatio( rtl::OUString::createFromAscii( "MMToPixelRatio" ) ); + // #i92233# + static rtl::OUString sMMToPixelRatio(RTL_CONSTASCII_USTRINGPARAM("MMToPixelRatio")); bool bProvideMMToPixelRatio( false ); { if ( aRequestedAttributes.getLength() == 0 ) @@ -1504,7 +1444,7 @@ uno::Sequence< PropertyValue > SwAccessibleParagraph::getDefaultAttributes( ++i; } - // --> OD 2010-03-08 #i92233# + // #i92233# if ( bProvideMMToPixelRatio ) { PropertyValue rPropVal; @@ -1546,7 +1486,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl( SfxItemSet aSet( pPaM->GetDoc()->GetAttrPool(), RES_CHRATR_BEGIN, RES_CHRATR_END -1, 0 ); - // --> OD 2007-11-12 #i82637# + // #i82637# // From the perspective of the a11y API the character attributes, which // are set at the automatic paragraph style of the paragraph are treated // as run attributes. @@ -1577,11 +1517,9 @@ void SwAccessibleParagraph::_getRunAttributesImpl( { tAccParaPropValMap aRunAttrSeq; { - // --> OD 2007-11-12 #i82637# tAccParaPropValMap aDefAttrSeq; uno::Sequence< ::rtl::OUString > aDummy; - _getDefaultAttributesImpl( aDummy, aDefAttrSeq, true ); - // <-- + _getDefaultAttributesImpl( aDummy, aDefAttrSeq, true ); // #i82637# const SfxItemPropertyMap* pPropMap = aSwMapProvider.GetPropertySet( PROPERTY_MAP_TEXT_CURSOR )->getPropertyMap(); @@ -1590,8 +1528,7 @@ void SwAccessibleParagraph::_getRunAttributesImpl( while ( aPropIt != aPropertyEntries.end() ) { const SfxPoolItem* pItem( 0 ); - // --> OD 2007-11-12 #i82637# - // Found character attributes, whose value equals the value of + // #i82637# - Found character attributes, whose value equals the value of // the corresponding default character attributes, are excluded. if ( aSet.GetItemState( aPropIt->nWID, sal_True, &pItem ) == SFX_ITEM_SET ) { @@ -1645,7 +1582,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 +1615,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 +1678,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 +1688,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 +1765,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 +1779,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 +1791,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 +1803,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 +1839,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 +1850,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 +1867,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 +1903,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 +1947,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 +1989,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 +2006,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 +2021,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 +2049,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 +2111,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(); @@ -2219,7 +2156,7 @@ sal_Bool SwAccessibleParagraph::setAttributes( { xPortion->setPropertyValues( aNames, aValues ); } - catch( UnknownPropertyException e ) + catch( UnknownPropertyException &e ) { // error handling through return code! bRet = sal_False; @@ -2290,7 +2227,7 @@ uno::Reference<XAccessible> SwAccessibleParagraph::getSelectedAccessibleChild( return aSelectionHelper.getSelectedAccessibleChild(nSelectedChildIndex); } -// --> OD 2004-11-16 #111714# - index has to be treated as global child index. +// index has to be treated as global child index. void SwAccessibleParagraph::deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, @@ -2357,12 +2294,12 @@ 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 ); sal_Int32 nCount = 0; - // --> OD 2007-06-27 #i77108# - provide hyperlinks also in editable documents. + // #i77108# - provide hyperlinks also in editable documents. // if( !IsEditableState() ) // <-- { @@ -2379,14 +2316,12 @@ 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; - // --> OD 2007-06-27 #i77108# - provide hyperlinks also in editable documents. -// if( !IsEditableState() ) - // <-- + // #i77108# { const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() ); SwHyperlinkIter_Impl aHIter( pTxtFrm ); @@ -2434,7 +2369,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 @@ -2445,9 +2380,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde } sal_Int32 nRet = -1; - // --> OD 2007-06-27 #i77108# - provide hyperlinks also in editable documents. -// if( !IsEditableState() ) - // <-- + // #i77108# { const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() ); SwHyperlinkIter_Impl aHIter( pTxtFrm ); @@ -2469,8 +2402,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde return nRet; } -// --> OD 2008-05-26 #i71360# -// --> OD 2010-02-22 #i108125# - adjustments for change tracking text markup +// #i71360#, #i108125# - adjustments for change tracking text markup sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMarkupType ) throw (lang::IllegalArgumentException, uno::RuntimeException) @@ -2560,7 +2492,7 @@ uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL } // <-- -// --> OD 2008-05-29 #i89175# +// #i89175# sal_Int32 SAL_CALL SwAccessibleParagraph::getLineNumberAtIndex( sal_Int32 nIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) @@ -2668,11 +2600,12 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getNumberOfLineWithCaret() return nLineNo; } -// --> OD 2010-02-19 #i108125# +// #i108125# void SwAccessibleParagraph::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) { mpParaChangeTrackInfo->reset(); CheckRegistration( pOld, pNew ); } -// <-- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx index 440fd08c7ebd..d3092e2326f3 100644 --- a/sw/source/core/access/accpara.hxx +++ b/sw/source/core/access/accpara.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,11 +35,9 @@ #include <com/sun/star/accessibility/XAccessibleTextMarkup.hpp> #include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp> #include <com/sun/star/accessibility/XAccessibleTextAttributes.hpp> -#include <hash_map> +#include <boost/unordered_map.hpp> #include <accselectionhelper.hxx> -// --> OD 2010-02-19 #i108125# -#include <calbck.hxx> -// <-- +#include <calbck.hxx> // #i108125# class SwTxtFrm; class SwTxtNode; @@ -46,9 +45,7 @@ class SwPaM; class SwAccessiblePortionData; class SwAccessibleHyperTextData; class SwXTextPortion; -// --> OD 2010-02-19 #i108125# -class SwParaChangeTrackingInfo; -// <-- +class SwParaChangeTrackingInfo; //#i108125# namespace rtl { class OUString; } namespace com { namespace sun { namespace star { @@ -56,15 +53,13 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleHyperlink; } } } } -typedef ::std::hash_map< ::rtl::OUString, +typedef ::boost::unordered_map< ::rtl::OUString, ::com::sun::star::beans::PropertyValue, ::rtl::OUStringHash, ::std::equal_to< ::rtl::OUString > > tAccParaPropValMap; class SwAccessibleParagraph : - // --> OD 2010-02-19 #i108125# - public SwClient, - // <-- + public SwClient, // #i108125# public SwAccessibleContext, public ::com::sun::star::accessibility::XAccessibleEditableText, public com::sun::star::accessibility::XAccessibleSelection, @@ -94,9 +89,7 @@ class SwAccessibleParagraph : // implementation for XAccessibleSelection SwAccessibleSelectionHelper aSelectionHelper; - // --> OD 2010-02-19 #i108125# - SwParaChangeTrackingInfo* mpParaChangeTrackInfo; - // <-- + SwParaChangeTrackingInfo* mpParaChangeTrackInfo; // #i108125# /// get the SwTxtNode (requires frame; check before) const SwTxtNode* GetTxtNode() const; @@ -114,9 +107,8 @@ class SwAccessibleParagraph : sal_Bool GetSelection(sal_Int32& nStart, sal_Int32& nEnd); // helper for GetSelection and getCaretPosition - // --> OD 2005-12-20 #i27301# - // - add parameter <_bForSelection>, which indicates, if the cursor is - // retrieved for selection or for caret position. + // #i27301# - add parameter <_bForSelection>, which indicates, + // if the cursor is retrieved for selection or for caret position. SwPaM* GetCursor( const bool _bForSelection ); /// for cut/copy/paste: execute a particular slot at the view shell @@ -148,7 +140,7 @@ class SwAccessibleParagraph : } } - // --> OD 2006-07-13 #i63870# + // #i63870# void _getDefaultAttributesImpl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes, tAccParaPropValMap& rDefAttrSeq, @@ -259,12 +251,7 @@ public: getLocale (void) throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException, ::com::sun::star::uno::RuntimeException); - /** paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO - - OD 2005-12-02 #i27138# - - @author OD - */ + /** #i27138# - paragraphs are in relation CONTENT_FLOWS_FROM and/or CONTENT_FLOWS_TO */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet> SAL_CALL getAccessibleRelationSet (void) @@ -274,7 +261,7 @@ public: virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException); - // --> OD 2007-01-17 #i71385# + // #i71385# virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getBackground() @@ -372,7 +359,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - // --> OD 2004-11-16 #111714# - index has to be treated as global child index. + // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, @@ -390,7 +377,7 @@ public: throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - // --> OD 2008-05-19 #i71360# + // #i71360# //===== XAccesibleTextMarkup ============================================ virtual sal_Int32 SAL_CALL getTextMarkupCount( sal_Int32 nTextMarkupType ) throw (::com::sun::star::lang::IllegalArgumentException, @@ -411,7 +398,7 @@ public: ::com::sun::star::uno::RuntimeException); // <-- - // --> OD 2008-05-29 #i89175# + // #i89175# //===== XAccessibleMultiLineText ======================================== virtual sal_Int32 SAL_CALL getLineNumberAtIndex( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, @@ -430,7 +417,7 @@ public: throw (::com::sun::star::uno::RuntimeException); // <-- - // --> OD 2006-07-11 #i63870# + // #i63870# //===== XAccesibleTextAttributes ======================================== virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getDefaultAttributes( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRunAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRequestedAttributes ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); @@ -445,3 +432,4 @@ inline SwAccessibleParagraph::operator ::com::sun::star::accessibility::XAccessi #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx index c90fa9d4e34d..0142391027b8 100644 --- a/sw/source/core/access/accportions.cxx +++ b/sw/source/core/access/accportions.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,9 +35,7 @@ #include <txttypes.hxx> // for portion replacement in Special() -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <tools/resid.hxx> #include "viewopt.hxx" @@ -173,7 +172,7 @@ void SwAccessiblePortionData::Special( sDisplay = aTmpBuffer.makeStringAndClear(); break; } - // --> OD 2010-06-04 #i111768# - apply patch from kstribley: + // #i111768# - apply patch from kstribley: // Include the control characters. case POR_CONTROLCHAR: { @@ -316,7 +315,7 @@ void SwAccessiblePortionData::GetLineBoundary( FindBreak( aLineBreaks, nPos ) ); } -// --> OD 2008-05-30 #i89175# +// #i89175# sal_Int32 SwAccessiblePortionData::GetLineCount() const { size_t nBreaks = aLineBreaks.size(); @@ -467,9 +466,7 @@ size_t SwAccessiblePortionData::FindLastBreak( size_t nResult = FindBreak( rPositions, nValue ); // skip 'zero-length' portions - // --> OD 2006-10-19 #i70538# - // consider size of <rPosition> and ignore last entry -// while( rPositions[nResult+1] <= nValue ) + // #i70538# consider size of <rPosition> and ignore last entry while ( nResult < rPositions.size() - 2 && rPositions[nResult+1] <= nValue ) { @@ -553,11 +550,9 @@ sal_Int32 SwAccessiblePortionData::GetAccessiblePosition( sal_uInt16 nPos ) cons DBG_ASSERT( nPos <= pTxtNode->GetTxt().Len(), "illegal position" ); // find the portion number - // --> OD 2006-10-19 #i70538# - // consider "empty" model portions - e.g. number portion + // #i70538# - consider "empty" model portions - e.g. number portion size_t nPortionNo = FindLastBreak( aModelPositions, static_cast<sal_Int32>(nPos) ); - // <-- sal_Int32 nRet = aAccessiblePositions[nPortionNo]; @@ -751,3 +746,5 @@ sal_uInt16 SwAccessiblePortionData::GetLastValidCorePosition() const { return static_cast<sal_uInt16>( aModelPositions[ aModelPositions.size()-1 ] ); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx index 1e147ff2d99b..ef04e7ff56eb 100644 --- a/sw/source/core/access/accportions.hxx +++ b/sw/source/core/access/accportions.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -121,7 +122,7 @@ public: // get start and end position of the last line void GetLastLineBoundary( com::sun::star::i18n::Boundary& rBound ) const; - // --> OD 2008-05-30 #i89175# + // #i89175# sal_Int32 GetLineCount() const; sal_Int32 GetLineNo( const sal_Int32 nPos ) const; void GetBoundaryOfLine( const sal_Int32 nLineNo, @@ -173,3 +174,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx index b8fabc3d5f25..c656b4000d05 100644 --- a/sw/source/core/access/accpreview.cxx +++ b/sw/source/core/access/accpreview.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -28,29 +29,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" - #include <vcl/svapp.hxx> #include <rtl/uuid.h> -#ifndef _ACCESS_HRC #include "access.hrc" -#endif #include <accpreview.hxx> - const sal_Char sServiceName[] = "com.sun.star.text.AccessibleTextDocumentPageView"; const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleDocumentPageView"; - -// using namespace accessibility; - using ::com::sun::star::lang::IndexOutOfBoundsException; using ::com::sun::star::uno::RuntimeException; using ::com::sun::star::uno::Sequence; using ::rtl::OUString; - - - // // SwAccessiblePreview // @@ -92,7 +83,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) @@ -102,3 +93,5 @@ Sequence< sal_Int8 > SAL_CALL SwAccessiblePreview::getImplementationId() } return aId; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accpreview.hxx b/sw/source/core/access/accpreview.hxx index aab14dc80026..589811e927c9 100644 --- a/sw/source/core/access/accpreview.hxx +++ b/sw/source/core/access/accpreview.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -74,3 +75,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx index 8e4593377c63..c3beba54da6e 100644 --- a/sw/source/core/access/accselectionhelper.cxx +++ b/sw/source/core/access/accselectionhelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -96,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()), @@ -106,19 +107,14 @@ void SwAccessibleSelectionHelper::selectAccessibleChild( // we can only select fly frames, so we ignore (should: return // false) all other attempts at child selection - sal_Bool bRet = sal_False; SwFEShell* pFEShell = GetFEShell(); if( pFEShell != NULL ) { const SdrObject *pObj = aChild.GetDrawObject(); if( pObj ) - { - bRet = rContext.Select( const_cast< SdrObject *>( pObj ), 0==aChild.GetSwFrm()); - } + rContext.Select( const_cast< SdrObject *>( pObj ), 0==aChild.GetSwFrm()); } // no frame shell, or no frame, or no fly frame -> can't select - - // return bRet; } sal_Bool SwAccessibleSelectionHelper::isAccessibleChildSelected( @@ -126,7 +122,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()), @@ -161,7 +157,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. @@ -193,7 +189,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 @@ -245,7 +241,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 @@ -301,27 +297,27 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild( Reference< XAccessible > xChild; if( aChild.GetSwFrm() ) { - ::vos::ORef < SwAccessibleContext > xChildImpl( + ::rtl::Reference < SwAccessibleContext > xChildImpl( rContext.GetMap()->GetContextImpl( aChild.GetSwFrm(), sal_True ) ); - if( xChildImpl.isValid() ) + if( xChildImpl.is() ) { xChildImpl->SetParent( &rContext ); - xChild = xChildImpl.getBodyPtr(); + xChild = xChildImpl.get(); } } else if ( aChild.GetDrawObject() ) { - ::vos::ORef < ::accessibility::AccessibleShape > xChildImpl( + ::rtl::Reference < ::accessibility::AccessibleShape > xChildImpl( rContext.GetMap()->GetContextImpl( aChild.GetDrawObject(), &rContext, sal_True ) ); - if( xChildImpl.isValid() ) - xChild = xChildImpl.getBodyPtr(); + if( xChildImpl.is() ) + xChild = xChildImpl.get(); } return xChild; } -// --> OD 2004-11-16 #111714# - index has to be treated as global child index. +// index has to be treated as global child index. void SwAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, @@ -332,3 +328,5 @@ void SwAccessibleSelectionHelper::deselectAccessibleChild( nChildIndex >= rContext.GetChildCount( *(rContext.GetMap()) ) ) throwIndexOutOfBoundsException(); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/accselectionhelper.hxx b/sw/source/core/access/accselectionhelper.hxx index ff0833d25ed6..43ccce61612d 100644 --- a/sw/source/core/access/accselectionhelper.hxx +++ b/sw/source/core/access/accselectionhelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -69,7 +70,7 @@ public: sal_Int32 nSelectedChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - // --> OD 2004-11-16 #111714# - index has to be treated as global child index. + // index has to be treated as global child index. void deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, @@ -79,3 +80,4 @@ public: #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx index fd788574aad7..ba843fb22715 100644 --- a/sw/source/core/access/acctable.cxx +++ b/sw/source/core/access/acctable.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -27,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> @@ -102,7 +103,7 @@ class SwAccessibleTableData_Impl SwAccTableSelHander_Impl& rSelHdl, sal_Bool bColumns ) const; - // --> OD 2007-06-27 #i77106# + // #i77106# inline bool IncludeRow( const SwFrm& rFrm ) const { return !mbOnlyTableColumnHeader || @@ -110,8 +111,7 @@ class SwAccessibleTableData_Impl } // <-- public: - // --> OD 2007-06-27 #i77106# - // add third optional parameter <bOnlyTableColumnHeader>, default value <false> + // #i77106# - add third optional parameter <bOnlyTableColumnHeader>, default value <false> SwAccessibleTableData_Impl( SwAccessibleMap& rAccMap, const SwTabFrm *pTabFrm, sal_Bool bIsInPagePreview, @@ -164,13 +164,12 @@ void SwAccessibleTableData_Impl::CollectData( const SwFrm *pFrm ) { if( pLower->IsRowFrm() ) { - // --> OD 2007-06-27 #i77106# + // #i77106# if ( IncludeRow( *pLower ) ) { maRows.insert( pLower->Frm().Top() - maTabFrmPos.Y() ); CollectData( pLower ); } - // <-- } else if( pLower->IsCellFrm() && rLower.IsAccessible( mbIsInPagePreview ) ) @@ -210,13 +209,12 @@ void SwAccessibleTableData_Impl::CollectExtents( const SwFrm *pFrm ) } else { - // --> OD 2007-06-27 #i77106# + // #i77106# if ( !pLower->IsRowFrm() || IncludeRow( *pLower ) ) { CollectExtents( pLower ); } - // <-- } } ++aIter; @@ -236,17 +234,17 @@ sal_Bool SwAccessibleTableData_Impl::FindCell( { const SwAccessibleChild& rLower = *aIter; const SwFrm *pLower = rLower.GetSwFrm(); - ASSERT( pLower, "child should be a frame" ); + OSL_ENSURE( pLower, "child should be a frame" ); if( pLower ) { if( rLower.IsAccessible( mbIsInPagePreview ) ) { - ASSERT( pLower->IsCellFrm(), "lower is not a cell frame" ); + OSL_ENSURE( pLower->IsCellFrm(), "lower is not a cell frame" ); const SwRect& rFrm = pLower->Frm(); if( rFrm.Right() >= rPos.X() && rFrm.Bottom() >= rPos.Y() ) { // We have found the cell - ASSERT( rFrm.Left() <= rPos.X() && rFrm.Top() <= rPos.Y(), + OSL_ENSURE( rFrm.Left() <= rPos.X() && rFrm.Top() <= rPos.Y(), "find frame moved to far!" ); bFound = sal_True; if( !bExact || @@ -258,13 +256,12 @@ sal_Bool SwAccessibleTableData_Impl::FindCell( } else { - // --> OD 2007-06-27 #i77106# + // #i77106# if ( !pLower->IsRowFrm() || IncludeRow( *pLower ) ) { bFound = FindCell( rPos, pLower, bExact, rRet ); } - // <-- } } ++aIter; @@ -288,13 +285,13 @@ void SwAccessibleTableData_Impl::GetSelection( { const SwAccessibleChild& rLower = *aIter; const SwFrm *pLower = rLower.GetSwFrm(); - ASSERT( pLower, "child should be a frame" ); + OSL_ENSURE( pLower, "child should be a frame" ); const SwRect& rBox = rLower.GetBox( mrAccMap ); if( pLower && rBox.IsOver( rArea ) ) { if( rLower.IsAccessible( mbIsInPagePreview ) ) { - ASSERT( pLower->IsCellFrm(), "lower is not a cell frame" ); + OSL_ENSURE( pLower->IsCellFrm(), "lower is not a cell frame" ); const SwCellFrm *pCFrm = static_cast < const SwCellFrm * >( pLower ); SwTableBox *pBox = @@ -325,14 +322,13 @@ void SwAccessibleTableData_Impl::GetSelection( } else { - // --> OD 2007-06-27 #i77106# + // #i77106# if ( !pLower->IsRowFrm() || IncludeRow( *pLower ) ) { GetSelection( rTabPos, rArea, rSelBoxes, pLower, rSelHdl, bColumns ); } - // <-- } } ++aIter; @@ -560,7 +556,7 @@ inline SwAccAllTableSelHander_Impl::SwAccAllTableSelHander_Impl( sal_Int32 nSize uno::Sequence < sal_Int32 > SwAccAllTableSelHander_Impl::GetSelSequence() { - ASSERT( nCount >= 0, "underflow" ); + OSL_ENSURE( nCount >= 0, "underflow" ); uno::Sequence < sal_Int32 > aRet( nCount ); sal_Int32 *pRet = aRet.getArray(); sal_Int32 nPos = 0; @@ -574,7 +570,7 @@ uno::Sequence < sal_Int32 > SwAccAllTableSelHander_Impl::GetSelSequence() } } - ASSERT( nPos == nCount, "count is wrong" ); + OSL_ENSURE( nPos == nCount, "count is wrong" ); return aRet; } @@ -582,9 +578,9 @@ uno::Sequence < sal_Int32 > SwAccAllTableSelHander_Impl::GetSelSequence() void SwAccAllTableSelHander_Impl::Unselect( sal_Int32 nRowOrCol, sal_Int32 nExt ) { - ASSERT( static_cast< size_t >( nRowOrCol ) < aSelected.size(), + OSL_ENSURE( static_cast< size_t >( nRowOrCol ) < aSelected.size(), "index to large" ); - ASSERT( static_cast< size_t >( nRowOrCol+nExt ) <= aSelected.size(), + OSL_ENSURE( static_cast< size_t >( nRowOrCol+nExt ) <= aSelected.size(), "extent to large" ); while( nExt ) { @@ -633,9 +629,7 @@ void SwAccessibleTable::FireTableChangeEvent( const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int32 nChildIndex ) const { DBG_ASSERT( nChildIndex >= 0, "Illegal child index." ); - // --> OD 2007-06-27 #i77106# - DBG_ASSERT( nChildIndex < const_cast<SwAccessibleTable*>(this)->getAccessibleChildCount(), "Illegal child index." ); - // <-- + DBG_ASSERT( nChildIndex < const_cast<SwAccessibleTable*>(this)->getAccessibleChildCount(), "Illegal child index." ); // #i77106# const SwTableBox* pBox = NULL; @@ -674,9 +668,7 @@ sal_Int32 SwAccessibleTable::GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const { // iterate over all children to n-th isAccessibleChildSelected() - // --> OD 2007-06-27 #i77106# - sal_Int32 nChildren = const_cast<SwAccessibleTable*>(this)->getAccessibleChildCount(); - // <-- + sal_Int32 nChildren = const_cast<SwAccessibleTable*>(this)->getAccessibleChildCount(); // #i77106# if( nSelectedChildIndex >= nChildren ) return -1L; @@ -713,7 +705,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 ); @@ -735,7 +727,7 @@ SwAccessibleTable::SwAccessibleTable( SwAccessibleTable::~SwAccessibleTable() { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; delete mpTableData; } @@ -750,7 +742,7 @@ void SwAccessibleTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew if( pTabFrm ) { const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt(); - ASSERT( pFrmFmt == GetRegisteredIn(), "invalid frame" ); + OSL_ENSURE( pFrmFmt == GetRegisteredIn(), "invalid frame" ); OUString sOldName( GetName() ); @@ -840,7 +832,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) @@ -851,7 +843,7 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleTable::getImplementationId() return aId; } -// --> OD 2007-06-28 #i77106# +// #i77106# SwAccessibleTableData_Impl* SwAccessibleTable::CreateNewTableData() { const SwTabFrm* pTabFrm = static_cast<const SwTabFrm*>( GetFrm() ); @@ -861,7 +853,7 @@ SwAccessibleTableData_Impl* SwAccessibleTable::CreateNewTableData() void SwAccessibleTable::UpdateTableData() { - // --> OD 2007-06-28 #i77106# - usage of new method <CreateNewTableData()> + // #i77106# - usage of new method <CreateNewTableData()> delete mpTableData; mpTableData = CreateNewTableData(); // <-- @@ -876,7 +868,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 +878,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 +888,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 ) @@ -907,9 +899,8 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription( sal_Int32 nRow ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - // --> OD 2010-03-10 #i87532# - // determine table cell in <nRow>th row and in first column of row header table - // and return its text content. + // #i87532# - determine table cell in <nRow>th row and + // in first column of row header table and return its text content. OUString sRowDesc; GetTableData().CheckRowAndCol(nRow, 0, this); @@ -919,7 +910,7 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription( { uno::Reference< XAccessible > xRowHeaderCell = xTableRowHeader->getAccessibleCellAt( nRow, 0 ); - ASSERT( xRowHeaderCell.is(), + OSL_ENSURE( xRowHeaderCell.is(), "<SwAccessibleTable::getAccessibleRowDescription(..)> - missing row header cell -> serious issue." ); uno::Reference< XAccessibleContext > xRowHeaderCellContext = xRowHeaderCell->getAccessibleContext(); @@ -943,9 +934,8 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription( sal_Int32 nColumn ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) { - // --> OD 2010-03-10 #i87532# - // determine table cell in first row and in <nColumn>th column of column header table - // and return its text content. + // #i87532# - determine table cell in first row and + // in <nColumn>th column of column header table and return its text content. OUString sColumnDesc; GetTableData().CheckRowAndCol(0, nColumn, this); @@ -955,7 +945,7 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription( { uno::Reference< XAccessible > xColumnHeaderCell = xTableColumnHeader->getAccessibleCellAt( 0, nColumn ); - ASSERT( xColumnHeaderCell.is(), + OSL_ENSURE( xColumnHeaderCell.is(), "<SwAccessibleTable::getAccessibleColumnDescription(..)> - missing column header cell -> serious issue." ); uno::Reference< XAccessibleContext > xColumnHeaderCellContext = xColumnHeaderCell->getAccessibleContext(); @@ -981,7 +971,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRowExtentAt( { sal_Int32 nExtend = -1; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1012,7 +1002,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumnExtentAt( { sal_Int32 nExtend = -1; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1049,8 +1039,8 @@ uno::Reference< XAccessibleTable > SAL_CALL SwAccessibleTable::getAccessibleColumnHeaders( ) throw (uno::RuntimeException) { - // --> OD 2010-03-10 #i87532# - // assure that return accesible object is empty, if no column header exists. + // #i87532# - assure that return accesible object is empty, + // if no column header exists. SwAccessibleTableColHeaders* pTableColHeaders = new SwAccessibleTableColHeaders( GetMap(), static_cast< const SwTabFrm *>( GetFrm() ) ); uno::Reference< XAccessibleTable > xTableColumnHeaders( pTableColHeaders ); @@ -1066,7 +1056,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 +1080,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 +1103,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 +1130,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 +1160,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 +1192,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 +1219,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleIndex( { sal_Int32 nRet = -1; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) @@ -1247,11 +1237,11 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex ) { sal_Int32 nRet = -1; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) - // --> OD 2007-06-27 #i77106# + // #i77106# if ( ( nChildIndex < 0 ) || ( nChildIndex >= getAccessibleChildCount() ) ) { @@ -1271,7 +1261,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex ) } else { - ASSERT( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:" + OSL_ENSURE( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:" "aCell not expected to be valid."); throw lang::IndexOutOfBoundsException(); @@ -1286,11 +1276,11 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn( { sal_Int32 nRet = -1; - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ) - // --> OD 2007-06-27 #i77106# + // #i77106# if ( ( nChildIndex < 0 ) || ( nChildIndex >= getAccessibleChildCount() ) ) { @@ -1310,7 +1300,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn( } else { - ASSERT( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:" + OSL_ENSURE( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:" "aCell not expected to be valid."); throw lang::IndexOutOfBoundsException(); @@ -1348,7 +1338,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 +1348,7 @@ void SwAccessibleTable::InvalidatePosOrSize( const SwRect& rOldBox ) void SwAccessibleTable::Dispose( sal_Bool bRecursive ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( GetRegisteredIn() ) GetRegisteredInNonConst()->Remove( this ); @@ -1369,10 +1359,10 @@ 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" ); + OSL_ENSURE( pFrm, "frame expected" ); if( HasTableData() ) { FireTableChangeEvent( GetTableData() ); @@ -1392,18 +1382,16 @@ void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj, void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChildFrmOrObj, const SwRect& rOldBox ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; if( HasTableData() ) { - ASSERT( !HasTableData() || + OSL_ENSURE( !HasTableData() || GetFrm()->Frm().Pos() == GetTableData().GetTablePos(), "table has invalid position" ); if( HasTableData() ) { - // --> OD 2007-06-28 #i77106# - SwAccessibleTableData_Impl *pNewTableData = CreateNewTableData(); - // <-- + SwAccessibleTableData_Impl *pNewTableData = CreateNewTableData(); // #i77106# if( !pNewTableData->CompareExtents( GetTableData() ) ) { FireTableChangeEvent( GetTableData() ); @@ -1417,9 +1405,8 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil } } - // --> OD 2010-02-18 #i013961# - always call super class method + // #i013961# - always call super class method SwAccessibleContext::InvalidateChildPosOrSize( rChildFrmOrObj, rOldBox ); - // <-- } @@ -1431,12 +1418,10 @@ 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# - if( (nChildIndex < 0) || (nChildIndex >= getAccessibleChildCount()) ) - // <-- + if( (nChildIndex < 0) || (nChildIndex >= getAccessibleChildCount()) ) // #i77106# throw lang::IndexOutOfBoundsException(); // preliminaries: get 'our' table box, and get the cursor shell @@ -1447,13 +1432,11 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild( if( pCrsrShell == NULL ) return; - // --> OD 2004-11-16 #111714# - assure, that child, indentified by the given - // index, isn't already selected. + // assure, that child, indentified by the given index, isn't already selected. if ( IsChildSelected( nChildIndex ) ) { return; } - // <-- // now we can start to do the work: check whether we already have // a table selection (in 'our' table). If so, extend the @@ -1478,14 +1461,6 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild( const SwStartNode* pStartNode = pBox->GetSttNd(); if( pSelectedTable == NULL || !pCrsrShell->GetTblCrs() ) { - // if we're in the wrong table, or there's no table selection - // at all, then select the current table cell. -// SwPaM* pPaM = pCrsrShell->GetCrsr(); -// pPaM->DeleteMark(); -// *(pPaM->GetPoint()) = SwPosition( *pStartNode ); -// pPaM->Move( fnMoveForward, fnGoNode ); -// // pCrsrShell->SelTblBox(); - pCrsrShell->StartAction(); // Set cursor into current cell. This deletes any table cursor. SwPaM aPaM( *pStartNode ); @@ -1515,20 +1490,6 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild( *(aPaM.GetMark()) = *pPaM->GetMark(); Select( aPaM ); - // if only one box is selected, we select this one in - // order to maintain our table selection -// if( aPaM.GetPoint()->nNode.GetNode().FindTableBoxStartNode() == -// aPaM.GetMark()->nNode.GetNode().FindTableBoxStartNode() ) -// { -// // pCrsrShell->SelTblBox(); -// } -// else -// { - // finally; set the selection. This will call UpdateCursor - // on the cursor shell, too. -// pCrsrShell->KillPams(); - // pCrsrShell->SetSelection( aPaM ); -// } } } @@ -1538,12 +1499,10 @@ 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# - if( (nChildIndex < 0) || (nChildIndex >= getAccessibleChildCount()) ) - // <-- + if( (nChildIndex < 0) || (nChildIndex >= getAccessibleChildCount()) ) // #i77106# throw lang::IndexOutOfBoundsException(); return IsChildSelected( nChildIndex ); @@ -1552,7 +1511,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 ); @@ -1571,23 +1530,19 @@ void SAL_CALL SwAccessibleTable::selectAllAccessibleChildren( ) // first clear selection, then select first and last child clearAccessibleSelection(); selectAccessibleChild( 0 ); - // --> OD 2007-06-27 #i77106# - selectAccessibleChild( getAccessibleChildCount()-1 ); - // <-- + selectAccessibleChild( getAccessibleChildCount()-1 ); // #i77106# } 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() sal_Int32 nCount = 0; - // --> OD 2007-06-27 #i71106# - sal_Int32 nChildren = getAccessibleChildCount(); - // <-- + sal_Int32 nChildren = getAccessibleChildCount(); // #i71106# for( sal_Int32 n = 0; n < nChildren; n++ ) if( IsChildSelected( n ) ) nCount++; @@ -1600,7 +1555,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 @@ -1613,35 +1568,32 @@ uno::Reference<XAccessible> SAL_CALL SwAccessibleTable::getSelectedAccessibleChi if( nChildIndex < 0 ) throw lang::IndexOutOfBoundsException(); - // --> OD 2007-06-28 #i77106# + // #i77106# if ( nChildIndex >= getAccessibleChildCount() ) { throw lang::IndexOutOfBoundsException(); } - // <-- return getAccessibleChild( nChildIndex ); } -// --> OD 2004-11-16 #111714# - index has to be treated as global child index. +// index has to be treated as global child index. void SAL_CALL SwAccessibleTable::deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleTable ); SwCrsrShell* pCrsrShell = GetCrsrShell(); - // --> OD 2004-11-16 #111714# - index has to be treated as global child index + // index has to be treated as global child index if ( !pCrsrShell ) throw lang::IndexOutOfBoundsException(); // assure, that given child index is in bounds. - // --> OD 2007-06-27 #i77106# - if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) - // <-- + if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) // #i77106# throw lang::IndexOutOfBoundsException(); // assure, that child, identified by the given index, is selected. @@ -1678,13 +1630,12 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild( pCrsrShell->EndAction(); } -// --> OD 2007-06-28 #i77106# -// implementation of class <SwAccessibleTableColHeaders> +// #i77106# - implementation of class <SwAccessibleTableColHeaders> 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 ); @@ -1706,9 +1657,7 @@ SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2 OUString sDesc2 = GetResource( STR_ACCESS_TABLE_DESC, &sArg1, &sArg2 ); SetDesc( sDesc2 ); - // --> OD 2008-03-10 #i85634# - NotRegisteredAtAccessibleMap(); - // <-- + NotRegisteredAtAccessibleMap(); // #i85634# } SwAccessibleTableData_Impl* SwAccessibleTableColHeaders::CreateNewTableData() @@ -1733,7 +1682,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 ) @@ -1802,3 +1751,5 @@ uno::Reference< XAccessibleTable > static const sal_Char sImplName[] = "com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView"; return OUString(RTL_CONSTASCII_USTRINGPARAM(sImplName)); } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acctable.hxx b/sw/source/core/access/acctable.hxx index 82141c09bead..491ba5c4416d 100644 --- a/sw/source/core/access/acctable.hxx +++ b/sw/source/core/access/acctable.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -67,15 +68,13 @@ protected: virtual ~SwAccessibleTable(); - // --> OD 2007-06-27 #i77106# + // #i77106# inline void SetDesc( ::rtl::OUString sNewDesc ) { sDesc = sNewDesc; } - // --> OD 2007-06-28 #i77106# - virtual SwAccessibleTableData_Impl* CreateNewTableData(); - // <-- + virtual SwAccessibleTableData_Impl* CreateNewTableData(); // #i77106# // force update of table data void UpdateTableData(); @@ -252,7 +251,7 @@ public: throw ( ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); - // --> OD 2004-11-16 #111714# - index has to be treated as global child index. + // index has to be treated as global child index. virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw ( ::com::sun::star::lang::IndexOutOfBoundsException, @@ -267,8 +266,7 @@ inline SwAccessibleTableData_Impl& SwAccessibleTable::GetTableData() return *mpTableData; } -// --> OD 2007-06-28 #i77106# -// subclass to represent table column headers +// #i77106# - subclass to represent table column headers class SwAccessibleTableColHeaders : public SwAccessibleTable { protected: @@ -329,3 +327,5 @@ public: }; // <-- #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index c0188c7eb193..6d41322a7703 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -30,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> @@ -43,9 +44,7 @@ #include <flyfrm.hxx> #include <accmap.hxx> #include <unotools/accessiblerelationsethelper.hxx> -// --> OD 2009-07-14 #i73249# -#include <hints.hxx> -// <-- +#include <hints.hxx> // #i73249# #include "acctextframe.hxx" using namespace ::com::sun::star; @@ -87,9 +86,8 @@ SwAccessibleTextFrame::~SwAccessibleTextFrame() void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) { const sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ; - // --> OD 2009-07-14 #i73249# - // suppress handling of RES_NAME_CHANGED in case that attribute Title is - // used as the accessible name. + // #i73249# - suppress handling of RES_NAME_CHANGED + // in case that attribute Title is used as the accessible name. if ( nWhich != RES_NAME_CHANGED || msTitle.getLength() == 0 ) { @@ -99,7 +97,7 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( GetFrm() ); switch( nWhich ) { - // --> OD 2009-07-14 #i73249# + // #i73249# case RES_TITLE_CHANGED: { const String& sOldTitle( @@ -156,11 +154,11 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem * } } -// --> OD 2009-07-14 #i73249# +// #i73249# OUString SAL_CALL SwAccessibleTextFrame::getAccessibleName (void) throw (uno::RuntimeException) { - vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; CHECK_FOR_DEFUNC( XAccessibleContext ) @@ -175,7 +173,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 ) @@ -212,7 +210,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) @@ -254,7 +252,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 @@ -276,3 +274,5 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleTextFrame::getAccess return pHelper; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/acctextframe.hxx b/sw/source/core/access/acctextframe.hxx index a2b891de18e4..92c029d69e23 100644 --- a/sw/source/core/access/acctextframe.hxx +++ b/sw/source/core/access/acctextframe.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -37,7 +38,7 @@ namespace com { namespace star { class SwAccessibleTextFrame : public SwAccessibleFrameBase { private: - // --> OD 2009-07-14 #i73249# + // #i73249# ::rtl::OUString msTitle; ::rtl::OUString msDesc; // <-- @@ -54,8 +55,7 @@ public: //===== XAccessibleContext ============================================== - // --> OD 2009-07-14 #i73249# - /// Return the object's current name. + // #i73249# - Return the object's current name. virtual ::rtl::OUString SAL_CALL getAccessibleName (void) throw (::com::sun::star::uno::RuntimeException); @@ -112,3 +112,5 @@ public: #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx index 465e4a01b3da..c98510bd4b74 100644 --- a/sw/source/core/access/parachangetrackinginfo.cxx +++ b/sw/source/core/access/parachangetrackinginfo.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,9 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: $ - * $Revision: $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -32,7 +30,6 @@ #include <parachangetrackinginfo.hxx> -#include <errhdl.hxx> #include <wrong.hxx> #include <com/sun/star/text/TextMarkupType.hpp> @@ -56,8 +53,7 @@ namespace { if ( !rTxtFrm.GetTxtNode() ) { - ASSERT( false, - "<initChangeTrackTextMarkupLists(..) - missing <SwTxtNode> instance!" ); + OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTxtNode> instance!" ); return; } const SwTxtNode& rTxtNode( *(rTxtFrm.GetTxtNode()) ); @@ -65,8 +61,7 @@ namespace { const IDocumentRedlineAccess* pIDocChangeTrack( rTxtNode.getIDocumentRedlineAccess() ); if ( !pIDocChangeTrack ) { - ASSERT( false, - "<initChangeTrackTextMarkupLists(..) - missing <IDocumentRedlineAccess> instance!" ); + OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <IDocumentRedlineAccess> instance!" ); return; } @@ -193,9 +188,9 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co if ( mpChangeTrackInsertionTextMarkupList == 0 ) { - ASSERT( mpChangeTrackDeletionTextMarkupList == 0, + OSL_ENSURE( mpChangeTrackDeletionTextMarkupList == 0, "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackDeletionTextMarkupList> expected to be NULL." ); - ASSERT( mpChangeTrackFormatChangeTextMarkupList == 0, + OSL_ENSURE( mpChangeTrackFormatChangeTextMarkupList == 0, "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackFormatChangeTextMarkupList> expected to be NULL." ); initChangeTrackTextMarkupLists( mrTxtFrm, mpChangeTrackInsertionTextMarkupList, @@ -222,10 +217,11 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co break; default: { - ASSERT( false, - "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..)> - misusage - unexpected text markup type for change tracking." ); + OSL_FAIL( "<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..)> - misusage - unexpected text markup type for change tracking." ); } } return pChangeTrackingTextMarkupList; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx index 91131f37b757..fea7d2fb5f14 100644 --- a/sw/source/core/access/parachangetrackinginfo.hxx +++ b/sw/source/core/access/parachangetrackinginfo.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -6,9 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: $ - * $Revision: $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -57,3 +55,4 @@ class SwParaChangeTrackingInfo }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx index 90444e4cdca0..c3dd4d7d6bab 100644 --- a/sw/source/core/access/textmarkuphelper.cxx +++ b/sw/source/core/access/textmarkuphelper.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -34,7 +35,6 @@ #include <algorithm> #include <comphelper/stlunosequence.hxx> -#include <errhdl.hxx> #include <com/sun/star/text/TextMarkupType.hpp> #include <com/sun/star/accessibility/TextSegment.hpp> @@ -85,14 +85,14 @@ namespace { SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData, const SwTxtNode& rTxtNode ) : mrPortionData( rPortionData ) - // --> OD 2010-02-19 #i108125# + // #i108125# , mpTxtNode( &rTxtNode ) , mpTextMarkupList( 0 ) // <-- { } -// --> OD 2010-02-19 #i108125# +// #i108125# SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData, const SwWrongList& rTextMarkupList ) : mrPortionData( rPortionData ) @@ -108,7 +108,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp { sal_Int32 nTextMarkupCount( 0 ); - // --> OD 2010-02-19 #i108125# + // #i108125# const SwWrongList* pTextMarkupList = mpTextMarkupList ? mpTextMarkupList @@ -138,7 +138,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp aTextMarkupSegment.SegmentStart = -1; aTextMarkupSegment.SegmentEnd = -1; - // --> OD 2010-02-19 #i108125# + // #i108125# const SwWrongList* pTextMarkupList = mpTextMarkupList ? mpTextMarkupList @@ -161,8 +161,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp } else { - ASSERT( false, - "<SwTextMarkupHelper::getTextMarkup(..)> - missing <SwWrongArea> instance" ); + OSL_FAIL( "<SwTextMarkupHelper::getTextMarkup(..)> - missing <SwWrongArea> instance" ); } } @@ -187,7 +186,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp return uno::Sequence< ::com::sun::star::accessibility::TextSegment >(); } - // --> OD 2010-02-19 #i108125# + // #i108125# const SwWrongList* pTextMarkupList = mpTextMarkupList ? mpTextMarkupList @@ -203,7 +202,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp { const SwWrongArea* pTextMarkup = pTextMarkupList->GetElement( static_cast<sal_uInt16>(nTextMarkupIdx) ); - ASSERT( pTextMarkup, + OSL_ENSURE( pTextMarkup, "<SwTextMarkupHelper::getTextMarkup(..)> - missing <SwWrongArea> instance" ); if ( pTextMarkup && pTextMarkup->mnPos <= nCoreCharIndex && @@ -229,3 +228,5 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp return aTextMarkups; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx index 9b2bb519a2a1..57d3152bab2a 100644 --- a/sw/source/core/access/textmarkuphelper.hxx +++ b/sw/source/core/access/textmarkuphelper.hxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -39,19 +40,14 @@ struct TextSegment; class SwAccessiblePortionData; class SwTxtNode; -// --> OD 2010-02-19 #i108125# -class SwWrongList; -// <-- - +class SwWrongList; // #i108125# class SwTextMarkupHelper { public: SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData, const SwTxtNode& rTxtNode ); - // --> OD 2010-02-19 #i108125# SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData, - const SwWrongList& rTextMarkupList ); - // <-- + const SwWrongList& rTextMarkupList ); // #i108125# ~SwTextMarkupHelper() {} sal_Int32 getTextMarkupCount( const sal_Int32 nTextMarkupType ) @@ -78,10 +74,11 @@ class SwTextMarkupHelper const SwAccessiblePortionData& mrPortionData; - // --> OD 2010-02-19 #i108125# + // #i108125# const SwTxtNode* mpTxtNode; const SwWrongList* mpTextMarkupList; // <-- }; #endif +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |