diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2014-06-12 18:00:42 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-13 06:29:59 +0000 |
| commit | 9b5b0aca5f33012344fef73449c17f4dfd8c8043 (patch) | |
| tree | b0280e13de49a15920a65a0ffe2e8aea14cf69e7 /desktop/source | |
| parent | 8f80cde668b50c939aeff0d98a3e67c362df1fd4 (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/9754
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/source')
| -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 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; |