[Libreoffice-commits] core.git: Branch 'libreoffice-7-1-5' - toolkit/source

[Michael Weghorn (via logerrit)]

 toolkit/source/helper/unowrapper.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3bb93f85a32973b492d2d0eb61e1f71269be2fbc
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Jul 7 13:24:37 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jul 12 22:00:23 2021 +0200

    tdf#140594 Create proper window peer for FORMATTEDFIELD
    
        commit 2a694f9e0e7789b4b3b792a9eedd29366fa10c1c
        Date:   Wed May 6 14:08:07 2020 -0400
    
            lok: fix the window type of the formatted field control
    
    had introduced the new 'WindowType::FORMATTEDFIELD' and set
    it for the 'FormattedField' control (instead of using
    the previous default value set in the 'SpinField' ctor,
    which is 'WindowType::SPINFIELD').
    
    So far, this type was not explicitly handled when
    creating the XWindow peer.
    
    Handle it just the same as 'WindowType::SPINFIELD'
    and return a new 'VCLXNumericField', which e.g.
    makes sure that a "proper" accessible is created
    and thus alues of a spin field are announced by
    the NVDA screen reader (again).
    
    (See also
    
        commit 33cac418db78f64f7fa84b8e65c01c2b02cf17a7
        Date:   Fri May 29 16:53:59 2020 +0200
    
            tdf#133498 Make native drawing of FormattedField work (again)
    
    which had fixed a similar regression elsewhere.)
    
    Change-Id: Ie8a4d279a12a1b83a9cf97f1304d84214b3a2a2f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118568
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit cdc752fd5e5b3bf97043b9542867d84827614f2c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118503
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>
    (cherry picked from commit 1e7f4ecdfbb30cdf35501292ced01388b8d24647)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118507
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index eb37d4137419..34bcdb6d12f4 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -54,6 +54,7 @@ static css::uno::Reference< css::awt::XWindowPeer > CreateXWindow( vcl::Window c
         case WindowType::METRICBOX:
         case WindowType::COMBOBOX:       return new VCLXComboBox;
         case WindowType::SPINFIELD:
+        case WindowType::FORMATTEDFIELD:
         case WindowType::CURRENCYFIELD:  return new VCLXNumericField;
         case WindowType::DATEFIELD:      return new VCLXDateField;
         case WindowType::MULTILINEEDIT: