[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-1' - vcl/source

[Caolán McNamara]

 vcl/source/window/layout.cxx |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 47ff82608b065c3c0d98557583bb822b20fb4081
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 17 16:57:44 2014 +0000

    Resolves: fdo#74284 use AccessibleRole::PANEL for VclBoxes under windows
    
    (cherry picked from commit 685ec1899435037205d98a102a32ca8b6a4836d0)
    
    Change-Id: Ic8c743c2646c8610b3d90425024413b40dfdab13
    Reviewed-on: https://gerrit.libreoffice.org/8105
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Kohei Yoshida <libreoffice at kohei.us>
    Tested-by: Kohei Yoshida <libreoffice at kohei.us>

diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 35e76a4..8d8ab0d 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -322,7 +322,13 @@ bool VclBox::set_property(const OString &rKey, const OString &rValue)
 
 sal_uInt16 VclBox::getDefaultAccessibleRole() const
 {
+#if defined(WNT)
+    //fdo#74284 call Boxes Panels, keep then as "Filler" under
+    //at least Linux seeing as that's what Gtk does for GtkBoxes
+    return com::sun::star::accessibility::AccessibleRole::PANEL;
+#else
     return com::sun::star::accessibility::AccessibleRole::FILLER;
+#endif
 }
 
 #define DEFAULT_CHILD_MIN_WIDTH 85