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

[Caolán McNamara]

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

New commits:
commit c6c5636a69fa9261e02ac357dec0e8987a5ad829
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/4680
    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 513dd50..b007193 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -694,12 +694,12 @@ void Dialog::StateChanged( StateChangedType nType )
 
     if ( nType == STATE_CHANGE_INITSHOW )
     {
-        if (isLayoutEnabled())
-            setInitialLayoutSize();
-
         if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
             ImplWindowAutoMnemonic( this );
 
+        if (isLayoutEnabled())
+            setInitialLayoutSize();
+
         if ( !HasChildPathFocus() || HasFocus() )
             GrabFocusToFirstControl();
         if ( !(GetStyle() & WB_CLOSEABLE) )