[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-5' - desktop/source

[Lionel Elie Mamane]

 desktop/source/deployment/registry/script/dp_script.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit e28ca31cb74ba08ce75186f5d56d7e2ec572ab46
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Jun 12 18:00:42 2014 +0200

    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 at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 9b5b0aca5f33012344fef73449c17f4dfd8c8043)
    Reviewed-on: https://gerrit.libreoffice.org/9761
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index 5bd7239..60dc3f2 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;