sb111: #i101955# cleaned up configmgr::update interface

3 files changed, 18 insertions, 12 deletions

diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 7b287bafb01c..c374dabcab32 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -204,25 +204,31 @@ void Components::writeModifications() {
     writeModFile(*this, getModificationFileUrl(), data_);
 }
 
-void Components::insertXcsFile(int layer, rtl::OUString const & fileUri) {
+void Components::insertExtensionXcsFile(
+    bool shared, rtl::OUString const & fileUri)
+{
     try {
-        parseXcsFile(fileUri, layer, &data_);
+        parseXcsFile(fileUri, shared ? 9 : 13, &data_);
     } catch (css::container::NoSuchElementException & e) {
         throw css::uno::RuntimeException(
             (rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("insertXcsFile does not exist: ")) +
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "insertExtensionXcsFile does not exist: ")) +
              e.Message),
             css::uno::Reference< css::uno::XInterface >());
     }
 }
 
-void Components::insertXcuFile(int layer, rtl::OUString const & fileUri) {
+void Components::insertExtensionXcuFile(
+    bool shared, rtl::OUString const & fileUri)
+{
     try {
-        parseXcuFile(fileUri, layer + 1, &data_);
+        parseXcuFile(fileUri, shared ? 10 : 14, &data_);
     } catch (css::container::NoSuchElementException & e) {
         throw css::uno::RuntimeException(
             (rtl::OUString(
-                RTL_CONSTASCII_USTRINGPARAM("insertXcuFile does not exist: ")) +
+                RTL_CONSTASCII_USTRINGPARAM(
+                    "insertExtensionXcuFile does not exist: ")) +
              e.Message),
             css::uno::Reference< css::uno::XInterface >());
     }
diff --git a/configmgr/source/components.hxx b/configmgr/source/components.hxx
index d9730dafe978..c37d44701d61 100644
--- a/configmgr/source/components.hxx
+++ b/configmgr/source/components.hxx
@@ -92,9 +92,9 @@ public:
 
     void writeModifications();
 
-    void insertXcsFile(int layer, rtl::OUString const & fileUri);
+    void insertExtensionXcsFile(bool shared, rtl::OUString const & fileUri);
 
-    void insertXcuFile(int layer, rtl::OUString const & fileUri);
+    void insertExtensionXcuFile(bool shared, rtl::OUString const & fileUri);
 
     com::sun::star::beans::Optional< com::sun::star::uno::Any >
     getExternalValue(rtl::OUString const & descriptor);
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 6ed052f87f04..52df4f25eca7 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -41,14 +41,14 @@ namespace configmgr {
 
 namespace update {
 
-void insertXcsFile(int layer, rtl::OUString const & fileUri) {
+void insertExtensionXcsFile(bool shared, rtl::OUString const & fileUri) {
     osl::MutexGuard g(lock);
-    Components::getSingleton().insertXcsFile(layer, fileUri);
+    Components::getSingleton().insertExtensionXcsFile(shared, fileUri);
 }
 
-void insertXcuFile(int layer, rtl::OUString const & fileUri) {
+void insertExtensionXcuFile(bool shared, rtl::OUString const & fileUri) {
     osl::MutexGuard g(lock);
-    Components::getSingleton().insertXcuFile(layer, fileUri);
+    Components::getSingleton().insertExtensionXcuFile(shared, fileUri);
 }
 
 }