[Libreoffice-commits] .: 2 commits - desktop/source xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/source

[Libreoffice Gerrit user]

 desktop/source/deployment/manager/dp_extensionmanager.cxx |    6 +++---
 xmlsecurity/Library_xsec_xmlsec.mk                        |    2 +-
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx          |   14 ++++++--------
 3 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit a05e1e4967a21f3dd5a49215d97df99a7ec84f18
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 19 16:06:43 2012 +0100

    fdo#57224: Fix logic of considering optional/ambiguous value as "disabled"
    
    ...so that only a "not-registered" that is non-optional and non-ambiguous is
    considered as "disabled" by user's intention.  Other combinations can occur for
    broken extensions (that will thus become disabled again anyway when we try to
    automatically enable them) and for originally enabled extensions for which
    cleanExtensionCache in desktop/source/app/app.cxx has forecefully removed
    user/uno_packages/cache/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc
    (and which should rather be kept enabled).
    
    Change-Id: Ic85b609ec9b3634cfa94a77151d42c07b9488030

diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index b0c65e0..5f701c6 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -1245,9 +1245,9 @@ void ExtensionManager::reinstallDeployedExtensions(
                 {
                     beans::Optional< beans::Ambiguous< sal_Bool > > registered(
                         extensions[pos]->isRegistered(xAbortChannel, xCmdEnv));
-                    if (!registered.IsPresent
-                        || registered.Value.IsAmbiguous
-                        || !registered.Value.Value)
+                    if (registered.IsPresent &&
+                        !(registered.Value.IsAmbiguous ||
+                          registered.Value.Value))
                     {
                         const OUString id = dp_misc::getIdentifier(extensions[ pos ]);
                         OSL_ASSERT(!id.isEmpty());
commit 8648c974ea5e222027a5ac1c9a01cd9ac6e344a8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Nov 19 14:26:58 2012 +0100

    Clean-up "SYSTEM_MOZILLA" -> "SYSTEM_NSS"
    
    Change-Id: I47ec3aeb14445b697bf8f5af34c5d16a14069735

diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 4eceb30..6808cbc 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -156,7 +156,7 @@ $(eval $(call gb_Library_set_include,xsec_xmlsec,\
 ))
 
 $(eval $(call gb_Library_add_defs,xsec_xmlsec,\
-	-DSYSTEM_MOZILLA \
+	-DSYSTEM_NSS \
 ))
 
 $(eval $(call gb_Library_add_libs,xsec_xmlsec,\
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index a1c01d3..af92f34 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -248,9 +248,9 @@ void deleteRootsModule()
 //the location of the roots module to the profile, which makes FF2 and TB2 use
 //it instead of there own module.
 //
-//When using SYSTEM_MOZILLA then the libnss3.so lib is typically found in
-///usr/lib. This folder may, however, NOT contain the roots certificate
-//module. That is, just providing the library name in SECMOD_LoadUserModule or
+//When using SYSTEM_NSS then the libnss3.so lib is typically found in /usr/lib.
+//This folder may, however, NOT contain the roots certificate module. That is,
+//just providing the library name in SECMOD_LoadUserModule or
 //SECMOD_AddNewModule will FAIL to load the mozilla unless the LD_LIBRARY_PATH
 //contains an FF or TB installation.
 //ATTENTION: DO NOT call this function directly instead use initNSS
@@ -305,13 +305,13 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex
     out_nss_init = true;
 
 #ifdef XMLSEC_CRYPTO_NSS
-#if defined SYSTEM_MOZILLA
+#if defined SYSTEM_NSS
     if (!SECMOD_HasRootCerts())
-    {
 #endif
+    {
         deleteRootsModule();
 
-#if defined SYSTEM_MOZILLA
+#if defined SYSTEM_NSS
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi" SAL_DLLEXTENSION));
 #else
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${LO_LIB_DIR}/libnssckbi" SAL_DLLEXTENSION));
@@ -365,10 +365,8 @@ bool nsscrypto_initialize( const css::uno::Reference< css::uno::XComponentContex
             xmlsec_trace("Adding new root certificate module failed.");
             return_value = false;
         }
-#if SYSTEM_MOZILLA
     }
 #endif
-#endif
 
     return return_value;
 }