[Libreoffice-commits] .: 4 commits - sd/qa sw/qa xmlsecurity/source

[Markus Mohrhard]

 sd/qa/unit/filters-test.cxx                      |    9 +++++++--
 sw/qa/core/filters-test.cxx                      |    5 ++++-
 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |    3 +--
 3 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 2cfe0c6a3010af4a5c9a2971dd05c9437160dd4d
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Nov 11 02:15:49 2011 +0100

    we should close the unit test documents in sw

diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index cd63ebe..22923cc 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -79,7 +79,10 @@ bool SwFiltersTest::load(const rtl::OUString &rFilter, const rtl::OUString &rURL
     SwDocShellRef xDocShRef = new SwDocShell;
     SfxMedium aSrcMed(rURL, STREAM_STD_READ, true);
     aSrcMed.SetFilter(&aFilter);
-    return xDocShRef->DoLoad(&aSrcMed);
+    bool bLoaded = xDocShRef->DoLoad(&aSrcMed);
+    if (xDocShRef.Is())
+        xDocShRef->DoClose();
+    return bLoaded;
 }
 
 void SwFiltersTest::testCVEs()
commit 6be5fda2e1af48ba3b994164184d4fcb9091b13b
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Nov 11 02:19:11 2011 +0100

    close file before the first assertion message if loading failed

diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index a1ef22c..1ae13d6 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -116,7 +116,12 @@ FileFormat aFileFormats[] = {
     ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell();
     SfxMedium* pSrcMed = new SfxMedium(rURL, STREAM_STD_READWRITE, true);
     pSrcMed->SetFilter(aFilter);
-    CPPUNIT_ASSERT_MESSAGE( "load failed", xDocShRef->DoLoad(pSrcMed) );
+    if ( !xDocShRef->DoLoad(pSrcMed) )
+    {
+        if (xDocShRef.Is())
+            xDocShRef->DoClose();
+        CPPUNIT_ASSERT_MESSAGE( "failed to load", false );
+    }
 
     return xDocShRef;
 }
commit 6cc21742c5fa7ce20dc4cadd59f9946cff155045
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Nov 11 02:08:32 2011 +0100

    don't use calc in draw's filters-test

diff --git a/sd/qa/unit/filters-test.cxx b/sd/qa/unit/filters-test.cxx
index 62006c4..a1ef22c 100644
--- a/sd/qa/unit/filters-test.cxx
+++ b/sd/qa/unit/filters-test.cxx
@@ -110,7 +110,7 @@ FileFormat aFileFormats[] = {
         rtl::OUString(), pFmt->nFormatType, nFormat,
         rtl::OUString::createFromAscii( pFmt->pTypeName ),
         0, rtl::OUString(), rtl::OUString(), /* userdata */
-        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/scalc*")) );
+        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/sdraw*")) );
     aFilter->SetVersion(SOFFICE_FILEFORMAT_CURRENT);
 
     ::sd::DrawDocShellRef xDocShRef = new ::sd::DrawDocShell();
commit 84e1d374294b4228f7ad571a019fffba98f36a28
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date:   Fri Nov 11 01:48:33 2011 +0100

    use the newly introduced LO_LIB_DIRS variable
    
    the password unit test needs this code path and will fail otherwise

diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index bc1184a..eaa5e32 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -79,7 +79,6 @@
 #include <secmod.h>
 #include <nssckbi.h>
 
-
 namespace css = ::com::sun::star;
 namespace cssu = css::uno;
 namespace cssl = css::lang;
@@ -303,7 +302,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa
 #if defined SYSTEM_MOZILLA
         OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION));
 #else
-        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${BRAND_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION));
+        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${LO_LIB_DIR}/libnssckbi"SAL_DLLEXTENSION));
 #endif
         ::rtl::Bootstrap::expandMacros(rootModule);