[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svtools/source

[Michael Stahl]

 svtools/source/config/menuoptions.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 64291d696fe2bd8e6df70173ef1650ad72ed76e5
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Aug 20 00:25:31 2015 +0200

    tdf#93451: svtools: don't commit SvtMenuOptions too early
    
    Surprisingly SvtMenuOptions_Impl::ImplCommit() does not actually write
    m_eMenuIcons for "ShowIconsInMenues" but something read out of
    Application::Settings(), which appears to be deliberate (i#95318).
    Whatever sets that does it after SetMenuIconsState() is called,
    so keep the SvtMenuOptions modified by not calling Commit().
    
    (regression from 765f6211b1371c1e40de386e715de6b3d1a8df86)
    
    Change-Id: I368b65589d16753d80a1b9e9cc7d7df59c0f53da
    (cherry picked from commit ce0bba5fc1090caa7fb80f1bcc6ce64f67f11238)
    Reviewed-on: https://gerrit.libreoffice.org/17865
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 22dc5e6..32d54b2 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.cxx
@@ -128,7 +128,7 @@ class SvtMenuOptions_Impl : public ConfigItem
                         SetModified();
                         for ( ::std::list<Link<>>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
                             iter->Call( this );
-                        Commit();
+                        // tdf#93451: don't Commit() here, it's too early
                     }