[Libreoffice-commits] core.git: configmgr/source

Stephan Bergmann sbergman at redhat.com
Fri Oct 30 01:39:25 PDT 2015


 configmgr/source/modifications.hxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit fb3f7e20c1cdeb944dff3c8ca9f48dc6450c9ebb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 30 09:38:57 2015 +0100

    Get this remove/re-add dance finally sorted out for good
    
    Change-Id: I16cb3fdd699dcd45de25b49d30e0d1b6392fd82b

diff --git a/configmgr/source/modifications.hxx b/configmgr/source/modifications.hxx
index dde8452..5549e14 100644
--- a/configmgr/source/modifications.hxx
+++ b/configmgr/source/modifications.hxx
@@ -24,8 +24,9 @@
 
 #include <boost/unordered_map.hpp>
 
-#include "path.hxx"
+#include <config_dconf.h>
 
+#include "path.hxx"
 
 namespace configmgr {
 
@@ -45,6 +46,10 @@ public:
 
     void remove(Path const & path);
 
+#if ENABLE_DCONF
+    void clear() { root_.children.clear(); }
+#endif
+
     bool empty() const { return root_.children.empty(); }
 
     Node const & getRoot() const { return root_;}


More information about the Libreoffice-commits mailing list