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

[Caolán McNamara]

 vcl/source/window/dialog.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7fa6f79ea8ec07884689aff36d7856a1b6f98c00
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jul 2 15:19:20 2013 +0100

    Resolves: fdo#66502 set AutoMnemonics before calculating layout
    
    Change-Id: I3274ec9e8e4e1f61f0108a3e6ba64107128736c2
    (cherry picked from commit 00601259144f5b49b516581ca6ae28fc6e524030)
    Reviewed-on: https://gerrit.libreoffice.org/4679
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index c0bb501..909b638 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -705,6 +705,9 @@ void Dialog::StateChanged( StateChangedType nType )
 
     if ( nType == STATE_CHANGE_INITSHOW )
     {
+        if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
+            ImplWindowAutoMnemonic( this );
+
         if (isLayoutEnabled())
         {
             mbIsCalculatingInitialLayoutSize = true;
@@ -713,9 +716,6 @@ void Dialog::StateChanged( StateChangedType nType )
             mbIsCalculatingInitialLayoutSize = false;
         }
 
-        if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
-            ImplWindowAutoMnemonic( this );
-
         if ( !HasChildPathFocus() || HasFocus() )
             GrabFocusToFirstControl();
         if ( !(GetStyle() & WB_CLOSEABLE) )