1 files changed, 134 insertions, 9 deletions

diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 57f45068d954..4c1d59d5d054 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -30,27 +30,84 @@
 
 #include <set>
 
-#include "configmgr/update.hxx"
+#include "boost/noncopyable.hpp"
+#include "com/sun/star/configuration/XUpdate.hpp"
+#include "com/sun/star/lang/XSingleComponentFactory.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "cppuhelper/factory.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include "cppuhelper/weak.hxx"
 #include "osl/mutex.hxx"
 #include "rtl/ref.hxx"
+#include "rtl/unload.h"
+#include "rtl/ustring.h"
 #include "rtl/ustring.hxx"
+#include "sal/types.h"
 
 #include "broadcaster.hxx"
 #include "components.hxx"
 #include "lock.hxx"
 #include "modifications.hxx"
 #include "rootaccess.hxx"
+#include "update.hxx"
 
-namespace configmgr {
+namespace configmgr { namespace update {
 
-namespace update {
+namespace {
 
-void insertExtensionXcsFile(bool shared, rtl::OUString const & fileUri) {
+namespace css = com::sun::star;
+
+std::set< rtl::OUString > seqToSet(
+    css::uno::Sequence< rtl::OUString > const & sequence)
+{
+    return std::set< rtl::OUString >(
+        sequence.getConstArray(),
+        sequence.getConstArray() + sequence.getLength());
+}
+
+class Service:
+    public cppu::WeakImplHelper1< css::configuration::XUpdate >,
+    private boost::noncopyable
+{
+public:
+    Service() {}
+
+private:
+    virtual ~Service() {}
+
+    virtual void SAL_CALL insertExtensionXcsFile(
+        sal_Bool shared, rtl::OUString const & fileUri)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL insertExtensionXcuFile(
+        sal_Bool shared, rtl::OUString const & fileUri)
+        throw (css::uno::RuntimeException);
+
+    virtual void SAL_CALL insertModificationXcuFile(
+        rtl::OUString const & fileUri,
+        css::uno::Sequence< rtl::OUString > const & includedPaths,
+        css::uno::Sequence< rtl::OUString > const & excludedPaths)
+        throw (css::uno::RuntimeException);
+};
+
+void Service::insertExtensionXcsFile(
+    sal_Bool shared, rtl::OUString const & fileUri)
+    throw (css::uno::RuntimeException)
+{
     osl::MutexGuard g(lock);
     Components::getSingleton().insertExtensionXcsFile(shared, fileUri);
 }
 
-void insertExtensionXcuFile(bool shared, rtl::OUString const & fileUri) {
+void Service::insertExtensionXcuFile(
+    sal_Bool shared, rtl::OUString const & fileUri)
+    throw (css::uno::RuntimeException)
+{
     Broadcaster bc;
     {
         osl::MutexGuard g(lock);
@@ -63,23 +120,91 @@ void insertExtensionXcuFile(bool shared, rtl::OUString const & fileUri) {
     bc.send();
 }
 
-void insertModificationXcuFile(
+void Service::insertModificationXcuFile(
     rtl::OUString const & fileUri,
-    std::set< rtl::OUString > const & includedPaths,
-    std::set< rtl::OUString > const & excludedPaths)
+    css::uno::Sequence< rtl::OUString > const & includedPaths,
+    css::uno::Sequence< rtl::OUString > const & excludedPaths)
+    throw (css::uno::RuntimeException)
 {
     Broadcaster bc;
     {
         osl::MutexGuard g(lock);
         Modifications mods;
         Components::getSingleton().insertModificationXcuFile(
-            fileUri, includedPaths, excludedPaths, &mods);
+            fileUri, seqToSet(includedPaths), seqToSet(excludedPaths), &mods);
         Components::getSingleton().initGlobalBroadcaster(
             mods, rtl::Reference< RootAccess >(), &bc);
     }
     bc.send();
 }
 
+class Factory:
+    public cppu::WeakImplHelper1< css::lang::XSingleComponentFactory >,
+    private boost::noncopyable
+{
+public:
+    Factory() {}
+
+private:
+    virtual ~Factory() {}
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithContext(
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
+    createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any > const & Arguments,
+        css::uno::Reference< css::uno::XComponentContext > const & Context)
+        throw (css::uno::Exception, css::uno::RuntimeException);
+};
+
+css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext(
+    css::uno::Reference< css::uno::XComponentContext > const & Context)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    return createInstanceWithArgumentsAndContext(
+        css::uno::Sequence< css::uno::Any >(), Context);
+}
+
+css::uno::Reference< css::uno::XInterface >
+Factory::createInstanceWithArgumentsAndContext(
+    css::uno::Sequence< css::uno::Any > const & Arguments,
+    css::uno::Reference< css::uno::XComponentContext > const &)
+    throw (css::uno::Exception, css::uno::RuntimeException)
+{
+    if (Arguments.getLength() != 0) {
+        throw css::uno::Exception(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "com.sun.star.comp.configuration.Update must be"
+                    " instantiated without arguments")),
+            static_cast< cppu::OWeakObject * >(this));
+    }
+    return static_cast< cppu::OWeakObject * >(new Service);
 }
 
 }
+
+rtl::OUString getImplementationName() {
+    return rtl::OUString(
+        RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.configuration.Update"));
+}
+
+css::uno::Sequence< rtl::OUString > getSupportedServiceNames() {
+    rtl::OUString name(
+        RTL_CONSTASCII_USTRINGPARAM(
+            "com.sun.star.configuration.Update_Service"));
+    return css::uno::Sequence< rtl::OUString >(&name, 1);
+}
+
+css::uno::Reference< css::lang::XSingleComponentFactory > createFactory(
+    cppu::ComponentFactoryFunc, rtl::OUString const &,
+    css::uno::Sequence< rtl::OUString > const &, rtl_ModuleCount *)
+    SAL_THROW(())
+{
+    return new Factory;
+}
+
+} }