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:30:49 +0000 |
| commit | c6c5636a69fa9261e02ac357dec0e8987a5ad829 (patch) | |
| tree | 0cd6b725b25a860c97396d958335803bb8b144c7 | |
| parent | 9a516c14d62684f498821d0389bbdee349774a8b (diff) | |
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@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -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 513dd5005cd3..b0071937692b 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) ) |