diff options
Diffstat (limited to 'basctl/source/accessibility/accessibledialogcontrolshape.cxx')
-rw-r--r-- | basctl/source/accessibility/accessibledialogcontrolshape.cxx | 62 |
1 files changed, 27 insertions, 35 deletions
diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index b48eb53a0d1a..c19741c95afa 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -22,17 +22,18 @@ #include <dlgeddef.hxx> #include <dlgedview.hxx> #include <dlgedobj.hxx> +#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #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 <toolkit/awt/vclxfont.hxx> #include <toolkit/helper/convert.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/accessiblecontexthelper.hxx> +#include <comphelper/diagnose_ex.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <i18nlangtag/languagetag.hxx> @@ -171,7 +172,7 @@ vcl::Window* AccessibleDialogControlShape::GetWindow() const { Reference< awt::XControl > xControl = m_pDlgEdObj->GetControl(); if ( xControl.is() ) - pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() ).get(); + pWindow = VCLUnoHelper::GetWindow( xControl->getPeer() ); } return pWindow; @@ -200,25 +201,25 @@ OUString AccessibleDialogControlShape::GetModelStringProperty( OUString const & } -void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) +void AccessibleDialogControlShape::FillAccessibleStateSet( sal_Int64& rStateSet ) { - rStateSet.AddState( AccessibleStateType::ENABLED ); + rStateSet |= AccessibleStateType::ENABLED; - rStateSet.AddState( AccessibleStateType::VISIBLE ); + rStateSet |= AccessibleStateType::VISIBLE; - rStateSet.AddState( AccessibleStateType::SHOWING ); + rStateSet |= AccessibleStateType::SHOWING; - rStateSet.AddState( AccessibleStateType::FOCUSABLE ); + rStateSet |= AccessibleStateType::FOCUSABLE; if ( IsFocused() ) - rStateSet.AddState( AccessibleStateType::FOCUSED ); + rStateSet |= AccessibleStateType::FOCUSED; - rStateSet.AddState( AccessibleStateType::SELECTABLE ); + rStateSet |= AccessibleStateType::SELECTABLE; if ( IsSelected() ) - rStateSet.AddState( AccessibleStateType::SELECTED ); + rStateSet |= AccessibleStateType::SELECTED; - rStateSet.AddState( AccessibleStateType::RESIZABLE ); + rStateSet |= AccessibleStateType::RESIZABLE; } // OCommonAccessibleComponent @@ -227,12 +228,6 @@ awt::Rectangle AccessibleDialogControlShape::implGetBounds() return GetBounds(); } -// XInterface -IMPLEMENT_FORWARD_XINTERFACE2( AccessibleDialogControlShape, OAccessibleExtendedComponentHelper, AccessibleDialogControlShape_BASE ) - -// XTypeProvider -IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleDialogControlShape, OAccessibleExtendedComponentHelper, AccessibleDialogControlShape_BASE ) - // XComponent void AccessibleDialogControlShape::disposing() { @@ -285,7 +280,7 @@ void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEv // XServiceInfo OUString AccessibleDialogControlShape::getImplementationName() { - return "com.sun.star.comp.basctl.AccessibleShape"; + return u"com.sun.star.comp.basctl.AccessibleShape"_ustr; } sal_Bool AccessibleDialogControlShape::supportsService( const OUString& rServiceName ) @@ -295,7 +290,7 @@ sal_Bool AccessibleDialogControlShape::supportsService( const OUString& rService Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames() { - return { "com.sun.star.drawing.AccessibleShape" }; + return { u"com.sun.star.drawing.AccessibleShape"_ustr }; } // XAccessible @@ -305,13 +300,13 @@ Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleConte } // XAccessibleContext -sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() +sal_Int64 AccessibleDialogControlShape::getAccessibleChildCount() { return 0; } -Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i ) +Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int64 i ) { OExternalLockGuard aGuard( this ); @@ -334,18 +329,18 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) } -sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) +sal_Int64 AccessibleDialogControlShape::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); - sal_Int32 nIndexInParent = -1; + sal_Int64 nIndexInParent = -1; Reference< XAccessible > xParent( getAccessibleParent() ); if ( xParent.is() ) { Reference< XAccessibleContext > xParentContext( xParent->getAccessibleContext() ); if ( xParentContext.is() ) { - for ( sal_Int32 i = 0, nCount = xParentContext->getAccessibleChildCount(); i < nCount; ++i ) + for ( sal_Int64 i = 0, nCount = xParentContext->getAccessibleChildCount(); i < nCount; ++i ) { Reference< XAccessible > xChild( xParentContext->getAccessibleChild( i ) ); if ( xChild.is() ) @@ -393,29 +388,26 @@ Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleR { OExternalLockGuard aGuard( this ); - utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; - Reference< XAccessibleRelationSet > xSet = pRelationSetHelper; - return xSet; + return new utl::AccessibleRelationSetHelper; } -Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStateSet( ) +sal_Int64 AccessibleDialogControlShape::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); - utl::AccessibleStateSetHelper* pStateSetHelper = new utl::AccessibleStateSetHelper; - Reference< XAccessibleStateSet > xSet = pStateSetHelper; + sal_Int64 nStateSet = 0; if ( !rBHelper.bDisposed && !rBHelper.bInDispose ) { - FillAccessibleStateSet( *pStateSetHelper ); + FillAccessibleStateSet( nStateSet ); } else { - pStateSetHelper->AddState( AccessibleStateType::DEFUNC ); + nStateSet |= AccessibleStateType::DEFUNC; } - return xSet; + return nStateSet; } @@ -506,7 +498,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) aFont = pWindow->GetControlFont(); else aFont = pWindow->GetFont(); - VCLXFont* pVCLXFont = new VCLXFont; + rtl::Reference<VCLXFont> pVCLXFont = new VCLXFont; pVCLXFont->Init( *xDev, aFont ); xFont = pVCLXFont; } |