[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/window/syswin.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 8f25e553b91f5ed3544c580a450658cc76ffed56
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 8 13:50:22 2016 +0100

    Resolves: tdf#99324 let bare tabpage in dialogs get toggled auto-mnemonics
    
    Change-Id: Icdf2a908d131ff05a1c00b7305686edba26d4b24

diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 1a75e4d..0bc7a0a 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -153,6 +153,18 @@ bool Accelerator::ToggleMnemonicsOnHierarchy(const CommandEvent& rCEvent, vcl::W
                      pTabPageChild = nextLogicalChildOfParent(pTabPage, pTabPageChild);
                  }
             }
+            else if ( pGetChild->GetType() == WINDOW_TABPAGE )
+            {
+                 // bare tabpage without tabcontrol parent (options dialog)
+                 vcl::Window* pTabPageChild = firstLogicalChildOfParent( pGetChild );
+
+                 // and go through its children
+                 while ( pTabPageChild )
+                 {
+                     ImplHandleControlAccelerator(pTabPageChild, bShowAccel);
+                     pTabPageChild = nextLogicalChildOfParent(pGetChild, pTabPageChild);
+                 }
+            }
 
             ImplHandleControlAccelerator( pGetChild, bShowAccel );
             pGetChild = nextLogicalChildOfParent(pWindow, pGetChild);