diff options
Diffstat (limited to 'accessibility/source/extended')
32 files changed, 276 insertions, 252 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 2d05e80499f4..f0a97b33bb24 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.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. @@ -134,7 +135,7 @@ void SAL_CALL AccessibleBrowseBox::disposing() sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); return BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount(); @@ -145,7 +146,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -174,7 +175,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -205,7 +206,7 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) void SAL_CALL AccessibleBrowseBox::grabFocus() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); mpBrowseBox->GrabFocus(); @@ -390,3 +391,5 @@ bool AccessibleBrowseBoxAccess::isContextAlive() const // ============================================================================ } // namespace accessibility + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index f8b43ecdced2..24cc3ce52f2a 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.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. @@ -117,7 +118,7 @@ void SAL_CALL AccessibleBrowseBoxBase::disposing() ::osl::MutexGuard aGuard( getOslMutex() ); if ( m_xFocusWindow.is() ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; m_xFocusWindow->removeFocusListener( this ); } @@ -207,7 +208,7 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleBrowseBoxBase::getAccessibleStateSet() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); // don't check whether alive -> StateSet may contain DEFUNC return implCreateStateSetHelper(); @@ -263,7 +264,7 @@ awt::Size SAL_CALL AccessibleBrowseBoxBase::getSize() sal_Bool SAL_CALL AccessibleBrowseBoxBase::isShowing() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); return implIsShowing(); @@ -462,7 +463,7 @@ void AccessibleBrowseBoxBase::ensureIsAlive() const Rectangle AccessibleBrowseBoxBase::getBoundingBox() throw ( lang::DisposedException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); Rectangle aRect = implGetBoundingBox(); @@ -476,7 +477,7 @@ Rectangle AccessibleBrowseBoxBase::getBoundingBox() Rectangle AccessibleBrowseBoxBase::getBoundingBoxOnScreen() throw ( lang::DisposedException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); Rectangle aRect = implGetBoundingBoxOnScreen(); @@ -568,7 +569,7 @@ void SAL_CALL AccessibleBrowseBoxBase::disposing( const ::com::sun::star::lang:: // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -594,7 +595,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (::com::sun: // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground( ) throw (::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); sal_Int32 nColor = 0; @@ -656,3 +657,4 @@ BrowseBoxAccessibleElement::~BrowseBoxAccessibleElement( ) // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index 560878b544f3..2353a25007aa 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.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. @@ -170,3 +171,4 @@ namespace accessibility } } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index e801a6cf2c20..77a59ef99fc1 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.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. @@ -77,7 +78,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidHeaderIndex( nChildIndex ); @@ -96,7 +97,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -128,7 +129,7 @@ Any SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleKeyBinding() OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowDescription( sal_Int32 nRow ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidRow( nRow ); @@ -138,7 +139,7 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowDescription( sal OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnDescription( sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidColumn( nColumn ); @@ -162,7 +163,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessib Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleRows() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -176,7 +177,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessib Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleColumns() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -190,7 +191,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessib sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleRowSelected( sal_Int32 nRow ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidRow( nRow ); @@ -200,7 +201,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleRowSelected( sal_Int sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleColumnSelected( sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidColumn( nColumn ); @@ -211,7 +212,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleCel sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -222,7 +223,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -234,7 +235,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleSelected( void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidHeaderIndex( nChildIndex ); @@ -256,7 +257,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_I void SAL_CALL AccessibleBrowseBoxHeaderBar::clearAccessibleSelection() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); mpBrowseBox->SetNoSelection(); @@ -265,7 +266,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::clearAccessibleSelection() void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); // no multiselection of columns possible @@ -278,7 +279,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren() sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); return isRowBar() ? implGetSelectedRowCount() : implGetSelectedColumnCount(); @@ -288,7 +289,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -301,7 +302,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -417,3 +418,4 @@ void AccessibleBrowseBoxHeaderBar::ensureIsValidHeaderIndex( sal_Int32 nIndex ) // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 9e9f63ec72c8..4f778f5b8df8 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.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 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR if( implIsShowing() ) pStateSetHelper->AddState( AccessibleStateType::SHOWING ); - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; pStateSetHelper->AddState( AccessibleStateType::VISIBLE ); pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE ); pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); @@ -110,7 +111,7 @@ Reference<XAccessible > SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChi void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus() throw ( ::com::sun::star::uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); if ( isRowBarCell() ) @@ -171,3 +172,4 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent() // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index 00a095a104d7..ad5594df6987 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.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. @@ -73,7 +74,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidIndex( nChildIndex ); @@ -94,7 +95,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleAtPoint( const awt::Point& rPoint ) throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -110,7 +111,7 @@ AccessibleBrowseBoxTable::getAccessibleAtPoint( const awt::Point& rPoint ) void SAL_CALL AccessibleBrowseBoxTable::grabFocus() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); mpBrowseBox->GrabTableFocus(); @@ -128,7 +129,7 @@ Any SAL_CALL AccessibleBrowseBoxTable::getAccessibleKeyBinding() OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowDescription( sal_Int32 nRow ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidRow( nRow ); @@ -138,7 +139,7 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowDescription( sal_Int OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnDescription( sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidColumn( nColumn ); @@ -164,7 +165,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCo Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRows() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -176,7 +177,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRo Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleColumns() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -188,7 +189,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleCo sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleRowSelected( sal_Int32 nRow ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidRow( nRow ); @@ -198,7 +199,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleRowSelected( sal_Int32 n sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleColumnSelected( sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidColumn( nColumn ); @@ -209,7 +210,7 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -220,7 +221,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -276,3 +277,4 @@ Reference< XAccessibleTable > AccessibleBrowseBoxTable::implGetHeaderBar( // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 7a7aed644f5c..825689cf3185 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.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. @@ -75,7 +76,7 @@ AccessibleBrowseBoxTableBase::~AccessibleBrowseBoxTableBase() sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); return implGetChildCount(); @@ -93,7 +94,7 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRole() sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowCount() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); return implGetRowCount(); @@ -102,7 +103,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowCount() sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnCount() throw ( uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); return implGetColumnCount(); @@ -112,7 +113,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -123,7 +124,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -148,7 +149,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -158,7 +159,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex( sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidIndex( nChildIndex ); @@ -168,7 +169,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nCh sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidIndex( nChildIndex ); @@ -353,3 +354,4 @@ void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int32 nChildIndex ) // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index fe79593e5613..6cdd7e22c4ab 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.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. @@ -134,7 +135,7 @@ namespace accessibility ::com::sun::star::awt::Rectangle SAL_CALL AccessibleBrowseBoxTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -155,7 +156,7 @@ namespace accessibility { //! TODO CTL bidi // DBG_ASSERT(0,"Need to be done by base class!"); - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -195,7 +196,7 @@ namespace accessibility */ ::utl::AccessibleStateSetHelper* AccessibleBrowseBoxTableCell::implCreateStateSetHelper() { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ::utl::AccessibleStateSetHelper* pStateSetHelper = new ::utl::AccessibleStateSetHelper; @@ -229,7 +230,7 @@ namespace accessibility sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleIndexInParent() throw ( ::com::sun::star::uno::RuntimeException ) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -242,7 +243,7 @@ namespace accessibility } sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) ) @@ -252,13 +253,13 @@ namespace accessibility } sal_Unicode SAL_CALL AccessibleBrowseBoxTableCell::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getCharacter( nIndex ); } ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleBrowseBoxTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ::rtl::OUString sText( implGetText() ); @@ -270,32 +271,32 @@ namespace accessibility } sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getCharacterCount( ); } ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getSelectedText( ); } sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getSelectionStart( ); } sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getSelectionEnd( ); } sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) ) throw IndexOutOfBoundsException(); @@ -304,37 +305,37 @@ namespace accessibility } ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getText( ) throw (::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getText( ); } ::rtl::OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType); } sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - BBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ::rtl::OUString sText = implGetText(); checkIndex_Impl( nStartIndex, sText ); @@ -352,3 +353,5 @@ namespace accessibility } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index f0aa406b62bf..f48415e518d4 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.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. @@ -116,7 +117,7 @@ void SAL_CALL AccessibleGridControl::disposing() sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); return m_aTable.GetAccessibleControlCount(); @@ -127,7 +128,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); if (nChildIndex<0 || nChildIndex>=getAccessibleChildCount()) @@ -179,7 +180,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint ) throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -210,7 +211,7 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint ) void SAL_CALL AccessibleGridControl::grabFocus() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); m_aTable.GrabFocus(); @@ -370,3 +371,5 @@ bool AccessibleGridControlAccess::isContextAlive() const // ============================================================================ } // namespace accessibility + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index ea81bd350426..bf1fb2cca520 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.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. @@ -163,7 +164,7 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleGridControlBase::getAccessibleStateSet() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); // don't check whether alive -> StateSet may contain DEFUNC return implCreateStateSetHelper(); @@ -219,7 +220,7 @@ awt::Size SAL_CALL AccessibleGridControlBase::getSize() sal_Bool SAL_CALL AccessibleGridControlBase::isShowing() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); return implIsShowing(); @@ -363,7 +364,7 @@ void AccessibleGridControlBase::ensureIsAlive() const Rectangle AccessibleGridControlBase::getBoundingBox() throw ( lang::DisposedException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); Rectangle aRect = implGetBoundingBox(); @@ -377,7 +378,7 @@ Rectangle AccessibleGridControlBase::getBoundingBox() Rectangle AccessibleGridControlBase::getBoundingBoxOnScreen() throw ( lang::DisposedException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); Rectangle aRect = implGetBoundingBoxOnScreen(); @@ -461,7 +462,7 @@ Reference<XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint //// ----------------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -486,7 +487,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (::com::su // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) throw (::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); sal_Int32 nColor = 0; @@ -533,3 +534,4 @@ GridControlAccessibleElement::~GridControlAccessibleElement( ) // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index 1870eebc8e3e..464d5842163d 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.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. @@ -78,7 +79,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); if (nChildIndex<0 || nChildIndex>=getAccessibleChildCount()) @@ -114,7 +115,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleAtPoint( const awt::Point& rPoint ) throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -146,7 +147,7 @@ Any SAL_CALL AccessibleGridControlHeader::getAccessibleKeyBinding() OUString SAL_CALL AccessibleGridControlHeader::getAccessibleRowDescription( sal_Int32 nRow ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidRow( nRow ); @@ -156,7 +157,7 @@ OUString SAL_CALL AccessibleGridControlHeader::getAccessibleRowDescription( sal_ OUString SAL_CALL AccessibleGridControlHeader::getAccessibleColumnDescription( sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidColumn( nColumn ); @@ -282,3 +283,4 @@ Reference< XAccessible > AccessibleGridControlHeader::implGetChild( // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 485c57c40ae1..830f1e876aa7 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.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. @@ -65,7 +66,7 @@ AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nCol if( implIsShowing() ) pStateSetHelper->AddState( AccessibleStateType::SHOWING ); - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; pStateSetHelper->AddState( AccessibleStateType::VISIBLE ); pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE ); pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); @@ -168,3 +169,4 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent() // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 461e776f1392..18124682ae60 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.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. @@ -71,7 +72,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidIndex( nChildIndex ); @@ -96,7 +97,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint ) throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -112,7 +113,7 @@ AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint ) void SAL_CALL AccessibleGridControlTable::grabFocus() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); m_aTable.GrabFocus(); @@ -130,7 +131,7 @@ Any SAL_CALL AccessibleGridControlTable::getAccessibleKeyBinding() OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_Int32 nRow ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidRow( nRow ); @@ -140,7 +141,7 @@ OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_I OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription( sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidColumn( nColumn ); @@ -169,7 +170,7 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessible Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleRows() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); Sequence< sal_Int32 > aSelSeq; @@ -188,7 +189,7 @@ Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessible sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleRowSelected( sal_Int32 nRow ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidRow( nRow ); @@ -217,7 +218,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleCellA sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -228,7 +229,7 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -239,7 +240,7 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected( void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidIndex( nChildIndex ); @@ -251,7 +252,7 @@ void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChil sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidIndex( nChildIndex ); @@ -262,7 +263,7 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); for(unsigned int i=0;i<m_aTable.GetSelectedRows().size();i++) @@ -271,7 +272,7 @@ void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection() void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows(); @@ -281,7 +282,7 @@ void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren() sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); Sequence< sal_Int32 > selectedRows = getSelectedAccessibleRows(); @@ -292,7 +293,7 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); if(isAccessibleChildSelected(nSelectedChildIndex)) @@ -305,7 +306,7 @@ void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); (void)nSelectedChildIndex; @@ -376,3 +377,4 @@ Reference< XAccessibleTable > AccessibleGridControlTable::implGetHeaderBar( // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index f6d1147ad309..211f2a29d03f 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.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,7 +73,7 @@ AccessibleGridControlTableBase::~AccessibleGridControlTableBase() sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleChildCount() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); sal_Int32 nChildren = 0; @@ -97,7 +98,7 @@ sal_Int16 SAL_CALL AccessibleGridControlTableBase::getAccessibleRole() sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowCount() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); return m_aTable.GetRowCount(); @@ -106,7 +107,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowCount() sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnCount() throw ( uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); return m_aTable.GetColumnCount(); @@ -116,7 +117,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -127,7 +128,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -152,7 +153,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidAddress( nRow, nColumn ); @@ -162,7 +163,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex( sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidIndex( nChildIndex ); @@ -172,7 +173,7 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 n sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) throw ( lang::IndexOutOfBoundsException, uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); ensureIsValidIndex( nChildIndex ); @@ -286,3 +287,4 @@ void AccessibleGridControlTableBase::ensureIsValidIndex( sal_Int32 nChildIndex ) // ============================================================================ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 43b9400e9050..68bba16d6a3b 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.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. @@ -93,7 +94,7 @@ namespace accessibility // ----------------------------------------------------------------------------- void SAL_CALL AccessibleGridControlCell::grabFocus() throw ( RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); m_aTable.GoToCell( m_nColPos, m_nRowPos ); } @@ -153,7 +154,7 @@ namespace accessibility ::com::sun::star::awt::Rectangle SAL_CALL AccessibleGridControlTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -169,7 +170,7 @@ namespace accessibility sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint( const ::com::sun::star::awt::Point& _aPoint ) throw (RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -209,7 +210,7 @@ namespace accessibility */ ::utl::AccessibleStateSetHelper* AccessibleGridControlTableCell::implCreateStateSetHelper() { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ::utl::AccessibleStateSetHelper* pStateSetHelper = new ::utl::AccessibleStateSetHelper; @@ -243,7 +244,7 @@ namespace accessibility sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleIndexInParent() throw ( ::com::sun::star::uno::RuntimeException ) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -256,7 +257,7 @@ namespace accessibility } sal_Bool SAL_CALL AccessibleGridControlTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); if ( !implIsValidRange( nIndex, nIndex, implGetText().getLength() ) ) @@ -266,13 +267,13 @@ namespace accessibility } sal_Unicode SAL_CALL AccessibleGridControlTableCell::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getCharacter( nIndex ); } ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleGridControlTableCell::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ::rtl::OUString sText( implGetText() ); @@ -284,32 +285,32 @@ namespace accessibility } sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getCharacterCount( ); } ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getSelectedText( ); } sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getSelectionStart( ); } sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getSelectionEnd( ); } sal_Bool SAL_CALL AccessibleGridControlTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); if ( !implIsValidRange( nStartIndex, nEndIndex, implGetText().getLength() ) ) throw IndexOutOfBoundsException(); @@ -318,37 +319,37 @@ namespace accessibility } ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getText( ) throw (::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getText( ); } ::rtl::OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType); } sal_Bool SAL_CALL AccessibleGridControlTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - TCSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ::rtl::OUString sText = implGetText(); checkIndex_Impl( nStartIndex, sText ); @@ -368,3 +369,5 @@ namespace accessibility return Rectangle(Point(0,0),Point(0,0));//To Do - return headercell rectangle } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index 6976b221a8b5..be2245474174 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.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. * @@ -39,7 +40,7 @@ #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <tools/diagnose_ex.h> @@ -128,7 +129,7 @@ namespace accessibility { public: MethodGuard( AccessibleToolPanelDeck_Impl& i_rImpl ) - :m_aGuard( Application::GetSolarMutex() ) + :m_aGuard() { i_rImpl.checkDisposed(); } @@ -136,13 +137,8 @@ namespace accessibility { } - void clear() - { - m_aGuard.clear(); - } - private: - ::vos::OClearableGuard m_aGuard; + SolarMutexGuard m_aGuard; }; } @@ -410,3 +406,5 @@ namespace accessibility //...................................................................................................................... } // namespace accessibility //...................................................................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index 7e97e3714172..f4864c95a860 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.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. * @@ -45,7 +46,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> #include <vcl/button.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> #include <tools/diagnose_ex.h> #include <vector> @@ -295,7 +296,7 @@ namespace accessibility { public: MethodGuard( AccessibleToolPanelTabBar_Impl& i_rImpl ) - :m_aGuard( Application::GetSolarMutex() ) + :m_aGuard() { i_rImpl.checkDisposed(); } @@ -303,13 +304,8 @@ namespace accessibility { } - void clear() - { - m_aGuard.clear(); - } - private: - ::vos::OClearableGuard m_aGuard; + SolarMutexGuard m_aGuard; }; } @@ -457,3 +453,5 @@ namespace accessibility //...................................................................................................................... } // namespace accessibility //...................................................................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index 0cdfd8480457..b621124cbe5f 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.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. * @@ -41,7 +42,7 @@ #include <unotools/accessiblerelationsethelper.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> -#include <vos/mutex.hxx> +#include <osl/mutex.hxx> //...................................................................................................................... namespace accessibility @@ -257,7 +258,7 @@ namespace accessibility { public: ItemMethodGuard( AccessibleToolPanelDeckTabBarItem_Impl& i_rImpl ) - :m_aGuard( Application::GetSolarMutex() ) + :m_aGuard() { i_rImpl.checkDisposed(); } @@ -265,13 +266,8 @@ namespace accessibility { } - void clear() - { - m_aGuard.clear(); - } - private: - ::vos::OClearableGuard m_aGuard; + SolarMutexGuard m_aGuard; }; //================================================================================================================== @@ -453,3 +449,5 @@ namespace accessibility //...................................................................................................................... } // namespace accessibility //...................................................................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index 1c7aca77e603..addbcaaa7cf8 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.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. @@ -90,3 +91,4 @@ namespace accessibility // ................................................................................. +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index 5f5472d04050..5312717034ee 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.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. @@ -271,3 +272,5 @@ namespace accessibility // ................................................................................. } // namespace accessibility // ................................................................................. + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 397161fd6ac0..dddb38fcbea1 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.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. @@ -370,3 +371,4 @@ namespace accessibility }// namespace accessibility //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 19e809bcc6ea..2a4b90affd54 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.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. @@ -64,15 +65,6 @@ namespace //........................................................................ namespace accessibility { - //........................................................................ - // class ALBSolarGuard --------------------------------------------------------- - - /** Aquire the solar mutex. */ - class ALBSolarGuard : public ::vos::OGuard - { - public: - inline ALBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {} - }; // class AccessibleIconChoiceCtrlEntry ----------------------------------------------------- @@ -193,7 +185,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox() throw ( lang::DisposedException ) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -202,7 +194,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen() throw ( lang::DisposedException ) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -379,7 +371,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet( ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; @@ -408,7 +400,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return implGetLocale(); @@ -453,7 +445,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nColor = 0; @@ -470,7 +462,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- sal_Int32 AccessibleIconChoiceCtrlEntry::getBackground( ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nColor = 0; @@ -490,7 +482,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterBounds( sal_Int32 _nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); if ( ( 0 > _nIndex ) || ( getCharacterCount() <= _nIndex ) ) @@ -510,7 +502,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nIndex = -1; @@ -539,7 +531,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); String sText = getText(); @@ -592,7 +584,7 @@ throw(RuntimeException) } sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -603,14 +595,14 @@ throw(RuntimeException) } sal_Unicode SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getCharacter( nIndex ); } ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -623,7 +615,7 @@ throw(RuntimeException) } sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getCharacterCount( ); @@ -631,28 +623,28 @@ throw(RuntimeException) ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectedText( ); } sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionStart( ); } sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionEnd( ); } sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -663,35 +655,35 @@ throw(RuntimeException) } ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getText( ) throw (::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getText( ); } ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -711,7 +703,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); sal_Bool bRet = sal_False; @@ -731,7 +723,7 @@ throw(RuntimeException) // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); checkActionIndex_Impl( nIndex ); @@ -754,3 +746,4 @@ throw(RuntimeException) }// namespace accessibility //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index dca212a9cfed..95e52056e1da 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.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. @@ -430,3 +431,4 @@ namespace accessibility }// namespace accessibility //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 5ce10cbc81b3..71c52a90b1db 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.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. @@ -64,16 +65,6 @@ namespace //........................................................................ namespace accessibility { - //........................................................................ - // class ALBSolarGuard --------------------------------------------------------- - - /** Aquire the solar mutex. */ - class ALBSolarGuard : public ::vos::OGuard - { - public: - inline ALBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {} - }; - // class AccessibleListBoxEntry ----------------------------------------------------- using namespace ::com::sun::star::accessibility; @@ -174,7 +165,7 @@ namespace accessibility // ----------------------------------------------------------------------------- Rectangle AccessibleListBoxEntry::GetBoundingBox() throw ( lang::DisposedException ) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -183,7 +174,7 @@ namespace accessibility // ----------------------------------------------------------------------------- Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen() throw ( lang::DisposedException ) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -251,7 +242,7 @@ namespace accessibility // ----------------------------------------------------------------------------- void SAL_CALL AccessibleListBoxEntry::disposing() { - ALBSolarGuard(); + SolarMutexGuard(); ::osl::MutexGuard aGuard( m_aMutex ); Reference< XAccessible > xKeepAlive( this ); @@ -323,7 +314,7 @@ namespace accessibility // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount( ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -337,7 +328,7 @@ namespace accessibility // ----------------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -387,7 +378,7 @@ namespace accessibility // ----------------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleParent( ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -467,7 +458,7 @@ namespace accessibility // ----------------------------------------------------------------------------- Locale SAL_CALL AccessibleListBoxEntry::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); return implGetLocale(); @@ -482,7 +473,7 @@ namespace accessibility // ----------------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -525,7 +516,7 @@ namespace accessibility // ----------------------------------------------------------------------------- sal_Int32 AccessibleListBoxEntry::getForeground( ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nColor = 0; @@ -542,7 +533,7 @@ namespace accessibility // ----------------------------------------------------------------------------- sal_Int32 AccessibleListBoxEntry::getBackground( ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); sal_Int32 nColor = 0; @@ -562,7 +553,7 @@ namespace accessibility // ----------------------------------------------------------------------------- awt::Rectangle SAL_CALL AccessibleListBoxEntry::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -587,7 +578,7 @@ namespace accessibility // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleListBoxEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -608,7 +599,7 @@ namespace accessibility // ----------------------------------------------------------------------------- sal_Bool SAL_CALL AccessibleListBoxEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -669,7 +660,7 @@ namespace accessibility // ----------------------------------------------------------------------------- sal_Bool SAL_CALL AccessibleListBoxEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); sal_Bool bRet = sal_False; @@ -691,7 +682,7 @@ namespace accessibility // ----------------------------------------------------------------------------- ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); checkActionIndex_Impl( nIndex ); @@ -715,7 +706,7 @@ namespace accessibility // ----------------------------------------------------------------------------- void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -730,7 +721,7 @@ namespace accessibility // ----------------------------------------------------------------------------- sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -745,7 +736,7 @@ namespace accessibility // ----------------------------------------------------------------------------- void SAL_CALL AccessibleListBoxEntry::clearAccessibleSelection( ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -765,7 +756,7 @@ namespace accessibility // ----------------------------------------------------------------------------- void SAL_CALL AccessibleListBoxEntry::selectAllAccessibleChildren( ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -785,7 +776,7 @@ namespace accessibility // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount( ) throw (RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -808,7 +799,7 @@ namespace accessibility // ----------------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -841,7 +832,7 @@ namespace accessibility // ----------------------------------------------------------------------------- void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -859,7 +850,7 @@ namespace accessibility } sal_Bool SAL_CALL AccessibleListBoxEntry::setCaretPosition ( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -870,14 +861,14 @@ namespace accessibility } sal_Unicode SAL_CALL AccessibleListBoxEntry::getCharacter( sal_Int32 nIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getCharacter( nIndex ); } ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL AccessibleListBoxEntry::getCharacterAttributes( sal_Int32 nIndex, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -890,7 +881,7 @@ namespace accessibility } sal_Int32 SAL_CALL AccessibleListBoxEntry::getCharacterCount( ) throw (::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getCharacterCount( ); @@ -898,28 +889,28 @@ namespace accessibility ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getSelectedText( ) throw (::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectedText( ); } sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionStart( ) throw (::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionStart( ); } sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionEnd( ) throw (::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionEnd( ); } sal_Bool SAL_CALL AccessibleListBoxEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -930,35 +921,35 @@ namespace accessibility } ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getText( ) throw (::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getText( ); } ::rtl::OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } ::com::sun::star::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { - ALBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); @@ -968,3 +959,4 @@ namespace accessibility }// namespace accessibility //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index fc1fb578bd21..88a04c5584bc 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.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. @@ -552,3 +553,5 @@ namespace accessibility //......................................................................... } // namespace accessibility //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx index 5c26185f6b03..4fa22f9bc602 100644 --- a/accessibility/source/extended/accessibletabbarbase.cxx +++ b/accessibility/source/extended/accessibletabbarbase.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. @@ -112,3 +113,4 @@ void AccessibleTabBarBase::ClearTabBarPointer() } // namespace accessibility //......................................................................... +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 32dfb591a3ad..898d2435b10a 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.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. @@ -509,3 +510,5 @@ namespace accessibility //......................................................................... } // namespace accessibility //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 51c86003b0c2..60589218ae47 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.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. @@ -803,3 +804,5 @@ namespace accessibility //......................................................................... } // namespace accessibility //......................................................................... + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index 7b8f12360d13..1b22c0b87565 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.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,6 @@ namespace accessibility { //........................................................................ - // class TLBSolarGuard --------------------------------------------------------- - - /** Aquire the solar mutex. */ - class TLBSolarGuard : public ::vos::OGuard - { - public: - inline TLBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {} - }; - // class AccessibleTabListBox ----------------------------------------------------- using namespace ::com::sun::star::accessibility; @@ -116,7 +108,7 @@ namespace accessibility AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException ) { - TLBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -142,3 +134,4 @@ namespace accessibility }// namespace accessibility //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 6afd503ff5b6..3cd3c333148a 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.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. @@ -39,15 +40,6 @@ namespace accessibility { //........................................................................ - // class TLBSolarGuard --------------------------------------------------------- - - /** Aquire the solar mutex. */ - class TLBSolarGuard : public ::vos::OGuard - { - public: - inline TLBSolarGuard() : ::vos::OGuard( Application::GetSolarMutex() ) {} - }; - // class AccessibleTabListBoxTable --------------------------------------------- using namespace ::com::sun::star::accessibility; @@ -298,7 +290,7 @@ namespace accessibility // ----------------------------------------------------------------------------- void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - TLBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -309,7 +301,7 @@ namespace accessibility // ----------------------------------------------------------------------------- sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - TLBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -320,7 +312,7 @@ namespace accessibility // ----------------------------------------------------------------------------- void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection( ) throw (RuntimeException) { - TLBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -330,7 +322,7 @@ namespace accessibility // ----------------------------------------------------------------------------- void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren( ) throw (RuntimeException) { - TLBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -340,7 +332,7 @@ namespace accessibility // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount( ) throw (RuntimeException) { - TLBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -350,7 +342,7 @@ namespace accessibility // ----------------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - TLBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -366,7 +358,7 @@ namespace accessibility // ----------------------------------------------------------------------------- void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { - TLBSolarGuard aSolarGuard; + SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getOslMutex() ); ensureIsAlive(); @@ -379,3 +371,4 @@ namespace accessibility }// namespace accessibility //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx index 8600003c2bff..ff7fc77d4069 100644 --- a/accessibility/source/extended/listboxaccessible.cxx +++ b/accessibility/source/extended/listboxaccessible.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. @@ -101,3 +102,5 @@ namespace accessibility //........................................................................ } // namespace accessibility //........................................................................ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 6925d2fe9fbf..f8462e144633 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.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. @@ -2250,3 +2251,4 @@ void Document::disposeParagraphs() } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |