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

[Caolán McNamara]

 sw/qa/core/data/xml/pass/ooo32780-1.sxw    |binary
 sw/qa/core/filters-test.cxx                |    2 +-
 sw/qa/extras/odfimport/data/ooo32780-1.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx       |    5 +++++
 sw/source/core/layout/sectfrm.cxx          |   22 +++++++---------------
 5 files changed, 13 insertions(+), 16 deletions(-)

New commits:
commit abae860fa702b56fb11164ebb98acb4681e49cc1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 20 13:31:47 2015 +0000

    fix a bunch of crashtest import failures
    
    as far as I can tell this has been broken since
    
    commit 118dfcf180d2d5a2d015ebb5f0082962773b7d24
    Date:   Thu Apr 17 15:07:52 2003 +0000
    
    <SwSectionFrm::CalcFtnCntnt()> - consider that footnote/endnote can move
    
    with a private bug id so not currently possible to find out what the original
    problem to be solved was, so revert that and lock this down with an import test
    and maybe we will flush out the original problem eventually.
    
    Change-Id: I2af13b9b5875928aa157d47be0aaff2836ba38e1

diff --git a/sw/qa/core/data/xml/pass/ooo32780-1.sxw b/sw/qa/core/data/xml/pass/ooo32780-1.sxw
new file mode 100644
index 0000000..f946567
Binary files /dev/null and b/sw/qa/core/data/xml/pass/ooo32780-1.sxw differ
diff --git a/sw/qa/extras/odfimport/data/ooo32780-1.odt b/sw/qa/extras/odfimport/data/ooo32780-1.odt
new file mode 100644
index 0000000..e7185b6
Binary files /dev/null and b/sw/qa/extras/odfimport/data/ooo32780-1.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 139e2bc..dd32fb6 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -314,6 +314,11 @@ DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
     CPPUNIT_ASSERT_EQUAL(sal_Int32(422), xShape->getPosition().Y); // Was -2371
 }
 
+DECLARE_ODFIMPORT_TEST(testCalcFtnCntnt, "ooo32780-1.odt")
+{
+    //this was a CalcFtnCntnt crash
+}
+
 DECLARE_ODFIMPORT_TEST(testFdo75872_ooo33, "fdo75872_ooo33.odt")
 {
     // graphics default style: line color and fill color changed
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 437a6c7..5215723 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -2497,11 +2497,6 @@ long SwSectionFrm::Undersize( bool bOverSize )
     return nRet;
 }
 
-/// OD 01.04.2003 #108446# - determine next frame for footnote/endnote formatting
-/// before format of current one, because current one can move backward.
-/// After moving backward to a previous page method <FindNext()> will return
-/// the text frame presenting the first page footnote, if it exists. Thus, the
-/// rest of the footnote/endnote container would not be formatted.
 void SwSectionFrm::CalcFtnCntnt()
 {
     SwFtnContFrm* pCont = ContainsFtnCont();
@@ -2515,20 +2510,17 @@ void SwSectionFrm::CalcFtnCntnt()
             SwFtnFrm* pFtn = pFrm->FindFtnFrm();
             if( pFtn )
                 pFtn->Calc();
-            // OD 01.04.2003 #108446# - determine next frame before format current frame.
-            SwFrm* pNextFrm = 0;
+            pFrm->Calc();
+            if( pFrm->IsSctFrm() )
             {
-                if( pFrm->IsSctFrm() )
-                {
-                    pNextFrm = static_cast<SwSectionFrm*>(pFrm)->ContainsAny();
-                }
-                if( !pNextFrm )
+                SwFrm *pTmp = static_cast<SwSectionFrm*>(pFrm)->ContainsAny();
+                if( pTmp )
                 {
-                    pNextFrm = pFrm->FindNext();
+                    pFrm = pTmp;
+                    continue;
                 }
             }
-            pFrm->Calc();
-            pFrm = pNextFrm;
+            pFrm = pFrm->FindNext();
         }
     }
 }
commit 7b9fbdd9a7d0701b6a771b5c590c5393f366a6b6
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 20 13:27:36 2015 +0000

    Staroffice->StarOffice
    
    Change-Id: I10055b9d448115c1699c82a0e86cfd6ed709b648

diff --git a/sw/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index e6713fc..023b50d9a 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -135,7 +135,7 @@ bool SwFiltersTest::filter(const OUString &rFilter, const OUString &rURL,
 
 void SwFiltersTest::testCVEs()
 {
-    testDir(OUString("Staroffice XML (Writer)"),
+    testDir(OUString("StarOffice XML (Writer)"),
             getURLFromSrc("/sw/qa/core/data/xml/"),
             OUString(FILTER_XML),
             SfxFilterFlags::IMPORT | SfxFilterFlags::OWN | SfxFilterFlags::DEFAULT,