diff options
Diffstat (limited to 'accessibility/source/extended')
16 files changed, 139 insertions, 176 deletions
diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index 4b16293e5083..69981e9640aa 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -184,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() @@ -355,23 +355,22 @@ bool AccessibleBrowseBoxBase::implIsShowing() return bShowing; } -rtl::Reference<::utl::AccessibleStateSetHelper> AccessibleBrowseBoxBase::implCreateStateSetHelper() +sal_Int64 AccessibleBrowseBoxBase::implCreateStateSet() { - rtl::Reference<::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 diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index 2b29547bad92..6efbb5a1199a 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx @@ -52,18 +52,17 @@ namespace accessibility return this; } - rtl::Reference<::utl::AccessibleStateSetHelper> AccessibleCheckBoxCell::implCreateStateSetHelper() + sal_Int64 AccessibleCheckBoxCell::implCreateStateSet() { - rtl::Reference<::utl::AccessibleStateSetHelper> pStateSetHelper = - AccessibleBrowseBoxCell::implCreateStateSetHelper(); + sal_Int64 nStateSet = AccessibleBrowseBoxCell::implCreateStateSet(); if( isAlive() ) { mpBrowseBox->FillAccessibleStateSetForCell( - *pStateSetHelper, getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) ); + nStateSet, getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) ); if ( m_eState == TRISTATE_TRUE ) - pStateSetHelper->AddState( AccessibleStateType::CHECKED ); + nStateSet |= AccessibleStateType::CHECKED; } - return pStateSetHelper; + return nStateSet; } // XAccessibleValue diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 81b3bfa4e7e4..610d4f9fe4c5 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -43,38 +43,34 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR , m_nColumnRowId(_nColumnRowId) { } -/** Creates a new AccessibleStateSetHelper and fills it with states of the - current object. - @return - A filled AccessibleStateSetHelper. +/** Return a bitset of states of the current object. */ -rtl::Reference<::utl::AccessibleStateSetHelper> AccessibleBrowseBoxHeaderCell::implCreateStateSetHelper() +sal_Int64 AccessibleBrowseBoxHeaderCell::implCreateStateSet() { SolarMethodGuard aGuard( getMutex() ); - rtl::Reference<::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; - mpBrowseBox->FillAccessibleStateSet( *pStateSetHelper, getType() ); - pStateSetHelper->AddState( AccessibleStateType::VISIBLE ); - pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE ); - pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); - pStateSetHelper->AddState( AccessibleStateType::SELECTABLE ); + mpBrowseBox->FillAccessibleStateSet( nStateSet, getType() ); + nStateSet |= AccessibleStateType::VISIBLE; + nStateSet |= AccessibleStateType::FOCUSABLE; + nStateSet |= AccessibleStateType::TRANSIENT; + nStateSet |= AccessibleStateType::SELECTABLE; bool bSelected = isRowBarCell() ? mpBrowseBox->IsRowSelected(m_nColumnRowId) : mpBrowseBox->IsColumnSelected(m_nColumnRowId); if ( bSelected ) - pStateSetHelper->AddState( AccessibleStateType::SELECTED ); + nStateSet |= AccessibleStateType::SELECTED; } else - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + nStateSet |= AccessibleStateType::DEFUNC; - return pStateSetHelper; + return nStateSet; } /** @return diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index 13cdb63e24dd..9ebda45ddc8c 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -41,7 +41,6 @@ namespace accessibility } } using namespace ::com::sun::star::lang; - using namespace utl; using namespace comphelper; using namespace ::com::sun::star::uno; using ::com::sun::star::accessibility::XAccessible; @@ -155,29 +154,26 @@ namespace accessibility throw css::lang::IndexOutOfBoundsException(); } - /** Creates a new AccessibleStateSetHelper and fills it with states of the - current object. - @return - A filled AccessibleStateSetHelper. + /** Return a bitset of states of the current object. */ - rtl::Reference<::utl::AccessibleStateSetHelper> AccessibleBrowseBoxTableCell::implCreateStateSetHelper() + sal_Int64 AccessibleBrowseBoxTableCell::implCreateStateSet() { SolarMethodGuard aGuard(getMutex()); - rtl::Reference<::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; - mpBrowseBox->FillAccessibleStateSetForCell( *pStateSetHelper, getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) ); + mpBrowseBox->FillAccessibleStateSetForCell( nStateSet, getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) ); } else - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + nStateSet |= AccessibleStateType::DEFUNC; - return pStateSetHelper; + return nStateSet; } diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 6b7ce3fad417..79a57029259d 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -155,13 +155,13 @@ AccessibleGridControlBase::getAccessibleRelationSet() return new utl::AccessibleRelationSetHelper; } -css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL +sal_Int64 SAL_CALL AccessibleGridControlBase::getAccessibleStateSet() { SolarMutexGuard aSolarGuard; // don't check whether alive -> StateSet may contain DEFUNC - return implCreateStateSetHelper(); + return implCreateStateSet(); } lang::Locale SAL_CALL AccessibleGridControlBase::getLocale() @@ -278,22 +278,21 @@ bool AccessibleGridControlBase::implIsShowing() return bShowing; } -rtl::Reference<::utl::AccessibleStateSetHelper> AccessibleGridControlBase::implCreateStateSetHelper() +sal_Int64 AccessibleGridControlBase::implCreateStateSet() { - rtl::Reference<::utl::AccessibleStateSetHelper> - pStateSetHelper = new ::utl::AccessibleStateSetHelper; + sal_Int64 nStateSet = 0; if( isAlive() ) { // SHOWING done with m_xParent if( implIsShowing() ) - pStateSetHelper->AddState( AccessibleStateType::SHOWING ); + nStateSet |= AccessibleStateType::SHOWING; // GridControl fills StateSet with states depending on object type - m_aTable.FillAccessibleStateSet( *pStateSetHelper, getType() ); + m_aTable.FillAccessibleStateSet( nStateSet, getType() ); } else - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); - return pStateSetHelper; + nStateSet |= AccessibleStateType::DEFUNC; + return nStateSet; } // internal helper methods diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 72333d3405c5..8bcf4b830fbb 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -39,34 +39,30 @@ AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nCol , m_nColumnRowId(_nColumnRowId) { } -/** Creates a new AccessibleStateSetHelper and fills it with states of the - current object. - @return - A filled AccessibleStateSetHelper. +/** Return a bitset of states of the current object. */ -rtl::Reference<::utl::AccessibleStateSetHelper> AccessibleGridControlHeaderCell::implCreateStateSetHelper() +sal_Int64 AccessibleGridControlHeaderCell::implCreateStateSet() { - rtl::Reference<::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; - pStateSetHelper->AddState( AccessibleStateType::VISIBLE ); - pStateSetHelper->AddState( AccessibleStateType::FOCUSABLE ); - pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); - pStateSetHelper->AddState( AccessibleStateType::SELECTABLE ); + nStateSet |= AccessibleStateType::VISIBLE; + nStateSet |= AccessibleStateType::FOCUSABLE; + nStateSet |= AccessibleStateType::TRANSIENT; + nStateSet |= AccessibleStateType::SELECTABLE; if ( m_aTable.IsRowSelected(m_nColumnRowId) ) - pStateSetHelper->AddState( AccessibleStateType::SELECTED ); + nStateSet |= AccessibleStateType::SELECTED; } else - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + nStateSet |= AccessibleStateType::DEFUNC; - return pStateSetHelper; + return nStateSet; } /** @return diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 20bf37698e9d..317a6ac6acd6 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -40,7 +40,6 @@ namespace accessibility } } using namespace ::com::sun::star::lang; - using namespace utl; using namespace comphelper; using namespace ::com::sun::star::uno; using ::com::sun::star::accessibility::XAccessible; @@ -177,27 +176,24 @@ namespace accessibility throw css::lang::IndexOutOfBoundsException(); } - /** Creates a new AccessibleStateSetHelper and fills it with states of the - current object. - @return - A filled AccessibleStateSetHelper. + /** Return a bitset of states of the current object. */ - rtl::Reference<::utl::AccessibleStateSetHelper> AccessibleGridControlTableCell::implCreateStateSetHelper() + sal_Int64 AccessibleGridControlTableCell::implCreateStateSet() { - rtl::Reference<::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; - m_aTable.FillAccessibleStateSetForCell( *pStateSetHelper, getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) ); + m_aTable.FillAccessibleStateSetForCell( nStateSet, getRowPos(), static_cast< sal_uInt16 >( getColumnPos() ) ); } else - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + nStateSet |= AccessibleStateType::DEFUNC; - return pStateSetHelper; + return nStateSet; } diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index 54f0696735f5..8e18b96b7cb8 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -123,7 +123,7 @@ namespace accessibility return baseGetAccessibleRelationSet( ); } - css::uno::Reference<css::accessibility::XAccessibleStateSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() + sal_Int64 SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 9ad90c3879eb..9632a6665ab4 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -23,7 +23,6 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <unotools/accessiblestatesethelper.hxx> #include <vcl/toolkit/ivctrl.hxx> #include <cppuhelper/supportsservice.hxx> @@ -318,14 +317,14 @@ namespace accessibility pCtrl->SetNoSelection(); } - void AccessibleIconChoiceCtrl::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) + void AccessibleIconChoiceCtrl::FillAccessibleStateSet( sal_Int64& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); if ( isAlive() ) { - rStateSet.AddState( AccessibleStateType::FOCUSABLE ); - rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS ); - rStateSet.AddState( AccessibleStateType::SELECTABLE ); + rStateSet |= AccessibleStateType::FOCUSABLE; + rStateSet |= AccessibleStateType::MANAGES_DESCENDANTS; + rStateSet |= AccessibleStateType::SELECTABLE; } } diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index 5a995a94fc91..86abc128eb28 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -26,7 +26,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <toolkit/helper/convert.hxx> -#include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <svtools/stringtransfer.hxx> @@ -296,32 +295,32 @@ namespace accessibility return new utl::AccessibleRelationSetHelper; } - Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet( ) + sal_Int64 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); - rtl::Reference<utl::AccessibleStateSetHelper> pStateSetHelper = new utl::AccessibleStateSetHelper; + sal_Int64 nStateSet = 0; if ( IsAlive_Impl() ) { - pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); - pStateSetHelper->AddState( AccessibleStateType::SELECTABLE ); - pStateSetHelper->AddState( AccessibleStateType::ENABLED ); - pStateSetHelper->AddState( AccessibleStateType::SENSITIVE ); + nStateSet |= AccessibleStateType::TRANSIENT; + nStateSet |= AccessibleStateType::SELECTABLE; + nStateSet |= AccessibleStateType::ENABLED; + nStateSet |= AccessibleStateType::SENSITIVE; if ( IsShowing_Impl() ) { - pStateSetHelper->AddState( AccessibleStateType::SHOWING ); - pStateSetHelper->AddState( AccessibleStateType::VISIBLE ); + nStateSet |= AccessibleStateType::SHOWING; + nStateSet |= AccessibleStateType::VISIBLE; } if ( m_pIconCtrl && m_pIconCtrl->GetCursor() == m_pIconCtrl->GetEntry( m_nIndex ) ) - pStateSetHelper->AddState( AccessibleStateType::SELECTED ); + nStateSet |= AccessibleStateType::SELECTED; } else - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + nStateSet |= AccessibleStateType::DEFUNC; - return pStateSetHelper; + return nStateSet; } Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale( ) diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 462f28664086..21d58fa8da5e 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/supportsservice.hxx> -#include <unotools/accessiblestatesethelper.hxx> namespace accessibility @@ -490,15 +489,15 @@ namespace accessibility getListBox()->Select( pEntry, false ); } - void AccessibleListBox::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) + void AccessibleListBox::FillAccessibleStateSet( sal_Int64& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); if ( getListBox() && isAlive() ) { - rStateSet.AddState( AccessibleStateType::FOCUSABLE ); - rStateSet.AddState( AccessibleStateType::MANAGES_DESCENDANTS ); + rStateSet |= AccessibleStateType::FOCUSABLE; + rStateSet |= AccessibleStateType::MANAGES_DESCENDANTS; if ( getListBox()->GetSelectionMode() == SelectionMode::Multiple ) - rStateSet.AddState( AccessibleStateType::MULTI_SELECTABLE ); + rStateSet |= AccessibleStateType::MULTI_SELECTABLE; } } diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index 2fff77b03699..b3aa55f7e154 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -31,7 +31,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <toolkit/helper/convert.hxx> -#include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/accessibleeventnotifier.hxx> @@ -473,41 +472,41 @@ namespace accessibility return xRelSet; } - Reference< XAccessibleStateSet > SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet( ) + sal_Int64 SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet( ) { ::osl::MutexGuard aGuard( m_aMutex ); - rtl::Reference<utl::AccessibleStateSetHelper> pStateSetHelper = new utl::AccessibleStateSetHelper; + sal_Int64 nStateSet = 0; if ( IsAlive_Impl() ) { switch(getAccessibleRole()) { case AccessibleRole::LABEL: - pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); - pStateSetHelper->AddState( AccessibleStateType::SELECTABLE ); - pStateSetHelper->AddState( AccessibleStateType::ENABLED ); + nStateSet |= AccessibleStateType::TRANSIENT; + nStateSet |= AccessibleStateType::SELECTABLE; + nStateSet |= AccessibleStateType::ENABLED; if (m_pTreeListBox->IsInplaceEditingEnabled()) - pStateSetHelper->AddState( AccessibleStateType::EDITABLE ); + nStateSet |= AccessibleStateType::EDITABLE; if (IsShowing_Impl()) - pStateSetHelper->AddState( AccessibleStateType::SHOWING ); + nStateSet |= AccessibleStateType::SHOWING; break; case AccessibleRole::CHECK_BOX: - pStateSetHelper->AddState( AccessibleStateType::TRANSIENT ); - pStateSetHelper->AddState( AccessibleStateType::SELECTABLE ); - pStateSetHelper->AddState( AccessibleStateType::ENABLED ); + nStateSet |= AccessibleStateType::TRANSIENT; + nStateSet |= AccessibleStateType::SELECTABLE; + nStateSet |= AccessibleStateType::ENABLED; if (IsShowing_Impl()) - pStateSetHelper->AddState( AccessibleStateType::SHOWING ); + nStateSet |= AccessibleStateType::SHOWING; break; } SvTreeListEntry *pEntry = m_pTreeListBox->GetEntryFromPath(m_aEntryPath); if (pEntry) - m_pTreeListBox->FillAccessibleEntryStateSet(pEntry, *pStateSetHelper); + m_pTreeListBox->FillAccessibleEntryStateSet(pEntry, nStateSet); } else - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + nStateSet |= AccessibleStateType::DEFUNC; - return pStateSetHelper; + return nStateSet; } Locale SAL_CALL AccessibleListBoxEntry::getLocale( ) diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 8bf2d7addc1d..c1809ade84f0 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/supportsservice.hxx> -#include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <i18nlangtag/languagetag.hxx> #include <o3tl/safeint.hxx> @@ -113,29 +112,29 @@ namespace accessibility } - void AccessibleTabBar::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) + void AccessibleTabBar::FillAccessibleStateSet( sal_Int64& rStateSet ) { if ( !m_pTabBar ) return; if ( m_pTabBar->IsEnabled() ) { - rStateSet.AddState( AccessibleStateType::ENABLED ); - rStateSet.AddState( AccessibleStateType::SENSITIVE ); + rStateSet |= AccessibleStateType::ENABLED; + rStateSet |= AccessibleStateType::SENSITIVE; } - rStateSet.AddState( AccessibleStateType::FOCUSABLE ); + rStateSet |= AccessibleStateType::FOCUSABLE; if ( m_pTabBar->HasFocus() ) - rStateSet.AddState( AccessibleStateType::FOCUSED ); + rStateSet |= AccessibleStateType::FOCUSED; - rStateSet.AddState( AccessibleStateType::VISIBLE ); + rStateSet |= AccessibleStateType::VISIBLE; if ( m_pTabBar->IsVisible() ) - rStateSet.AddState( AccessibleStateType::SHOWING ); + rStateSet |= AccessibleStateType::SHOWING; if ( m_pTabBar->GetStyle() & WB_SIZEABLE ) - rStateSet.AddState( AccessibleStateType::RESIZABLE ); + rStateSet |= AccessibleStateType::RESIZABLE; } @@ -341,22 +340,22 @@ namespace accessibility } - Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet( ) + sal_Int64 AccessibleTabBar::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); - rtl::Reference<utl::AccessibleStateSetHelper> pStateSetHelper = new utl::AccessibleStateSetHelper; + sal_Int64 nStateSet = 0; if ( !rBHelper.bDisposed && !rBHelper.bInDispose ) { - FillAccessibleStateSet( *pStateSetHelper ); + FillAccessibleStateSet( nStateSet ); } else { - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + nStateSet |= AccessibleStateType::DEFUNC; } - return pStateSetHelper; + return nStateSet; } diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 197ad78d9777..400530983764 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/supportsservice.hxx> -#include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -135,23 +134,23 @@ namespace accessibility } - void AccessibleTabBarPage::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) + void AccessibleTabBarPage::FillAccessibleStateSet( sal_Int64& rStateSet ) { if ( IsEnabled() ) { - rStateSet.AddState( AccessibleStateType::ENABLED ); - rStateSet.AddState( AccessibleStateType::SENSITIVE ); + rStateSet |= AccessibleStateType::ENABLED; + rStateSet |= AccessibleStateType::SENSITIVE; } - rStateSet.AddState( AccessibleStateType::VISIBLE ); + rStateSet |= AccessibleStateType::VISIBLE; if ( IsShowing() ) - rStateSet.AddState( AccessibleStateType::SHOWING ); + rStateSet |= AccessibleStateType::SHOWING; - rStateSet.AddState( AccessibleStateType::SELECTABLE ); + rStateSet |= AccessibleStateType::SELECTABLE; if ( IsSelected() ) - rStateSet.AddState( AccessibleStateType::SELECTED ); + rStateSet |= AccessibleStateType::SELECTED; } @@ -311,22 +310,22 @@ namespace accessibility } - Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet( ) + sal_Int64 AccessibleTabBarPage::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); - rtl::Reference<utl::AccessibleStateSetHelper> pStateSetHelper = new utl::AccessibleStateSetHelper; + sal_Int64 nStateSet = 0; if ( !rBHelper.bDisposed && !rBHelper.bInDispose ) { - FillAccessibleStateSet( *pStateSetHelper ); + FillAccessibleStateSet( nStateSet ); } else { - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + nStateSet |= AccessibleStateType::DEFUNC; } - return pStateSetHelper; + return nStateSet; } diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index a65750fbd4b3..6070db1eb95b 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/supportsservice.hxx> #include <o3tl/safeint.hxx> -#include <unotools/accessiblestatesethelper.hxx> #include <unotools/accessiblerelationsethelper.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -295,21 +294,21 @@ namespace accessibility } - void AccessibleTabBarPageList::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) + void AccessibleTabBarPageList::FillAccessibleStateSet( sal_Int64& rStateSet ) { if ( !m_pTabBar ) return; if ( m_pTabBar->IsEnabled() ) { - rStateSet.AddState( AccessibleStateType::ENABLED ); - rStateSet.AddState( AccessibleStateType::SENSITIVE ); + rStateSet |= AccessibleStateType::ENABLED; + rStateSet |= AccessibleStateType::SENSITIVE; } - rStateSet.AddState( AccessibleStateType::VISIBLE ); + rStateSet |= AccessibleStateType::VISIBLE; if ( m_pTabBar->IsVisible() ) - rStateSet.AddState( AccessibleStateType::SHOWING ); + rStateSet |= AccessibleStateType::SHOWING; } @@ -470,22 +469,22 @@ namespace accessibility } - Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet( ) + sal_Int64 AccessibleTabBarPageList::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); - rtl::Reference<utl::AccessibleStateSetHelper> pStateSetHelper = new utl::AccessibleStateSetHelper; + sal_Int64 nStateSet = 0; if ( !rBHelper.bDisposed && !rBHelper.bInDispose ) { - FillAccessibleStateSet( *pStateSetHelper ); + FillAccessibleStateSet( nStateSet ); } else { - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + nStateSet |= AccessibleStateType::DEFUNC; } - return pStateSetHelper; + return nStateSet; } diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 218ba33e6bae..b374a880ead5 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -32,7 +32,6 @@ #include <extended/textwindowaccessibility.hxx> #include <comphelper/accessibleeventnotifier.hxx> #include <unotools/accessiblerelationsethelper.hxx> -#include <unotools/accessiblestatesethelper.hxx> #include <utility> #include <vcl/svapp.hxx> #include <vcl/txtattr.hxx> @@ -193,15 +192,13 @@ SAL_CALL Paragraph::getAccessibleRelationSet() } // virtual -css::uno::Reference< css::accessibility::XAccessibleStateSet > -SAL_CALL Paragraph::getAccessibleStateSet() +sal_Int64 SAL_CALL Paragraph::getAccessibleStateSet() { checkDisposed(); // FIXME Notification of changes (STATE_CHANGED) missing when // m_rView.IsReadOnly() changes: - return new ::utl::AccessibleStateSetHelper( - m_xDocument->retrieveParagraphState(this)); + return m_xDocument->retrieveParagraphState(this); } // virtual @@ -748,29 +745,21 @@ css::lang::Locale Document::retrieveLocale() // happen that this Paragraph lies outside the range from m_aVisibleBegin // to m_aVisibleEnd. In that case, it is neither VISIBLE nor SHOWING: ::sal_Int64 nState - = (static_cast< ::sal_Int64 >(1) - << css::accessibility::AccessibleStateType::ENABLED) - | (static_cast< ::sal_Int64 >(1) - << css::accessibility::AccessibleStateType::SENSITIVE) - | (static_cast< ::sal_Int64 >(1) - << css::accessibility::AccessibleStateType::FOCUSABLE) - | (static_cast< ::sal_Int64 >(1) - << css::accessibility::AccessibleStateType::MULTI_LINE); + = css::accessibility::AccessibleStateType::ENABLED + | css::accessibility::AccessibleStateType::SENSITIVE + | css::accessibility::AccessibleStateType::FOCUSABLE + | css::accessibility::AccessibleStateType::MULTI_LINE; if (!m_rView.IsReadOnly()) - nState |= (static_cast< ::sal_Int64 >(1) - << css::accessibility::AccessibleStateType::EDITABLE); + nState |= css::accessibility::AccessibleStateType::EDITABLE; Paragraphs::iterator aPara(m_xParagraphs->begin() + pParagraph->getNumber()); if (aPara >= m_aVisibleBegin && aPara < m_aVisibleEnd) { nState - |= (static_cast< ::sal_Int64 >(1) - << css::accessibility::AccessibleStateType::VISIBLE) - | (static_cast< ::sal_Int64 >(1) - << css::accessibility::AccessibleStateType::SHOWING); + |= css::accessibility::AccessibleStateType::VISIBLE + | css::accessibility::AccessibleStateType::SHOWING; if (aPara == m_aFocused) - nState |= (static_cast< ::sal_Int64 >(1) - << css::accessibility::AccessibleStateType::FOCUSED); + nState |= css::accessibility::AccessibleStateType::FOCUSED; } return nState; }; @@ -1369,11 +1358,11 @@ Document::getAccessibleAtPoint(css::awt::Point const & rPoint) } return nullptr; } -void Document::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) +void Document::FillAccessibleStateSet( sal_Int64& rStateSet ) { VCLXAccessibleComponent::FillAccessibleStateSet( rStateSet ); if (!m_rView.IsReadOnly()) - rStateSet.AddState( css::accessibility::AccessibleStateType::EDITABLE ); + rStateSet |= css::accessibility::AccessibleStateType::EDITABLE; } void Document::FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) |