diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-21 22:27:55 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2016-02-22 08:58:17 +0100 |
commit | 2b354fbaeb1b59419bd82eabc7b3f01b2da3c315 (patch) | |
tree | 2657e8fa5387be1afdea225692855f04b2e88b8a /cui | |
parent | 806c73ffb65db133f797e9b315f061754e7648c8 (diff) |
tdf#87178 Resetting menu shouldn't reset other resources
Change-Id: I6d6334cac9fdb5dfa3e35fe0cba70e5d9adf6fc2
(cherry picked from commit eb3ee586e420ee4e38f9ef8c579e1a37d2dc0c10)
Reviewed-on: https://gerrit.libreoffice.org/21703
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit eb0aad9186953e0602ed96244492a71f203d8f94)
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/customize/cfg.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index e4da216faa49..92827b86d08d 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1302,7 +1302,14 @@ void MenuSaveInData::ApplyMenu( void MenuSaveInData::Reset() { - GetConfigManager()->reset(); + try + { + GetConfigManager()->removeSettings( m_aMenuResourceURL ); + } + catch ( const css::uno::Exception& ) + {} + + PersistChanges( GetConfigManager() ); delete pRootEntry; pRootEntry = NULL; |