diff options
Diffstat (limited to 'accessibility')
53 files changed, 1318 insertions, 1564 deletions
diff --git a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx index b79b89cf378e..14ca94741d6f 100644 --- a/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleGridControlHeaderCell.hxx @@ -44,7 +44,7 @@ namespace accessibility /** Grabs the focus to the GridControl. */ virtual void SAL_CALL grabFocus() throw ( ::com::sun::star::uno::RuntimeException ); - // XInterface ------------------------------------------------------------- + // XInterface /** Queries for a new interface. */ ::com::sun::star::uno::Any SAL_CALL queryInterface( @@ -56,14 +56,14 @@ namespace accessibility /** Releases the object (calls release() on base class). */ virtual void SAL_CALL release() throw (); - // XAccessible ------------------------------------------------------------ + // XAccessible /** @return The XAccessibleContext interface of this object. */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() throw ( ::com::sun::star::uno::RuntimeException ); - //------------------------------------------------------------------------- + inline sal_Bool isRowBarCell() const { return getType() == ::svt::table::TCTYPE_ROWHEADERCELL; diff --git a/accessibility/inc/accessibility/helper/accessiblestrings.hrc b/accessibility/inc/accessibility/helper/accessiblestrings.hrc index 03815d8dd3c0..12454d4c3696 100644 --- a/accessibility/inc/accessibility/helper/accessiblestrings.hrc +++ b/accessibility/inc/accessibility/helper/accessiblestrings.hrc @@ -20,14 +20,10 @@ #ifndef ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ #define ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ - -//------------------------------------------------------------------------------ - #define RID_TK_ACC_START 1000 -// Accessible Action Id's ------------------------------------------------------ - +// Accessible Action Id's #define RID_STR_ACC_ACTION_CLICK ( RID_TK_ACC_START + 0 ) #define RID_STR_ACC_ACTION_TOGGLEPOPUP ( RID_TK_ACC_START + 1 ) #define RID_STR_ACC_ACTION_SELECT ( RID_TK_ACC_START + 2 ) @@ -51,8 +47,6 @@ #define RID_STR_ACC_NAME_BROWSEBUTTON ( RID_TK_ACC_START + 100 ) #define RID_STR_ACC_DESC_PANELDECL_TABBAR ( RID_TK_ACC_START + 101 ) -// ----------------------------------------------------------------------------- - #endif // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index ad850610ebb6..0432aa9868e1 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -72,7 +72,7 @@ AccessibleBrowseBox::AccessibleBrowseBox( m_xFocusWindow = VCLUnoHelper::GetInterface(mpBrowseBox->GetWindowInstance()); } -// ----------------------------------------------------------------------------- + void AccessibleBrowseBox::setCreator( const Reference< XAccessible >& _rxCreator ) { #if OSL_DEBUG_LEVEL > 0 @@ -82,11 +82,11 @@ void AccessibleBrowseBox::setCreator( const Reference< XAccessible >& _rxCreator m_pImpl->m_aCreator = _rxCreator; } -// ----------------------------------------------------------------------------- + AccessibleBrowseBox::~AccessibleBrowseBox() { } -// ----------------------------------------------------------------------------- + void SAL_CALL AccessibleBrowseBox::disposing() { @@ -111,7 +111,7 @@ void SAL_CALL AccessibleBrowseBox::disposing() AccessibleBrowseBoxBase::disposing(); } -// ----------------------------------------------------------------------------- + // XAccessibleContext --------------------------------------------------------- @@ -123,7 +123,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() ensureIsAlive(); return BBINDEX_FIRSTCONTROL + mpBrowseBox->GetAccessibleControlCount(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) @@ -184,7 +184,7 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) } return xChild; } -// ----------------------------------------------------------------------------- + void SAL_CALL AccessibleBrowseBox::grabFocus() throw ( uno::RuntimeException ) @@ -194,7 +194,7 @@ void SAL_CALL AccessibleBrowseBox::grabFocus() ensureIsAlive(); mpBrowseBox->GrabFocus(); } -// ----------------------------------------------------------------------------- + Any SAL_CALL AccessibleBrowseBox::getAccessibleKeyBinding() throw ( uno::RuntimeException ) @@ -202,7 +202,7 @@ Any SAL_CALL AccessibleBrowseBox::getAccessibleKeyBinding() ensureIsAlive(); return Any(); } -// ----------------------------------------------------------------------------- + // XServiceInfo --------------------------------------------------------------- @@ -211,7 +211,7 @@ OUString SAL_CALL AccessibleBrowseBox::getImplementationName() { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBox" ); } -// ----------------------------------------------------------------------------- + // internal virtual methods --------------------------------------------------- @@ -221,13 +221,13 @@ Rectangle AccessibleBrowseBox::implGetBoundingBox() OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" ); return mpBrowseBox->GetWindowExtentsRelative( pParent ); } -// ----------------------------------------------------------------------------- + Rectangle AccessibleBrowseBox::implGetBoundingBoxOnScreen() { return mpBrowseBox->GetWindowExtentsRelative( NULL ); } -// ----------------------------------------------------------------------------- + // internal helper methods ---------------------------------------------------- @@ -241,7 +241,7 @@ Reference< XAccessible > AccessibleBrowseBox::implGetTable() } return m_pImpl->mxTable; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType ) @@ -272,7 +272,7 @@ AccessibleBrowseBox::implGetHeaderBar( AccessibleBrowseBoxObjType eObjType ) } return xRet; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex ) @@ -292,14 +292,14 @@ AccessibleBrowseBox::implGetFixedChild( sal_Int32 nChildIndex ) } return xRet; } -// ----------------------------------------------------------------------------- + AccessibleBrowseBoxTable* AccessibleBrowseBox::createAccessibleTable() { Reference< XAccessible > xCreator = (Reference< XAccessible >)m_pImpl->m_aCreator; OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleBrowseBox::createAccessibleTable: my creator died - how this?" ); return new AccessibleBrowseBoxTable( xCreator, *mpBrowseBox ); } -// ----------------------------------------------------------------------------- + void AccessibleBrowseBox::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue) { if ( m_pImpl->mxTable.is() ) @@ -307,7 +307,7 @@ void AccessibleBrowseBox::commitTableEvent(sal_Int16 _nEventId,const Any& _rNewV m_pImpl->m_pTable->commitEvent(_nEventId,_rNewValue,_rOldValue); } } -// ----------------------------------------------------------------------------- + void AccessibleBrowseBox::commitHeaderBarEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue,sal_Bool _bColumnHeaderBar) @@ -328,12 +328,12 @@ AccessibleBrowseBoxAccess::AccessibleBrowseBoxAccess( const Reference< XAccessib { } -// ----------------------------------------------------------------------------- + AccessibleBrowseBoxAccess::~AccessibleBrowseBoxAccess() { } -// ----------------------------------------------------------------------------- + void AccessibleBrowseBoxAccess::dispose() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -342,7 +342,7 @@ void AccessibleBrowseBoxAccess::dispose() ::comphelper::disposeComponent( m_xContext ); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() throw ( RuntimeException ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -361,7 +361,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibl return m_xContext; } -// ----------------------------------------------------------------------------- + bool AccessibleBrowseBoxAccess::isContextAlive() const { return ( NULL != m_pContext ) && m_pContext->isAlive(); diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index ab6f9acb4351..b707f8dd0877 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -276,7 +276,7 @@ void SAL_CALL AccessibleBrowseBoxBase::focusGained( const ::com::sun::star::awt: commitEvent(AccessibleEventId::STATE_CHANGED,aFocused,aEmpty); } -// ----------------------------------------------------------------------------- + void SAL_CALL AccessibleBrowseBoxBase::focusLost( const ::com::sun::star::awt::FocusEvent& ) throw (::com::sun::star::uno::RuntimeException) { @@ -513,24 +513,24 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole() } return nRole; } -// ----------------------------------------------------------------------------- + Any SAL_CALL AccessibleBrowseBoxBase::getAccessibleKeyBinding() throw ( uno::RuntimeException ) { return Any(); } -// ----------------------------------------------------------------------------- + Reference<XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleAtPoint( const ::com::sun::star::awt::Point& ) throw ( uno::RuntimeException ) { return NULL; } -// ----------------------------------------------------------------------------- + void SAL_CALL AccessibleBrowseBoxBase::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException) { m_xFocusWindow = NULL; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -556,7 +556,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (::com::sun: return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -590,14 +590,14 @@ Reference< XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessib return this; } -// ---------------------------------------------------------------------------- + BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& rBrowseBox, const Reference< awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType ) :AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType ) { } -// ---------------------------------------------------------------------------- + BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& rBrowseBox, const Reference< awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType, const OUString& rName, const OUString& rDescription ) @@ -605,7 +605,7 @@ BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const Reference< XAccess { } -// ---------------------------------------------------------------------------- + BrowseBoxAccessibleElement::~BrowseBoxAccessibleElement( ) { } diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index 7e35230abeae..f23f472e1e53 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx @@ -40,17 +40,16 @@ namespace accessibility ,m_bIsTriState(_bIsTriState) { } - // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2( AccessibleCheckBoxCell, AccessibleBrowseBoxCell, AccessibleCheckBoxCell_BASE ) - // ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleCheckBoxCell, AccessibleBrowseBoxCell, AccessibleCheckBoxCell_BASE ) - //-------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL AccessibleCheckBoxCell::getAccessibleContext( ) throw (RuntimeException) { ensureIsAlive(); return this; } - // ----------------------------------------------------------------------------- + ::utl::AccessibleStateSetHelper* AccessibleCheckBoxCell::implCreateStateSetHelper() { ::utl::AccessibleStateSetHelper* pStateSetHelper = @@ -64,10 +63,8 @@ namespace accessibility } return pStateSetHelper; } - // ----------------------------------------------------------------------------- - // ----------------------------------------------------------------------------- + // XAccessibleValue - // ----------------------------------------------------------------------------- Any SAL_CALL AccessibleCheckBoxCell::getCurrentValue( ) throw (RuntimeException) { @@ -89,15 +86,11 @@ namespace accessibility return makeAny(nValue); } - // ----------------------------------------------------------------------------- - sal_Bool SAL_CALL AccessibleCheckBoxCell::setCurrentValue( const Any& ) throw (RuntimeException) { return sal_False; } - // ----------------------------------------------------------------------------- - Any SAL_CALL AccessibleCheckBoxCell::getMaximumValue( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( getOslMutex() ); @@ -112,8 +105,6 @@ namespace accessibility return aValue; } - // ----------------------------------------------------------------------------- - Any SAL_CALL AccessibleCheckBoxCell::getMinimumValue( ) throw (RuntimeException) { Any aValue; @@ -121,23 +112,23 @@ namespace accessibility return aValue; } - // ----------------------------------------------------------------------------- + // XAccessibleContext sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount( ) throw (::com::sun::star::uno::RuntimeException) { return 0; } - // ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::lang::IndexOutOfBoundsException(); } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) { return OUString( "com.sun.star.comp.svtools.TableCheckBoxCell" ); } - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent() throw ( ::com::sun::star::uno::RuntimeException ) { @@ -145,7 +136,7 @@ namespace accessibility return ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos(); } - // ----------------------------------------------------------------------------- + void AccessibleCheckBoxCell::SetChecked( sal_Bool _bChecked ) { m_eState = _bChecked ? STATE_CHECK : STATE_NOCHECK; diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 270f05704c9f..2a11f6b069ed 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -76,7 +76,7 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR return pStateSetHelper; } -// ----------------------------------------------------------------------------- + /** @return The count of visible children. */ @@ -85,7 +85,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount() { return 0; } -// ----------------------------------------------------------------------------- + /** @return The XAccessible interface of the specified child. @@ -95,7 +95,7 @@ Reference<XAccessible > SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChi { throw IndexOutOfBoundsException(); } -// ----------------------------------------------------------------------------- + /** Grabs the focus to the column header. */ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus() @@ -109,7 +109,7 @@ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus() else mpBrowseBox->SelectColumn(static_cast<sal_uInt16>(m_nColumnRowId)); //!!! } -// ----------------------------------------------------------------------------- + /** @return The name of this class. */ @@ -118,7 +118,7 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName() { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderCell" ); } -// ----------------------------------------------------------------------------- + namespace { Rectangle getRectangle(IAccessibleTableProvider* _pBrowseBox,sal_Int32 _nRowColIndex, sal_Bool _bOnScreen,sal_Bool _bRowBar) @@ -140,13 +140,13 @@ Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBox() { return getRectangle(mpBrowseBox,m_nColumnRowId,sal_False,isRowBarCell()); } -// ----------------------------------------------------------------------------- + Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen() { return getRectangle(mpBrowseBox,m_nColumnRowId,sal_True,isRowBarCell()); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent() throw ( RuntimeException ) { @@ -157,9 +157,9 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent() --nIndex; return nIndex; } -// ----------------------------------------------------------------------------- + } // namespace accessibility -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 5ee23f662eb6..5538833441a1 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -79,11 +79,11 @@ AccessibleGridControl::AccessibleGridControl( m_pImpl->m_aCreator = _rxCreator; } -// ----------------------------------------------------------------------------- + AccessibleGridControl::~AccessibleGridControl() { } -// ----------------------------------------------------------------------------- + void SAL_CALL AccessibleGridControl::disposing() { @@ -114,7 +114,7 @@ void SAL_CALL AccessibleGridControl::disposing() ::comphelper::disposeComponent(m_pImpl->m_xColumnHeaderBar); AccessibleGridControlBase::disposing(); } -// ----------------------------------------------------------------------------- + // XAccessibleContext --------------------------------------------------------- @@ -125,7 +125,7 @@ sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() ensureIsAlive(); return m_aTable.GetAccessibleControlCount(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) @@ -170,7 +170,7 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) } return xChild; } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole() throw ( uno::RuntimeException ) @@ -180,7 +180,7 @@ sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole() ensureIsAlive(); return AccessibleRole::PANEL; } -// ----------------------------------------------------------------------------- + // XAccessibleComponent ------------------------------------------------------- @@ -213,7 +213,7 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint ) } return xChild; } -// ----------------------------------------------------------------------------- + void SAL_CALL AccessibleGridControl::grabFocus() throw ( uno::RuntimeException ) @@ -222,7 +222,7 @@ void SAL_CALL AccessibleGridControl::grabFocus() ensureIsAlive(); m_aTable.GrabFocus(); } -// ----------------------------------------------------------------------------- + Any SAL_CALL AccessibleGridControl::getAccessibleKeyBinding() throw ( uno::RuntimeException ) @@ -232,7 +232,7 @@ Any SAL_CALL AccessibleGridControl::getAccessibleKeyBinding() ensureIsAlive(); return Any(); } -// ----------------------------------------------------------------------------- + // XServiceInfo --------------------------------------------------------------- @@ -241,7 +241,7 @@ OUString SAL_CALL AccessibleGridControl::getImplementationName() { return OUString( "com.sun.star.accessibility.AccessibleGridControl" ); } -// ----------------------------------------------------------------------------- + // internal virtual methods --------------------------------------------------- @@ -251,7 +251,7 @@ Rectangle AccessibleGridControl::implGetBoundingBox() OSL_ENSURE( pParent, "implGetBoundingBox - missing parent window" ); return m_aTable.GetWindowExtentsRelative( pParent ); } -// ----------------------------------------------------------------------------- + Rectangle AccessibleGridControl::implGetBoundingBoxOnScreen() { @@ -268,7 +268,7 @@ Reference< XAccessible > AccessibleGridControl::implGetTable() } return m_pImpl->m_xTable; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType ) @@ -299,7 +299,7 @@ AccessibleGridControl::implGetHeaderBar( AccessibleTableControlObjType eObjType } return xRet; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex ) { @@ -318,14 +318,14 @@ AccessibleGridControl::implGetFixedChild( sal_Int32 nChildIndex ) } return xRet; } -// ----------------------------------------------------------------------------- + AccessibleGridControlTable* AccessibleGridControl::createAccessibleTable() { Reference< XAccessible > xCreator = (Reference< XAccessible >)m_pImpl->m_aCreator; OSL_ENSURE( xCreator.is(), "accessibility/extended/AccessibleGirdControl::createAccessibleTable: my creator died - how this?" ); return new AccessibleGridControlTable( xCreator, m_aTable, TCTYPE_TABLE ); } -// ----------------------------------------------------------------------------- + void AccessibleGridControl::commitCellEvent(sal_Int16 _nEventId,const Any& _rNewValue,const Any& _rOldValue) { sal_Int32 nChildCount = getAccessibleChildCount(); @@ -406,7 +406,7 @@ void AccessibleGridControl::commitTableEvent(sal_Int16 _nEventId,const Any& _rNe // = AccessibleGridControlAccess // ============================================================================ -// ----------------------------------------------------------------------------- + AccessibleGridControlAccess::AccessibleGridControlAccess( const Reference< XAccessible >& rxParent, IAccessibleTable& rTable ) : m_xParent( rxParent ) @@ -415,12 +415,12 @@ AccessibleGridControlAccess::AccessibleGridControlAccess( { } -// ----------------------------------------------------------------------------- + AccessibleGridControlAccess::~AccessibleGridControlAccess() { } -// ----------------------------------------------------------------------------- + void AccessibleGridControlAccess::DisposeAccessImpl() { SolarMutexGuard g; @@ -430,7 +430,7 @@ void AccessibleGridControlAccess::DisposeAccessImpl() ::comphelper::disposeComponent( m_xContext ); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext() throw ( RuntimeException ) { SolarMutexGuard g; @@ -450,7 +450,7 @@ Reference< XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessi return m_xContext; } -// ----------------------------------------------------------------------------- + bool AccessibleGridControlAccess::isContextAlive() const { return ( NULL != m_pContext ) && m_pContext->isAlive(); diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 8df5cf657956..ebe621522e2d 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -434,19 +434,19 @@ sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole() } return nRole; } -// ----------------------------------------------------------------------------- + Any SAL_CALL AccessibleGridControlBase::getAccessibleKeyBinding() throw ( uno::RuntimeException ) { return Any(); } -// ----------------------------------------------------------------------------- + Reference<XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint( const ::com::sun::star::awt::Point& ) throw ( uno::RuntimeException ) { return NULL; } -//// ----------------------------------------------------------------------------- +// sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -471,7 +471,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (::com::su } return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) throw (::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -512,7 +512,7 @@ Reference< XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccess ensureIsAlive(); return this; } -// ---------------------------------------------------------------------------- + GridControlAccessibleElement::~GridControlAccessibleElement( ) { } diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index f716a8aade25..8965d9d13346 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -67,7 +67,7 @@ AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nCol return pStateSetHelper; } -// ----------------------------------------------------------------------------- + /** @return The count of visible children. */ @@ -76,7 +76,7 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount() { return 0; } -// ----------------------------------------------------------------------------- + /** @return The XAccessible interface of the specified child. @@ -115,14 +115,14 @@ Reference<XAccessible > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC return this; } -// ----------------------------------------------------------------------------- + /** Grabs the focus to the column header. */ void SAL_CALL AccessibleGridControlHeaderCell::grabFocus() throw ( ::com::sun::star::uno::RuntimeException ) { } -// ----------------------------------------------------------------------------- + /** @return The name of this class. */ @@ -131,7 +131,7 @@ OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName() { return OUString( "com.sun.star.accessibility.AccessibleGridControlHeaderCell" ); } -// ----------------------------------------------------------------------------- + Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox() { Window* pParent = m_aTable.GetAccessibleParentWindow(); @@ -144,7 +144,7 @@ Rectangle AccessibleGridControlHeaderCell::implGetBoundingBox() aCellRect = m_aTable.calcHeaderCellRect(false, nIndex); return Rectangle(Point(aGridRect.Left()+aCellRect.Left(),aGridRect.Top()+aCellRect.Top()), aCellRect.GetSize()); } -// ----------------------------------------------------------------------------- + Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen() { @@ -157,7 +157,7 @@ Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen() aCellRect = m_aTable.calcHeaderCellRect(false, nIndex); return Rectangle(Point(aGridRect.Left()+aCellRect.Left(),aGridRect.Top()+aCellRect.Top()), aCellRect.GetSize()); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent() throw ( RuntimeException ) { @@ -167,9 +167,9 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent() sal_Int32 nIndex = m_nColumnRowId; return nIndex; } -// ----------------------------------------------------------------------------- + } // namespace accessibility -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 84fdb1aaf146..ffbba4a6e4ea 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -51,7 +51,7 @@ namespace accessibility // ============================================================================= // = AccessibleGridControlCell // ============================================================================= - // ----------------------------------------------------------------------------- + AccessibleGridControlCell::AccessibleGridControlCell( const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable, sal_Int32 _nRowPos, sal_uInt16 _nColPos, AccessibleTableControlObjType _eType ) @@ -71,19 +71,19 @@ namespace accessibility implSetName( aAccName ); } - // ----------------------------------------------------------------------------- + AccessibleGridControlCell::~AccessibleGridControlCell() { } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleGridControlCell::grabFocus() throw ( RuntimeException ) { SolarMutexGuard aSolarGuard; m_aTable.GoToCell( m_nColPos, m_nRowPos ); } - //// ----------------------------------------------------------------------------- + // // implementation of a table cell OUString AccessibleGridControlTableCell::implGetText() { @@ -352,7 +352,7 @@ namespace accessibility Rectangle aCell( Point( nX, nY ), aCellRect.GetSize()); return aCell; } - // ----------------------------------------------------------------------------- + Rectangle AccessibleGridControlTableCell::implGetBoundingBoxOnScreen() { Rectangle aGridRect = m_aTable.GetWindowExtentsRelative( NULL ); diff --git a/accessibility/source/extended/AccessibleToolPanelDeck.cxx b/accessibility/source/extended/AccessibleToolPanelDeck.cxx index e5279f3c0481..7014211050fc 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeck.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeck.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "accessibility/extended/AccessibleToolPanelDeck.hxx" #include <com/sun/star/accessibility/AccessibleRole.hpp> @@ -35,11 +34,9 @@ #include <boost/noncopyable.hpp> -//...................................................................................................................... + namespace accessibility { -//...................................................................................................................... - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::UNO_QUERY; @@ -67,9 +64,7 @@ namespace accessibility typedef ::com::sun::star::awt::Point UnoPoint; - //================================================================================================================== - //= AccessibleToolPanelDeck_Impl - declaration - //================================================================================================================== + // AccessibleToolPanelDeck_Impl - declaration class AccessibleToolPanelDeck_Impl :public ::boost::noncopyable ,public ::svt::IToolPanelDeckListener { @@ -105,9 +100,7 @@ namespace accessibility Reference< XAccessible > m_xActivePanelAccessible; }; - //================================================================================================================== - //= MethodGuard - //================================================================================================================== + // MethodGuard namespace { class MethodGuard @@ -127,10 +120,7 @@ namespace accessibility }; } - //================================================================================================================== - //= AccessibleToolPanelDeck_Impl - implementation - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + // AccessibleToolPanelDeck_Impl - implementation AccessibleToolPanelDeck_Impl::AccessibleToolPanelDeck_Impl( AccessibleToolPanelDeck& i_rAntiImpl, const Reference< XAccessible >& i_rAccessibleParent, ::svt::ToolPanelDeck& i_rPanelDeck ) :m_rAntiImpl( i_rAntiImpl ) @@ -141,14 +131,12 @@ namespace accessibility m_pPanelDeck->AddListener( *this ); } - //------------------------------------------------------------------------------------------------------------------ AccessibleToolPanelDeck_Impl::~AccessibleToolPanelDeck_Impl() { if ( !isDisposed() ) dispose(); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeck_Impl::dispose() { ENSURE_OR_RETURN_VOID( !isDisposed(), "disposed twice" ); @@ -157,14 +145,12 @@ namespace accessibility m_xAccessibleParent.clear(); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeck_Impl::checkDisposed() { if ( isDisposed() ) throw DisposedException( OUString(), *&m_rAntiImpl ); } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > AccessibleToolPanelDeck_Impl::getOwnAccessible() const { Reference< XAccessible > xOwnAccessible( static_cast< XAccessible* >( m_rAntiImpl.GetVCLXWindow() ) ); @@ -173,7 +159,6 @@ namespace accessibility return xOwnAccessible; } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > AccessibleToolPanelDeck_Impl::getActivePanelAccessible() { ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelDeck_Impl::getActivePanelAccessible: already disposed!", NULL ); @@ -191,20 +176,17 @@ namespace accessibility return m_xActivePanelAccessible; } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeck_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) { (void)i_pPanel; (void)i_nPosition; } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeck_Impl::PanelRemoved( const size_t i_nPosition ) { (void)i_nPosition; } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeck_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) { if ( !!i_rOldActive ) @@ -229,7 +211,6 @@ namespace accessibility } } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeck_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) { MethodGuard aGuard( *this ); @@ -238,17 +219,13 @@ namespace accessibility m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any() ); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeck_Impl::Dying() { // the tool panel deck is dying, so dispose ourself m_rAntiImpl.dispose(); } - //================================================================================================================== - //= AccessibleToolPanelDeck - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + // AccessibleToolPanelDeck AccessibleToolPanelDeck::AccessibleToolPanelDeck( const Reference< XAccessible >& i_rAccessibleParent, ::svt::ToolPanelDeck& i_rPanelDeck ) :AccessibleToolPanelDeck_Base( i_rPanelDeck.GetWindowPeer() ) @@ -256,12 +233,10 @@ namespace accessibility { } - //------------------------------------------------------------------------------------------------------------------ AccessibleToolPanelDeck::~AccessibleToolPanelDeck() { } - //------------------------------------------------------------------------------------------------------------------ sal_Int32 SAL_CALL AccessibleToolPanelDeck::getAccessibleChildCount( ) throw (RuntimeException) { MethodGuard aGuard( *m_pImpl ); @@ -275,7 +250,6 @@ namespace accessibility return nChildCount; } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *m_pImpl ); @@ -296,7 +270,6 @@ namespace accessibility return m_pImpl->getActivePanelAccessible(); } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleParent( ) throw (RuntimeException) { MethodGuard aGuard( *m_pImpl ); @@ -306,14 +279,12 @@ namespace accessibility return m_pImpl->m_xAccessibleParent; } - //------------------------------------------------------------------------------------------------------------------ sal_Int16 SAL_CALL AccessibleToolPanelDeck::getAccessibleRole( ) throw (RuntimeException) { MethodGuard aGuard( *m_pImpl ); return AccessibleRole::PANEL; } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > SAL_CALL AccessibleToolPanelDeck::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException) { MethodGuard aGuard( *m_pImpl ); @@ -351,21 +322,18 @@ namespace accessibility return NULL; } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL AccessibleToolPanelDeck::grabFocus( ) throw (RuntimeException) { MethodGuard aGuard( *m_pImpl ); m_pImpl->m_pPanelDeck->GrabFocus(); } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL AccessibleToolPanelDeck::disposing() { AccessibleToolPanelDeck_Base::disposing(); m_pImpl->dispose(); } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > AccessibleToolPanelDeck::GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent ) { // don't let the base class generate any A11Y events from VclWindowEvent, we completely manage those @@ -374,7 +342,6 @@ namespace accessibility return NULL; } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeck::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ) { AccessibleToolPanelDeck_Base::FillAccessibleStateSet( i_rStateSet ); @@ -387,9 +354,6 @@ namespace accessibility i_rStateSet.AddState( AccessibleStateType::FOCUSABLE ); } } - -//...................................................................................................................... } // namespace accessibility -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx index fc83bd59a865..0253b577d6c8 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBar.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "accessibility/extended/AccessibleToolPanelDeckTabBar.hxx" #include "accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx" #include "accessibility/helper/accresmgr.hxx" @@ -40,11 +39,8 @@ #include <vector> -//...................................................................................................................... namespace accessibility { -//...................................................................................................................... - using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::XInterface; using ::com::sun::star::uno::UNO_QUERY; @@ -67,9 +63,7 @@ namespace accessibility typedef ::com::sun::star::awt::Point UnoPoint; - //================================================================================================================== - //= AccessibleWrapper - //================================================================================================================== + // AccessibleWrapper typedef ::cppu::WeakImplHelper1< XAccessible > AccessibleWrapper_Base; class AccessibleWrapper : public AccessibleWrapper_Base { @@ -89,9 +83,7 @@ namespace accessibility const Reference< XAccessibleContext > m_xContext; }; - //================================================================================================================== - //= AccessibleToolPanelTabBar_Impl - //================================================================================================================== + // AccessibleToolPanelTabBar_Impl class AccessibleToolPanelTabBar_Impl :public ::boost::noncopyable ,public ::svt::IToolPanelDeckListener { @@ -132,7 +124,6 @@ namespace accessibility ::std::vector< Reference< XAccessible > > m_aChildren; }; - //------------------------------------------------------------------------------------------------------------------ AccessibleToolPanelTabBar_Impl::AccessibleToolPanelTabBar_Impl( AccessibleToolPanelTabBar& i_rAntiImpl, const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar ) :m_rAntiImpl( i_rAntiImpl ) @@ -152,21 +143,18 @@ namespace accessibility i_rTabBar.GetScrollButton( false ).AddEventListener( LINK( this, AccessibleToolPanelTabBar_Impl, OnWindowEvent ) ); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelTabBar_Impl::checkDisposed() { if ( isDisposed() ) throw DisposedException( OUString(), *&m_rAntiImpl ); } - //------------------------------------------------------------------------------------------------------------------ AccessibleToolPanelTabBar_Impl::~AccessibleToolPanelTabBar_Impl() { if ( !isDisposed() ) dispose(); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelTabBar_Impl::dispose() { ENSURE_OR_RETURN_VOID( !isDisposed(), "disposed twice" ); @@ -180,7 +168,6 @@ namespace accessibility m_xAccessibleParent.clear(); } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem( size_t i_nPosition ) { ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelTabBar_Impl::getAccessiblePanelItem: already disposed!", NULL ); @@ -197,7 +184,6 @@ namespace accessibility return rAccessibleChild; } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > AccessibleToolPanelTabBar_Impl::getOwnAccessible() const { Reference< XAccessible > xOwnAccessible( static_cast< XAccessible* >( m_rAntiImpl.GetVCLXWindow() ) ); @@ -206,7 +192,6 @@ namespace accessibility return xOwnAccessible; } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelTabBar_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) { ENSURE_OR_RETURN_VOID( i_nPosition <= m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::PanelInserted: illegal position (or invalid cache!)" ); @@ -215,7 +200,6 @@ namespace accessibility m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), makeAny( getAccessiblePanelItem( i_nPosition ) ) ); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelTabBar_Impl::PanelRemoved( const size_t i_nPosition ) { ENSURE_OR_RETURN_VOID( i_nPosition < m_aChildren.size(), "AccessibleToolPanelTabBar_Impl::PanelInserted: illegal position (or invalid cache!)" ); @@ -225,27 +209,23 @@ namespace accessibility m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::CHILD, makeAny( xOldChild ), Any() ); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelTabBar_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) { (void)i_rOldActive; (void)i_rNewActive; } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelTabBar_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) { (void)i_rNewLayouter; m_rAntiImpl.dispose(); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelTabBar_Impl::Dying() { m_rAntiImpl.dispose(); } - //------------------------------------------------------------------------------------------------------------------ IMPL_LINK( AccessibleToolPanelTabBar_Impl, OnWindowEvent, const VclSimpleEvent*, i_pEvent ) { ENSURE_OR_RETURN( !isDisposed(), "AccessibleToolPanelTabBar_Impl::OnWindowEvent: already disposed!", 0L ); @@ -272,9 +252,7 @@ namespace accessibility return 1L; } - //================================================================================================================== - //= MethodGuard - //================================================================================================================== + // MethodGuard namespace { class MethodGuard @@ -294,10 +272,7 @@ namespace accessibility }; } - //================================================================================================================== - //= AccessibleToolPanelTabBar - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + // AccessibleToolPanelTabBar AccessibleToolPanelTabBar::AccessibleToolPanelTabBar( const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar ) :AccessibleToolPanelTabBar_Base( i_rTabBar.GetWindowPeer() ) @@ -305,12 +280,10 @@ namespace accessibility { } - //------------------------------------------------------------------------------------------------------------------ AccessibleToolPanelTabBar::~AccessibleToolPanelTabBar() { } - //------------------------------------------------------------------------------------------------------------------ sal_Int32 SAL_CALL AccessibleToolPanelTabBar::getAccessibleChildCount( ) throw (RuntimeException) { MethodGuard aGuard( *m_pImpl ); @@ -323,7 +296,6 @@ namespace accessibility + ( bHasScrollForward ? 1 : 0 ); } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleChild( sal_Int32 i_nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { MethodGuard aGuard( *m_pImpl ); @@ -351,21 +323,18 @@ namespace accessibility return m_pImpl->getAccessiblePanelItem( i_nIndex - ( bHasScrollBack ? 1 : 0 ) ); } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleParent( ) throw (RuntimeException) { MethodGuard aGuard( *m_pImpl ); return m_pImpl->getAccessibleParent(); } - //------------------------------------------------------------------------------------------------------------------ sal_Int16 SAL_CALL AccessibleToolPanelTabBar::getAccessibleRole( ) throw (RuntimeException) { MethodGuard aGuard( *m_pImpl ); return AccessibleRole::PAGE_TAB_LIST; } - //------------------------------------------------------------------------------------------------------------------ namespace { bool lcl_covers( const ::Window& i_rWindow, const ::Point& i_rPoint ) @@ -375,7 +344,6 @@ namespace accessibility } } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > SAL_CALL AccessibleToolPanelTabBar::getAccessibleAtPoint( const UnoPoint& i_rPoint ) throw (RuntimeException) { MethodGuard aGuard( *m_pImpl ); @@ -406,14 +374,12 @@ namespace accessibility return NULL; } - //------------------------------------------------------------------------------------------------------------------ void SAL_CALL AccessibleToolPanelTabBar::disposing() { AccessibleToolPanelTabBar_Base::disposing(); m_pImpl->dispose(); } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessible > AccessibleToolPanelTabBar::GetChildAccessible( const VclWindowEvent& i_rVclWindowEvent ) { // don't let the base class generate any A11Y events from VclWindowEvent, we completely manage those @@ -422,7 +388,6 @@ namespace accessibility return NULL; } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelTabBar::FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& i_rStateSet ) { AccessibleToolPanelTabBar_Base::FillAccessibleStateSet( i_rStateSet ); @@ -434,9 +399,6 @@ namespace accessibility else i_rStateSet.AddState( AccessibleStateType::HORIZONTAL ); } - -//...................................................................................................................... } // namespace accessibility -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx index 8b7a2fdb0bdf..f5ef6d74ddcb 100644 --- a/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx +++ b/accessibility/source/extended/AccessibleToolPanelDeckTabBarItem.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "accessibility/extended/AccessibleToolPanelDeckTabBarItem.hxx" #include <com/sun/star/accessibility/AccessibleRole.hpp> @@ -34,11 +33,8 @@ #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -//...................................................................................................................... namespace accessibility { -//...................................................................................................................... - typedef ::com::sun::star::awt::Rectangle UnoRectangle; typedef ::com::sun::star::awt::Point UnoPoint; @@ -66,9 +62,7 @@ namespace accessibility namespace AccessibleStateType = ::com::sun::star::accessibility::AccessibleStateType; namespace AccessibleEventId = ::com::sun::star::accessibility::AccessibleEventId; - //================================================================================================================== - //= AccessibleToolPanelDeckTabBarItem_Impl - //================================================================================================================== + // AccessibleToolPanelDeckTabBarItem_Impl class AccessibleToolPanelDeckTabBarItem_Impl : public ::svt::IToolPanelDeckListener { public: @@ -115,10 +109,7 @@ namespace accessibility size_t m_nItemPos; }; - //================================================================================================================== - //= AccessibleToolPanelDeckTabBarItem_Impl - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + // AccessibleToolPanelDeckTabBarItem_Impl AccessibleToolPanelDeckTabBarItem_Impl::AccessibleToolPanelDeckTabBarItem_Impl( AccessibleToolPanelDeckTabBarItem& i_rAntiImpl, const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar, const size_t i_nItemPos ) @@ -131,19 +122,16 @@ namespace accessibility m_pPanelDeck->AddListener( *this ); } - //------------------------------------------------------------------------------------------------------------------ AccessibleToolPanelDeckTabBarItem_Impl::~AccessibleToolPanelDeckTabBarItem_Impl() { } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeckTabBarItem_Impl::checkDisposed() const { if ( isDisposed() ) throw DisposedException( OUString(), *&m_rAntiImpl ); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeckTabBarItem_Impl::dispose() { ENSURE_OR_RETURN_VOID( !isDisposed(), "AccessibleToolPanelDeckTabBarItem_Impl::dispose: disposed twice!" ); @@ -154,14 +142,12 @@ namespace accessibility m_pTabBar = NULL; } - //------------------------------------------------------------------------------------------------------------------ Reference< XAccessibleComponent > AccessibleToolPanelDeckTabBarItem_Impl::getParentAccessibleComponent() const { Reference< XAccessible > xAccessibleParent( m_rAntiImpl.getAccessibleParent(), UNO_QUERY_THROW ); return Reference< XAccessibleComponent >( xAccessibleParent->getAccessibleContext(), UNO_QUERY ); } - //------------------------------------------------------------------------------------------------------------------ OUString AccessibleToolPanelDeckTabBarItem_Impl::getPanelDisplayName() { const ::svt::PToolPanel pPanel( m_pPanelDeck->GetPanel( getItemPos() ) ); @@ -170,13 +156,11 @@ namespace accessibility return pPanel->GetDisplayName(); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeckTabBarItem_Impl::impl_notifyBoundRectChanges() { m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::BOUNDRECT_CHANGED, Any(), Any() ); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeckTabBarItem_Impl::impl_notifyStateChange( const sal_Int16 i_nLostState, const sal_Int16 i_nGainedState ) { m_rAntiImpl.NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, @@ -185,7 +169,6 @@ namespace accessibility ); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeckTabBarItem_Impl::PanelInserted( const ::svt::PToolPanel& i_pPanel, const size_t i_nPosition ) { (void)i_pPanel; @@ -194,7 +177,6 @@ namespace accessibility impl_notifyBoundRectChanges(); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeckTabBarItem_Impl::PanelRemoved( const size_t i_nPosition ) { if ( i_nPosition == m_nItemPos ) @@ -208,7 +190,6 @@ namespace accessibility } } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeckTabBarItem_Impl::ActivePanelChanged( const ::boost::optional< size_t >& i_rOldActive, const ::boost::optional< size_t >& i_rNewActive ) { if ( m_nItemPos == i_rOldActive ) @@ -223,7 +204,6 @@ namespace accessibility } } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeckTabBarItem_Impl::LayouterChanged( const ::svt::PDeckLayouter& i_rNewLayouter ) { (void)i_rNewLayouter; @@ -232,16 +212,12 @@ namespace accessibility dispose(); } - //------------------------------------------------------------------------------------------------------------------ void AccessibleToolPanelDeckTabBarItem_Impl::Dying() { // if the tool panel deck is dying, then its layouter dies, so should we. dispose(); } - //================================================================================================================== - //= ItemMethodGuard - //================================================================================================================== class ItemMethodGuard { public: @@ -258,10 +234,6 @@ namespace accessibility SolarMutexGuard m_aGuard; }; - //================================================================================================================== - //= AccessibleToolPanelDeckTabBarItem - //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ AccessibleToolPanelDeckTabBarItem::AccessibleToolPanelDeckTabBarItem( const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar, const size_t i_nItemPos ) : ::comphelper::OAccessibleExtendedComponentHelper( @@ -271,52 +243,44 @@ namespace accessibility { } - //------------------------------------------------------------------------------------------------------------------ AccessibleToolPanelDeckTabBarItem::~AccessibleToolPanelDeckTabBarItem() { } - //-------------------------------------------------------------------- sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChildCount( ) throw (RuntimeException) { return 0; } - //-------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { (void)i; throw IndexOutOfBoundsException( OUString(), *this ); } - //-------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleParent( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getAccessibleParent(); } - //-------------------------------------------------------------------- sal_Int16 SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRole( ) throw (RuntimeException) { return AccessibleRole::PAGE_TAB; } - //-------------------------------------------------------------------- OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleDescription( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); } - //-------------------------------------------------------------------- OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleName( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); } - //-------------------------------------------------------------------- Reference< XAccessibleRelationSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleRelationSet( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); @@ -324,7 +288,6 @@ namespace accessibility return pRelationSet; } - //-------------------------------------------------------------------- Reference< XAccessibleStateSet > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleStateSet( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); @@ -355,8 +318,6 @@ namespace accessibility return pStateSet; } - - //-------------------------------------------------------------------- Reference< XAccessible > SAL_CALL AccessibleToolPanelDeckTabBarItem::getAccessibleAtPoint( const UnoPoint& i_rLocation ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); @@ -365,14 +326,12 @@ namespace accessibility return NULL; } - //-------------------------------------------------------------------- void SAL_CALL AccessibleToolPanelDeckTabBarItem::grabFocus( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); m_pImpl->getTabBar()->FocusPanelItem( m_pImpl->getItemPos() ); } - //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getForeground( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); @@ -380,7 +339,6 @@ namespace accessibility return xParentComponent->getForeground(); } - //-------------------------------------------------------------------- ::sal_Int32 SAL_CALL AccessibleToolPanelDeckTabBarItem::getBackground( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); @@ -388,7 +346,6 @@ namespace accessibility return xParentComponent->getBackground(); } - //-------------------------------------------------------------------- Reference< XFont > SAL_CALL AccessibleToolPanelDeckTabBarItem::getFont( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); @@ -398,7 +355,6 @@ namespace accessibility return xParentComponent->getFont(); } - //-------------------------------------------------------------------- OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getTitledBorderText( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); @@ -406,14 +362,12 @@ namespace accessibility return OUString(); } - //-------------------------------------------------------------------- OUString SAL_CALL AccessibleToolPanelDeckTabBarItem::getToolTipText( ) throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); return m_pImpl->getPanelDisplayName(); } - //-------------------------------------------------------------------- UnoRectangle SAL_CALL AccessibleToolPanelDeckTabBarItem::implGetBounds() throw (RuntimeException) { ItemMethodGuard aGuard( *m_pImpl ); @@ -430,15 +384,11 @@ namespace accessibility ); } - //-------------------------------------------------------------------- void SAL_CALL AccessibleToolPanelDeckTabBarItem::disposing() { ItemMethodGuard aGuard( *m_pImpl ); m_pImpl->dispose(); } - -//...................................................................................................................... } // namespace accessibility -//...................................................................................................................... /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index f0c49de44251..1056de2e988b 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx @@ -20,19 +20,14 @@ #include "accessibility/extended/accessiblebrowseboxcell.hxx" #include <svtools/accessibletableprovider.hxx> -// ................................................................................. namespace accessibility { -// ................................................................................. - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; using namespace ::com::sun::star::accessibility; using namespace ::svt; - // ============================================================================= - // = AccessibleBrowseBoxCell - // ============================================================================= + // AccessibleBrowseBoxCell AccessibleBrowseBoxCell::AccessibleBrowseBoxCell( const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox, const Reference< XWindow >& _xFocusWindow, @@ -48,32 +43,25 @@ namespace accessibility implSetName( aAccName ); } - // ----------------------------------------------------------------------------- AccessibleBrowseBoxCell::~AccessibleBrowseBoxCell() { } - // ----------------------------------------------------------------------------- void SAL_CALL AccessibleBrowseBoxCell::grabFocus() throw ( RuntimeException ) { SolarMethodGuard aGuard( *this ); mpBrowseBox->GoToCell( m_nRowPos, m_nColPos ); } - // ----------------------------------------------------------------------------- + ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBox() { return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False, sal_False ); } - // ----------------------------------------------------------------------------- ::Rectangle AccessibleBrowseBoxCell::implGetBoundingBoxOnScreen() { return mpBrowseBox->GetFieldRectPixelAbs( m_nRowPos, m_nColPos, sal_False ); } - -// ................................................................................. } // namespace accessibility -// ................................................................................. - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index de61a4a059d5..c58ef312544c 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -23,12 +23,8 @@ #include <com/sun/star/accessibility/XAccessibleText.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> - -// ................................................................................. namespace accessibility { -// ................................................................................. - using namespace com::sun::star::accessibility; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -36,7 +32,6 @@ namespace accessibility using namespace ::comphelper; using namespace ::svt; - // ----------------------------------------------------------------------------- EditBrowseBoxTableCell::EditBrowseBoxTableCell( const com::sun::star::uno::Reference< XAccessible >& _rxParent, const com::sun::star::uno::Reference< XAccessible >& _rxOwningAccessible, @@ -51,7 +46,6 @@ namespace accessibility aggregateProxy( m_refCount, *this ); } - // ----------------------------------------------------------------------------- EditBrowseBoxTableCell::~EditBrowseBoxTableCell() { if ( !rBHelper.bDisposed ) @@ -61,26 +55,21 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName() throw ( ::com::sun::star::uno::RuntimeException ) { return OUString( "com.sun.star.comp.svtools.TableCellProxy" ); } - // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2( EditBrowseBoxTableCell, AccessibleBrowseBoxCell, OAccessibleContextWrapperHelper ) - // ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XTYPEPROVIDER2( EditBrowseBoxTableCell, AccessibleBrowseBoxCell, OAccessibleContextWrapperHelper ) - // ----------------------------------------------------------------------------- void EditBrowseBoxTableCell::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException) { commitEvent( _rEvent.EventId, _rEvent.NewValue, _rEvent.OldValue ); } // XAccessibleComponent - // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL EditBrowseBoxTableCell::getForeground( ) throw (RuntimeException) { SolarMethodGuard aGuard( *this ); @@ -90,7 +79,6 @@ namespace accessibility return 0; } - // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL EditBrowseBoxTableCell::getBackground( ) throw (RuntimeException) { SolarMethodGuard aGuard( *this ); @@ -100,20 +88,17 @@ namespace accessibility return 0; } - // ----------------------------------------------------------------------------- Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent( ) throw (RuntimeException) { return m_xParentAccessible; } - // ----------------------------------------------------------------------------- OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException ) { SolarMethodGuard aGuard( *this ); return m_xInnerContext->getAccessibleDescription(); } - // ----------------------------------------------------------------------------- OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName() throw ( RuntimeException ) { SolarMethodGuard aGuard( *this ); @@ -122,14 +107,12 @@ namespace accessibility return "Column " + OUString::number(getColumnPos()-1) + ", Row " + OUString::number(getRowPos()); } - // ----------------------------------------------------------------------------- Reference< XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException ) { SolarMethodGuard aGuard( *this ); return OAccessibleContextWrapperHelper::getAccessibleRelationSet( ); } - // ----------------------------------------------------------------------------- Reference<XAccessibleStateSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() throw ( RuntimeException ) { SolarMethodGuard aGuard( *this ); @@ -137,27 +120,24 @@ namespace accessibility // TODO: shouldn't we add an ACTIVE here? Isn't the EditBrowseBoxTableCell always ACTIVE? } - // ----------------------------------------------------------------------------- sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount( ) throw (RuntimeException) { SolarMethodGuard aGuard( *this ); return OAccessibleContextWrapperHelper::getAccessibleChildCount(); } - // ----------------------------------------------------------------------------- Reference< XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) throw (::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException) { SolarMethodGuard aGuard( *this ); return OAccessibleContextWrapperHelper::getAccessibleChild( i ); } - // ----------------------------------------------------------------------------- sal_Int16 SAL_CALL EditBrowseBoxTableCell::getAccessibleRole() throw ( RuntimeException ) { SolarMethodGuard aGuard( *this ); return m_xInnerContext->getAccessibleRole( ); } - // ----------------------------------------------------------------------------- + void SAL_CALL EditBrowseBoxTableCell::dispose() throw( RuntimeException ) { // simply disambiguate. Note that the OComponentHelper base in AccessibleBrowseBoxCell @@ -165,13 +145,13 @@ namespace accessibility // so there is no need to do this here. AccessibleBrowseBoxCell::dispose(); } - // ----------------------------------------------------------------------------- + void SAL_CALL EditBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException) { AccessibleBrowseBoxCell::disposing( _rSource ); OAccessibleContextWrapperHelper::disposing( _rSource ); } - // ----------------------------------------------------------------------------- + void SAL_CALL EditBrowseBoxTableCell::disposing() { SolarMethodGuard aGuard( *this, false ); @@ -179,9 +159,8 @@ namespace accessibility // TODO: do we need to dispose our inner object? The base class does this, but is it a good idea? AccessibleBrowseBoxCell::disposing(); } - // ============================================================================= - // = EditBrowseBoxTableCell - // ============================================================================= + + // EditBrowseBoxTableCell EditBrowseBoxTableCellAccess::EditBrowseBoxTableCellAccess( const Reference< XAccessible >& _rxParent, const Reference< XAccessible > _rxControlAccessible, const Reference< XWindow >& _rxFocusWindow, @@ -195,11 +174,11 @@ namespace accessibility ,m_nColPos( _nColPos ) { } - // ----------------------------------------------------------------------------- + EditBrowseBoxTableCellAccess::~EditBrowseBoxTableCellAccess( ) { } - //-------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext( ) throw (RuntimeException) { if ( !m_pBrowseBox || !m_xControlAccessible.is() ) @@ -215,7 +194,7 @@ namespace accessibility } return xMyContext; } - //-------------------------------------------------------------------- + void SAL_CALL EditBrowseBoxTableCellAccess::disposing() { // dispose our context, if it still alive @@ -239,8 +218,6 @@ namespace accessibility // NO dispose of the inner object there: it is the XAccessible of an window, and disposing // it would delete the respective VCL window } -// ................................................................................. } // namespace accessibility -// ................................................................................. /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 460ee4dafa75..8b2fd453c3bf 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -40,23 +40,23 @@ namespace accessibility using namespace ::com::sun::star::lang; using namespace ::com::sun::star; - // ----------------------------------------------------------------------------- + // Ctor() and Dtor() - // ----------------------------------------------------------------------------- + AccessibleIconChoiceCtrl::AccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl, const Reference< XAccessible >& _xParent ) : VCLXAccessibleComponent( _rIconCtrl.GetWindowPeer() ), m_xParent ( _xParent ) { } - // ----------------------------------------------------------------------------- + AccessibleIconChoiceCtrl::~AccessibleIconChoiceCtrl() { } - // ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2(AccessibleIconChoiceCtrl, VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE) IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleIconChoiceCtrl, VCLXAccessibleComponent, AccessibleIconChoiceCtrl_BASE) - // ----------------------------------------------------------------------------- + void AccessibleIconChoiceCtrl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( isAlive() ) @@ -116,35 +116,35 @@ namespace accessibility } } } - // ----------------------------------------------------------------------------- + // XComponent - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleIconChoiceCtrl::disposing() { ::osl::MutexGuard aGuard( m_aMutex ); m_xParent = NULL; } - // ----------------------------------------------------------------------------- + // XServiceInfo - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName() throw (RuntimeException) { return getImplementationName_Static(); } - // ----------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames() throw (RuntimeException) { return getSupportedServiceNames_Static(); } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, _rServiceName); } - // ----------------------------------------------------------------------------- + // XServiceInfo - static methods - // ----------------------------------------------------------------------------- + Sequence< OUString > AccessibleIconChoiceCtrl::getSupportedServiceNames_Static(void) throw (RuntimeException) { Sequence< OUString > aSupported(3); @@ -153,22 +153,22 @@ namespace accessibility aSupported[2] = "com.sun.star.awt.AccessibleIconChoiceControl"; return aSupported; } - // ----------------------------------------------------------------------------- + OUString AccessibleIconChoiceCtrl::getImplementationName_Static(void) throw (RuntimeException) { return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControl" ); } - // ----------------------------------------------------------------------------- + // XAccessible - // ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext( ) throw (RuntimeException) { ensureAlive(); return this; } - // ----------------------------------------------------------------------------- + // XAccessibleContext - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -176,7 +176,7 @@ namespace accessibility ensureAlive(); return getCtrl()->GetEntryCount(); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, IndexOutOfBoundsException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -189,7 +189,7 @@ namespace accessibility return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this ); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleParent( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -197,13 +197,13 @@ namespace accessibility ensureAlive(); return m_xParent; } - // ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleRole( ) throw (RuntimeException) { //return AccessibleRole::TREE; return AccessibleRole::LIST; } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -211,7 +211,7 @@ namespace accessibility ensureAlive(); return getCtrl()->GetAccessibleDescription(); } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -223,9 +223,9 @@ namespace accessibility sName = "IconChoiceControl"; return sName; } - // ----------------------------------------------------------------------------- + // XAccessibleSelection - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -239,7 +239,7 @@ namespace accessibility pCtrl->SetCursor( pEntry ); } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -253,7 +253,7 @@ namespace accessibility return ( pCtrl->GetCursor() == pEntry ); } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleIconChoiceCtrl::clearAccessibleSelection( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -261,7 +261,7 @@ namespace accessibility ensureAlive(); getCtrl()->SetNoSelection(); } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleIconChoiceCtrl::selectAllAccessibleChildren( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -277,7 +277,7 @@ namespace accessibility pCtrl->SetCursor( pEntry ); } } - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -296,7 +296,7 @@ namespace accessibility return nSelCount; } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -325,7 +325,7 @@ namespace accessibility return xChild; } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -355,7 +355,7 @@ namespace accessibility if ( 1 == nSelCount && bFound ) pCtrl->SetNoSelection(); } - // ----------------------------------------------------------------------------- + void AccessibleIconChoiceCtrl::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); @@ -366,7 +366,7 @@ namespace accessibility rStateSet.AddState( AccessibleStateType::SELECTABLE ); } } - // ----------------------------------------------------------------------------- + SvtIconChoiceCtrl* AccessibleIconChoiceCtrl::getCtrl() { return static_cast<SvtIconChoiceCtrl*>(GetWindow()); diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index acbda971a2a9..6fc8a1e183e8 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -61,9 +61,9 @@ namespace accessibility using namespace ::com::sun::star::lang; using namespace ::com::sun::star; - // ----------------------------------------------------------------------------- + // Ctor() and Dtor() - // ----------------------------------------------------------------------------- + AccessibleIconChoiceCtrlEntry::AccessibleIconChoiceCtrlEntry( SvtIconChoiceCtrl& _rIconCtrl, sal_uLong _nPos, const Reference< XAccessible >& _xParent ) : @@ -84,7 +84,7 @@ namespace accessibility } osl_atomic_decrement( &m_refCount ); } - // ----------------------------------------------------------------------------- + void AccessibleIconChoiceCtrlEntry::disposing( const EventObject& _rSource ) throw(RuntimeException) { @@ -94,7 +94,7 @@ throw(RuntimeException) OSL_ENSURE( !m_xParent.is() && ( NULL == m_pIconCtrl ), "" ); } } - // ----------------------------------------------------------------------------- + AccessibleIconChoiceCtrlEntry::~AccessibleIconChoiceCtrlEntry() { if ( IsAlive_Impl() ) @@ -104,7 +104,7 @@ throw(RuntimeException) dispose(); } } - // ----------------------------------------------------------------------------- + Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox_Impl() const { Rectangle aRect; @@ -114,7 +114,7 @@ throw(RuntimeException) return aRect; } - // ----------------------------------------------------------------------------- + Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen_Impl() const { Rectangle aRect; @@ -129,12 +129,12 @@ throw(RuntimeException) return aRect; } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleIconChoiceCtrlEntry::IsAlive_Impl() const { return ( !rBHelper.bDisposed && !rBHelper.bInDispose && m_pIconCtrl ); } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleIconChoiceCtrlEntry::IsShowing_Impl() const { sal_Bool bShowing = sal_False; @@ -149,7 +149,7 @@ throw(RuntimeException) return bShowing; } - // ----------------------------------------------------------------------------- + Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox() throw (lang::DisposedException, uno::RuntimeException) { @@ -159,7 +159,7 @@ throw(RuntimeException) EnsureIsAlive(); return GetBoundingBox_Impl(); } - // ----------------------------------------------------------------------------- + Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen() throw (lang::DisposedException, uno::RuntimeException) { @@ -169,13 +169,13 @@ throw(RuntimeException) EnsureIsAlive(); return GetBoundingBoxOnScreen_Impl(); } - // ----------------------------------------------------------------------------- + void AccessibleIconChoiceCtrlEntry::EnsureIsAlive() const throw ( lang::DisposedException ) { if ( !IsAlive_Impl() ) throw lang::DisposedException(); } - // ----------------------------------------------------------------------------- + OUString AccessibleIconChoiceCtrlEntry::implGetText() { OUString sRet; @@ -184,7 +184,7 @@ throw(RuntimeException) sRet = pEntry->GetDisplayText(); return sRet; } - // ----------------------------------------------------------------------------- + Locale AccessibleIconChoiceCtrlEntry::implGetLocale() { Locale aLocale; @@ -197,10 +197,10 @@ throw(RuntimeException) nStartIndex = 0; nEndIndex = 0; } - // ----------------------------------------------------------------------------- + // XTypeProvider - // ----------------------------------------------------------------------------- - // ----------------------------------------------------------------------------- + + Sequence< sal_Int8 > AccessibleIconChoiceCtrlEntry::getImplementationId() throw (RuntimeException) { static ::cppu::OImplementationId* pId = NULL; @@ -217,9 +217,9 @@ throw(RuntimeException) } return pId->getImplementationId(); } - // ----------------------------------------------------------------------------- + // XComponent - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleIconChoiceCtrlEntry::disposing() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -239,26 +239,26 @@ throw(RuntimeException) m_pIconCtrl = NULL; m_xParent = NULL; } - // ----------------------------------------------------------------------------- + // XServiceInfo - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } - // ----------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, _rServiceName); } - // ----------------------------------------------------------------------------- + // XServiceInfo - static methods - // ----------------------------------------------------------------------------- + Sequence< OUString > AccessibleIconChoiceCtrlEntry::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< OUString > aSupported(3); @@ -267,32 +267,32 @@ throw(RuntimeException) aSupported[2] = "com.sun.star.awt.AccessibleIconChoiceControlEntry"; return aSupported; } - // ----------------------------------------------------------------------------- + OUString AccessibleIconChoiceCtrlEntry::getImplementationName_Static(void) throw( RuntimeException ) { return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControlEntry" ); } - // ----------------------------------------------------------------------------- + // XAccessible - // ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleContext( ) throw (RuntimeException) { EnsureIsAlive(); return this; } - // ----------------------------------------------------------------------------- + // XAccessibleContext - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount( ) throw (RuntimeException) { return 0; // no children } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException,RuntimeException) { throw IndexOutOfBoundsException(); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleParent( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -300,26 +300,26 @@ throw(RuntimeException) EnsureIsAlive(); return m_xParent; } - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_nIndex; } - // ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole( ) throw (RuntimeException) { //return AccessibleRole::LABEL; return AccessibleRole::LIST_ITEM; } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription( ) throw (RuntimeException) { // no description for every item return OUString(); } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -327,12 +327,12 @@ throw(RuntimeException) EnsureIsAlive(); return implGetText(); } - // ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRelationSet( ) throw (RuntimeException) { return new utl::AccessibleRelationSetHelper; } - // ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -361,7 +361,7 @@ throw(RuntimeException) return xStateSet; } - // ----------------------------------------------------------------------------- + Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -369,44 +369,44 @@ throw(RuntimeException) return implGetLocale(); } - // ----------------------------------------------------------------------------- + // XAccessibleComponent - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException) { return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) { return Reference< XAccessible >(); } - // ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getBounds( ) throw (RuntimeException) { return AWTRectangle( GetBoundingBox() ); } - // ----------------------------------------------------------------------------- + awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocation( ) throw (RuntimeException) { return AWTPoint( GetBoundingBox().TopLeft() ); } - // ----------------------------------------------------------------------------- + awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen( ) throw (RuntimeException) { return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } - // ----------------------------------------------------------------------------- + awt::Size SAL_CALL AccessibleIconChoiceCtrlEntry::getSize( ) throw (RuntimeException) { return AWTSize( GetBoundingBox().GetSize() ); } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus( ) throw (RuntimeException) { // do nothing, because no focus for each item } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -423,7 +423,7 @@ throw(RuntimeException) return nColor; } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleIconChoiceCtrlEntry::getBackground( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -440,10 +440,10 @@ throw(RuntimeException) return nColor; } - // ----------------------------------------------------------------------------- + // XAccessibleText - // ----------------------------------------------------------------------------- - // ----------------------------------------------------------------------------- + + awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterBounds( sal_Int32 _nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -463,7 +463,7 @@ throw(RuntimeException) return aBounds; } - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -492,7 +492,7 @@ throw(RuntimeException) return nIndex; } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -508,9 +508,9 @@ throw(RuntimeException) return sal_True; } - // ----------------------------------------------------------------------------- + // XAccessibleEventBroadcaster - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleIconChoiceCtrlEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if (xListener.is()) @@ -521,7 +521,7 @@ throw(RuntimeException) comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener ); } } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleIconChoiceCtrlEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if (xListener.is()) @@ -654,9 +654,9 @@ throw(RuntimeException) return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType); } - // ----------------------------------------------------------------------------- + // XAccessibleAction - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionCount( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -664,7 +664,7 @@ throw(RuntimeException) // three actions supported return ACCESSIBLE_ACTION_COUNT; } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -684,7 +684,7 @@ throw(RuntimeException) return bRet; } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -696,7 +696,7 @@ throw(RuntimeException) static const OUString sActionDesc( "Select" ); return sActionDesc; } - // ----------------------------------------------------------------------------- + Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 795e66a610b0..df275ccf46c2 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -45,16 +45,16 @@ namespace accessibility using namespace ::com::sun::star::lang; using namespace ::com::sun::star; - // ----------------------------------------------------------------------------- + // Ctor() and Dtor() - // ----------------------------------------------------------------------------- + AccessibleListBox::AccessibleListBox( SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) : VCLXAccessibleComponent( _rListBox.GetWindowPeer() ), m_xParent( _xParent ) { } - // ----------------------------------------------------------------------------- + AccessibleListBox::~AccessibleListBox() { if ( isAlive() ) @@ -66,12 +66,12 @@ namespace accessibility } IMPLEMENT_FORWARD_XINTERFACE2(AccessibleListBox, VCLXAccessibleComponent, AccessibleListBox_BASE) IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleListBox, VCLXAccessibleComponent, AccessibleListBox_BASE) - // ----------------------------------------------------------------------------- + SvTreeListBox* AccessibleListBox::getListBox() const { return static_cast< SvTreeListBox* >( const_cast<AccessibleListBox*>(this)->GetWindow() ); } - // ----------------------------------------------------------------------------- + void AccessibleListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( isAlive() ) @@ -291,7 +291,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleListBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -309,9 +309,9 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + // XComponent - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBox::disposing() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -320,26 +320,26 @@ namespace accessibility VCLXAccessibleComponent::disposing(); m_xParent = NULL; } - // ----------------------------------------------------------------------------- + // XServiceInfo - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleListBox::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } - // ----------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, _rServiceName); } - // ----------------------------------------------------------------------------- + // XServiceInfo - static methods - // ----------------------------------------------------------------------------- + Sequence< OUString > AccessibleListBox::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< OUString > aSupported(3); @@ -348,22 +348,22 @@ namespace accessibility aSupported[2] = "com.sun.star.awt.AccessibleTreeListBox"; return aSupported; } - // ----------------------------------------------------------------------------- + OUString AccessibleListBox::getImplementationName_Static(void) throw( RuntimeException ) { return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBox" ); } - // ----------------------------------------------------------------------------- + // XAccessible - // ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext( ) throw (RuntimeException) { ensureAlive(); return this; } - // ----------------------------------------------------------------------------- + // XAccessibleContext - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleListBox::getAccessibleChildCount( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -377,7 +377,7 @@ namespace accessibility return nCount; } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -391,7 +391,7 @@ namespace accessibility //return new AccessibleListBoxEntry( *getListBox(), pEntry, this ); return new AccessibleListBoxEntry( *getListBox(), pEntry, NULL ); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -399,7 +399,7 @@ namespace accessibility ensureAlive(); return m_xParent; } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleListBox::GetRoleType() { sal_Int32 nCase = 0; @@ -453,7 +453,7 @@ namespace accessibility else return AccessibleRole::TREE; } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleListBox::getAccessibleDescription( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -461,7 +461,7 @@ namespace accessibility ensureAlive(); return getListBox()->GetAccessibleDescription(); } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleListBox::getAccessibleName( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -469,9 +469,9 @@ namespace accessibility ensureAlive(); return getListBox()->GetAccessibleName(); } - // ----------------------------------------------------------------------------- + // XAccessibleSelection - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -484,7 +484,7 @@ namespace accessibility getListBox()->Select( pEntry, sal_True ); } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -497,7 +497,7 @@ namespace accessibility return getListBox()->IsSelected( pEntry ); } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBox::clearAccessibleSelection( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -512,7 +512,7 @@ namespace accessibility getListBox()->Select( pEntry, sal_False ); } } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBox::selectAllAccessibleChildren( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -527,7 +527,7 @@ namespace accessibility getListBox()->Select( pEntry, sal_True ); } } - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount( ) throw (RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -536,7 +536,7 @@ namespace accessibility return getListBox()->GetSelectionCount(); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -566,7 +566,7 @@ namespace accessibility return xChild; } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -579,7 +579,7 @@ namespace accessibility getListBox()->Select( pEntry, sal_False ); } - // ----------------------------------------------------------------------------- + void AccessibleListBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index eb6b9f23b232..1dcdb0fc04bd 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -66,9 +66,9 @@ namespace accessibility using namespace ::com::sun::star; using namespace ::comphelper; - // ----------------------------------------------------------------------------- + // Ctor() and Dtor() - // ----------------------------------------------------------------------------- + AccessibleListBoxEntry::AccessibleListBoxEntry( SvTreeListBox& _rListBox, SvTreeListEntry* _pEntry, const Reference< XAccessible >& _xParent ) : @@ -83,7 +83,7 @@ namespace accessibility { _rListBox.FillEntryPath( _pEntry, m_aEntryPath ); } - // ----------------------------------------------------------------------------- + AccessibleListBoxEntry::~AccessibleListBoxEntry() { if ( IsAlive_Impl() ) @@ -106,7 +106,7 @@ namespace accessibility } - // ----------------------------------------------------------------------------- + Rectangle AccessibleListBoxEntry::GetBoundingBox_Impl() const { Rectangle aRect; @@ -126,7 +126,7 @@ namespace accessibility return aRect; } - // ----------------------------------------------------------------------------- + Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen_Impl() const { Rectangle aRect; @@ -141,12 +141,12 @@ namespace accessibility return aRect; } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleListBoxEntry::IsAlive_Impl() const { return ( !rBHelper.bDisposed && !rBHelper.bInDispose && isAlive() ); } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleListBoxEntry::IsShowing_Impl() const { Reference< XAccessible > xParent = implGetParentAccessible( ); @@ -163,7 +163,7 @@ namespace accessibility return bShowing; } - // ----------------------------------------------------------------------------- + Rectangle AccessibleListBoxEntry::GetBoundingBox() throw (lang::DisposedException, uno::RuntimeException) { @@ -173,7 +173,7 @@ namespace accessibility EnsureIsAlive(); return GetBoundingBox_Impl(); } - // ----------------------------------------------------------------------------- + Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen() throw (lang::DisposedException, uno::RuntimeException) { @@ -183,13 +183,13 @@ namespace accessibility EnsureIsAlive(); return GetBoundingBoxOnScreen_Impl(); } - // ----------------------------------------------------------------------------- + void AccessibleListBoxEntry::EnsureIsAlive() const throw ( lang::DisposedException ) { if ( !IsAlive_Impl() ) throw lang::DisposedException(); } - // ----------------------------------------------------------------------------- + OUString AccessibleListBoxEntry::implGetText() { OUString sRet; @@ -198,7 +198,7 @@ namespace accessibility sRet = getListBox()->SearchEntryTextWithHeadTitle( pEntry ); return sRet; } - // ----------------------------------------------------------------------------- + Locale AccessibleListBoxEntry::implGetLocale() { Locale aLocale; @@ -211,10 +211,10 @@ namespace accessibility nStartIndex = 0; nEndIndex = 0; } - // ----------------------------------------------------------------------------- + // XTypeProvider - // ----------------------------------------------------------------------------- - // ----------------------------------------------------------------------------- + + Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId() throw (RuntimeException) { static ::cppu::OImplementationId* pId = NULL; @@ -232,17 +232,17 @@ namespace accessibility return pId->getImplementationId(); } - // ----------------------------------------------------------------------------- + // XComponent/ListBoxAccessibleBase - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBoxEntry::dispose() throw ( uno::RuntimeException ) { AccessibleListBoxEntry_BASE::dispose(); } - // ----------------------------------------------------------------------------- + // XComponent - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBoxEntry::disposing() { SolarMutexGuard(); @@ -265,26 +265,26 @@ namespace accessibility } m_aParent = WeakReference< XAccessible >(); } - // ----------------------------------------------------------------------------- + // XServiceInfo - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleListBoxEntry::getImplementationName() throw(RuntimeException) { return getImplementationName_Static(); } - // ----------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames() throw(RuntimeException) { return getSupportedServiceNames_Static(); } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, _rServiceName); } - // ----------------------------------------------------------------------------- + // XServiceInfo - static methods - // ----------------------------------------------------------------------------- + Sequence< OUString > AccessibleListBoxEntry::getSupportedServiceNames_Static(void) throw( RuntimeException ) { Sequence< OUString > aSupported(3); @@ -293,22 +293,22 @@ namespace accessibility aSupported[2] = "com.sun.star.awt.AccessibleTreeListBoxEntry"; return aSupported; } - // ----------------------------------------------------------------------------- + OUString AccessibleListBoxEntry::getImplementationName_Static(void) throw( RuntimeException ) { return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBoxEntry" ); } - // ----------------------------------------------------------------------------- + // XAccessible - // ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL AccessibleListBoxEntry::getAccessibleContext( ) throw (RuntimeException) { EnsureIsAlive(); return this; } - // ----------------------------------------------------------------------------- + // XAccessibleContext - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -322,7 +322,7 @@ namespace accessibility return nCount; } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException) { SolarMutexGuard aSolarGuard; @@ -336,7 +336,7 @@ namespace accessibility return new AccessibleListBoxEntry( *getListBox(), pEntry, this ); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleListBoxEntry::implGetParentAccessible( ) const { Reference< XAccessible > xParent = (Reference< XAccessible >)m_aParent; @@ -373,7 +373,7 @@ namespace accessibility return xParent; } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleParent( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -382,7 +382,7 @@ namespace accessibility return implGetParentAccessible( ); } - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -390,7 +390,7 @@ namespace accessibility OSL_ENSURE( !m_aEntryPath.empty(), "empty path" ); return m_aEntryPath.empty() ? -1 : m_aEntryPath.back(); } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleListBoxEntry::GetRoleType() { sal_Int32 nCase = 0; @@ -419,7 +419,7 @@ namespace accessibility } return nCase; } - // ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL AccessibleListBoxEntry::getAccessibleRole( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -457,7 +457,7 @@ namespace accessibility } return AccessibleRole::UNKNOWN; } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -492,7 +492,7 @@ namespace accessibility return getListBox()->SearchEntryTextWithHeadTitle( pEntry ); } } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -512,7 +512,7 @@ namespace accessibility return sRet; } - // ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > SAL_CALL AccessibleListBoxEntry::getAccessibleRelationSet( ) throw (RuntimeException) { Reference< XAccessibleRelationSet > xRelSet; @@ -530,7 +530,7 @@ namespace accessibility } return xRelSet; } - // ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -567,7 +567,7 @@ namespace accessibility return xStateSet; } - // ----------------------------------------------------------------------------- + Locale SAL_CALL AccessibleListBoxEntry::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -575,14 +575,14 @@ namespace accessibility return implGetLocale(); } - // ----------------------------------------------------------------------------- + // XAccessibleComponent - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException) { return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -600,32 +600,32 @@ namespace accessibility xAcc = pAccEntry; return xAcc; } - // ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds( ) throw (RuntimeException) { return AWTRectangle( GetBoundingBox() ); } - // ----------------------------------------------------------------------------- + awt::Point SAL_CALL AccessibleListBoxEntry::getLocation( ) throw (RuntimeException) { return AWTPoint( GetBoundingBox().TopLeft() ); } - // ----------------------------------------------------------------------------- + awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen( ) throw (RuntimeException) { return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } - // ----------------------------------------------------------------------------- + awt::Size SAL_CALL AccessibleListBoxEntry::getSize( ) throw (RuntimeException) { return AWTSize( GetBoundingBox().GetSize() ); } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBoxEntry::grabFocus( ) throw (RuntimeException) { // do nothing, because no focus for each item } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleListBoxEntry::getForeground( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -642,7 +642,7 @@ namespace accessibility return nColor; } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleListBoxEntry::getBackground( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -659,10 +659,10 @@ namespace accessibility return nColor; } - // ----------------------------------------------------------------------------- + // XAccessibleText - // ----------------------------------------------------------------------------- - // ----------------------------------------------------------------------------- + + awt::Rectangle SAL_CALL AccessibleListBoxEntry::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -687,7 +687,7 @@ namespace accessibility return aBounds; } - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleListBoxEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -709,7 +709,7 @@ namespace accessibility return nIndex; } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleListBoxEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -726,9 +726,9 @@ namespace accessibility return sal_True; } - // ----------------------------------------------------------------------------- + // XAccessibleEventBroadcaster - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBoxEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if (xListener.is()) @@ -739,7 +739,7 @@ namespace accessibility comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener ); } } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBoxEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if (xListener.is()) @@ -760,9 +760,9 @@ namespace accessibility } } } - // ----------------------------------------------------------------------------- + // XAccessibleAction - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleActionCount( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -783,7 +783,7 @@ namespace accessibility return ACCESSIBLE_ACTION_COUNT; return 0; } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleListBoxEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -821,7 +821,7 @@ namespace accessibility return bRet; } - // ----------------------------------------------------------------------------- + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -861,7 +861,7 @@ namespace accessibility } throw IndexOutOfBoundsException(); } - // ----------------------------------------------------------------------------- + Reference< XAccessibleKeyBinding > AccessibleListBoxEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -871,9 +871,9 @@ namespace accessibility // ... which key? return xRet; } - // ----------------------------------------------------------------------------- + // XAccessibleSelection - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -887,7 +887,7 @@ namespace accessibility getListBox()->Select( pEntry, sal_True ); } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -902,7 +902,7 @@ namespace accessibility return getListBox()->IsSelected( pEntry ); } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBoxEntry::clearAccessibleSelection( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -921,7 +921,7 @@ namespace accessibility getListBox()->Select( pEntry, sal_False ); } } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBoxEntry::selectAllAccessibleChildren( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -940,7 +940,7 @@ namespace accessibility getListBox()->Select( pEntry, sal_True ); } } - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -963,7 +963,7 @@ namespace accessibility return nSelCount; } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -996,7 +996,7 @@ namespace accessibility return xChild; } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -1122,9 +1122,9 @@ namespace accessibility return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType); } - // ----------------------------------------------------------------------------- + // XAccessibleValue - // ----------------------------------------------------------------------------- + Any AccessibleListBoxEntry::getCurrentValue( ) throw (RuntimeException) { @@ -1136,7 +1136,7 @@ namespace accessibility return aValue; } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleListBoxEntry::setCurrentValue( const Any& aNumber ) throw (RuntimeException) { @@ -1168,7 +1168,7 @@ namespace accessibility return bReturn; } - // ----------------------------------------------------------------------------- + Any AccessibleListBoxEntry::getMaximumValue( ) throw (RuntimeException) { @@ -1189,7 +1189,7 @@ namespace accessibility return aValue; } - // ----------------------------------------------------------------------------- + Any AccessibleListBoxEntry::getMinimumValue( ) throw (RuntimeException) { @@ -1210,7 +1210,7 @@ namespace accessibility return aValue; } - // ----------------------------------------------------------------------------- + SvTreeListEntry* AccessibleListBoxEntry::GetRealChild(sal_Int32 nIndex) { diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 96812ccfc22c..d80ffc5b1b63 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -56,13 +56,13 @@ namespace accessibility m_aAccessibleChildren.assign( m_pTabBar->GetAccessibleChildWindowCount() + 1, Reference< XAccessible >() ); } - // ----------------------------------------------------------------------------- + AccessibleTabBar::~AccessibleTabBar() { } - // ----------------------------------------------------------------------------- + void AccessibleTabBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -118,7 +118,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -145,9 +145,9 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + // OCommonAccessibleComponent - // ----------------------------------------------------------------------------- + awt::Rectangle AccessibleTabBar::implGetBounds() throw (RuntimeException) { @@ -158,21 +158,21 @@ namespace accessibility return aBounds; } - // ----------------------------------------------------------------------------- + // XInterface - // ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBar, AccessibleExtendedComponentHelper_BASE, AccessibleTabBar_BASE ) - // ----------------------------------------------------------------------------- + // XTypeProvider - // ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBar, AccessibleExtendedComponentHelper_BASE, AccessibleTabBar_BASE ) - // ----------------------------------------------------------------------------- + // XComponent - // ----------------------------------------------------------------------------- + void AccessibleTabBar::disposing() { @@ -188,23 +188,23 @@ namespace accessibility m_aAccessibleChildren.clear(); } - // ----------------------------------------------------------------------------- + // XServiceInfo - // ----------------------------------------------------------------------------- + OUString AccessibleTabBar::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.svtools.AccessibleTabBar" ); } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } - // ----------------------------------------------------------------------------- + Sequence< OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException) { @@ -213,9 +213,9 @@ namespace accessibility return aNames; } - // ----------------------------------------------------------------------------- + // XAccessible - // ----------------------------------------------------------------------------- + Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext( ) throw (RuntimeException) { @@ -224,9 +224,9 @@ namespace accessibility return this; } - // ----------------------------------------------------------------------------- + // XAccessibleContext - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBar::getAccessibleChildCount() throw (RuntimeException) { @@ -235,7 +235,7 @@ namespace accessibility return m_aAccessibleChildren.size(); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -270,7 +270,7 @@ namespace accessibility return xChild; } - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTabBar::getAccessibleParent( ) throw (RuntimeException) { @@ -287,7 +287,7 @@ namespace accessibility return xParent; } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBar::getAccessibleIndexInParent( ) throw (RuntimeException) { @@ -314,7 +314,7 @@ namespace accessibility return nIndexInParent; } - // ----------------------------------------------------------------------------- + sal_Int16 AccessibleTabBar::getAccessibleRole( ) throw (RuntimeException) { @@ -323,7 +323,7 @@ namespace accessibility return AccessibleRole::PANEL; } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException) { @@ -336,7 +336,7 @@ namespace accessibility return sDescription; } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBar::getAccessibleName( ) throw (RuntimeException) { @@ -349,7 +349,7 @@ namespace accessibility return sName; } - // ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet( ) throw (RuntimeException) { @@ -360,7 +360,7 @@ namespace accessibility return xSet; } - // ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet( ) throw (RuntimeException) { @@ -381,7 +381,7 @@ namespace accessibility return xSet; } - // ----------------------------------------------------------------------------- + Locale AccessibleTabBar::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -390,9 +390,9 @@ namespace accessibility return Application::GetSettings().GetLanguageTag().getLocale(); } - // ----------------------------------------------------------------------------- + // XAccessibleComponent - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) { @@ -421,7 +421,7 @@ namespace accessibility return xChild; } - // ----------------------------------------------------------------------------- + void AccessibleTabBar::grabFocus( ) throw (RuntimeException) { @@ -431,7 +431,7 @@ namespace accessibility m_pTabBar->GrabFocus(); } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBar::getForeground( ) throw (RuntimeException) { @@ -456,7 +456,7 @@ namespace accessibility return nColor; } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBar::getBackground( ) throw (RuntimeException) { @@ -474,9 +474,9 @@ namespace accessibility return nColor; } - // ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent - // ----------------------------------------------------------------------------- + Reference< awt::XFont > AccessibleTabBar::getFont( ) throw (RuntimeException) { @@ -502,7 +502,7 @@ namespace accessibility return xFont; } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBar::getTitledBorderText( ) throw (RuntimeException) { @@ -515,7 +515,7 @@ namespace accessibility return sText; } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBar::getToolTipText( ) throw (RuntimeException) { @@ -528,7 +528,7 @@ namespace accessibility return sText; } - // ----------------------------------------------------------------------------- + //......................................................................... } // namespace accessibility diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 090e0bf5f49d..34a687bf1554 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -41,9 +41,9 @@ namespace accessibility using namespace ::com::sun::star; using namespace ::comphelper; - // ----------------------------------------------------------------------------- + // class AccessibleTabBarPage - // ----------------------------------------------------------------------------- + AccessibleTabBarPage::AccessibleTabBarPage( TabBar* pTabBar, sal_uInt16 nPageId, const Reference< XAccessible >& rxParent ) :AccessibleTabBarBase( pTabBar ) @@ -58,13 +58,13 @@ namespace accessibility m_sPageText = m_pTabBar->GetPageText( m_nPageId ); } - // ----------------------------------------------------------------------------- + AccessibleTabBarPage::~AccessibleTabBarPage() { } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleTabBarPage::IsEnabled() { @@ -77,7 +77,7 @@ namespace accessibility return bEnabled; } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleTabBarPage::IsShowing() { @@ -89,7 +89,7 @@ namespace accessibility return bShowing; } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleTabBarPage::IsSelected() { @@ -101,7 +101,7 @@ namespace accessibility return bSelected; } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPage::SetEnabled( sal_Bool bEnabled ) { @@ -125,7 +125,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPage::SetShowing( sal_Bool bShowing ) { @@ -141,7 +141,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPage::SetSelected( sal_Bool bSelected ) { @@ -157,7 +157,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPage::SetPageText( const OUString& sPageText ) { @@ -171,7 +171,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -192,9 +192,9 @@ namespace accessibility rStateSet.AddState( AccessibleStateType::SELECTED ); } - // ----------------------------------------------------------------------------- + // OCommonAccessibleComponent - // ----------------------------------------------------------------------------- + awt::Rectangle AccessibleTabBarPage::implGetBounds() throw (RuntimeException) { @@ -223,21 +223,21 @@ namespace accessibility return aBounds; } - // ----------------------------------------------------------------------------- + // XInterface - // ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPage, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPage_BASE ) - // ----------------------------------------------------------------------------- + // XTypeProvider - // ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPage, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPage_BASE ) - // ----------------------------------------------------------------------------- + // XComponent - // ----------------------------------------------------------------------------- + void AccessibleTabBarPage::disposing() { @@ -245,23 +245,23 @@ namespace accessibility m_sPageText = OUString(); } - // ----------------------------------------------------------------------------- + // XServiceInfo - // ----------------------------------------------------------------------------- + OUString AccessibleTabBarPage::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPage" ); } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } - // ----------------------------------------------------------------------------- + Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException) { @@ -270,9 +270,9 @@ namespace accessibility return aNames; } - // ----------------------------------------------------------------------------- + // XAccessible - // ----------------------------------------------------------------------------- + Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext( ) throw (RuntimeException) { @@ -281,9 +281,9 @@ namespace accessibility return this; } - // ----------------------------------------------------------------------------- + // XAccessibleContext - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBarPage::getAccessibleChildCount() throw (RuntimeException) { @@ -292,7 +292,7 @@ namespace accessibility return 0; } - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -304,7 +304,7 @@ namespace accessibility return Reference< XAccessible >(); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent( ) throw (RuntimeException) { @@ -313,7 +313,7 @@ namespace accessibility return m_xParent; } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent( ) throw (RuntimeException) { @@ -326,7 +326,7 @@ namespace accessibility return nIndexInParent; } - // ----------------------------------------------------------------------------- + sal_Int16 AccessibleTabBarPage::getAccessibleRole( ) throw (RuntimeException) { @@ -335,7 +335,7 @@ namespace accessibility return AccessibleRole::PAGE_TAB; } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException) { @@ -348,7 +348,7 @@ namespace accessibility return sDescription; } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBarPage::getAccessibleName( ) throw (RuntimeException) { @@ -357,7 +357,7 @@ namespace accessibility return m_sPageText; } - // ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet( ) throw (RuntimeException) { @@ -368,7 +368,7 @@ namespace accessibility return xSet; } - // ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet( ) throw (RuntimeException) { @@ -389,7 +389,7 @@ namespace accessibility return xSet; } - // ----------------------------------------------------------------------------- + Locale AccessibleTabBarPage::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -398,9 +398,9 @@ namespace accessibility return Application::GetSettings().GetLanguageTag().getLocale(); } - // ----------------------------------------------------------------------------- + // XAccessibleComponent - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) { @@ -409,14 +409,14 @@ namespace accessibility return Reference< XAccessible >(); } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPage::grabFocus( ) throw (RuntimeException) { // no focus } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBarPage::getForeground( ) throw (RuntimeException) { @@ -434,7 +434,7 @@ namespace accessibility return nColor; } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBarPage::getBackground( ) throw (RuntimeException) { @@ -452,9 +452,9 @@ namespace accessibility return nColor; } - // ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent - // ----------------------------------------------------------------------------- + Reference< awt::XFont > AccessibleTabBarPage::getFont( ) throw (RuntimeException) { @@ -472,7 +472,7 @@ namespace accessibility return xFont; } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBarPage::getTitledBorderText( ) throw (RuntimeException) { @@ -481,7 +481,7 @@ namespace accessibility return m_sPageText; } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBarPage::getToolTipText( ) throw (RuntimeException) { @@ -490,7 +490,7 @@ namespace accessibility return OUString(); } - // ----------------------------------------------------------------------------- + //......................................................................... } // namespace accessibility diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 57c054db528d..b7a87b073161 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -42,9 +42,9 @@ namespace accessibility using namespace ::com::sun::star; using namespace ::comphelper; - // ----------------------------------------------------------------------------- + // class AccessibleTabBarPageList - // ----------------------------------------------------------------------------- + AccessibleTabBarPageList::AccessibleTabBarPageList( TabBar* pTabBar, sal_Int32 nIndexInParent ) :AccessibleTabBarBase( pTabBar ) @@ -54,13 +54,13 @@ namespace accessibility m_aAccessibleChildren.assign( m_pTabBar->GetPageCount(), Reference< XAccessible >() ); } - // ----------------------------------------------------------------------------- + AccessibleTabBarPageList::~AccessibleTabBarPageList() { } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled ) { @@ -76,7 +76,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::UpdateShowing( sal_Bool bShowing ) { @@ -92,7 +92,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::UpdateSelected( sal_Int32 i, sal_Bool bSelected ) { @@ -110,7 +110,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::UpdatePageText( sal_Int32 i ) { @@ -132,7 +132,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::InsertChild( sal_Int32 i ) { @@ -152,7 +152,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::RemoveChild( sal_Int32 i ) { @@ -178,7 +178,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::MoveChild( sal_Int32 i, sal_Int32 j ) { @@ -199,7 +199,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -346,7 +346,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -365,9 +365,9 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + // OCommonAccessibleComponent - // ----------------------------------------------------------------------------- + awt::Rectangle AccessibleTabBarPageList::implGetBounds() throw (RuntimeException) { @@ -378,21 +378,21 @@ namespace accessibility return aBounds; } - // ----------------------------------------------------------------------------- + // XInterface - // ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( AccessibleTabBarPageList, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPageList_BASE ) - // ----------------------------------------------------------------------------- + // XTypeProvider - // ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleTabBarPageList, AccessibleExtendedComponentHelper_BASE, AccessibleTabBarPageList_BASE ) - // ----------------------------------------------------------------------------- + // XComponent - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::disposing() { @@ -408,23 +408,23 @@ namespace accessibility m_aAccessibleChildren.clear(); } - // ----------------------------------------------------------------------------- + // XServiceInfo - // ----------------------------------------------------------------------------- + OUString AccessibleTabBarPageList::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPageList" ); } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleTabBarPageList::supportsService( const OUString& rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } - // ----------------------------------------------------------------------------- + Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException) { @@ -433,9 +433,9 @@ namespace accessibility return aNames; } - // ----------------------------------------------------------------------------- + // XAccessible - // ----------------------------------------------------------------------------- + Reference< XAccessibleContext > AccessibleTabBarPageList::getAccessibleContext( ) throw (RuntimeException) { @@ -444,9 +444,9 @@ namespace accessibility return this; } - // ----------------------------------------------------------------------------- + // XAccessibleContext - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBarPageList::getAccessibleChildCount() throw (RuntimeException) { @@ -455,7 +455,7 @@ namespace accessibility return m_aAccessibleChildren.size(); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -481,7 +481,7 @@ namespace accessibility return xChild; } - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent( ) throw (RuntimeException) { @@ -494,7 +494,7 @@ namespace accessibility return xParent; } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent( ) throw (RuntimeException) { @@ -503,7 +503,7 @@ namespace accessibility return m_nIndexInParent; } - // ----------------------------------------------------------------------------- + sal_Int16 AccessibleTabBarPageList::getAccessibleRole( ) throw (RuntimeException) { @@ -512,7 +512,7 @@ namespace accessibility return AccessibleRole::PAGE_TAB_LIST; } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException) { @@ -521,7 +521,7 @@ namespace accessibility return OUString(); } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBarPageList::getAccessibleName( ) throw (RuntimeException) { @@ -530,7 +530,7 @@ namespace accessibility return OUString(); } - // ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > AccessibleTabBarPageList::getAccessibleRelationSet( ) throw (RuntimeException) { @@ -541,7 +541,7 @@ namespace accessibility return xSet; } - // ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet( ) throw (RuntimeException) { @@ -562,7 +562,7 @@ namespace accessibility return xSet; } - // ----------------------------------------------------------------------------- + Locale AccessibleTabBarPageList::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -571,9 +571,9 @@ namespace accessibility return Application::GetSettings().GetLanguageTag().getLocale(); } - // ----------------------------------------------------------------------------- + // XAccessibleComponent - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) { @@ -602,14 +602,14 @@ namespace accessibility return xChild; } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::grabFocus( ) throw (RuntimeException) { // no focus } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBarPageList::getForeground( ) throw (RuntimeException) { @@ -627,7 +627,7 @@ namespace accessibility return nColor; } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBarPageList::getBackground( ) throw (RuntimeException) { @@ -645,9 +645,9 @@ namespace accessibility return nColor; } - // ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent - // ----------------------------------------------------------------------------- + Reference< awt::XFont > AccessibleTabBarPageList::getFont( ) throw (RuntimeException) { @@ -665,7 +665,7 @@ namespace accessibility return xFont; } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBarPageList::getTitledBorderText( ) throw (RuntimeException) { @@ -674,7 +674,7 @@ namespace accessibility return OUString(); } - // ----------------------------------------------------------------------------- + OUString AccessibleTabBarPageList::getToolTipText( ) throw (RuntimeException) { @@ -683,9 +683,9 @@ namespace accessibility return OUString(); } - // ----------------------------------------------------------------------------- + // XAccessibleSelection - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -703,7 +703,7 @@ namespace accessibility } } - // ----------------------------------------------------------------------------- + sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -719,14 +719,14 @@ namespace accessibility return bSelected; } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::clearAccessibleSelection( ) throw (RuntimeException) { // This method makes no sense in a TabBar, and so does nothing. } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::selectAllAccessibleChildren( ) throw (RuntimeException) { @@ -735,7 +735,7 @@ namespace accessibility selectAccessibleChild( 0 ); } - // ----------------------------------------------------------------------------- + sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount( ) throw (RuntimeException) { @@ -744,7 +744,7 @@ namespace accessibility return 1; } - // ----------------------------------------------------------------------------- + Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -767,7 +767,7 @@ namespace accessibility return xChild; } - // ----------------------------------------------------------------------------- + void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -779,7 +779,7 @@ namespace accessibility // This method makes no sense in a TabBar, and so does nothing. } - // ----------------------------------------------------------------------------- + //......................................................................... } // namespace accessibility diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index a277a447f1aa..82d71cf3b5c6 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -35,9 +35,9 @@ namespace accessibility using namespace ::com::sun::star::lang; using namespace ::com::sun::star; - // ----------------------------------------------------------------------------- + // Ctor() and Dtor() - // ----------------------------------------------------------------------------- + AccessibleTabListBox::AccessibleTabListBox( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) :AccessibleBrowseBox( rxParent, NULL, rBox ) ,m_pTabListBox( &rBox ) @@ -50,7 +50,7 @@ namespace accessibility osl_atomic_decrement( &m_refCount ); } - // ----------------------------------------------------------------------------- + AccessibleTabListBox::~AccessibleTabListBox() { if ( isAlive() ) @@ -60,7 +60,7 @@ namespace accessibility dispose(); } } - // ----------------------------------------------------------------------------- + AccessibleBrowseBoxTable* AccessibleTabListBox::createAccessibleTable() { return new AccessibleTabListBoxTable( this, *m_pTabListBox ); @@ -80,13 +80,13 @@ namespace accessibility return 2; // header and table } - // ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext() throw ( RuntimeException ) { return this; } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException ) diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index a61e37a01fe4..b316a4a39d17 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -36,9 +36,9 @@ namespace accessibility using namespace ::com::sun::star::lang; using namespace ::com::sun::star; - // ----------------------------------------------------------------------------- + // Ctor() and Dtor() - // ----------------------------------------------------------------------------- + AccessibleTabListBoxTable::AccessibleTabListBoxTable( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) : AccessibleBrowseBoxTable( rxParent, rBox ), @@ -48,7 +48,7 @@ namespace accessibility { m_pTabListBox->AddEventListener( LINK( this, AccessibleTabListBoxTable, WindowEventListener ) ); } - // ----------------------------------------------------------------------------- + AccessibleTabListBoxTable::~AccessibleTabListBoxTable() { if ( isAlive() ) @@ -60,7 +60,7 @@ namespace accessibility dispose(); } } - // ----------------------------------------------------------------------------- + void AccessibleTabListBoxTable::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { if ( isAlive() ) @@ -250,7 +250,7 @@ namespace accessibility } } } - // ----------------------------------------------------------------------------- + IMPL_LINK( AccessibleTabListBoxTable, WindowEventListener, VclSimpleEvent*, pEvent ) { OSL_ENSURE( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" ); @@ -313,21 +313,21 @@ namespace accessibility return 0; } - // ----------------------------------------------------------------------------- + // XInterface & XTypeProvider - // ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2(AccessibleTabListBoxTable, AccessibleBrowseBoxTable, AccessibleTabListBoxTableImplHelper) IMPLEMENT_FORWARD_XTYPEPROVIDER2(AccessibleTabListBoxTable, AccessibleBrowseBoxTable, AccessibleTabListBoxTableImplHelper) - // ----------------------------------------------------------------------------- + // XServiceInfo - // ----------------------------------------------------------------------------- + OUString AccessibleTabListBoxTable::getImplementationName (void) throw (RuntimeException) { return OUString( "com.sun.star.comp.svtools.AccessibleTabListBoxTable" ); } - // ----------------------------------------------------------------------------- + // XAccessibleSelection - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -338,7 +338,7 @@ namespace accessibility implSelectRow( implGetRow( nChildIndex ), sal_True ); } - // ----------------------------------------------------------------------------- + sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -349,7 +349,7 @@ namespace accessibility return implIsRowSelected( implGetRow( nChildIndex ) ); } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -359,7 +359,7 @@ namespace accessibility m_pTabListBox->SetNoSelection(); } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -369,7 +369,7 @@ namespace accessibility m_pTabListBox->SelectAll(); } - // ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -379,7 +379,7 @@ namespace accessibility return implGetColumnCount() * implGetSelRowCount(); } - // ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -395,7 +395,7 @@ namespace accessibility sal_Int32 nColumn = nSelectedChildIndex / nRows; return getAccessibleCellAt( nRow, nColumn ); } - // ----------------------------------------------------------------------------- + void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx index d5ea35feebb6..e02a1d638225 100644 --- a/accessibility/source/extended/listboxaccessible.cxx +++ b/accessibility/source/extended/listboxaccessible.cxx @@ -20,22 +20,15 @@ #include <accessibility/extended/listboxaccessible.hxx> #include <svtools/treelistbox.hxx> -//........................................................................ namespace accessibility { -//........................................................................ - - //==================================================================== - //= ListBoxAccessibleBase - //==================================================================== - //-------------------------------------------------------------------- + // ListBoxAccessibleBase ListBoxAccessibleBase::ListBoxAccessibleBase( SvTreeListBox& _rWindow ) :m_pWindow( &_rWindow ) { m_pWindow->AddEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) ); } - //-------------------------------------------------------------------- ListBoxAccessibleBase::~ListBoxAccessibleBase( ) { if ( m_pWindow ) @@ -47,7 +40,6 @@ namespace accessibility } } - //-------------------------------------------------------------------- IMPL_LINK( ListBoxAccessibleBase, WindowEventListener, VclSimpleEvent*, pEvent ) { OSL_ENSURE( pEvent && pEvent->ISA( VclWindowEvent ), "ListBoxAccessibleBase::WindowEventListener: unexpected WindowEvent!" ); @@ -61,7 +53,6 @@ namespace accessibility return 0; } - // ----------------------------------------------------------------------------- void ListBoxAccessibleBase::disposing() { if ( m_pWindow ) @@ -69,7 +60,6 @@ namespace accessibility m_pWindow = NULL; } - // ----------------------------------------------------------------------------- void ListBoxAccessibleBase::ProcessWindowEvent( const VclWindowEvent& _rVclWindowEvent ) { if ( isAlive() ) @@ -87,9 +77,6 @@ namespace accessibility } } } - -//........................................................................ } // namespace accessibility -//........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx index 640c2d58be79..f59ffe627643 100644 --- a/accessibility/source/helper/acc_factory.cxx +++ b/accessibility/source/helper/acc_factory.cxx @@ -63,7 +63,6 @@ #include "floatingwindowaccessible.hxx" -//........................................................................ namespace accessibility { @@ -76,7 +75,6 @@ inline bool hasFloatingChild(Window *pWindow) return false; } -//........................................................................ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; @@ -84,9 +82,7 @@ inline bool hasFloatingChild(Window *pWindow) using namespace ::svt; using namespace ::svt::table; - //================================================================ - //= IAccessibleFactory - //================================================================ + // IAccessibleFactory class AccessibleFactory :public ::toolkit::IAccessibleFactory ,public ::svt::IAccessibleFactory { @@ -230,25 +226,20 @@ inline bool hasFloatingChild(Window *pWindow) virtual ~AccessibleFactory(); }; - - //-------------------------------------------------------------------- AccessibleFactory::AccessibleFactory() :m_refCount( 0 ) { } - //-------------------------------------------------------------------- AccessibleFactory::~AccessibleFactory() { } - //-------------------------------------------------------------------- oslInterlockedCount SAL_CALL AccessibleFactory::acquire() { return osl_atomic_increment( &m_refCount ); } - //-------------------------------------------------------------------- oslInterlockedCount SAL_CALL AccessibleFactory::release() { if ( 0 == osl_atomic_decrement( &m_refCount ) ) @@ -256,10 +247,10 @@ inline bool hasFloatingChild(Window *pWindow) delete this; return 0; } + return m_refCount; } - //-------------------------------------------------------------------- Reference< XAccessible > AccessibleFactory::createAccessible( Menu* _pMenu, sal_Bool _bIsMenuBar ) { OAccessibleMenuBaseComponent* pAccessible; @@ -271,25 +262,21 @@ inline bool hasFloatingChild(Window *pWindow) return pAccessible; } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXButton* _pXWindow ) { return new VCLXAccessibleButton( _pXWindow ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXCheckBox* _pXWindow ) { return new VCLXAccessibleCheckBox( _pXWindow ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXRadioButton* _pXWindow ) { return new VCLXAccessibleRadioButton( _pXWindow ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXListBox* _pXWindow ) { sal_Bool bIsDropDownBox = sal_False; @@ -303,31 +290,26 @@ inline bool hasFloatingChild(Window *pWindow) return new VCLXAccessibleListBox( _pXWindow ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXFixedText* _pXWindow ) { return new VCLXAccessibleFixedText( _pXWindow ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXFixedHyperlink* _pXWindow ) { return new VCLXAccessibleFixedHyperlink( _pXWindow ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXScrollBar* _pXWindow ) { return new VCLXAccessibleScrollBar( _pXWindow ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXEdit* _pXWindow ) { return new VCLXAccessibleEdit( _pXWindow ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXComboBox* _pXWindow ) { sal_Bool bIsDropDownBox = sal_False; @@ -341,7 +323,6 @@ inline bool hasFloatingChild(Window *pWindow) return new VCLXAccessibleComboBox( _pXWindow ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXWindow* _pXWindow ) { Reference< XAccessibleContext > xContext; @@ -364,22 +345,27 @@ inline bool hasFloatingChild(Window *pWindow) } } } + else if ( nType == WINDOW_STATUSBAR ) { xContext = (XAccessibleContext*) new VCLXAccessibleStatusBar( _pXWindow ); } + else if ( nType == WINDOW_TABCONTROL ) { xContext = (XAccessibleContext*) new VCLXAccessibleTabControl( _pXWindow ); } + else if ( nType == WINDOW_TABPAGE && pWindow->GetAccessibleParentWindow() && pWindow->GetAccessibleParentWindow()->GetType() == WINDOW_TABCONTROL ) { xContext = new VCLXAccessibleTabPageWindow( _pXWindow ); } + else if ( nType == WINDOW_FLOATINGWINDOW ) { xContext = new FloatingWindowAccessible( _pXWindow ); } + else if ( nType == WINDOW_BORDERWINDOW && hasFloatingChild( pWindow ) ) { // The logic here has to match that of Window::GetAccessibleParentWindow in @@ -396,6 +382,7 @@ inline bool hasFloatingChild(Window *pWindow) else xContext = new FloatingWindowAccessible( _pXWindow ); } + else if ( ( nType == WINDOW_HELPTEXTWINDOW ) || ( nType == WINDOW_FIXEDLINE ) ) { xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleFixedText( _pXWindow ); @@ -405,65 +392,55 @@ inline bool hasFloatingChild(Window *pWindow) xContext = (accessibility::XAccessibleContext*) new VCLXAccessibleComponent( _pXWindow ); } } - return xContext; } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleContext( VCLXToolBox* _pXWindow ) { return new VCLXAccessibleToolBox( _pXWindow ); } - //-------------------------------------------------------------------- IAccessibleTabListBox* AccessibleFactory::createAccessibleTabListBox( const Reference< XAccessible >& rxParent, SvHeaderTabListBox& rBox ) const { return new AccessibleTabListBox( rxParent, rBox ); } - //-------------------------------------------------------------------- IAccessibleBrowseBox* AccessibleFactory::createAccessibleBrowseBox( const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox ) const { return new AccessibleBrowseBoxAccess( _rxParent, _rBrowseBox ); } - //-------------------------------------------------------------------- IAccessibleTableControl* AccessibleFactory::createAccessibleTableControl( const Reference< XAccessible >& _rxParent, IAccessibleTable& _rTable ) const { return new AccessibleGridControlAccess( _rxParent, _rTable ); } - //-------------------------------------------------------------------- Reference< XAccessible > AccessibleFactory::createAccessibleIconChoiceCtrl( SvtIconChoiceCtrl& _rIconCtrl, const Reference< XAccessible >& _xParent ) const { return new AccessibleIconChoiceCtrl( _rIconCtrl, _xParent ); } - //-------------------------------------------------------------------- Reference< XAccessible > AccessibleFactory::createAccessibleTabBar( TabBar& _rTabBar ) const { return new AccessibleTabBar( &_rTabBar ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleTextWindowContext( VCLXWindow* pVclXWindow, TextEngine& rEngine, TextView& rView ) const { return new Document( pVclXWindow, rEngine, rView ); } - //-------------------------------------------------------------------- Reference< XAccessible > AccessibleFactory::createAccessibleTreeListBox( SvTreeListBox& _rListBox, const Reference< XAccessible >& _xParent ) const { return new AccessibleListBox( _rListBox, _xParent ); } - //-------------------------------------------------------------------- Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderBar( const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rOwningTable, AccessibleBrowseBoxObjType _eObjType ) const @@ -471,7 +448,6 @@ inline bool hasFloatingChild(Window *pWindow) return new AccessibleBrowseBoxHeaderBar( rxParent, _rOwningTable, _eObjType ); } - //-------------------------------------------------------------------- Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxTableCell( const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox, const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowId, sal_uInt16 _nColId, sal_Int32 _nOffset ) const @@ -480,7 +456,6 @@ inline bool hasFloatingChild(Window *pWindow) _nRowId, _nColId, _nOffset ); } - //-------------------------------------------------------------------- Reference< XAccessible > AccessibleFactory::createAccessibleBrowseBoxHeaderCell( sal_Int32 _nColumnRowId, const Reference< XAccessible >& rxParent, IAccessibleTableProvider& _rBrowseBox, const Reference< XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType _eObjType ) const @@ -489,7 +464,6 @@ inline bool hasFloatingChild(Window *pWindow) _xFocusWindow, _eObjType ); } - //-------------------------------------------------------------------- Reference< XAccessible > AccessibleFactory::createAccessibleCheckBoxCell( const Reference< XAccessible >& _rxParent, IAccessibleTableProvider& _rBrowseBox, const Reference< XWindow >& _xFocusWindow, sal_Int32 _nRowPos, sal_uInt16 _nColPos, @@ -499,7 +473,6 @@ inline bool hasFloatingChild(Window *pWindow) _nRowPos, _nColPos, _eState, _bIsTriState ); } - //-------------------------------------------------------------------- Reference< XAccessible > AccessibleFactory::createEditBrowseBoxTableCellAccess( const Reference< XAccessible >& _rxParent, const Reference< XAccessible >& _rxControlAccessible, const Reference< XWindow >& _rxFocusWindow, IAccessibleTableProvider& _rBrowseBox, @@ -509,27 +482,21 @@ inline bool hasFloatingChild(Window *pWindow) _rxFocusWindow, _rBrowseBox, _nRowPos, _nColPos ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelDeck( const Reference< XAccessible >& i_rAccessibleParent, ::svt::ToolPanelDeck& i_rPanelDeck ) { return new AccessibleToolPanelDeck( i_rAccessibleParent, i_rPanelDeck ); } - //-------------------------------------------------------------------- Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelTabBar( const Reference< XAccessible >& i_rAccessibleParent, ::svt::IToolPanelDeck& i_rPanelDeck, ::svt::PanelTabBar& i_rTabBar ) { return new AccessibleToolPanelTabBar( i_rAccessibleParent, i_rPanelDeck, i_rTabBar ); } -//........................................................................ } // namespace accessibility -//........................................................................ -//======================================================================== - -/** this is the entry point to retrieve a factory for the toolkit-level Accessible/Contexts supplied +/* this is the entry point to retrieve a factory for the toolkit-level Accessible/Contexts supplied by this library This function implements the factory function needed in toolkit @@ -545,6 +512,7 @@ extern "C" } } + /** this is the entry point to retrieve a factory for the svtools-level Accessible/Contexts supplied by this library diff --git a/accessibility/source/helper/accresmgr.cxx b/accessibility/source/helper/accresmgr.cxx index 2251266df119..e05cea6c38ad 100644 --- a/accessibility/source/helper/accresmgr.cxx +++ b/accessibility/source/helper/accresmgr.cxx @@ -24,20 +24,20 @@ #include <vcl/settings.hxx> using namespace accessibility; -// ----------------------------------------------------------------------------- + // TkResMgr -// ----------------------------------------------------------------------------- + SimpleResMgr* TkResMgr::m_pImpl = NULL; -// ----------------------------------------------------------------------------- + TkResMgr::EnsureDelete::~EnsureDelete() { delete TkResMgr::m_pImpl; } -// ----------------------------------------------------------------------------- + void TkResMgr::ensureImplExists() { @@ -53,7 +53,7 @@ void TkResMgr::ensureImplExists() } } -// ----------------------------------------------------------------------------- + OUString TkResMgr::loadString( sal_uInt16 nResId ) { @@ -66,6 +66,6 @@ OUString TkResMgr::loadString( sal_uInt16 nResId ) return sReturn; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index b4d4dd953cf7..20783a889125 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -40,9 +40,9 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // OAccessibleMenuBaseComponent -// ----------------------------------------------------------------------------- + OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent( Menu* pMenu ) :AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() ) @@ -62,7 +62,7 @@ OAccessibleMenuBaseComponent::OAccessibleMenuBaseComponent( Menu* pMenu ) } } -// ----------------------------------------------------------------------------- + OAccessibleMenuBaseComponent::~OAccessibleMenuBaseComponent() { @@ -73,42 +73,42 @@ OAccessibleMenuBaseComponent::~OAccessibleMenuBaseComponent() m_pExternalLock = NULL; } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::IsEnabled() { return sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::IsFocused() { return sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::IsVisible() { return sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::IsSelected() { return sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::IsChecked() { return sal_False; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::SetStates() { @@ -119,7 +119,7 @@ void OAccessibleMenuBaseComponent::SetStates() m_bChecked = IsChecked(); } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::SetEnabled( sal_Bool bEnabled ) { @@ -147,7 +147,7 @@ void OAccessibleMenuBaseComponent::SetEnabled( sal_Bool bEnabled ) } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::SetFocused( sal_Bool bFocused ) { @@ -163,7 +163,7 @@ void OAccessibleMenuBaseComponent::SetFocused( sal_Bool bFocused ) } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::SetVisible( sal_Bool bVisible ) { @@ -179,7 +179,7 @@ void OAccessibleMenuBaseComponent::SetVisible( sal_Bool bVisible ) } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::SetSelected( sal_Bool bSelected ) { @@ -195,7 +195,7 @@ void OAccessibleMenuBaseComponent::SetSelected( sal_Bool bSelected ) } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::SetChecked( sal_Bool bChecked ) { @@ -211,7 +211,7 @@ void OAccessibleMenuBaseComponent::SetChecked( sal_Bool bChecked ) } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled ) { @@ -227,7 +227,7 @@ void OAccessibleMenuBaseComponent::UpdateEnabled( sal_Int32 i, sal_Bool bEnabled } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, sal_Bool bFocused ) { @@ -243,7 +243,7 @@ void OAccessibleMenuBaseComponent::UpdateFocused( sal_Int32 i, sal_Bool bFocused } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::UpdateVisible() { @@ -260,7 +260,7 @@ void OAccessibleMenuBaseComponent::UpdateVisible() } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, sal_Bool bSelected ) { @@ -278,7 +278,7 @@ void OAccessibleMenuBaseComponent::UpdateSelected( sal_Int32 i, sal_Bool bSelect } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, sal_Bool bChecked ) { @@ -294,7 +294,7 @@ void OAccessibleMenuBaseComponent::UpdateChecked( sal_Int32 i, sal_Bool bChecked } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::UpdateAccessibleName( sal_Int32 i ) { @@ -310,7 +310,7 @@ void OAccessibleMenuBaseComponent::UpdateAccessibleName( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::UpdateItemText( sal_Int32 i ) { @@ -326,14 +326,14 @@ void OAccessibleMenuBaseComponent::UpdateItemText( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + sal_Int32 OAccessibleMenuBaseComponent::GetChildCount() { return m_aAccessibleChildren.size(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i ) { @@ -376,7 +376,7 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChild( sal_Int32 i ) return xChild; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Point& rPoint ) { @@ -403,7 +403,7 @@ Reference< XAccessible > OAccessibleMenuBaseComponent::GetChildAt( const awt::Po return xChild; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::InsertChild( sal_Int32 i ) { @@ -438,7 +438,7 @@ void OAccessibleMenuBaseComponent::InsertChild( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i ) { @@ -476,14 +476,14 @@ void OAccessibleMenuBaseComponent::RemoveChild( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::IsHighlighted() { return sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::IsChildHighlighted() { @@ -506,7 +506,7 @@ sal_Bool OAccessibleMenuBaseComponent::IsChildHighlighted() return bChildHighlighted; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::SelectChild( sal_Int32 i ) { @@ -519,7 +519,7 @@ void OAccessibleMenuBaseComponent::SelectChild( sal_Int32 i ) m_pMenu->HighlightItem( (sal_uInt16)i ); } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::DeSelectAll() { @@ -527,7 +527,7 @@ void OAccessibleMenuBaseComponent::DeSelectAll() m_pMenu->DeHighlight(); } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i ) { @@ -539,32 +539,32 @@ sal_Bool OAccessibleMenuBaseComponent::IsChildSelected( sal_Int32 i ) return bSelected; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::Select() { } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::DeSelect() { } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::Click() { } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::IsPopupMenuOpen() { return sal_False; } -// ----------------------------------------------------------------------------- + IMPL_LINK( OAccessibleMenuBaseComponent, MenuEventListener, VclSimpleEvent*, pEvent ) { @@ -577,7 +577,7 @@ IMPL_LINK( OAccessibleMenuBaseComponent, MenuEventListener, VclSimpleEvent*, pEv return 0; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMenuEvent ) { @@ -686,21 +686,21 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen } } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuBaseComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleMenuBaseComponent_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuBaseComponent, AccessibleExtendedComponentHelper_BASE, OAccessibleMenuBaseComponent_BASE ) -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void OAccessibleMenuBaseComponent::disposing() { @@ -723,18 +723,18 @@ void OAccessibleMenuBaseComponent::disposing() } } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } -// ----------------------------------------------------------------------------- + // XAccessible -// ----------------------------------------------------------------------------- + Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleContext( ) throw (RuntimeException) { @@ -743,9 +743,9 @@ Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleConte return this; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStateSet( ) throw (RuntimeException) { @@ -766,7 +766,7 @@ Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStat return xSet; } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuBaseComponent::IsMenuHideDisabledEntries() { diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 1db0ff737867..2edd76c018fb 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -43,29 +43,29 @@ using namespace ::com::sun::star; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // class OAccessibleMenuComponent -// ----------------------------------------------------------------------------- + OAccessibleMenuComponent::OAccessibleMenuComponent( Menu* pMenu ) :OAccessibleMenuBaseComponent( pMenu ) { } -// ----------------------------------------------------------------------------- + OAccessibleMenuComponent::~OAccessibleMenuComponent() { } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuComponent::IsEnabled() { return sal_True; } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuComponent::IsVisible() { @@ -77,7 +77,7 @@ sal_Bool OAccessibleMenuComponent::IsVisible() return bVisible; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -101,9 +101,9 @@ void OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHe rStateSet.AddState( AccessibleStateType::OPAQUE ); } -// ----------------------------------------------------------------------------- + // OCommonAccessibleComponent -// ----------------------------------------------------------------------------- + awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException) { @@ -138,21 +138,21 @@ awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException return aBounds; } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( OAccessibleMenuComponent, OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent, OAccessibleMenuBaseComponent, OAccessibleMenuComponent_BASE ) -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeException) { @@ -161,7 +161,7 @@ sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeExce return GetChildCount(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -173,7 +173,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 return GetChild( i ); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw (RuntimeException) { @@ -195,7 +195,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw return xParent; } -// ----------------------------------------------------------------------------- + sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) throw (RuntimeException) { @@ -204,7 +204,7 @@ sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) throw (RuntimeExceptio return AccessibleRole::UNKNOWN; } -// ----------------------------------------------------------------------------- + OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException) { @@ -221,7 +221,7 @@ OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeExc return sDescription; } -// ----------------------------------------------------------------------------- + OUString OAccessibleMenuComponent::getAccessibleName( ) throw (RuntimeException) { @@ -230,7 +230,7 @@ OUString OAccessibleMenuComponent::getAccessibleName( ) throw (RuntimeException return OUString(); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelationSet( ) throw (RuntimeException) { @@ -241,7 +241,7 @@ Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelat return xSet; } -// ----------------------------------------------------------------------------- + Locale OAccessibleMenuComponent::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -250,9 +250,9 @@ Locale OAccessibleMenuComponent::getLocale( ) throw (IllegalAccessibleComponent return Application::GetSettings().GetLanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + // XAccessibleComponent -// ----------------------------------------------------------------------------- + Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) { @@ -261,7 +261,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const a return GetChildAt( rPoint ); } -// ----------------------------------------------------------------------------- + awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeException) { @@ -282,7 +282,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeExcep return aPos; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException) { @@ -296,7 +296,7 @@ void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException) } } -// ----------------------------------------------------------------------------- + sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException) { @@ -308,7 +308,7 @@ sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException) return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 OAccessibleMenuComponent::getBackground( ) throw (RuntimeException) { @@ -317,9 +317,9 @@ sal_Int32 OAccessibleMenuComponent::getBackground( ) throw (RuntimeException) return 0; } -// ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent -// ----------------------------------------------------------------------------- + Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) throw (RuntimeException) { @@ -346,7 +346,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) throw (RuntimeExce return xFont; } -// ----------------------------------------------------------------------------- + OUString OAccessibleMenuComponent::getTitledBorderText( ) throw (RuntimeException) { @@ -355,7 +355,7 @@ OUString OAccessibleMenuComponent::getTitledBorderText( ) throw (RuntimeExcepti return OUString(); } -// ----------------------------------------------------------------------------- + OUString OAccessibleMenuComponent::getToolTipText( ) throw (RuntimeException) { @@ -364,9 +364,9 @@ OUString OAccessibleMenuComponent::getToolTipText( ) throw (RuntimeException) return OUString(); } -// ----------------------------------------------------------------------------- + // XAccessibleSelection -// ----------------------------------------------------------------------------- + void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -378,7 +378,7 @@ void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) th SelectChild( nChildIndex ); } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -390,7 +390,7 @@ sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIn return IsChildSelected( nChildIndex ); } -// ----------------------------------------------------------------------------- + void OAccessibleMenuComponent::clearAccessibleSelection( ) throw (RuntimeException) { @@ -399,14 +399,14 @@ void OAccessibleMenuComponent::clearAccessibleSelection( ) throw (RuntimeExcept DeSelectAll(); } -// ----------------------------------------------------------------------------- + void OAccessibleMenuComponent::selectAllAccessibleChildren( ) throw (RuntimeException) { // This method makes no sense in a menu, and so does nothing. } -// ----------------------------------------------------------------------------- + sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) throw (RuntimeException) { @@ -423,7 +423,7 @@ sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) throw (R return nRet; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -446,7 +446,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( s return xChild; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -458,6 +458,6 @@ void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) DeSelectAll(); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 1e0cdbca8f8c..6a3fea7ad38e 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -51,9 +51,9 @@ using namespace ::com::sun::star; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // class OAccessibleMenuItemComponent -// ----------------------------------------------------------------------------- + OAccessibleMenuItemComponent::OAccessibleMenuItemComponent( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu ) :OAccessibleMenuBaseComponent( pMenu ) @@ -64,13 +64,13 @@ OAccessibleMenuItemComponent::OAccessibleMenuItemComponent( Menu* pParent, sal_u m_sItemText = GetItemText(); } -// ----------------------------------------------------------------------------- + OAccessibleMenuItemComponent::~OAccessibleMenuItemComponent() { } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuItemComponent::IsEnabled() { @@ -83,7 +83,7 @@ sal_Bool OAccessibleMenuItemComponent::IsEnabled() return bEnabled; } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuItemComponent::IsVisible() { @@ -95,7 +95,7 @@ sal_Bool OAccessibleMenuItemComponent::IsVisible() return bVisible; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuItemComponent::Select() { @@ -113,7 +113,7 @@ void OAccessibleMenuItemComponent::Select() m_pParent->HighlightItem( m_nItemPos ); } -// ----------------------------------------------------------------------------- + void OAccessibleMenuItemComponent::DeSelect() { @@ -121,7 +121,7 @@ void OAccessibleMenuItemComponent::DeSelect() m_pParent->DeHighlight(); } -// ----------------------------------------------------------------------------- + void OAccessibleMenuItemComponent::Click() { @@ -169,14 +169,14 @@ void OAccessibleMenuItemComponent::Click() } } -// ----------------------------------------------------------------------------- + void OAccessibleMenuItemComponent::SetItemPos( sal_uInt16 nItemPos ) { m_nItemPos = nItemPos; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuItemComponent::SetAccessibleName( const OUString& sAccessibleName ) { @@ -190,7 +190,7 @@ void OAccessibleMenuItemComponent::SetAccessibleName( const OUString& sAccessibl } } -// ----------------------------------------------------------------------------- + OUString OAccessibleMenuItemComponent::GetAccessibleName() { @@ -207,7 +207,7 @@ OUString OAccessibleMenuItemComponent::GetAccessibleName() return sName; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuItemComponent::SetItemText( const OUString& sItemText ) { @@ -219,7 +219,7 @@ void OAccessibleMenuItemComponent::SetItemText( const OUString& sItemText ) } } -// ----------------------------------------------------------------------------- + OUString OAccessibleMenuItemComponent::GetItemText() { @@ -230,7 +230,7 @@ OUString OAccessibleMenuItemComponent::GetItemText() return sText; } -// ----------------------------------------------------------------------------- + void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -250,9 +250,9 @@ void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateS rStateSet.AddState( AccessibleStateType::OPAQUE ); } -// ----------------------------------------------------------------------------- + // OCommonAccessibleComponent -// ----------------------------------------------------------------------------- + awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeException) { @@ -290,9 +290,9 @@ awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeExcep return aBounds; } -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void SAL_CALL OAccessibleMenuItemComponent::disposing() { @@ -303,9 +303,9 @@ void SAL_CALL OAccessibleMenuItemComponent::disposing() m_sItemText = OUString(); } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (RuntimeException) { @@ -314,7 +314,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (Runtime return 0; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -326,7 +326,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_I return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) throw (RuntimeException) { @@ -335,7 +335,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) t return m_pParent->GetAccessible(); } -// ----------------------------------------------------------------------------- + sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) throw (RuntimeException) { @@ -344,7 +344,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) throw (Ru return m_nItemPos; } -// ----------------------------------------------------------------------------- + sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) throw (RuntimeException) { @@ -353,7 +353,7 @@ sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) throw (RuntimeExce return AccessibleRole::UNKNOWN; } -// ----------------------------------------------------------------------------- + OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException) { @@ -366,7 +366,7 @@ OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (Runtim return sDescription; } -// ----------------------------------------------------------------------------- + OUString OAccessibleMenuItemComponent::getAccessibleName( ) throw (RuntimeException) { @@ -375,7 +375,7 @@ OUString OAccessibleMenuItemComponent::getAccessibleName( ) throw (RuntimeExcep return m_sAccessibleName; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleRelationSet( ) throw (RuntimeException) { @@ -386,7 +386,7 @@ Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleR return xSet; } -// ----------------------------------------------------------------------------- + Locale OAccessibleMenuItemComponent::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -395,9 +395,9 @@ Locale OAccessibleMenuItemComponent::getLocale( ) throw (IllegalAccessibleCompo return Application::GetSettings().GetLanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + // XAccessibleComponent -// ----------------------------------------------------------------------------- + Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) { @@ -406,14 +406,14 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( con return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + void OAccessibleMenuItemComponent::grabFocus( ) throw (RuntimeException) { // no focus for items } -// ----------------------------------------------------------------------------- + sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeException) { @@ -431,7 +431,7 @@ sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeExceptio return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 OAccessibleMenuItemComponent::getBackground( ) throw (RuntimeException) { @@ -449,9 +449,9 @@ sal_Int32 OAccessibleMenuItemComponent::getBackground( ) throw (RuntimeExceptio return nColor; } -// ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent -// ----------------------------------------------------------------------------- + Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (RuntimeException) { @@ -469,7 +469,7 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (Runtime return xFont; } -// ----------------------------------------------------------------------------- + OUString OAccessibleMenuItemComponent::getTitledBorderText( ) throw (RuntimeException) { @@ -478,7 +478,7 @@ OUString OAccessibleMenuItemComponent::getTitledBorderText( ) throw (RuntimeExc return OUString(); } -// ----------------------------------------------------------------------------- + OUString OAccessibleMenuItemComponent::getToolTipText( ) throw (RuntimeException) { @@ -491,7 +491,7 @@ OUString OAccessibleMenuItemComponent::getToolTipText( ) throw (RuntimeExceptio return sRet; } -// ----------------------------------------------------------------------------- + sal_Bool OAccessibleMenuItemComponent::IsMenuHideDisabledEntries() { diff --git a/accessibility/source/standard/floatingwindowaccessible.cxx b/accessibility/source/standard/floatingwindowaccessible.cxx index be71fab38334..f75e7ce5b15a 100644 --- a/accessibility/source/standard/floatingwindowaccessible.cxx +++ b/accessibility/source/standard/floatingwindowaccessible.cxx @@ -19,7 +19,6 @@ #include <floatingwindowaccessible.hxx> - #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/window.hxx> @@ -28,22 +27,14 @@ namespace uno = ::com::sun::star::uno; using ::com::sun::star::accessibility::AccessibleRelation; namespace AccessibleRelationType = ::com::sun::star::accessibility::AccessibleRelationType; - -//------------------------------------------------------------------- - FloatingWindowAccessible::FloatingWindowAccessible(VCLXWindow* pWindow) : VCLXAccessibleComponent(pWindow) { } - -//------------------------------------------------------------------- - FloatingWindowAccessible::~FloatingWindowAccessible() { } -//------------------------------------------------------------------- - void FloatingWindowAccessible::FillAccessibleRelationSet(utl::AccessibleRelationSetHelper& rRelationSet) { Window* pWindow = GetWindow(); diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index d3509018a901..9bf3b8169647 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -39,22 +39,22 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // VCLXAccessibleButton -// ----------------------------------------------------------------------------- + VCLXAccessibleButton::VCLXAccessibleButton( VCLXWindow* pVCLWindow ) :VCLXAccessibleTextComponent( pVCLWindow ) { } -// ----------------------------------------------------------------------------- + VCLXAccessibleButton::~VCLXAccessibleButton() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -79,7 +79,7 @@ void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowE } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -108,28 +108,28 @@ void VCLXAccessibleButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper } } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleButton, VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextComponent, VCLXAccessibleButton_BASE ) -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleButton::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleButton" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (RuntimeException) { @@ -138,9 +138,9 @@ Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (Run return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleButton::getAccessibleName( ) throw (RuntimeException) { @@ -176,9 +176,9 @@ OUString VCLXAccessibleButton::getAccessibleName( ) throw (RuntimeException) return aName; } -// ----------------------------------------------------------------------------- + // XAccessibleAction -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeException) { @@ -187,7 +187,7 @@ sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeExcept return 1; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -203,7 +203,7 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (In return sal_True; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -215,7 +215,7 @@ OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex return OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) ); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -254,9 +254,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB return xKeyBinding; } -// ----------------------------------------------------------------------------- + // XAccessibleValue -// ----------------------------------------------------------------------------- + Any VCLXAccessibleButton::getCurrentValue( ) throw (RuntimeException) { @@ -271,7 +271,7 @@ Any VCLXAccessibleButton::getCurrentValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException) { @@ -297,7 +297,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt return bReturn; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleButton::getMaximumValue( ) throw (RuntimeException) { @@ -309,7 +309,7 @@ Any VCLXAccessibleButton::getMaximumValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleButton::getMinimumValue( ) throw (RuntimeException) { @@ -321,6 +321,6 @@ Any VCLXAccessibleButton::getMinimumValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index fa59bcd4cf62..eaa7cc6e8f5c 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -41,9 +41,9 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // VCLXAccessibleCheckBox -// ----------------------------------------------------------------------------- + VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow ) :VCLXAccessibleTextComponent( pVCLWindow ) @@ -52,13 +52,13 @@ VCLXAccessibleCheckBox::VCLXAccessibleCheckBox( VCLXWindow* pVCLWindow ) m_bIndeterminate = IsIndeterminate(); } -// ----------------------------------------------------------------------------- + VCLXAccessibleCheckBox::~VCLXAccessibleCheckBox() { } -// ----------------------------------------------------------------------------- + bool VCLXAccessibleCheckBox::IsChecked() { @@ -71,7 +71,7 @@ bool VCLXAccessibleCheckBox::IsChecked() return bChecked; } -// ----------------------------------------------------------------------------- + bool VCLXAccessibleCheckBox::IsIndeterminate() { @@ -84,7 +84,7 @@ bool VCLXAccessibleCheckBox::IsIndeterminate() return bIndeterminate; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleCheckBox::SetChecked( bool bChecked ) { @@ -100,7 +100,7 @@ void VCLXAccessibleCheckBox::SetChecked( bool bChecked ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleCheckBox::SetIndeterminate( bool bIndeterminate ) { @@ -116,7 +116,7 @@ void VCLXAccessibleCheckBox::SetIndeterminate( bool bIndeterminate ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -133,7 +133,7 @@ void VCLXAccessibleCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindo } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleCheckBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -148,28 +148,28 @@ void VCLXAccessibleCheckBox::FillAccessibleStateSet( utl::AccessibleStateSetHelp rStateSet.AddState( AccessibleStateType::INDETERMINATE ); } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleCheckBox, VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, VCLXAccessibleTextComponent, VCLXAccessibleCheckBox_BASE ) -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleCheckBox::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleCheckBox" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (RuntimeException) { @@ -178,9 +178,9 @@ Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (R return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleAction -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeException) { @@ -189,7 +189,7 @@ sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeExce return 1; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -221,7 +221,7 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw ( return sal_True; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -236,7 +236,7 @@ OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nInd return TK_RES_STRING( RID_STR_ACC_ACTION_CHECK ); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -275,9 +275,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe return xKeyBinding; } -// ----------------------------------------------------------------------------- + // XAccessibleValue -// ----------------------------------------------------------------------------- + Any VCLXAccessibleCheckBox::getCurrentValue( ) throw (RuntimeException) { @@ -292,7 +292,7 @@ Any VCLXAccessibleCheckBox::getCurrentValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (RuntimeException) { @@ -320,7 +320,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru return bReturn; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleCheckBox::getMaximumValue( ) throw (RuntimeException) { @@ -337,7 +337,7 @@ Any VCLXAccessibleCheckBox::getMaximumValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleCheckBox::getMinimumValue( ) throw (RuntimeException) { @@ -349,6 +349,6 @@ Any VCLXAccessibleCheckBox::getMinimumValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index b7e53761aa85..be40d5c43d1d 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -49,9 +49,9 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // VCLXAccessibleEdit -// ----------------------------------------------------------------------------- + VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow ) :VCLXAccessibleTextComponent( pVCLWindow ) @@ -60,13 +60,13 @@ VCLXAccessibleEdit::VCLXAccessibleEdit( VCLXWindow* pVCLWindow ) m_nCaretPosition = getCaretPosition(); } -// ----------------------------------------------------------------------------- + VCLXAccessibleEdit::~VCLXAccessibleEdit() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -109,7 +109,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleEdit::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -125,9 +125,9 @@ void VCLXAccessibleEdit::FillAccessibleStateSet( utl::AccessibleStateSetHelper& } } -// ----------------------------------------------------------------------------- + // OCommonAccessibleText -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleEdit::implGetText() { @@ -152,7 +152,7 @@ OUString VCLXAccessibleEdit::implGetText() return aText; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleEdit::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { @@ -165,28 +165,28 @@ void VCLXAccessibleEdit::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nE nEndIndex = aSelection.Max; } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleEdit, VCLXAccessibleTextComponent, VCLXAccessibleEdit_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit, VCLXAccessibleTextComponent, VCLXAccessibleEdit_BASE ) -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleEdit::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleEdit" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (RuntimeException) { @@ -195,9 +195,9 @@ Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (Runti return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException) { @@ -206,7 +206,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException) return 0; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -218,7 +218,7 @@ Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) t return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + sal_Int16 VCLXAccessibleEdit::getAccessibleRole( ) throw (RuntimeException) { @@ -234,9 +234,9 @@ sal_Int16 VCLXAccessibleEdit::getAccessibleRole( ) throw (RuntimeException) return nRole; } -// ----------------------------------------------------------------------------- + // XAccessibleAction -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeException) { @@ -246,7 +246,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeExceptio return 1; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -266,7 +266,7 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde return bDoAction; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -279,7 +279,7 @@ OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) return sAction; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -291,23 +291,23 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBin return Reference< XAccessibleKeyBinding >(); } -// ----------------------------------------------------------------------------- + // XAccessibleText -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleEdit::getCaretPosition( ) throw (RuntimeException) { return getSelectionEnd(); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { return setSelection( nIndex, nIndex ); } -// ----------------------------------------------------------------------------- + sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -316,7 +316,7 @@ sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOut return VCLXAccessibleTextComponent::getCharacter( nIndex ); } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -325,7 +325,7 @@ Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 return VCLXAccessibleTextComponent::getCharacterAttributes( nIndex, aRequestedAttributes ); } -// ----------------------------------------------------------------------------- + awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -368,7 +368,7 @@ awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw return aBounds; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) throw (RuntimeException) { @@ -377,7 +377,7 @@ sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) throw (RuntimeException) return VCLXAccessibleTextComponent::getCharacterCount(); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { @@ -386,7 +386,7 @@ sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw return VCLXAccessibleTextComponent::getIndexAtPoint( aPoint ); } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleEdit::getSelectedText( ) throw (RuntimeException) { @@ -395,7 +395,7 @@ OUString VCLXAccessibleEdit::getSelectedText( ) throw (RuntimeException) return VCLXAccessibleTextComponent::getSelectedText(); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) throw (RuntimeException) { @@ -404,7 +404,7 @@ sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) throw (RuntimeException) return VCLXAccessibleTextComponent::getSelectionStart(); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) throw (RuntimeException) { @@ -413,7 +413,7 @@ sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) throw (RuntimeException) return VCLXAccessibleTextComponent::getSelectionEnd(); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -436,7 +436,7 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd return bReturn; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleEdit::getText( ) throw (RuntimeException) { @@ -445,7 +445,7 @@ OUString VCLXAccessibleEdit::getText( ) throw (RuntimeException) return VCLXAccessibleTextComponent::getText(); } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -454,7 +454,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd return VCLXAccessibleTextComponent::getTextRange( nStartIndex, nEndIndex ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { @@ -463,7 +463,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd return VCLXAccessibleTextComponent::getTextAtIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { @@ -472,7 +472,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd return VCLXAccessibleTextComponent::getTextBeforeIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { @@ -481,7 +481,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd return VCLXAccessibleTextComponent::getTextBehindIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -490,9 +490,9 @@ sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndInde return VCLXAccessibleTextComponent::copyText( nStartIndex, nEndIndex ); } -// ----------------------------------------------------------------------------- + // XAccessibleEditableText -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -501,7 +501,7 @@ sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex return copyText( nStartIndex, nEndIndex ) && deleteText( nStartIndex, nEndIndex ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -535,7 +535,7 @@ sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoun return bReturn; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -544,7 +544,7 @@ sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIn return replaceText( nStartIndex, nEndIndex, OUString() ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -553,7 +553,7 @@ sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex return replaceText( nIndex, nIndex, sText ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -580,7 +580,7 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI return bReturn; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const Sequence<PropertyValue>& ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -592,7 +592,7 @@ sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEn return sal_False; // attributes cannot be set for an edit } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeException) { @@ -610,6 +610,6 @@ sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeExce return bSuccess; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx index 827ef624f97b..05035338b9cf 100644 --- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx @@ -21,29 +21,29 @@ using namespace ::com::sun::star; -// ----------------------------------------------------------------------------- + // VCLXAccessibleFixedHyperlink -// ----------------------------------------------------------------------------- + VCLXAccessibleFixedHyperlink::VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLWindow ) :VCLXAccessibleTextComponent( pVCLWindow ) { } -// ----------------------------------------------------------------------------- + VCLXAccessibleFixedHyperlink::~VCLXAccessibleFixedHyperlink() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleFixedHyperlink::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleTextComponent::FillAccessibleStateSet( rStateSet ); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { @@ -51,16 +51,16 @@ void VCLXAccessibleFixedHyperlink::implGetLineBoundary( i18n::Boundary& rBoundar OCommonAccessibleText::implGetLineBoundary( rBoundary, nIndex ); } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleFixedHyperlink::getImplementationName() throw (uno::RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleFixedHyperlink" ); } -// ----------------------------------------------------------------------------- + uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw (uno::RuntimeException) { @@ -69,6 +69,6 @@ uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames return aNames; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx index 786ca60b48fc..e5c64f31596b 100644 --- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx @@ -30,22 +30,22 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; -// ----------------------------------------------------------------------------- + // VCLXAccessibleFixedText -// ----------------------------------------------------------------------------- + VCLXAccessibleFixedText::VCLXAccessibleFixedText( VCLXWindow* pVCLWindow ) :VCLXAccessibleTextComponent( pVCLWindow ) { } -// ----------------------------------------------------------------------------- + VCLXAccessibleFixedText::~VCLXAccessibleFixedText() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -55,7 +55,7 @@ void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHel rStateSet.AddState( AccessibleStateType::MULTI_LINE ); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleFixedText::implGetLineBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { @@ -63,16 +63,16 @@ void VCLXAccessibleFixedText::implGetLineBoundary( i18n::Boundary& rBoundary, sa OCommonAccessibleText::implGetLineBoundary( rBoundary, nIndex ); } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleFixedText::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleFixedText" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw (RuntimeException) { @@ -81,6 +81,6 @@ Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw ( return aNames; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 44fb488b5698..91a44409be9e 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -94,19 +94,19 @@ VCLXAccessibleList::VCLXAccessibleList (VCLXWindow* pVCLWindow, BoxType aBoxType sal_uInt16 nCount = static_cast<sal_uInt16>(getAccessibleChildCount()); m_aAccessibleChildren.reserve(nCount); } -// ----------------------------------------------------------------------------- + VCLXAccessibleList::~VCLXAccessibleList (void) { delete m_pListBoxHelper; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::SetIndexInParent (sal_Int32 nIndex) { m_nIndexInParent = nIndex; } -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleList::disposing (void) { @@ -118,14 +118,14 @@ void SAL_CALL VCLXAccessibleList::disposing (void) delete m_pListBoxHelper; m_pListBoxHelper = NULL; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::clearItems() { // Clear the list itself and delete all the rest. ListItems().swap(m_aAccessibleChildren); // clear and minimize } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet) { @@ -154,7 +154,7 @@ void VCLXAccessibleList::FillAccessibleStateSet (utl::AccessibleStateSetHelper& rStateSet.AddState (AccessibleStateType::MANAGES_DESCENDANTS); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew ) { m_bVisible = _bSetNew ? true : false; @@ -184,7 +184,7 @@ void VCLXAccessibleList::notifyVisibleStates(sal_Bool _bSetNew ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::UpdateSelection_Acc (::rtl::OUString sTextOfSelectedItem, bool b_IsDropDownList) { if ( m_aBoxType == COMBOBOX ) @@ -202,7 +202,7 @@ void VCLXAccessibleList::UpdateSelection_Acc (::rtl::OUString sTextOfSelectedIte } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::UpdateSelection_Impl_Acc(bool b_IsDropDownList) { uno::Any aOldValue, aNewValue; @@ -340,7 +340,7 @@ void VCLXAccessibleList::UpdateFocus_Impl_Acc (sal_uInt16 nPos ,bool b_IsDropDow aNewValue ); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList) { switch ( rVclWindowEvent.GetId() ) @@ -390,7 +390,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) { // Create a reference to this object to prevent an early release of the @@ -483,7 +483,7 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve VCLXAccessibleComponent::FillAccessibleRelationSet(rRelationSet); } } -// ----------------------------------------------------------------------------- + /** To find out which item is currently selected and to update the SELECTED state of the associated accessibility objects accordingly we exploit the @@ -506,7 +506,7 @@ void VCLXAccessibleList::UpdateSelection (OUString sTextOfSelectedItem) } } -// ----------------------------------------------------------------------------- + Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i) { @@ -554,7 +554,7 @@ Reference<XAccessible> VCLXAccessibleList::CreateChild (sal_Int32 i) return xChild; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::HandleChangedItemList (bool /*bItemInserted*/, sal_Int32 /*nIndex*/) { @@ -563,7 +563,7 @@ void VCLXAccessibleList::HandleChangedItemList (bool /*bItemInserted*/, sal_Int3 AccessibleEventId::INVALIDATE_ALL_CHILDREN, Any(), Any()); } -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2(VCLXAccessibleList, VCLXAccessibleComponent, VCLXAccessibleList_BASE) IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleList, VCLXAccessibleComponent, VCLXAccessibleList_BASE) @@ -576,7 +576,7 @@ Reference<XAccessibleContext> SAL_CALL { return this; } -// ----------------------------------------------------------------------------- + //===== XAccessibleContext ================================================== @@ -592,7 +592,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount (void) return nCount; } -// ----------------------------------------------------------------------------- + Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int32 i) throw (IndexOutOfBoundsException, RuntimeException) @@ -616,7 +616,7 @@ Reference<XAccessible> SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int3 OSL_ENSURE( xChild.is(), "VCLXAccessibleList::getAccessibleChild: returning empty child!" ); return xChild; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent( ) throw (RuntimeException) @@ -625,7 +625,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent( ) return m_xParent; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void) throw (::com::sun::star::uno::RuntimeException) @@ -635,14 +635,14 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent (void) else return VCLXAccessibleComponent::getAccessibleIndexInParent(); } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole (void) throw (RuntimeException) { return AccessibleRole::LIST; } -// ----------------------------------------------------------------------------- + //===== XAccessibleComponent ================================================ @@ -662,7 +662,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::contains( const awt::Point& rPoint ) throw return bInside; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt::Point& rPoint ) throw (RuntimeException) @@ -691,7 +691,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleAt( const awt return xChild; } -// ----------------------------------------------------------------------------- + //===== XServiceInfo ========================================================== @@ -700,7 +700,7 @@ OUString VCLXAccessibleList::getImplementationName (void) { return OUString( "com.sun.star.comp.toolkit.AccessibleList" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames (void) throw (RuntimeException) @@ -711,7 +711,7 @@ Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames (void) aNames[nLength] = "com.sun.star.accessibility.AccessibleList"; return aNames; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::UpdateVisibleLineCount() { @@ -729,7 +729,7 @@ void VCLXAccessibleList::UpdateVisibleLineCount() } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::UpdateEntryRange_Impl() { SolarMutexGuard aSolarGuard; @@ -760,7 +760,7 @@ void VCLXAccessibleList::UpdateEntryRange_Impl() m_nLastTopEntry = nTop; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue,Reference< XAccessible >& _rxNewAcc) { OSL_ENSURE(m_pListBoxHelper,"Helper is not valid!"); @@ -776,7 +776,7 @@ sal_Bool VCLXAccessibleList::checkEntrySelected(sal_uInt16 _nPos,Any& _rNewValue } return bNowSelected; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16) { @@ -844,9 +844,9 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_uInt16) } } -// ----------------------------------------------------------------------------- + // XAccessibleSelection -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { sal_Bool bNotify = sal_False; @@ -871,7 +871,7 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) if ( bNotify ) UpdateSelection_Impl(); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -886,7 +886,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil } return bRet; } -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeException) { sal_Bool bNotify = sal_False; @@ -905,7 +905,7 @@ void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeExc if ( bNotify ) UpdateSelection_Impl(); } -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (RuntimeException) { sal_Bool bNotify = sal_False; @@ -930,7 +930,7 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (Runtime if ( bNotify ) UpdateSelection_Impl(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -941,7 +941,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) throw nCount = m_pListBoxHelper->GetSelectEntryCount(); return nCount; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -955,7 +955,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild return NULL; } -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { sal_Bool bNotify = sal_False; @@ -980,7 +980,7 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh if ( bNotify ) UpdateSelection_Impl(); } -// ----------------------------------------------------------------------------- + awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException) { awt::Rectangle aBounds ( 0, 0, 0, 0 ); @@ -1009,7 +1009,7 @@ awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException) } return aBounds; } -// ----------------------------------------------------------------------------- + awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeException) { @@ -1038,14 +1038,14 @@ awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeExcept return aPos; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleList::IsInDropDown() { return m_pListBoxHelper->IsInDropDown(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleList::HandleDropOpen() { diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 21e1d45da04e..b1e4c6dce484 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -58,9 +58,9 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; using namespace ::com::sun::star; -// ----------------------------------------------------------------------------- + // Ctor() and Dtor() -// ----------------------------------------------------------------------------- + VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHelper* _pListBoxHelper, sal_Int32 _nIndexInParent, const Reference< XAccessible >& _xParent ) : VCLXAccessibleListItem_BASE ( m_aMutex ), @@ -79,11 +79,11 @@ VCLXAccessibleListItem::VCLXAccessibleListItem( ::accessibility::IComboListBoxHe if ( m_pListBoxHelper ) m_sEntryText = m_pListBoxHelper->GetEntry( (sal_uInt16)_nIndexInParent ); } -// ----------------------------------------------------------------------------- + VCLXAccessibleListItem::~VCLXAccessibleListItem() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleListItem::SetSelected( sal_Bool _bSelected ) { if ( m_bSelected != _bSelected ) @@ -98,7 +98,7 @@ void VCLXAccessibleListItem::SetSelected( sal_Bool _bSelected ) NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleListItem::SetVisible( sal_Bool _bVisible ) { if ( m_bVisible != _bVisible ) @@ -111,7 +111,7 @@ void VCLXAccessibleListItem::SetVisible( sal_Bool _bVisible ) NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleListItem::NotifyAccessibleEvent( sal_Int16 _nEventId, const ::com::sun::star::uno::Any& _aOldValue, const ::com::sun::star::uno::Any& _aNewValue ) @@ -125,49 +125,49 @@ void VCLXAccessibleListItem::NotifyAccessibleEvent( sal_Int16 _nEventId, if (m_nClientId) comphelper::AccessibleEventNotifier::addEvent( m_nClientId, aEvt ); } -// ----------------------------------------------------------------------------- + // OCommonAccessibleText -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleListItem::implGetText() { return m_sEntryText; } -// ----------------------------------------------------------------------------- + Locale VCLXAccessibleListItem::implGetLocale() { return Application::GetSettings().GetLanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleListItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { nStartIndex = 0; nEndIndex = 0; } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + Any SAL_CALL VCLXAccessibleListItem::queryInterface( Type const & rType ) throw (RuntimeException) { return VCLXAccessibleListItem_BASE::queryInterface( rType ); } -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleListItem::acquire() throw () { VCLXAccessibleListItem_BASE::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleListItem::release() throw () { VCLXAccessibleListItem_BASE::release(); } -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + Sequence< Type > SAL_CALL VCLXAccessibleListItem::getTypes( ) throw (RuntimeException) { return VCLXAccessibleListItem_BASE::getTypes(); } -// ----------------------------------------------------------------------------- + Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw (RuntimeException) { static ::cppu::OImplementationId* pId = NULL; @@ -184,9 +184,9 @@ Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw (Runtim } return pId->getImplementationId(); } -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleListItem::disposing() { comphelper::AccessibleEventNotifier::TClientId nId( 0 ); @@ -210,19 +210,19 @@ void SAL_CALL VCLXAccessibleListItem::disposing() if ( nId ) comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nId, *this ); } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleListItem::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleListItem" ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleListItem::supportsService( const OUString& rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (RuntimeException) { Sequence< OUString > aNames(3); @@ -231,51 +231,51 @@ Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (R aNames[2] = "com.sun.star.accessibility.AccessibleListItem"; return aNames; } -// ----------------------------------------------------------------------------- + // XAccessible -// ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL VCLXAccessibleListItem::getAccessibleContext( ) throw (RuntimeException) { return this; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount( ) throw (RuntimeException) { return 0; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int32 ) throw (RuntimeException) { return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_xParent; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_nIndexInParent; } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole( ) throw (RuntimeException) { return AccessibleRole::LIST_ITEM; // return AccessibleRole::LABEL; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription( ) throw (RuntimeException) { // no description for every item return OUString(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -283,14 +283,14 @@ OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName( ) throw (RuntimeEx // entry text == accessible name return implGetText(); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleListItem::getAccessibleRelationSet( ) throw (RuntimeException) { utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; Reference< XAccessibleRelationSet > xSet = pRelationSetHelper; return xSet; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleStateSet( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -322,7 +322,7 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleS return xStateSet; } -// ----------------------------------------------------------------------------- + Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -330,9 +330,9 @@ Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw (IllegalAccessibleCo return implGetLocale(); } -// ----------------------------------------------------------------------------- + // XAccessibleComponent -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoint ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -347,12 +347,12 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi } return bInside; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) { return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -364,7 +364,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) throw (RuntimeExce return aRect; } -// ----------------------------------------------------------------------------- + awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -378,7 +378,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) throw (RuntimeExcept } return AWTPoint( aPoint ); } -// ----------------------------------------------------------------------------- + awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -393,7 +393,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (Runti } return AWTPoint( aPoint ); } -// ----------------------------------------------------------------------------- + awt::Size SAL_CALL VCLXAccessibleListItem::getSize( ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -405,19 +405,19 @@ awt::Size SAL_CALL VCLXAccessibleListItem::getSize( ) throw (RuntimeException) return AWTSize( aSize ); } -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleListItem::grabFocus( ) throw (RuntimeException) { // no focus for each item } -// ----------------------------------------------------------------------------- + // XAccessibleText -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleListItem::getCaretPosition() throw (RuntimeException) { return -1; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -428,7 +428,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) t return sal_False; } -// ----------------------------------------------------------------------------- + sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -436,7 +436,7 @@ sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) th return OCommonAccessibleText::getCharacter( nIndex ); } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -448,7 +448,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttribute return Sequence< PropertyValue >(); } -// ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -469,7 +469,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI return aBounds; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -477,7 +477,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeExc return OCommonAccessibleText::getCharacterCount(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -496,7 +496,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP } return nIndex; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -504,7 +504,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeExcept return OCommonAccessibleText::getSelectedText(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -512,7 +512,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeExc return OCommonAccessibleText::getSelectionStart(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -520,7 +520,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeExcep return OCommonAccessibleText::getSelectionEnd(); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -531,7 +531,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s return sal_False; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException) { SolarMutexGuard aSolarGuard; @@ -539,7 +539,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException) return OCommonAccessibleText::getText(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -547,7 +547,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -555,7 +555,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -563,7 +563,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { SolarMutexGuard aSolarGuard; @@ -571,7 +571,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { SolarMutexGuard aSolarGuard; @@ -602,9 +602,9 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I return bRet; } -// ----------------------------------------------------------------------------- + // XAccessibleEventBroadcaster -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if (xListener.is()) @@ -614,7 +614,7 @@ void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Referenc comphelper::AccessibleEventNotifier::addEventListener( m_nClientId, xListener ); } } -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException) { if ( xListener.is() && m_nClientId ) @@ -635,7 +635,7 @@ void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Refer } } } -// ----------------------------------------------------------------------------- + @@ -656,6 +656,6 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getBackground (void) { return COL_WHITE; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index 3ccbf7c2cfe1..8dba21b894f4 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -30,22 +30,22 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // VCLXAccessibleMenu -// ----------------------------------------------------------------------------- + VCLXAccessibleMenu::VCLXAccessibleMenu( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu ) :VCLXAccessibleMenuItem( pParent, nItemPos, pMenu ) { } -// ----------------------------------------------------------------------------- + VCLXAccessibleMenu::~VCLXAccessibleMenu() { } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenu::IsFocused() { @@ -57,7 +57,7 @@ sal_Bool VCLXAccessibleMenu::IsFocused() return bFocused; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenu::IsPopupMenuOpen() { @@ -73,28 +73,28 @@ sal_Bool VCLXAccessibleMenu::IsPopupMenuOpen() return bPopupMenuOpen; } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VCLXAccessibleMenu_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VCLXAccessibleMenu_BASE ) -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleMenu::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleMenu" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (RuntimeException) { @@ -103,9 +103,9 @@ Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (Runti return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) throw (RuntimeException) { @@ -114,7 +114,7 @@ sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) throw (RuntimeExceptio return GetChildCount(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -126,7 +126,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) t return GetChild( i ); } -// ----------------------------------------------------------------------------- + sal_Int16 VCLXAccessibleMenu::getAccessibleRole( ) throw (RuntimeException) { @@ -135,9 +135,9 @@ sal_Int16 VCLXAccessibleMenu::getAccessibleRole( ) throw (RuntimeException) return AccessibleRole::MENU; } -// ----------------------------------------------------------------------------- + // XAccessibleComponent -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) { @@ -146,9 +146,9 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Po return GetChildAt( rPoint ); } -// ----------------------------------------------------------------------------- + // XAccessibleSelection -// ----------------------------------------------------------------------------- + void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -160,7 +160,7 @@ void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (I SelectChild( nChildIndex ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -172,7 +172,7 @@ sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) return IsChildSelected( nChildIndex ); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleMenu::clearAccessibleSelection( ) throw (RuntimeException) { @@ -181,14 +181,14 @@ void VCLXAccessibleMenu::clearAccessibleSelection( ) throw (RuntimeException) DeSelectAll(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleMenu::selectAllAccessibleChildren( ) throw (RuntimeException) { // This method makes no sense in a menu, and so does nothing. } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) throw (RuntimeException) { @@ -205,7 +205,7 @@ sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) throw (Runtime return nRet; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -228,7 +228,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int return xChild; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -240,7 +240,7 @@ void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw DeSelectAll(); } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleMenu::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index 740ce1a5804e..3ba4c19eb30c 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -31,9 +31,9 @@ using namespace ::com::sun::star; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // class VCLXAccessibleMenuBar -// ----------------------------------------------------------------------------- + VCLXAccessibleMenuBar::VCLXAccessibleMenuBar( Menu* pMenu ) :OAccessibleMenuComponent( pMenu ) @@ -51,7 +51,7 @@ VCLXAccessibleMenuBar::VCLXAccessibleMenuBar( Menu* pMenu ) } } -// ----------------------------------------------------------------------------- + VCLXAccessibleMenuBar::~VCLXAccessibleMenuBar() { @@ -59,7 +59,7 @@ VCLXAccessibleMenuBar::~VCLXAccessibleMenuBar() m_pWindow->RemoveEventListener( LINK( this, VCLXAccessibleMenuBar, WindowEventListener ) ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenuBar::IsFocused() { @@ -71,7 +71,7 @@ sal_Bool VCLXAccessibleMenuBar::IsFocused() return bFocused; } -// ----------------------------------------------------------------------------- + IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclSimpleEvent*, pEvent ) { @@ -87,7 +87,7 @@ IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclSimpleEvent*, pEvent ) return 0; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleMenuBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -115,9 +115,9 @@ void VCLXAccessibleMenuBar::ProcessWindowEvent( const VclWindowEvent& rVclWindow } } -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void VCLXAccessibleMenuBar::disposing() { @@ -130,16 +130,16 @@ void VCLXAccessibleMenuBar::disposing() } } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleMenuBar::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleMenuBar" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (RuntimeException) { @@ -148,9 +148,9 @@ Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (Ru return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeException) { @@ -182,7 +182,7 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeEx return nIndexInParent; } -// ----------------------------------------------------------------------------- + sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole( ) throw (RuntimeException) { @@ -191,9 +191,9 @@ sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole( ) throw (RuntimeException) return AccessibleRole::MENU_BAR; } -// ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleMenuBar::getBackground( ) throw (RuntimeException) { @@ -202,6 +202,6 @@ sal_Int32 VCLXAccessibleMenuBar::getBackground( ) throw (RuntimeException) return Application::GetSettings().GetStyleSettings().GetMenuBarColor().GetColor(); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index c72ae8e1e041..488befd799e4 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -45,36 +45,36 @@ using namespace ::com::sun::star; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // class VCLXAccessibleMenuItem -// ----------------------------------------------------------------------------- + VCLXAccessibleMenuItem::VCLXAccessibleMenuItem( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu ) :OAccessibleMenuItemComponent( pParent, nItemPos, pMenu ) { } -// ----------------------------------------------------------------------------- + VCLXAccessibleMenuItem::~VCLXAccessibleMenuItem() { } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenuItem::IsFocused() { return IsHighlighted(); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenuItem::IsSelected() { return IsHighlighted(); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenuItem::IsChecked() { @@ -90,7 +90,7 @@ sal_Bool VCLXAccessibleMenuItem::IsChecked() return bChecked; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenuItem::IsHighlighted() { @@ -102,7 +102,7 @@ sal_Bool VCLXAccessibleMenuItem::IsHighlighted() return bHighlighted; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleMenuItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -122,23 +122,23 @@ void VCLXAccessibleMenuItem::FillAccessibleStateSet( utl::AccessibleStateSetHelp rStateSet.AddState( AccessibleStateType::CHECKED ); } -// ----------------------------------------------------------------------------- + // OCommonAccessibleText -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleMenuItem::implGetText() { return m_sItemText; } -// ----------------------------------------------------------------------------- + Locale VCLXAccessibleMenuItem::implGetLocale() { return Application::GetSettings().GetLanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleMenuItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { @@ -146,28 +146,28 @@ void VCLXAccessibleMenuItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32 nEndIndex = 0; } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleMenuItem, OAccessibleMenuItemComponent, VCLXAccessibleMenuItem_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem, OAccessibleMenuItemComponent, VCLXAccessibleMenuItem_BASE ) -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleMenuItem::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleMenuItem" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (RuntimeException) { @@ -176,9 +176,9 @@ Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (R return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole( ) throw (RuntimeException) { @@ -198,9 +198,9 @@ sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole( ) throw (RuntimeException) return nRole; } -// ----------------------------------------------------------------------------- + // XAccessibleText -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException) { @@ -209,7 +209,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException) return -1; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -222,7 +222,7 @@ sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (Ind return sal_False; } -// ----------------------------------------------------------------------------- + sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -231,7 +231,7 @@ sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (Inde return OCommonAccessibleText::getCharacter( nIndex ); } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -249,7 +249,7 @@ Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_In .GetCharacterAttributes( aRequestedAttributes ); } -// ----------------------------------------------------------------------------- + awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -271,7 +271,7 @@ awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) th return aBounds; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException) { @@ -280,7 +280,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException) return OCommonAccessibleText::getCharacterCount(); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { @@ -301,7 +301,7 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) th return nIndex; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException) { @@ -310,7 +310,7 @@ OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException) return OCommonAccessibleText::getSelectedText(); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException) { @@ -319,7 +319,7 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException) return OCommonAccessibleText::getSelectionStart(); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException) { @@ -328,7 +328,7 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException) return OCommonAccessibleText::getSelectionEnd(); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -340,7 +340,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 return sal_False; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException) { @@ -349,7 +349,7 @@ OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException) return OCommonAccessibleText::getText(); } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -358,7 +358,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { @@ -367,7 +367,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { @@ -376,7 +376,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { @@ -385,7 +385,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -421,9 +421,9 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd return bReturn; } -// ----------------------------------------------------------------------------- + // XAccessibleAction -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeException) { @@ -432,7 +432,7 @@ sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeExce return 1; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -446,7 +446,7 @@ sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw ( return sal_True; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -458,7 +458,7 @@ OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nInd return TK_RES_STRING( RID_STR_ACC_ACTION_SELECT ); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -535,9 +535,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe return xKeyBinding; } -// ----------------------------------------------------------------------------- + // XAccessibleValue -// ----------------------------------------------------------------------------- + Any VCLXAccessibleMenuItem::getCurrentValue( ) throw (RuntimeException) { @@ -552,7 +552,7 @@ Any VCLXAccessibleMenuItem::getCurrentValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException) { @@ -576,7 +576,7 @@ sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (Ru return bReturn; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleMenuItem::getMaximumValue( ) throw (RuntimeException) { @@ -588,7 +588,7 @@ Any VCLXAccessibleMenuItem::getMaximumValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleMenuItem::getMinimumValue( ) throw (RuntimeException) { @@ -600,6 +600,6 @@ Any VCLXAccessibleMenuItem::getMinimumValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx index 633bdf1e5fac..52c8fb440894 100644 --- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx @@ -28,31 +28,31 @@ using namespace ::com::sun::star; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // class VCLXAccessibleMenuSeparator -// ----------------------------------------------------------------------------- + VCLXAccessibleMenuSeparator::VCLXAccessibleMenuSeparator( Menu* pParent, sal_uInt16 nItemPos, Menu* pMenu ) :OAccessibleMenuItemComponent( pParent, nItemPos, pMenu ) { } -// ----------------------------------------------------------------------------- + VCLXAccessibleMenuSeparator::~VCLXAccessibleMenuSeparator() { } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleMenuSeparator::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleMenuSeparator" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() throw (RuntimeException) { @@ -61,9 +61,9 @@ Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() thr return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole( ) throw (RuntimeException) { @@ -72,6 +72,6 @@ sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole( ) throw (RuntimeExcep return AccessibleRole::SEPARATOR; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index 3db137b25e4b..e12ece7b6990 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -28,38 +28,38 @@ using namespace ::com::sun::star::uno; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // class VCLXAccessiblePopupMenu -// ----------------------------------------------------------------------------- + VCLXAccessiblePopupMenu::VCLXAccessiblePopupMenu( Menu* pMenu ) :OAccessibleMenuComponent( pMenu ) { } -// ----------------------------------------------------------------------------- + VCLXAccessiblePopupMenu::~VCLXAccessiblePopupMenu() { } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessiblePopupMenu::IsFocused() { return !IsChildHighlighted(); } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessiblePopupMenu::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessiblePopupMenu" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (RuntimeException) { @@ -68,9 +68,9 @@ Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw ( return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) throw (RuntimeException) { @@ -79,7 +79,7 @@ sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) throw (Runtime return 0; } -// ----------------------------------------------------------------------------- + sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole( ) throw (RuntimeException) { @@ -88,9 +88,9 @@ sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole( ) throw (RuntimeException return AccessibleRole::POPUP_MENU; } -// ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessiblePopupMenu::getBackground( ) throw (RuntimeException) { @@ -99,6 +99,6 @@ sal_Int32 VCLXAccessiblePopupMenu::getBackground( ) throw (RuntimeException) return Application::GetSettings().GetStyleSettings().GetMenuColor().GetColor(); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index 7e8b948ad3c9..0b272cb3d0a9 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -44,22 +44,22 @@ using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // VCLXAccessibleRadioButton -// ----------------------------------------------------------------------------- + VCLXAccessibleRadioButton::VCLXAccessibleRadioButton( VCLXWindow* pVCLWindow ) :VCLXAccessibleTextComponent( pVCLWindow ) { } -// ----------------------------------------------------------------------------- + VCLXAccessibleRadioButton::~VCLXAccessibleRadioButton() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -84,7 +84,7 @@ void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWi } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleRadioButton::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) { @@ -108,7 +108,7 @@ void VCLXAccessibleRadioButton::FillAccessibleRelationSet( utl::AccessibleRelati } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleRadioButton::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -123,28 +123,28 @@ void VCLXAccessibleRadioButton::FillAccessibleStateSet( utl::AccessibleStateSetH } } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleRadioButton, VCLXAccessibleTextComponent, VCLXAccessibleRadioButton_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextComponent, VCLXAccessibleRadioButton_BASE ) -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleRadioButton::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleRadioButton" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw (RuntimeException) { @@ -153,9 +153,9 @@ Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleAction -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeException) { @@ -164,7 +164,7 @@ sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeE return 1; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -180,7 +180,7 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) thro return sal_True; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -192,7 +192,7 @@ OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 n return TK_RES_STRING( RID_STR_ACC_ACTION_SELECT ); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -231,9 +231,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio return xKeyBinding; } -// ----------------------------------------------------------------------------- + // XAccessibleValue -// ----------------------------------------------------------------------------- + Any VCLXAccessibleRadioButton::getCurrentValue( ) throw (RuntimeException) { @@ -248,7 +248,7 @@ Any VCLXAccessibleRadioButton::getCurrentValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException) { @@ -274,7 +274,7 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw return bReturn; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleRadioButton::getMaximumValue( ) throw (RuntimeException) { @@ -286,7 +286,7 @@ Any VCLXAccessibleRadioButton::getMaximumValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleRadioButton::getMinimumValue( ) throw (RuntimeException) { @@ -298,6 +298,6 @@ Any VCLXAccessibleRadioButton::getMinimumValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 3ef392199f41..6148824809a9 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -39,22 +39,22 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::accessibility; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // VCLXAccessibleScrollBar -// ----------------------------------------------------------------------------- + VCLXAccessibleScrollBar::VCLXAccessibleScrollBar( VCLXWindow* pVCLWindow ) :VCLXAccessibleComponent( pVCLWindow ) { } -// ----------------------------------------------------------------------------- + VCLXAccessibleScrollBar::~VCLXAccessibleScrollBar() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -70,7 +70,7 @@ void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWind } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleScrollBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -88,28 +88,28 @@ void VCLXAccessibleScrollBar::FillAccessibleStateSet( utl::AccessibleStateSetHel } } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleComponent, VCLXAccessibleScrollBar_BASE ) -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleScrollBar" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (RuntimeException) { @@ -118,9 +118,9 @@ Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw ( return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleAction -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeException) { @@ -129,7 +129,7 @@ sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeExc return 4; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -158,7 +158,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw return bReturn; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -181,7 +181,7 @@ OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIn return sDescription; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -193,9 +193,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionK return Reference< XAccessibleKeyBinding >(); } -// ----------------------------------------------------------------------------- + // XAccessibleValue -// ----------------------------------------------------------------------------- + Any VCLXAccessibleScrollBar::getCurrentValue( ) throw (RuntimeException) { @@ -210,7 +210,7 @@ Any VCLXAccessibleScrollBar::getCurrentValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (RuntimeException) { @@ -238,7 +238,7 @@ sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (R return bReturn; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleScrollBar::getMaximumValue( ) throw (RuntimeException) { @@ -253,7 +253,7 @@ Any VCLXAccessibleScrollBar::getMaximumValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException) { @@ -265,7 +265,7 @@ Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException) return aValue; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleScrollBar::getAccessibleName( ) throw (uno::RuntimeException) { diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index e120fc00b60c..c05c3c6257e6 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -44,13 +44,13 @@ VCLXAccessibleStatusBar::VCLXAccessibleStatusBar( VCLXWindow* pVCLXWindow ) m_aAccessibleChildren.assign( m_pStatusBar->GetItemCount(), Reference< XAccessible >() ); } -// ----------------------------------------------------------------------------- + VCLXAccessibleStatusBar::~VCLXAccessibleStatusBar() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, sal_Bool bShowing ) { @@ -66,7 +66,7 @@ void VCLXAccessibleStatusBar::UpdateShowing( sal_Int32 i, sal_Bool bShowing ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i ) { @@ -85,7 +85,7 @@ void VCLXAccessibleStatusBar::UpdateItemName( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i ) { @@ -104,7 +104,7 @@ void VCLXAccessibleStatusBar::UpdateItemText( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i ) { @@ -124,7 +124,7 @@ void VCLXAccessibleStatusBar::InsertChild( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBar::RemoveChild( sal_Int32 i ) { @@ -150,7 +150,7 @@ void VCLXAccessibleStatusBar::RemoveChild( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -255,9 +255,9 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind } } -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBar::disposing() { @@ -278,16 +278,16 @@ void VCLXAccessibleStatusBar::disposing() } } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleStatusBar" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException) { @@ -296,9 +296,9 @@ Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw ( return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeException) { @@ -307,7 +307,7 @@ sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeExcep return m_aAccessibleChildren.size(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -333,9 +333,9 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 return xChild; } -// ----------------------------------------------------------------------------- + // XAccessibleComponent -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) { @@ -353,6 +353,6 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const aw return xChild; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 7659f31b4e85..66d9f7838c73 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -44,9 +44,9 @@ using namespace ::com::sun::star; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // class VCLXAccessibleStatusBarItem -// ----------------------------------------------------------------------------- + VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, sal_uInt16 nItemId ) :AccessibleTextHelper_BASE( new VCLExternalSolarLock() ) @@ -60,7 +60,7 @@ VCLXAccessibleStatusBarItem::VCLXAccessibleStatusBarItem( StatusBar* pStatusBar, m_bShowing = IsShowing(); } -// ----------------------------------------------------------------------------- + VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem() { @@ -68,7 +68,7 @@ VCLXAccessibleStatusBarItem::~VCLXAccessibleStatusBarItem() m_pExternalLock = NULL; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleStatusBarItem::IsShowing() { @@ -80,7 +80,7 @@ sal_Bool VCLXAccessibleStatusBarItem::IsShowing() return bShowing; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBarItem::SetShowing( sal_Bool bShowing ) { @@ -96,7 +96,7 @@ void VCLXAccessibleStatusBarItem::SetShowing( sal_Bool bShowing ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBarItem::SetItemName( const OUString& sItemName ) { @@ -110,7 +110,7 @@ void VCLXAccessibleStatusBarItem::SetItemName( const OUString& sItemName ) } } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleStatusBarItem::GetItemName() { @@ -121,7 +121,7 @@ OUString VCLXAccessibleStatusBarItem::GetItemName() return sName; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBarItem::SetItemText( const OUString& sItemText ) { @@ -133,7 +133,7 @@ void VCLXAccessibleStatusBarItem::SetItemText( const OUString& sItemText ) } } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleStatusBarItem::GetItemText() { @@ -149,7 +149,7 @@ OUString VCLXAccessibleStatusBarItem::GetItemText() return sText; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -162,9 +162,9 @@ void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSe rStateSet.AddState( AccessibleStateType::SHOWING ); } -// ----------------------------------------------------------------------------- + // OCommonAccessibleComponent -// ----------------------------------------------------------------------------- + awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() throw (RuntimeException) { @@ -176,23 +176,23 @@ awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() throw (RuntimeExcept return aBounds; } -// ----------------------------------------------------------------------------- + // OCommonAccessibleText -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleStatusBarItem::implGetText() { return GetItemText(); } -// ----------------------------------------------------------------------------- + lang::Locale VCLXAccessibleStatusBarItem::implGetLocale() { return Application::GetSettings().GetLanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBarItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { @@ -200,21 +200,21 @@ void VCLXAccessibleStatusBarItem::implGetSelection( sal_Int32& nStartIndex, sal_ nEndIndex = 0; } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleStatusBarItem, AccessibleTextHelper_BASE, VCLXAccessibleStatusBarItem_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleStatusBarItem, AccessibleTextHelper_BASE, VCLXAccessibleStatusBarItem_BASE ) -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBarItem::disposing() { @@ -225,23 +225,23 @@ void VCLXAccessibleStatusBarItem::disposing() m_sItemText = OUString(); } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleStatusBarItem::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleStatusBarItem" ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() throw (RuntimeException) { @@ -250,9 +250,9 @@ Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() thr return aNames; } -// ----------------------------------------------------------------------------- + // XAccessible -// ----------------------------------------------------------------------------- + Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContext( ) throw (RuntimeException) { @@ -261,9 +261,9 @@ Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContex return this; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeException) { @@ -272,7 +272,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeE return 0; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -284,7 +284,7 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_In return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) throw (RuntimeException) { @@ -297,7 +297,7 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) th return xParent; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) throw (RuntimeException) { @@ -310,7 +310,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) throw (Run return nIndexInParent; } -// ----------------------------------------------------------------------------- + sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) throw (RuntimeException) { @@ -319,7 +319,7 @@ sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) throw (RuntimeExcep return AccessibleRole::LABEL; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (RuntimeException) { @@ -332,7 +332,7 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (Runtim return sDescription; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleStatusBarItem::getAccessibleName( ) throw (RuntimeException) { @@ -341,7 +341,7 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleName( ) throw (RuntimeExcept return GetItemName(); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRelationSet( ) throw (RuntimeException) { @@ -352,7 +352,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRe return xSet; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet( ) throw (RuntimeException) { @@ -373,7 +373,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleState return xSet; } -// ----------------------------------------------------------------------------- + Locale VCLXAccessibleStatusBarItem::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -382,9 +382,9 @@ Locale VCLXAccessibleStatusBarItem::getLocale( ) throw (IllegalAccessibleCompon return Application::GetSettings().GetLanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + // XAccessibleComponent -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) { @@ -393,14 +393,14 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( cons return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleStatusBarItem::grabFocus( ) throw (RuntimeException) { // no focus for status bar items } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeException) { @@ -418,7 +418,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeExceptio return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleStatusBarItem::getBackground( ) throw (RuntimeException) { @@ -436,9 +436,9 @@ sal_Int32 VCLXAccessibleStatusBarItem::getBackground( ) throw (RuntimeException return nColor; } -// ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent -// ----------------------------------------------------------------------------- + Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( ) throw (RuntimeException) { @@ -456,7 +456,7 @@ Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( ) throw (RuntimeE return xFont; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) throw (RuntimeException) { @@ -465,7 +465,7 @@ OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) throw (RuntimeExce return GetItemText(); } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleStatusBarItem::getToolTipText( ) throw (RuntimeException) { @@ -474,9 +474,9 @@ OUString VCLXAccessibleStatusBarItem::getToolTipText( ) throw (RuntimeException return OUString(); } -// ----------------------------------------------------------------------------- + // XAccessibleText -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeException) { @@ -485,7 +485,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeExceptio return -1; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -497,7 +497,7 @@ sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw return sal_False; } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -521,7 +521,7 @@ Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( s return aValues; } -// ----------------------------------------------------------------------------- + awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -544,7 +544,7 @@ awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex return aBounds; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { @@ -564,7 +564,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint return nIndex; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -576,7 +576,7 @@ sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_I return sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -608,6 +608,6 @@ sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 return bReturn; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index ecd6a9df48d1..0ee4bb4be010 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -49,13 +49,13 @@ VCLXAccessibleTabControl::VCLXAccessibleTabControl( VCLXWindow* pVCLXWindow ) m_aAccessibleChildren.assign( m_pTabControl->GetPageCount(), Reference< XAccessible >() ); } -// ----------------------------------------------------------------------------- + VCLXAccessibleTabControl::~VCLXAccessibleTabControl() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::UpdateFocused() { @@ -71,7 +71,7 @@ void VCLXAccessibleTabControl::UpdateFocused() } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, bool bSelected ) { @@ -87,7 +87,7 @@ void VCLXAccessibleTabControl::UpdateSelected( sal_Int32 i, bool bSelected ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::UpdatePageText( sal_Int32 i ) { @@ -103,7 +103,7 @@ void VCLXAccessibleTabControl::UpdatePageText( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::UpdateTabPage( sal_Int32 i, bool bNew ) { @@ -119,7 +119,7 @@ void VCLXAccessibleTabControl::UpdateTabPage( sal_Int32 i, bool bNew ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::InsertChild( sal_Int32 i ) { @@ -139,7 +139,7 @@ void VCLXAccessibleTabControl::InsertChild( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::RemoveChild( sal_Int32 i ) { @@ -165,7 +165,7 @@ void VCLXAccessibleTabControl::RemoveChild( sal_Int32 i ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -260,7 +260,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -291,7 +291,7 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -301,21 +301,21 @@ void VCLXAccessibleTabControl::FillAccessibleStateSet( utl::AccessibleStateSetHe rStateSet.AddState( AccessibleStateType::FOCUSABLE ); } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabControl, VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabControl, VCLXAccessibleComponent, VCLXAccessibleTabControl_BASE ) -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::disposing() { @@ -336,16 +336,16 @@ void VCLXAccessibleTabControl::disposing() } } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTabControl::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleTabControl" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw (RuntimeException) { @@ -354,9 +354,9 @@ Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeException) { @@ -365,7 +365,7 @@ sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeExce return m_aAccessibleChildren.size(); } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -391,7 +391,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 return xChild; } -// ----------------------------------------------------------------------------- + sal_Int16 VCLXAccessibleTabControl::getAccessibleRole( ) throw (RuntimeException) { @@ -400,7 +400,7 @@ sal_Int16 VCLXAccessibleTabControl::getAccessibleRole( ) throw (RuntimeExceptio return AccessibleRole::PAGE_TAB_LIST; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTabControl::getAccessibleName( ) throw (RuntimeException) { @@ -409,9 +409,9 @@ OUString VCLXAccessibleTabControl::getAccessibleName( ) throw (RuntimeException return OUString(); } -// ----------------------------------------------------------------------------- + // XAccessibleSelection -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -424,7 +424,7 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) th m_pTabControl->SelectTabPage( m_pTabControl->GetPageId( (sal_uInt16)nChildIndex ) ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -440,14 +440,14 @@ sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIn return bSelected; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::clearAccessibleSelection( ) throw (RuntimeException) { // This method makes no sense in a tab control, and so does nothing. } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) throw (RuntimeException) { @@ -456,7 +456,7 @@ void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) throw (RuntimeExc selectAccessibleChild( 0 ); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) throw (RuntimeException) { @@ -465,7 +465,7 @@ sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) throw (R return 1; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -488,7 +488,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( s return xChild; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -500,6 +500,6 @@ void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) // This method makes no sense in a tab control, and so does nothing. } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index a1b2646fbbb8..147747de1741 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -44,9 +44,9 @@ using namespace ::com::sun::star; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // class VCLXAccessibleTabPage -// ----------------------------------------------------------------------------- + VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt16 nPageId ) :AccessibleTextHelper_BASE( new VCLExternalSolarLock() ) @@ -59,7 +59,7 @@ VCLXAccessibleTabPage::VCLXAccessibleTabPage( TabControl* pTabControl, sal_uInt1 m_sPageText = GetPageText(); } -// ----------------------------------------------------------------------------- + VCLXAccessibleTabPage::~VCLXAccessibleTabPage() { @@ -67,7 +67,7 @@ VCLXAccessibleTabPage::~VCLXAccessibleTabPage() m_pExternalLock = NULL; } -// ----------------------------------------------------------------------------- + bool VCLXAccessibleTabPage::IsFocused() { @@ -79,7 +79,7 @@ bool VCLXAccessibleTabPage::IsFocused() return bFocused; } -// ----------------------------------------------------------------------------- + bool VCLXAccessibleTabPage::IsSelected() { @@ -91,7 +91,7 @@ bool VCLXAccessibleTabPage::IsSelected() return bSelected; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabPage::SetFocused( bool bFocused ) { @@ -107,7 +107,7 @@ void VCLXAccessibleTabPage::SetFocused( bool bFocused ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabPage::SetSelected( bool bSelected ) { @@ -123,7 +123,7 @@ void VCLXAccessibleTabPage::SetSelected( bool bSelected ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabPage::SetPageText( const OUString& sPageText ) { @@ -139,7 +139,7 @@ void VCLXAccessibleTabPage::SetPageText( const OUString& sPageText ) } } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTabPage::GetPageText() { @@ -150,7 +150,7 @@ OUString VCLXAccessibleTabPage::GetPageText() return sText; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabPage::Update( bool bNew ) { @@ -173,7 +173,7 @@ void VCLXAccessibleTabPage::Update( bool bNew ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { @@ -195,9 +195,9 @@ void VCLXAccessibleTabPage::FillAccessibleStateSet( utl::AccessibleStateSetHelpe rStateSet.AddState( AccessibleStateType::SELECTED ); } -// ----------------------------------------------------------------------------- + // OCommonAccessibleComponent -// ----------------------------------------------------------------------------- + awt::Rectangle VCLXAccessibleTabPage::implGetBounds() throw (RuntimeException) { @@ -209,23 +209,23 @@ awt::Rectangle VCLXAccessibleTabPage::implGetBounds() throw (RuntimeException) return aBounds; } -// ----------------------------------------------------------------------------- + // OCommonAccessibleText -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTabPage::implGetText() { return GetPageText(); } -// ----------------------------------------------------------------------------- + lang::Locale VCLXAccessibleTabPage::implGetLocale() { return Application::GetSettings().GetLanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabPage::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { @@ -233,21 +233,21 @@ void VCLXAccessibleTabPage::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex = 0; } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTabPage, AccessibleTextHelper_BASE, VCLXAccessibleTabPage_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTabPage, AccessibleTextHelper_BASE, VCLXAccessibleTabPage_BASE ) -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabPage::disposing() { @@ -257,23 +257,23 @@ void VCLXAccessibleTabPage::disposing() m_sPageText = OUString(); } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTabPage::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleTabPage" ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleTabPage::supportsService( const OUString& rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (RuntimeException) { @@ -282,9 +282,9 @@ Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (Ru return aNames; } -// ----------------------------------------------------------------------------- + // XAccessible -// ----------------------------------------------------------------------------- + Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext( ) throw (RuntimeException) { @@ -293,9 +293,9 @@ Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext( ) return this; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeException) { @@ -312,7 +312,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeExcepti return nCount; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -332,7 +332,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i return xChild; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) throw (RuntimeException) { @@ -345,7 +345,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) throw (R return xParent; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) throw (RuntimeException) { @@ -358,7 +358,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) throw (RuntimeEx return nIndexInParent; } -// ----------------------------------------------------------------------------- + sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) throw (RuntimeException) { @@ -367,7 +367,7 @@ sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) throw (RuntimeException) return AccessibleRole::PAGE_TAB; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeException) { @@ -380,7 +380,7 @@ OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeExc return sDescription; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTabPage::getAccessibleName( ) throw (RuntimeException) { @@ -389,7 +389,7 @@ OUString VCLXAccessibleTabPage::getAccessibleName( ) throw (RuntimeException) return GetPageText(); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelationSet( ) throw (RuntimeException) { @@ -400,7 +400,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelation return xSet; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet( ) throw (RuntimeException) { @@ -421,7 +421,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet( return xSet; } -// ----------------------------------------------------------------------------- + Locale VCLXAccessibleTabPage::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException) { @@ -430,9 +430,9 @@ Locale VCLXAccessibleTabPage::getLocale( ) throw (IllegalAccessibleComponentSta return Application::GetSettings().GetLanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + // XAccessibleComponent -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException) { @@ -461,7 +461,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt: return xChild; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabPage::grabFocus( ) throw (RuntimeException) { @@ -474,7 +474,7 @@ void VCLXAccessibleTabPage::grabFocus( ) throw (RuntimeException) } } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException) { @@ -492,7 +492,7 @@ sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException) return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTabPage::getBackground( ) throw (RuntimeException) { @@ -510,9 +510,9 @@ sal_Int32 VCLXAccessibleTabPage::getBackground( ) throw (RuntimeException) return nColor; } -// ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent -// ----------------------------------------------------------------------------- + Reference< awt::XFont > VCLXAccessibleTabPage::getFont( ) throw (RuntimeException) { @@ -530,7 +530,7 @@ Reference< awt::XFont > VCLXAccessibleTabPage::getFont( ) throw (RuntimeExcepti return xFont; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTabPage::getTitledBorderText( ) throw (RuntimeException) { @@ -539,7 +539,7 @@ OUString VCLXAccessibleTabPage::getTitledBorderText( ) throw (RuntimeException) return OUString(); } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTabPage::getToolTipText( ) throw (RuntimeException) { @@ -548,9 +548,9 @@ OUString VCLXAccessibleTabPage::getToolTipText( ) throw (RuntimeException) return OUString(); } -// ----------------------------------------------------------------------------- + // XAccessibleText -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException) { @@ -559,7 +559,7 @@ sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException) return -1; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -571,7 +571,7 @@ sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (Inde return sal_False; } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -595,7 +595,7 @@ Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int return aValues; } -// ----------------------------------------------------------------------------- + awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -616,7 +616,7 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) thr return aBounds; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { @@ -637,7 +637,7 @@ sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) thr return nIndex; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -649,7 +649,7 @@ sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 n return sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -681,6 +681,6 @@ sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndI return bReturn; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx index f63e266da231..5ba6d5b8c6f3 100644 --- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx +++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx @@ -58,15 +58,15 @@ VCLXAccessibleTabPageWindow::VCLXAccessibleTabPageWindow( VCLXWindow* pVCLXWindo } } -// ----------------------------------------------------------------------------- + VCLXAccessibleTabPageWindow::~VCLXAccessibleTabPageWindow() { } -// ----------------------------------------------------------------------------- + // OCommonAccessibleComponent -// ----------------------------------------------------------------------------- + awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() throw (RuntimeException) { @@ -86,9 +86,9 @@ awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() throw (RuntimeExcept return aBounds; } -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void VCLXAccessibleTabPageWindow::disposing() { @@ -98,9 +98,9 @@ void VCLXAccessibleTabPageWindow::disposing() m_pTabPage = NULL; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( ) throw (RuntimeException) { @@ -129,7 +129,7 @@ Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( ) th return xParent; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) throw (RuntimeException) { @@ -138,6 +138,6 @@ sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) throw (Run return 0; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index 598ac7e1dde5..ea2070aa3ec5 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -54,13 +54,13 @@ VCLXAccessibleTextComponent::VCLXAccessibleTextComponent( VCLXWindow* pVCLXWindo m_sText = OutputDevice::GetNonMnemonicString( GetWindow()->GetText() ); } -// ----------------------------------------------------------------------------- + VCLXAccessibleTextComponent::~VCLXAccessibleTextComponent() { } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTextComponent::SetText( const OUString& sText ) { @@ -72,7 +72,7 @@ void VCLXAccessibleTextComponent::SetText( const OUString& sText ) } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTextComponent::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { @@ -89,9 +89,9 @@ void VCLXAccessibleTextComponent::ProcessWindowEvent( const VclWindowEvent& rVcl } } -// ----------------------------------------------------------------------------- + // OCommonAccessibleText -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTextComponent::implGetText() { @@ -102,14 +102,14 @@ OUString VCLXAccessibleTextComponent::implGetText() return aText; } -// ----------------------------------------------------------------------------- + lang::Locale VCLXAccessibleTextComponent::implGetLocale() { return Application::GetSettings().GetLanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleTextComponent::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { @@ -117,9 +117,9 @@ void VCLXAccessibleTextComponent::implGetSelection( sal_Int32& nStartIndex, sal_ nEndIndex = 0; } -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void VCLXAccessibleTextComponent::disposing() { @@ -128,21 +128,21 @@ void VCLXAccessibleTextComponent::disposing() m_sText = OUString(); } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleTextComponent, VCLXAccessibleComponent, VCLXAccessibleTextComponent_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTextComponent, VCLXAccessibleComponent, VCLXAccessibleTextComponent_BASE ) -// ----------------------------------------------------------------------------- + // XAccessibleText -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeException) { @@ -151,7 +151,7 @@ sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeExceptio return -1; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -160,7 +160,7 @@ sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw return setSelection( nIndex, nIndex ); } -// ----------------------------------------------------------------------------- + sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -169,7 +169,7 @@ sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw return OCommonAccessibleText::getCharacter( nIndex ); } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -244,7 +244,7 @@ Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( s return aValues; } -// ----------------------------------------------------------------------------- + awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -261,7 +261,7 @@ awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex return aRect; } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeException) { @@ -270,7 +270,7 @@ sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeExcepti return OCommonAccessibleText::getCharacterCount(); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { @@ -284,7 +284,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint return nIndex; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException) { @@ -293,7 +293,7 @@ OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException) return OCommonAccessibleText::getSelectedText(); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeException) { @@ -302,7 +302,7 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeExcepti return OCommonAccessibleText::getSelectionStart(); } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException) { @@ -311,7 +311,7 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException return OCommonAccessibleText::getSelectionEnd(); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -323,7 +323,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I return sal_False; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException) { @@ -332,7 +332,7 @@ OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException) return OCommonAccessibleText::getText(); } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -341,7 +341,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { @@ -350,7 +350,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { @@ -359,7 +359,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + ::com::sun::star::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { @@ -368,7 +368,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { @@ -400,6 +400,6 @@ sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 return bReturn; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 4492fde91d86..a748f7319093 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -63,7 +63,7 @@ namespace virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException); }; - // ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent( ) throw (::com::sun::star::uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -119,18 +119,15 @@ namespace static Sequence< sal_Int8 > getUnoTunnelImplementationId(); }; - // ------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2( OToolBoxWindowItem, OAccessibleWrapper, OToolBoxWindowItem_Base ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( OToolBoxWindowItem, OAccessibleWrapper, OToolBoxWindowItem_Base ) - // ------------------------------------------------------------------------- OAccessibleContextWrapper* OToolBoxWindowItem::createAccessibleContext( const Reference< XAccessibleContext >& _rxInnerContext ) { return new OToolBoxWindowItemContext( m_nIndexInParent, getComponentContext(), _rxInnerContext, this, getParent() ); } - //-------------------------------------------------------------------- sal_Bool OToolBoxWindowItem::isWindowItem( const Reference< XAccessible >& _rxAcc, OToolBoxWindowItem** /* [out] */ _ppImplementation ) { OToolBoxWindowItem* pImplementation = NULL; @@ -145,7 +142,6 @@ namespace return NULL != pImplementation; } - //-------------------------------------------------------------------- Sequence< sal_Int8 > OToolBoxWindowItem::getUnoTunnelImplementationId() { static ::cppu::OImplementationId * pId = 0; @@ -161,7 +157,6 @@ namespace return pId->getImplementationId(); } - //-------------------------------------------------------------------- sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException) { if ( ( 16 == _rId.getLength() ) @@ -173,20 +168,19 @@ namespace } } -// ----------------------------------------------------------------------------- // VCLXAccessibleToolBox -// ----------------------------------------------------------------------------- + VCLXAccessibleToolBox::VCLXAccessibleToolBox( VCLXWindow* pVCLXWindow ) : VCLXAccessibleComponent( pVCLXWindow ) { } -// ----------------------------------------------------------------------------- + VCLXAccessibleToolBox::~VCLXAccessibleToolBox() { } -// ----------------------------------------------------------------------------- + VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos, bool _bMustHaveFocus ) { VCLXAccessibleToolBoxItem* pItem = NULL; @@ -201,7 +195,6 @@ VCLXAccessibleToolBoxItem* VCLXAccessibleToolBox::GetItem_Impl( sal_Int32 _nPos, return pItem; } -// ----------------------------------------------------------------------------- void VCLXAccessibleToolBox::UpdateFocus_Impl() { @@ -254,7 +247,7 @@ void VCLXAccessibleToolBox::UpdateFocus_Impl() } } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::ReleaseFocus_Impl( sal_Int32 _nPos ) { ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); @@ -270,7 +263,7 @@ void VCLXAccessibleToolBox::ReleaseFocus_Impl( sal_Int32 _nPos ) } } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos ) { ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); @@ -295,7 +288,7 @@ void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos ) pFocusItem->SetFocus( sal_True ); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::UpdateIndeterminate_Impl( sal_Int32 _nPos ) { ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); @@ -313,7 +306,7 @@ void VCLXAccessibleToolBox::UpdateIndeterminate_Impl( sal_Int32 _nPos ) } } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator& _rMapPos, bool _bNotifyRemoval, bool _bDispose ) { @@ -346,7 +339,6 @@ void VCLXAccessibleToolBox::implReleaseToolboxItem( ToolBoxItemsMap::iterator& _ } } -// ----------------------------------------------------------------------------- void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdded ) { if ( _nPos < sal_Int32( m_aAccessibleChildren.size() ) ) @@ -408,7 +400,7 @@ void VCLXAccessibleToolBox::UpdateItem_Impl( sal_Int32 _nPos, sal_Bool _bItemAdd } } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::UpdateAllItems_Impl() { ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); @@ -433,8 +425,6 @@ void VCLXAccessibleToolBox::UpdateAllItems_Impl() } } -// ----------------------------------------------------------------------------- - void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( Window* pWindow, bool bOpen ) { ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); @@ -452,21 +442,20 @@ void VCLXAccessibleToolBox::UpdateCustomPopupItemp_Impl( Window* pWindow, bool b } } -// ----------------------------------------------------------------------------- void VCLXAccessibleToolBox::UpdateItemName_Impl( sal_Int32 _nPos ) { VCLXAccessibleToolBoxItem* pItem = GetItem_Impl( _nPos, false ); if ( pItem ) pItem->NameChanged(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::UpdateItemEnabled_Impl( sal_Int32 _nPos ) { VCLXAccessibleToolBoxItem* pItem = GetItem_Impl( _nPos, false ); if ( pItem ) pItem->ToggleEnableState(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWindowEvent, bool _bShow ) { Window* pChildWindow = (Window *) rVclWindowEvent.GetData(); @@ -488,7 +477,7 @@ void VCLXAccessibleToolBox::HandleSubToolBarEvent( const VclWindowEvent& rVclWin } } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::ReleaseSubToolBox( ToolBox* _pSubToolBox ) { ToolBox* pToolBox = static_cast< ToolBox* >( GetWindow() ); @@ -512,7 +501,7 @@ void VCLXAccessibleToolBox::ReleaseSubToolBox( ToolBox* _pSubToolBox ) pItem->NotifyChildEvent( xChild, false ); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); @@ -527,7 +516,7 @@ void VCLXAccessibleToolBox::FillAccessibleStateSet( utl::AccessibleStateSetHelpe rStateSet.AddState( AccessibleStateType::VERTICAL ); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { // to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING) @@ -648,7 +637,7 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent ); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) @@ -668,17 +657,14 @@ void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclW } } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XINTERFACE2( VCLXAccessibleToolBox, VCLXAccessibleComponent, VCLXAccessibleToolBox_BASE ) -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBox, VCLXAccessibleComponent, VCLXAccessibleToolBox_BASE ) -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- void SAL_CALL VCLXAccessibleToolBox::disposing() { VCLXAccessibleComponent::disposing(); @@ -691,14 +677,13 @@ void SAL_CALL VCLXAccessibleToolBox::disposing() } m_aAccessibleChildren.clear(); } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- OUString VCLXAccessibleToolBox::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleToolBox" ); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (RuntimeException) { Sequence< OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames(); @@ -707,9 +692,8 @@ Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (Ru aNames[nLength] = "com.sun.star.accessibility.AccessibleToolBox"; return aNames; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) throw (RuntimeException) { comphelper::OExternalLockGuard aGuard( this ); @@ -721,7 +705,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) throw (Run return nCount; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException) { if ( i < 0 || i >= getAccessibleChildCount() ) @@ -768,7 +752,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal return NULL; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( const awt::Point& _rPoint ) throw (RuntimeException) { comphelper::OExternalLockGuard aGuard( this ); @@ -784,7 +768,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( c return xAccessible; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const VclWindowEvent& rVclWindowEvent ) { Reference< XAccessible > xReturn; @@ -803,7 +787,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetItemWindowAccessible( const V } return xReturn; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleToolBox::GetChildAccessible( const VclWindowEvent& rVclWindowEvent ) { Reference< XAccessible > xReturn = GetItemWindowAccessible(rVclWindowEvent); @@ -812,9 +796,8 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetChildAccessible( const VclWin xReturn = VCLXAccessibleComponent::GetChildAccessible(rVclWindowEvent); return xReturn; } -// ----------------------------------------------------------------------------- + // XAccessibleSelection -// ----------------------------------------------------------------------------- void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -824,7 +807,7 @@ void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw sal_uInt16 nPos = static_cast < sal_uInt16 > (nChildIndex); pToolBox->ChangeHighlight( nPos ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -837,20 +820,20 @@ sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex else return sal_False; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::clearAccessibleSelection( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); ToolBox * pToolBox = static_cast < ToolBox * > ( GetWindow() ); pToolBox -> LoseFocus(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::selectAllAccessibleChildren( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); // intentionally empty. makes no sense for a toolbox } -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -865,7 +848,7 @@ sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) throw (Runt } return nRet; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -882,7 +865,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_ } return xChild; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -890,6 +873,5 @@ void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) thr throw IndexOutOfBoundsException(); clearAccessibleSelection(); // a toolbox can only have (n)one selected child } -// ----------------------------------------------------------------------------- /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index f32aab008385..2ec93928f258 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -54,9 +54,9 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star; using namespace ::comphelper; -// ----------------------------------------------------------------------------- + // Ctor() and Dtor() -// ----------------------------------------------------------------------------- + VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_Int32 _nPos ) : AccessibleTextHelper_BASE( new VCLExternalSolarLock() ), @@ -112,13 +112,13 @@ VCLXAccessibleToolBoxItem::VCLXAccessibleToolBoxItem( ToolBox* _pToolBox, sal_In } } } -// ----------------------------------------------------------------------------- + VCLXAccessibleToolBoxItem::~VCLXAccessibleToolBoxItem() { delete m_pExternalLock; m_pExternalLock = NULL; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName ) { OUString sRet; @@ -141,7 +141,7 @@ OUString VCLXAccessibleToolBoxItem::GetText( bool _bAsName ) } return sRet; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBoxItem::SetFocus( sal_Bool _bFocus ) { if ( m_bHasFocus != _bFocus ) @@ -156,7 +156,7 @@ void VCLXAccessibleToolBoxItem::SetFocus( sal_Bool _bFocus ) NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBoxItem::SetChecked( sal_Bool _bCheck ) { if( m_nRole == AccessibleRole::PANEL) @@ -173,7 +173,7 @@ void VCLXAccessibleToolBoxItem::SetChecked( sal_Bool _bCheck ) NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBoxItem::SetIndeterminate( bool _bIndeterminate ) { if ( m_bIndeterminate != _bIndeterminate ) @@ -187,7 +187,7 @@ void VCLXAccessibleToolBoxItem::SetIndeterminate( bool _bIndeterminate ) NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBoxItem::NameChanged() { OUString sNewName = implGetText(); @@ -201,19 +201,19 @@ void VCLXAccessibleToolBoxItem::NameChanged() NotifyAccessibleEvent( AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue ); } } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBoxItem::SetChild( const Reference< XAccessible >& _xChild ) { m_xChild = _xChild; } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBoxItem::NotifyChildEvent( const Reference< XAccessible >& _xChild, bool _bShow ) { Any aOld = _bShow ? Any() : makeAny( _xChild ); Any aNew = _bShow ? makeAny( _xChild ) : Any(); NotifyAccessibleEvent( AccessibleEventId::CHILD, aOld, aNew ); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBoxItem::ToggleEnableState() { Any aOldValue[2], aNewValue[2]; @@ -231,7 +231,7 @@ void VCLXAccessibleToolBoxItem::ToggleEnableState() NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[0], aNewValue[0] ); NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] ); } -// ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::implGetBounds( ) throw (RuntimeException) { awt::Rectangle aRect; @@ -240,25 +240,25 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::implGetBounds( ) throw (Runt return aRect; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleToolBoxItem::implGetText() { return GetText (true); } -// ----------------------------------------------------------------------------- + Locale VCLXAccessibleToolBoxItem::implGetLocale() { return Application::GetSettings().GetUILanguageTag().getLocale(); } -// ----------------------------------------------------------------------------- + void VCLXAccessibleToolBoxItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32& nEndIndex ) { nStartIndex = 0; nEndIndex = 0; } -// ----------------------------------------------------------------------------- + // XInterface -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_REFCOUNT( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE ) Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) throw (RuntimeException) { @@ -272,31 +272,31 @@ Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) thr aReturn = VCLXAccessibleToolBoxItem_BASE::queryInterface( _rType ); return aReturn; } -// ----------------------------------------------------------------------------- + // XTypeProvider -// ----------------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE, VCLXAccessibleToolBoxItem_BASE ) -// ----------------------------------------------------------------------------- + // XComponent -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleToolBoxItem::disposing() { AccessibleTextHelper_BASE::disposing(); m_pToolBox = NULL; } -// ----------------------------------------------------------------------------- + // XServiceInfo -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleToolBoxItem::getImplementationName() throw (RuntimeException) { return OUString( "com.sun.star.comp.toolkit.AccessibleToolBoxItem" ); } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleToolBoxItem::supportsService( const OUString& rServiceName ) throw (RuntimeException) { return cppu::supportsService(this, rServiceName); } -// ----------------------------------------------------------------------------- + Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw (RuntimeException) { Sequence< OUString > aNames(4); @@ -306,23 +306,23 @@ Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw aNames[3] = "com.sun.star.accessibility.AccessibleToolBoxItem"; return aNames; } -// ----------------------------------------------------------------------------- + // XAccessible -// ----------------------------------------------------------------------------- + Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleContext( ) throw (RuntimeException) { return this; } -// ----------------------------------------------------------------------------- + // XAccessibleContext -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount( ) throw (RuntimeException) { OContextEntryGuard aGuard( this ); return m_xChild.is() ? 1 : 0; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, com::sun::star::lang::IndexOutOfBoundsException) { OContextEntryGuard aGuard( this ); @@ -333,28 +333,28 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( return m_xChild; } -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleParent( ) throw (RuntimeException) { OContextEntryGuard aGuard( this ); return m_pToolBox->GetAccessible(); } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent( ) throw (RuntimeException) { OContextEntryGuard aGuard( this ); return m_nIndexInParent; } -// ----------------------------------------------------------------------------- + sal_Int16 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRole( ) throw (RuntimeException) { OContextEntryGuard aGuard( this ); return m_nRole; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -371,7 +371,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription( ) throw return sDescription; } } -// ----------------------------------------------------------------------------- + OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -379,7 +379,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) throw (Runtim // entry text == accessible name return GetText( true ); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet( ) throw (RuntimeException) { OContextEntryGuard aGuard( this ); @@ -388,7 +388,7 @@ Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAcces Reference< XAccessibleRelationSet > xSet = pRelationSetHelper; return xSet; } -// ----------------------------------------------------------------------------- + Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleStateSet( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -420,14 +420,14 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessib return xStateSet; } -// ----------------------------------------------------------------------------- + // XAccessibleText -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getCaretPosition() throw (RuntimeException) { return -1; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -437,7 +437,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex return sal_False; } -// ----------------------------------------------------------------------------- + Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -449,7 +449,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttrib return Sequence< PropertyValue >(); } -// ----------------------------------------------------------------------------- + awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -470,7 +470,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 return aBounds; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -489,7 +489,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& return nIndex; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -499,7 +499,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex return sal_False; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -532,14 +532,14 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa return bReturn; } -// ----------------------------------------------------------------------------- + // XAccessibleComponent -// ----------------------------------------------------------------------------- + Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException) { return Reference< XAccessible >(); } -// ----------------------------------------------------------------------------- + void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus( ) throw (RuntimeException) { Reference< XAccessible > xParent(getAccessibleParent()); @@ -554,7 +554,7 @@ void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus( ) throw (RuntimeException) } } } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -565,7 +565,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground( ) throw (RuntimeEx return nColor; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -576,19 +576,19 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeEx return nColor; } -// ----------------------------------------------------------------------------- + // XAccessibleExtendedComponent -// ----------------------------------------------------------------------------- + Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( ) throw (RuntimeException) { return uno::Reference< awt::XFont >(); } -// ----------------------------------------------------------------------------- + awt::FontDescriptor SAL_CALL VCLXAccessibleToolBoxItem::getFontMetrics( const Reference< awt::XFont >& xFont ) throw (RuntimeException) { return xFont->getFontDescriptor(); } -// ----------------------------------------------------------------------------- + OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -599,7 +599,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( ) throw (Runt return sRet; } -// ----------------------------------------------------------------------------- + OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -617,15 +617,15 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText( ) throw (RuntimeEx } return sRet; } -// ----------------------------------------------------------------------------- + // XAccessibleAction -// ----------------------------------------------------------------------------- + sal_Int32 VCLXAccessibleToolBoxItem::getAccessibleActionCount( ) throw (RuntimeException) { // only one action -> "Click" return 1; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -638,7 +638,7 @@ sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) thro return sal_True; } -// ----------------------------------------------------------------------------- + OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OExternalLockGuard aGuard( this ); @@ -648,7 +648,7 @@ OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 n return OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) ); } -// ----------------------------------------------------------------------------- + Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) { OContextEntryGuard aGuard( this ); @@ -658,9 +658,9 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActio return Reference< XAccessibleKeyBinding >(); } -// ----------------------------------------------------------------------------- + // XAccessibleValue -// ----------------------------------------------------------------------------- + Any VCLXAccessibleToolBoxItem::getCurrentValue( ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -673,7 +673,7 @@ Any VCLXAccessibleToolBoxItem::getCurrentValue( ) throw (RuntimeException) aValue <<= (sal_Int32)0; return aValue; } -// ----------------------------------------------------------------------------- + sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); @@ -696,17 +696,17 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw return bReturn; } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleToolBoxItem::getMaximumValue( ) throw (RuntimeException) { return makeAny((sal_Int32)1); } -// ----------------------------------------------------------------------------- + Any VCLXAccessibleToolBoxItem::getMinimumValue( ) throw (RuntimeException) { return makeAny((sal_Int32)0); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |