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

[Maxim Monastirsky]

 cui/source/customize/cfg.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit eb0aad9186953e0602ed96244492a71f203d8f94
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Thu Jan 21 22:27:55 2016 +0200

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index e4da216..92827b8 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;