3 files changed, 13 insertions, 1 deletions
diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index caf63ba3b5d0..02bd6b8799e8 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -7665,6 +7665,13 @@ css::uno::Sequence< css::uno::Type > SVTXNumericField::getTypes()
     return aTypeList.getTypes();
 }
 
+
+css::uno::Reference<accessibility::XAccessibleContext> SVTXNumericField::CreateAccessibleContext()
+{
+    return getAccessibleFactory().createAccessibleContext(this);
+}
+
+
 void SVTXNumericField::setValue( double Value )
 {
     SolarMutexGuard aGuard;
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 9d795ac620e4..7136dc5a3a8d 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -120,6 +120,11 @@ namespace toolkit
             return nullptr;
         }
         css::uno::Reference< css::accessibility::XAccessibleContext >
+            createAccessibleContext( SVTXNumericField* /*_pXWindow*/ ) override
+        {
+            return nullptr;
+        }
+        css::uno::Reference< css::accessibility::XAccessibleContext >
                 createAccessibleContext( VCLXWindow* /*_pXWindow*/ ) override
         {
             return nullptr;
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index aa32d1b86aa6..4f3f3b22b604 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -55,8 +55,8 @@ static rtl::Reference<VCLXWindow> CreateXWindow( vcl::Window const * pWindow )
         // corresponding accessibility API.
         case WindowType::METRICBOX:
         case WindowType::COMBOBOX:       return new VCLXComboBox;
+        case WindowType::FORMATTEDFIELD: return new SVTXNumericField;
         case WindowType::SPINFIELD:
-        case WindowType::FORMATTEDFIELD:
         case WindowType::CURRENCYFIELD:  return new VCLXNumericField;
         case WindowType::DATEFIELD:      return new VCLXDateField;
         case WindowType::MULTILINEEDIT: