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

[Stephan Bergmann]

 sw/qa/extras/ww8export/ww8export.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c244e2e2d64ee88e0e3f44f573247c8ce566e190
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Thu Nov 6 15:36:41 2014 +0100

    Fix cherry-pick mis-merge
    
    82c01116a7df315b78bfd3af6ccd936572b45d78 "bnc#636128 DOC filter: fix 
handling of FFData.cch"
    
    Change-Id: I7d26c5950c3265db10e1611402ab3b63abbe2d4a

diff --git a/sw/qa/extras/ww8export/ww8export.cxx 
b/sw/qa/extras/ww8export/ww8export.cxx
index 3a9cf7c..050b270 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -346,7 +346,6 @@ DECLARE_WW8EXPORT_TEST(testBorderColoursExport, 
"bordercolours.odt")
     CPPUNIT_ASSERT_BORDER_EQUAL(expectedBottom, border);
 #endif
 }
-#endif
 
 DECLARE_WW8EXPORT_TEST(testBnc636128, "bnc636128.doc")
 {
@@ -356,6 +355,7 @@ DECLARE_WW8EXPORT_TEST(testBnc636128, "bnc636128.doc")
     // This resulted in a container.NoSuchElementException.
     CPPUNIT_ASSERT_EQUAL(OUString("5"), 
xParameters->getByName("MaxLength").get<OUString>());
 }
+#endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits