merge DEV300_m90

1 files changed, 8 insertions, 0 deletions

diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index 4fc47f791821..1c735efca6ba 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -94,6 +94,11 @@ public:
 
     void writeModifications();
 
+    void flushModifications();
+        // must be called with configmgr::lock unaquired; must be called before
+        // shutdown if writeModifications has ever been called (probably
+        // indirectly, via removeExtensionXcuFile)
+
     void insertExtensionXcsFile(bool shared, rtl::OUString const & fileUri);
 
     void insertExtensionXcuFile(
@@ -160,11 +165,14 @@ private:
                 com::sun::star::beans::XPropertySet > >
         ExternalServices;
 
+    class WriteThread;
+
     com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >
         context_;
     Data data_;
     WeakRootSet roots_;
     ExternalServices externalServices_;
+    rtl::Reference< WriteThread > writeThread_;
 };
 
 }