summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-03-17 13:28:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-03-17 15:44:25 +0100
commit0cdfe74271c1544e4b6bdc2bcd1ec087d672d81c (patch)
tree0cf12c7e6f47fcb54bb86693efcee54c9881a810 /editeng
parent7fccffa78a26641053268b9c9e431156ce628552 (diff)
use actual type in AccessibleEditableTextPara
instead of casting everywhere Change-Id: I98b654fd93eb8cea49f2e6a399a986e45ed8381d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131708 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/accessibility/AccessibleEditableTextPara.cxx36
1 files changed, 16 insertions, 20 deletions
diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index d074ddfd5a11..22576523f9e6 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -122,16 +122,15 @@ namespace accessibility
try
{
// Create the state set.
- rtl::Reference<::utl::AccessibleStateSetHelper> pStateSet = new ::utl::AccessibleStateSetHelper ();
- mxStateSet = pStateSet;
+ mxStateSet = new ::utl::AccessibleStateSetHelper ();
// these are always on
- pStateSet->AddState( AccessibleStateType::MULTI_LINE );
- pStateSet->AddState( AccessibleStateType::FOCUSABLE );
- pStateSet->AddState( AccessibleStateType::VISIBLE );
- pStateSet->AddState( AccessibleStateType::SHOWING );
- pStateSet->AddState( AccessibleStateType::ENABLED );
- pStateSet->AddState( AccessibleStateType::SENSITIVE );
+ mxStateSet->AddState( AccessibleStateType::MULTI_LINE );
+ mxStateSet->AddState( AccessibleStateType::FOCUSABLE );
+ mxStateSet->AddState( AccessibleStateType::VISIBLE );
+ mxStateSet->AddState( AccessibleStateType::SHOWING );
+ mxStateSet->AddState( AccessibleStateType::ENABLED );
+ mxStateSet->AddState( AccessibleStateType::SENSITIVE );
}
catch (const uno::Exception&)
{
@@ -573,22 +572,20 @@ namespace accessibility
void AccessibleEditableTextPara::SetState( const sal_Int16 nStateId )
{
- ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- if( pStateSet != nullptr &&
- !pStateSet->contains(nStateId) )
+ if( mxStateSet != nullptr &&
+ !mxStateSet->contains(nStateId) )
{
- pStateSet->AddState( nStateId );
+ mxStateSet->AddState( nStateId );
FireEvent( AccessibleEventId::STATE_CHANGED, uno::makeAny( nStateId ) );
}
}
void AccessibleEditableTextPara::UnSetState( const sal_Int16 nStateId )
{
- ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- if( pStateSet != nullptr &&
- pStateSet->contains(nStateId) )
+ if( mxStateSet != nullptr &&
+ mxStateSet->contains(nStateId) )
{
- pStateSet->RemoveState( nStateId );
+ mxStateSet->RemoveState( nStateId );
FireEvent( AccessibleEventId::STATE_CHANGED, uno::Any(), uno::makeAny( nStateId ) );
}
}
@@ -941,9 +938,8 @@ namespace accessibility
SolarMutexGuard aGuard;
// Create a copy of the state set and return it.
- ::utl::AccessibleStateSetHelper* pStateSet = static_cast< ::utl::AccessibleStateSetHelper*>(mxStateSet.get());
- if( !pStateSet )
+ if( !mxStateSet )
return uno::Reference<XAccessibleStateSet>();
uno::Reference<XAccessibleStateSet> xParentStates;
if (getAccessibleParent().is())
@@ -953,9 +949,9 @@ namespace accessibility
}
if (xParentStates.is() && xParentStates->contains(AccessibleStateType::EDITABLE) )
{
- pStateSet->AddState(AccessibleStateType::EDITABLE);
+ mxStateSet->AddState(AccessibleStateType::EDITABLE);
}
- return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*pStateSet) );
+ return uno::Reference<XAccessibleStateSet>( new ::utl::AccessibleStateSetHelper (*mxStateSet) );
}
lang::Locale SAL_CALL AccessibleEditableTextPara::getLocale()