[Libreoffice-commits] .: 2 commits - sw/qa sw/source

[Caolán McNamara]

 sw/qa/core/filters-test.cxx     |   12 ------------
 sw/source/core/crsr/trvltbl.cxx |    4 ++++
 2 files changed, 4 insertions(+), 12 deletions(-)

New commits:
commit d5c43b1e12521ac3520c7c74278b74be90131a36
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 10 11:35:53 2011 +0100

    Related: rhbz#689053, protect against immediate crash here

diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index fa781ba..a18512a 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -755,6 +755,10 @@ String SwCrsrShell::GetBoxNms() const
         } while ( pFrm && !pFrm->IsCellFrm() );
 
         OSL_ENSURE( pFrm, "kein Frame zur Box" );
+
+        if( !pFrm )
+            return sNm;
+
         sNm = ((SwCellFrm*)pFrm)->GetTabBox()->GetName();
         sNm += ':';
         pPos = pTblCrsr->End();
commit 919ad525c8233e5752baf4471c9a49b21f2a69aa
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jun 10 10:48:13 2011 +0100

    re-enable these

diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index 1857062..75262f7 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -136,18 +136,6 @@ void FiltersTest::recursiveScan(const rtl::OUString &rFilter, const rtl::OUStrin
             if (nGitIndex == sURL.getLength() - RTL_CONSTASCII_LENGTH(".gitignore"))
                 continue;
 
-            //skip this for now, failint on gentoo tinderbox, despite working
-            //on fedora x86_64 for me
-            if (sURL.lastIndexOfAsciiL(
-                RTL_CONSTASCII_STRINGPARAM("CVE-2007-0245-1.rtf")) != -1)
-                continue;
-
-            //skip this for now, failint on gentoo tinderbox, despite working
-            //on fedora x86_64 for me
-            if (sURL.lastIndexOfAsciiL(
-                RTL_CONSTASCII_STRINGPARAM("CVE-2010-3452-1.rtf")) != -1)
-                continue;
-
             bool bRes = load(rFilter, sURL, rUserData);
             rtl::OString aRes(rtl::OUStringToOString(sURL, osl_getThreadTextEncoding()));
             CPPUNIT_ASSERT_MESSAGE(aRes.getStr(), bRes == bExpected);