diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-01-21 22:27:55 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-01-22 13:24:05 +0000 |
| commit | c36e8a3e99388485066a8321c28807ba4677114d (patch) | |
| tree | eba8a6b8ae337acc54e6e5af49e139fa32ea316c | |
| parent | 70e08ce45ae06abdd978430263c8ef5d6a8826e2 (diff) | |
tdf#87178 Resetting menu shouldn't reset other resources
Change-Id: I6d6334cac9fdb5dfa3e35fe0cba70e5d9adf6fc2
(cherry picked from commit eb3ee586e420ee4e38f9ef8c579e1a37d2dc0c10)
Reviewed-on: https://gerrit.libreoffice.org/21702
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
| -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 c7d4a0194006..4f9c7063c163 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -1328,7 +1328,14 @@ void SaveInData::ApplyMenu( void MenuSaveInData::Reset() { - GetConfigManager()->reset(); + try + { + GetConfigManager()->removeSettings( m_aMenuResourceURL ); + } + catch ( const css::uno::Exception& ) + {} + + PersistChanges( GetConfigManager() ); delete pRootEntry; pRootEntry = nullptr; |