diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-02 15:19:20 +0100 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-02 14:25:00 +0000 |
| commit | 7fa6f79ea8ec07884689aff36d7856a1b6f98c00 (patch) | |
| tree | 8989dd82cec23ed9750e330adbe9b9b56c4c9e12 /vcl | |
| parent | 2b4d78598c55389b24b4a5016279aed26ac0fb2e (diff) | |
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@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index c0bb50162f9f..909b63880031 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) ) |