[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sw/qa

[Miklos Vajna]

 sw/qa/extras/rtfimport/rtfimport.cxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 123dc8f836afd108ea69804546116f17438a7861
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Wed Jun 3 19:20:02 2015 +0200

    sw: fix Win-x86@51-TDF build
    
    I forgot that the paste() method in this suite is not available on
    Windows on 4-4, just on 5-0 and newer.
    
    Change-Id: I6b625c2c5af34e8c7d7a66dd138ce860fdf18a24
    Reviewed-on: https://gerrit.libreoffice.org/16064
    Reviewed-by: Michael Stahl <mst...@redhat.com>
    Tested-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index bfa13c5..66f04e7 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2274,20 +2274,24 @@ DECLARE_RTFIMPORT_TEST(testTdf91074, "tdf91074.rtf")
 
 DECLARE_RTFIMPORT_TEST(testTdf90260Nopar, "hello.rtf")
 {
+#if !defined WNT
     uno::Reference<text::XTextDocument> xTextDocument(mxComponent, 
uno::UNO_QUERY);
     uno::Reference<text::XTextRange> xText(xTextDocument->getText(), 
uno::UNO_QUERY);
     uno::Reference<text::XTextRange> xEnd = xText->getEnd();
     paste("tdf90260-nopar.rtf", xEnd);
     CPPUNIT_ASSERT_EQUAL(1, getParagraphs());
+#endif
 }
 
 DECLARE_RTFIMPORT_TEST(testTdf90260Par, "hello.rtf")
 {
+#if !defined WNT
     uno::Reference<text::XTextDocument> xTextDocument(mxComponent, 
uno::UNO_QUERY);
     uno::Reference<text::XTextRange> xText(xTextDocument->getText(), 
uno::UNO_QUERY);
     uno::Reference<text::XTextRange> xEnd = xText->getEnd();
     paste("tdf90260-par.rtf", xEnd);
     CPPUNIT_ASSERT_EQUAL(2, getParagraphs());
+#endif
 }
 
 DECLARE_RTFIMPORT_TEST(testTdf86814, "tdf86814.rtf")
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits