Kaydet (Commit) 64291d69 authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Caolán McNamara

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 765f6211)

Change-Id: I368b65589d16753d80a1b9e9cc7d7df59c0f53da
(cherry picked from commit ce0bba5f)
Reviewed-on: https://gerrit.libreoffice.org/17865Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst a23d5bc8
...@@ -128,7 +128,7 @@ class SvtMenuOptions_Impl : public ConfigItem ...@@ -128,7 +128,7 @@ class SvtMenuOptions_Impl : public ConfigItem
SetModified(); SetModified();
for ( ::std::list<Link<>>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter ) for ( ::std::list<Link<>>::const_iterator iter = aList.begin(); iter != aList.end(); ++iter )
iter->Call( this ); iter->Call( this );
Commit(); // tdf#93451: don't Commit() here, it's too early
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment