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

[Kohei Yoshida]

 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 61ad374e723d57d1bafb4131d6b78cca42a504ed
Author: Kohei Yoshida <kohei.yoshida at collabora.com>
Date:   Wed Jun 11 15:36:36 2014 -0400

    This assumption doesn't hold on all build environments.
    
    Change-Id: Ie1f56aed91e7cbfc59e254a111991f958e9a1607

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 770c239..ed2a4de 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -2146,7 +2146,10 @@ DECLARE_OOXMLIMPORT_TEST(testFdo78883, "fdo78883.docx")
     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(1), xCursor->getPage());
+
+    // Check to make sure the document loaded.  Note that the page number may
+    // be 1 or 2 depending on the environment.
+    CPPUNIT_ASSERT(xCursor->getPage() > sal_Int16(0));
 }
 
 DECLARE_OOXMLIMPORT_TEST(testFdo79535, "fdo79535.docx")