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

[Justin Luth]

 dev/null                                    |binary
 sw/qa/extras/ooxmlexport/data/fdo55381.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx   |   10 ++++++++++
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx    |    9 ---------
 4 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit a09fc7dd097357b60931739b6ed281a0b931aa73
Author: Justin Luth <justin_luth at sil.org>
Date:   Mon Mar 13 08:35:00 2017 +0300

    ooxmlimport: move tdf#55381 unit test to ooxmlexport
    
    This test wasn't round-trippable because the page breaks were
    all lost, and all of the frames ended up on page 1.
    
    fixed in 5.3 daily debug bibisect 12a5c2be4d64199c6540969c645118112084a639
    best guess: author Tamás Zolnai 2016-10-28 14:10:41 (GMT)
    best guess: commit b927c1f4b334f80d2c2965e5b7327d6b6a685105
    tdf#103544: DOCX exp.: Image loss when have a frame anchored to the same para.
    
    This doc still needs some work - the frames are shifted backwards one page,
    so frame 1 is on page 2 and the last page contains two frames.
    
    Change-Id: I512c1d66b742b29f1a9fe8644355f3d9df5ed1f1
    Reviewed-on: https://gerrit.libreoffice.org/35127
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/qa/extras/ooxmlimport/data/fdo55381.docx b/sw/qa/extras/ooxmlexport/data/fdo55381.docx
similarity index 100%
rename from sw/qa/extras/ooxmlimport/data/fdo55381.docx
rename to sw/qa/extras/ooxmlexport/data/fdo55381.docx
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index d60b332..176c918 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -37,6 +37,16 @@ protected:
     }
 };
 
+DECLARE_OOXMLEXPORT_TEST(testFdo55381, "fdo55381.docx")
+{
+    uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
+    uno::Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+    uno::Reference<text::XPageCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+    xCursor->jumpToLastPage();
+    CPPUNIT_ASSERT_EQUAL(sal_Int16(4), xCursor->getPage());
+    //TODO: frames not located on the correct pages
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf92045, "tdf92045.docx")
 {
     // This was true, <w:effect w:val="none"/> resulted in setting the blinking font effect.
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index bbc8ef0..367b894 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -873,15 +873,6 @@ DECLARE_OOXMLIMPORT_TEST(testFdo75722dml, "fdo75722-dml.docx")
     CPPUNIT_ASSERT_EQUAL(sal_Int64(3128), nRot);
 }
 
-DECLARE_OOXMLIMPORT_TEST(testFdo55381, "fdo55381.docx")
-{
-    uno::Reference<frame::XModel> xModel(mxComponent, uno::UNO_QUERY);
-    uno::Reference<text::XTextViewCursorSupplier> xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
-    uno::Reference<text::XPageCursor> xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
-    xCursor->jumpToLastPage();
-    CPPUNIT_ASSERT_EQUAL(sal_Int16(4), xCursor->getPage());
-}
-
 DECLARE_OOXMLIMPORT_TEST(testFdo76803, "fdo76803.docx")
 {
     // The ContourPolyPolygon was wrong