summaryrefslogtreecommitdiff
path: root/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'accessibility/source/extended/AccessibleBrowseBoxBase.cxx')
-rw-r--r--accessibility/source/extended/AccessibleBrowseBoxBase.cxx90
1 files changed, 43 insertions, 47 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
index 7b519e57ab4a..8d9a0577e638 100644
--- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
+++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx
@@ -19,6 +19,7 @@
#include <extended/AccessibleBrowseBoxBase.hxx>
#include <toolkit/helper/convert.hxx>
+#include <utility>
#include <vcl/accessibletableprovider.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -49,14 +50,14 @@ using namespace com::sun::star::accessibility::AccessibleStateType;
// Ctor/Dtor/disposing
AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
- const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+ css::uno::Reference< css::accessibility::XAccessible > xParent,
::vcl::IAccessibleTableProvider& rBrowseBox,
- const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
- ::vcl::AccessibleBrowseBoxObjType eObjType ) :
+ css::uno::Reference< css::awt::XWindow > _xFocusWindow,
+ AccessibleBrowseBoxObjType eObjType ) :
AccessibleBrowseBoxImplHelper( m_aMutex ),
- mxParent( rxParent ),
+ mxParent(std::move( xParent )),
mpBrowseBox( &rBrowseBox ),
- m_xFocusWindow(_xFocusWindow),
+ m_xFocusWindow(std::move(_xFocusWindow)),
maName( rBrowseBox.GetAccessibleObjectName( eObjType ) ),
maDescription( rBrowseBox.GetAccessibleObjectDescription( eObjType ) ),
meObjType( eObjType ),
@@ -67,18 +68,18 @@ AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
}
AccessibleBrowseBoxBase::AccessibleBrowseBoxBase(
- const css::uno::Reference< css::accessibility::XAccessible >& rxParent,
+ css::uno::Reference< css::accessibility::XAccessible > rxParent,
::vcl::IAccessibleTableProvider& rBrowseBox,
- const css::uno::Reference< css::awt::XWindow >& _xFocusWindow,
- ::vcl::AccessibleBrowseBoxObjType eObjType,
- const OUString& rName,
- const OUString& rDescription ) :
+ css::uno::Reference< css::awt::XWindow > _xFocusWindow,
+ AccessibleBrowseBoxObjType eObjType,
+ OUString rName,
+ OUString rDescription ) :
AccessibleBrowseBoxImplHelper( m_aMutex ),
- mxParent( rxParent ),
+ mxParent(std::move( rxParent )),
mpBrowseBox( &rBrowseBox ),
- m_xFocusWindow(_xFocusWindow),
- maName( rName ),
- maDescription( rDescription ),
+ m_xFocusWindow(std::move(_xFocusWindow)),
+ maName(std::move( rName )),
+ maDescription(std::move( rDescription )),
meObjType( eObjType ),
m_aClientId(0)
{
@@ -125,13 +126,13 @@ Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBoxBase::g
return mxParent;
}
-sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent()
+sal_Int64 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent()
{
::osl::MutexGuard aGuard( getMutex() );
ensureIsAlive();
// -1 for child not found/no parent (according to specification)
- sal_Int32 nRet = -1;
+ sal_Int64 nRet = -1;
css::uno::Reference< uno::XInterface > xMeMyselfAndI( static_cast< css::accessibility::XAccessibleContext* >( this ), uno::UNO_QUERY );
@@ -144,8 +145,8 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent()
{
css::uno::Reference< uno::XInterface > xChild;
- sal_Int32 nChildCount = xParentContext->getAccessibleChildCount();
- for( sal_Int32 nChild = 0; nChild < nChildCount; ++nChild )
+ sal_Int64 nChildCount = xParentContext->getAccessibleChildCount();
+ for( sal_Int64 nChild = 0; nChild < nChildCount; ++nChild )
{
xChild.set(xParentContext->getAccessibleChild( nChild ), css::uno::UNO_QUERY);
@@ -183,12 +184,12 @@ AccessibleBrowseBoxBase::getAccessibleRelationSet()
return new utl::AccessibleRelationSetHelper;
}
-Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
+sal_Int64 SAL_CALL
AccessibleBrowseBoxBase::getAccessibleStateSet()
{
SolarMethodGuard aGuard( getMutex() );
// don't check whether alive -> StateSet may contain DEFUNC
- return implCreateStateSetHelper();
+ return implCreateStateSet();
}
lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale()
@@ -209,7 +210,7 @@ lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale()
sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const css::awt::Point& rPoint )
{
- return tools::Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) );
+ return tools::Rectangle( Point(), getBoundingBox().GetSize() ).Contains( VCLPoint( rPoint ) );
}
awt::Rectangle SAL_CALL AccessibleBrowseBoxBase::getBounds()
@@ -303,7 +304,7 @@ sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService(
Sequence< OUString > SAL_CALL AccessibleBrowseBoxBase::getSupportedServiceNames()
{
- return { "com.sun.star.accessibility.AccessibleContext" };
+ return { u"com.sun.star.accessibility.AccessibleContext"_ustr };
}
// other public methods
@@ -348,29 +349,28 @@ bool AccessibleBrowseBoxBase::implIsShowing()
css::uno::Reference< css::accessibility::XAccessibleComponent >
xParentComp( mxParent->getAccessibleContext(), uno::UNO_QUERY );
if( xParentComp.is() )
- bShowing = implGetBoundingBox().IsOver(
+ bShowing = implGetBoundingBox().Overlaps(
VCLRectangle( xParentComp->getBounds() ) );
}
return bShowing;
}
-::utl::AccessibleStateSetHelper* AccessibleBrowseBoxBase::implCreateStateSetHelper()
+sal_Int64 AccessibleBrowseBoxBase::implCreateStateSet()
{
- ::utl::AccessibleStateSetHelper*
- pStateSetHelper = new ::utl::AccessibleStateSetHelper;
+ sal_Int64 nStateSet = 0;
if( isAlive() )
{
// SHOWING done with mxParent
if( implIsShowing() )
- pStateSetHelper->AddState( AccessibleStateType::SHOWING );
+ nStateSet |= AccessibleStateType::SHOWING;
// BrowseBox fills StateSet with states depending on object type
- mpBrowseBox->FillAccessibleStateSet( *pStateSetHelper, getType() );
+ mpBrowseBox->FillAccessibleStateSet( nStateSet, getType() );
}
else
- pStateSetHelper->AddState( AccessibleStateType::DEFUNC );
+ nStateSet |= AccessibleStateType::DEFUNC;
- return pStateSetHelper;
+ return nStateSet;
}
// internal helper methods
@@ -399,12 +399,12 @@ tools::Rectangle AccessibleBrowseBoxBase::getBoundingBox()
return aRect;
}
-tools::Rectangle AccessibleBrowseBoxBase::getBoundingBoxOnScreen()
+AbsoluteScreenPixelRectangle AccessibleBrowseBoxBase::getBoundingBoxOnScreen()
{
SolarMethodGuard aGuard(getMutex());
ensureIsAlive();
- tools::Rectangle aRect = implGetBoundingBoxOnScreen();
+ AbsoluteScreenPixelRectangle aRect = implGetBoundingBoxOnScreen();
if ( aRect.Left() == 0 && aRect.Top() == 0 && aRect.Right() == 0 && aRect.Bottom() == 0 )
{
SAL_WARN( "accessibility", "rectangle doesn't exist" );
@@ -422,11 +422,7 @@ void AccessibleBrowseBoxBase::commitEvent(
return;
// build an event object
- AccessibleEventObject aEvent;
- aEvent.Source = *this;
- aEvent.EventId = _nEventId;
- aEvent.OldValue = _rOldValue;
- aEvent.NewValue = _rNewValue;
+ AccessibleEventObject aEvent(*this, _nEventId, _rNewValue, _rOldValue, -1);
// let the notifier handle this event
@@ -440,24 +436,24 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole()
sal_Int16 nRole = AccessibleRole::UNKNOWN;
switch ( meObjType )
{
- case vcl::BBTYPE_ROWHEADERCELL:
+ case AccessibleBrowseBoxObjType::RowHeaderCell:
nRole = AccessibleRole::ROW_HEADER;
break;
- case vcl::BBTYPE_COLUMNHEADERCELL:
+ case AccessibleBrowseBoxObjType::ColumnHeaderCell:
nRole = AccessibleRole::COLUMN_HEADER;
break;
- case vcl::BBTYPE_COLUMNHEADERBAR:
- case vcl::BBTYPE_ROWHEADERBAR:
- case vcl::BBTYPE_TABLE:
+ case AccessibleBrowseBoxObjType::ColumnHeaderBar:
+ case AccessibleBrowseBoxObjType::RowHeaderBar:
+ case AccessibleBrowseBoxObjType::Table:
nRole = AccessibleRole::TABLE;
break;
- case vcl::BBTYPE_TABLECELL:
+ case AccessibleBrowseBoxObjType::TableCell:
nRole = AccessibleRole::TABLE_CELL;
break;
- case vcl::BBTYPE_BROWSEBOX:
+ case AccessibleBrowseBoxObjType::BrowseBox:
nRole = AccessibleRole::PANEL;
break;
- case vcl::BBTYPE_CHECKBOXCELL:
+ case AccessibleBrowseBoxObjType::CheckBoxCell:
nRole = AccessibleRole::CHECK_BOX;
break;
}
@@ -535,14 +531,14 @@ Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessible
BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox,
- const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::vcl::AccessibleBrowseBoxObjType eObjType )
+ const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType )
:AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType )
{
}
BrowseBoxAccessibleElement::BrowseBoxAccessibleElement( const css::uno::Reference< css::accessibility::XAccessible >& rxParent, ::vcl::IAccessibleTableProvider& rBrowseBox,
- const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::vcl::AccessibleBrowseBoxObjType eObjType,
+ const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, AccessibleBrowseBoxObjType eObjType,
const OUString& rName, const OUString& rDescription )
:AccessibleBrowseBoxBase( rxParent, rBrowseBox, _xFocusWindow, eObjType, rName, rDescription )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 18:41:43 +0000