summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-06 15:36:41 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-06 15:45:29 +0100
commitc244e2e2d64ee88e0e3f44f573247c8ce566e190 (patch)
treef4584ec1f4ca9acdcf3c6b68798ef6ea65ae57e5
parent2e06cfc1b4e774602096f4c7241e476523283a93 (diff)
Fix cherry-pick mis-merge
82c01116a7df315b78bfd3af6ccd936572b45d78 "bnc#636128 DOC filter: fix handling of FFData.cch" Change-Id: I7d26c5950c3265db10e1611402ab3b63abbe2d4a
-rw-r--r--sw/qa/extras/ww8export/ww8export.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index 3a9cf7cac62f..050b2707b60e 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();