sw/qa/extras/ooxmlexport/ooxmlexport8.cxx | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 143c482b3189cb084fbdf5e6f78f15b43f099e24
Author: Serge Krot <serge.k...@cib.de>
Date: Thu Oct 19 17:44:37 2017 +0200
sw: enable ooxml export tests also for Win32
* seems they work fine these days
* also removed magic number from fdo69649 test in favour of getting the
value straight from the document
Change-Id: Ife9d96eb413740b56b771df0d23e590f44f9452f
Reviewed-on: https://gerrit.libreoffice.org/43568
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index 03fd2fbc7103..e7f7c9ccfdc1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -117,8 +117,6 @@ protected:
}
};
-#if !defined(_WIN32)
-
DECLARE_OOXMLEXPORT_TEST(testN751054, "n751054.docx")
{
text::TextContentAnchorType eValue =
getProperty<text::TextContentAnchorType>(getShape(1), "AnchorType");
@@ -1368,8 +1366,10 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69649, "fdo69649.docx")
xTextCursor->gotoRange(xTextRange->getStart(),false);
xTextCursor->gotoRange(xTextRange->getEnd(),true);
OUString aTocString(xTextCursor->getString());
- aTocString = aTocString.copy(256);
- CPPUNIT_ASSERT(aTocString.startsWithIgnoreAsciiCase( "Heading 15.1:\t15" )
);
+
+ // heading 15 on the 15th page
+ aTocString = aTocString.copy(aTocString.indexOf("Heading 15.1:\t") +
strlen("Heading 15.1:\t"));
+ CPPUNIT_ASSERT(aTocString.startsWithIgnoreAsciiCase( "15" ) );
}
DECLARE_OOXMLEXPORT_TEST(testFdo73389,"fdo73389.docx")
@@ -1891,8 +1891,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf87924, "tdf87924.docx")
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0),
aGeometry["TextPreRotateAngle"].get<sal_Int32>());
}
-#endif
-
DECLARE_OOXMLEXPORT_TEST(testIndents, "indents.docx")
{
//expected left margin and first line indent values
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
