diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-08-20 00:25:31 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-20 14:14:03 +0200 |
| commit | c7724e73abaf2bfd1490cfeae1c8ab0244f126e7 (patch) | |
| tree | d82ceac4c81dbc6051e185f8e2b7fb789dfcb4ea /svtools | |
| parent | f763ca94f196aca4d90748d9b3af9b1dcdf13534 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/config/menuoptions.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index 22dc5e6a4bde..32d54b2f175c 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 } |