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

[Isamu Mogi]

 vcl/source/window/menu.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 26355306ffaae4ec85a0ddaa372d93526781ac6a
Author: Isamu Mogi <saturday6c at gmail.com>
Date:   Sat Mar 22 11:46:37 2014 +0900

    fdo#68546 Update style settings before changing layout
    
    Currently, ImplInitStyleSettings()'s effect isn't be reflect to UI.
    Because it is called after refreshing UI by ImplLayoutChanged().
    This fixes these order.
    
    Change-Id: I4cfe0115bc32551cecc70cf4b33921fb8ee7ea5a
    Reviewed-on: https://gerrit.libreoffice.org/8714
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 88e2b9e..8b52b46 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -6026,8 +6026,8 @@ void MenuBarWindow::DataChanged( const DataChangedEvent& rDCEvt )
          ((rDCEvt.GetType() == DATACHANGED_SETTINGS) &&
           (rDCEvt.GetFlags() & SETTINGS_STYLE)) )
     {
-        ImplLayoutChanged();
         ImplInitStyleSettings();
+        ImplLayoutChanged();
     }
 }