summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2014-06-12 18:00:42 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2014-06-17 17:59:10 +0000
commite28ca31cb74ba08ce75186f5d56d7e2ec572ab46 (patch)
tree655c071526704ae8fa47d28daa031615f24077b0
parentbump product version to 4.2.5.2.0+ (diff)
downloadcore-libreoffice-4-2-5.tar.gz
core-libreoffice-4-2-5.zip
allow extensions to override Access2Base libreoffice-4-2-5
In particular, this allows users or administrators to upgrade Access2Base by installing the extension version of it. Change-Id: I1650e5beced0fd168afa029dbac2025e2fa16e1f Reviewed-on: https://gerrit.libreoffice.org/9754 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 9b5b0aca5f33012344fef73449c17f4dfd8c8043) Reviewed-on: https://gerrit.libreoffice.org/9761 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 5bd7239b61c8..60dc3f2d8fc4 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -346,7 +346,8 @@ lcl_maybeAddScript(
//same id
if (sOriginalUrl.match("vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE")
|| sOriginalUrl.match("vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE")
- || sOriginalUrl.match("vnd.sun.star.expand:$BUNDLED_EXTENSIONS"))
+ || sOriginalUrl.match("vnd.sun.star.expand:$BUNDLED_EXTENSIONS")
+ || sOriginalUrl.match("$(INST)/share/basic/Access2Base/"))
{
xScriptLibs->removeLibrary(rName);
bCanAdd = true;