diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2014-06-12 18:00:42 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2014-06-12 16:06:26 +0000 |
| commit | b534967caca6767cd2100da363b1da2433640ddd (patch) | |
| tree | a577cb80a8d1e2fd06cc3fdb35d1a59a3dd3d522 /desktop | |
| parent | 51ab8c92785b261bf952e96b6daa1947cf39d1ac (diff) | |
allow extensions to override Access2Base
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/9756
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Tested-by: Lionel Elie Mamane <lionel@mamane.lu>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/registry/script/dp_script.cxx | 3 |
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 78f070df296d..fb66b62edb8e 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; |