diff options
| -rw-r--r-- | configmgr/inc/configmgr/update.hxx | 8 | ||||
| -rw-r--r-- | configmgr/source/components.cxx | 18 | ||||
| -rw-r--r-- | configmgr/source/components.hxx | 4 | ||||
| -rw-r--r-- | configmgr/source/update.cxx | 8 | ||||
| -rw-r--r-- | desktop/source/deployment/registry/configuration/dp_configuration.cxx | 10 |
5 files changed, 26 insertions, 22 deletions
diff --git a/configmgr/inc/configmgr/update.hxx b/configmgr/inc/configmgr/update.hxx index 2983ae8194..77978932d2 100644 --- a/configmgr/inc/configmgr/update.hxx +++ b/configmgr/inc/configmgr/update.hxx @@ -40,11 +40,11 @@ namespace configmgr { namespace update { -OOO_DLLPUBLIC_CONFIGMGR void insertXcsFile( - int layer, rtl::OUString const & fileUri); +OOO_DLLPUBLIC_CONFIGMGR void insertExtensionXcsFile( + bool shared, rtl::OUString const & fileUri); -OOO_DLLPUBLIC_CONFIGMGR void insertXcuFile( - int layer, rtl::OUString const & fileUri); +OOO_DLLPUBLIC_CONFIGMGR void insertExtensionXcuFile( + bool shared, rtl::OUString const & fileUri); } diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 7b287bafb0..c374dabcab 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 d9730dafe9..c37d44701d 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 6ed052f87f..52df4f25ec 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); } } diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 4bf3978a22..c456946986 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -632,16 +632,14 @@ void BackendImpl::PackageImpl::processPackage_( { if (m_isSchema) { - configmgr::update::insertXcsFile( - that->m_eContext == CONTEXT_SHARED ? 9 : 13, //TODO - expandUnoRcUrl(url)); + configmgr::update::insertExtensionXcsFile( + that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url)); } else { url = replaceOrigin(url, xCmdEnv); - configmgr::update::insertXcuFile( - that->m_eContext == CONTEXT_SHARED ? 9 : 13, //TODO - expandUnoRcUrl(url)); + configmgr::update::insertExtensionXcuFile( + that->m_eContext == CONTEXT_SHARED, expandUnoRcUrl(url)); } that->addToConfigmgrIni( m_isSchema, url, xCmdEnv ); |