strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a11y: Use FormattedField directly in SVTXAccessibleNumericField

Browse source 
... instead of using the toolkit/UNO wrapper
SVTXNumericField.

Change-Id: I86e274a06f210e2076e287087a1d4b979abe7c35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177814
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn 2024-12-04 16:17:03 +01:00
parent def785ee31
commit 1d2f37a93c
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
accessibility/source/standard/svtaccessiblenumericfield.cxx
View file

@ -19,7 +19,7 @@
#include <standard/svtaccessiblenumericfield.hxx>
#include <comphelper/accessiblecontexthelper.hxx>
#include <toolkit/awt/vclxwindows.hxx>
#include <vcl/toolkit/fmtfield.hxx>
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
@ -50,9 +50,9 @@ css::uno::Any SAL_CALL SVTXAccessibleNumericField::getCurrentValue()
OExternalLockGuard aGuard(this);
double dValue = 0;
SVTXNumericField* pField = static_cast<SVTXNumericField*>(GetVCLXWindow());
VclPtr<FormattedField> pField = GetAs<FormattedField>();
if (pField)
dValue = pField->getValue();
dValue = pField->GetFormatter().GetValue();
return css::uno::Any(dValue);
}
@ -61,13 +61,13 @@ sal_Bool SVTXAccessibleNumericField::setCurrentValue(const css::uno::Any& aNumbe
{
OExternalLockGuard aGuard(this);
SVTXNumericField* pField = static_cast<SVTXNumericField*>(GetVCLXWindow());
VclPtr<FormattedField> pField = GetAs<FormattedField>();
if (!pField)
return false;
double dValue = 0;
aNumber >>= dValue;
pField->setValue(dValue);
pField->GetFormatter().SetValue(dValue);
return true;
}
@ -76,9 +76,9 @@ css::uno::Any SAL_CALL SVTXAccessibleNumericField::getMaximumValue()
OExternalLockGuard aGuard(this);
double dValue = 0;
SVTXNumericField* pField = static_cast<SVTXNumericField*>(GetVCLXWindow());
VclPtr<FormattedField> pField = GetAs<FormattedField>();
if (pField)
dValue = pField->getMax();
dValue = pField->GetFormatter().GetMaxValue();
return css::uno::Any(dValue);
}
@ -88,9 +88,9 @@ css::uno::Any SAL_CALL SVTXAccessibleNumericField::getMinimumValue()
OExternalLockGuard aGuard(this);
double dValue = 0;
SVTXNumericField* pField = static_cast<SVTXNumericField*>(GetVCLXWindow());
VclPtr<FormattedField> pField = GetAs<FormattedField>();
if (pField)
dValue = pField->getMin();
dValue = pField->GetFormatter().GetMinValue();
return css::uno::Any(dValue);
}
@ -100,9 +100,9 @@ css::uno::Any SAL_CALL SVTXAccessibleNumericField::getMinimumIncrement()
OExternalLockGuard aGuard(this);
double dValue = 0;
SVTXNumericField* pField = static_cast<SVTXNumericField*>(GetVCLXWindow());
VclPtr<FormattedField> pField = GetAs<FormattedField>();
if (pField)
dValue = pField->getSpinSize();
dValue = pField->GetFormatter().GetSpinSize();
return css::uno::Any(dValue);
}

2
include/vcl/toolkit/fmtfield.hxx
View file

@ -26,7 +26,7 @@
#include <vcl/formatter.hxx>
#include <vcl/toolkit/spinfld.hxx>
class UNLESS_MERGELIBS(VCL_DLLPUBLIC) FormattedField : public SpinField
class VCL_DLLPUBLIC FormattedField : public SpinField
{
public:
FormattedField(vcl::Window* pParent, WinBits nStyle);