summaryrefslogtreecommitdiff
path: root/sw/qa/extras
diff options
context:
space:
mode:
Diffstat (limited to 'sw/qa/extras')
-rw-r--r--sw/qa/extras/ooxmlexport/data/fdo68787.docx (renamed from sw/qa/extras/ooxmlimport/data/fdo68787.docx)bin14436 -> 14436 bytes
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport.cxx9
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx9
3 files changed, 9 insertions, 9 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/fdo68787.docx b/sw/qa/extras/ooxmlexport/data/fdo68787.docx
index c47b80995848..c47b80995848 100644
--- a/sw/qa/extras/ooxmlimport/data/fdo68787.docx
+++ b/sw/qa/extras/ooxmlexport/data/fdo68787.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 1445cccceb11..5dc83f5b2d1a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -115,6 +115,7 @@ public:
void testBnc834035();
void testFdo68418();
void testA4AndBorders();
+ void testFdo68787();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -206,6 +207,7 @@ void Test::run()
{"bnc834035.odt", &Test::testBnc834035},
{"fdo68418.docx", &Test::testFdo68418},
{"a4andborders.docx", &Test::testA4AndBorders},
+ {"fdo68787.docx", &Test::testFdo68787},
};
// Don't test the first import of these, for some reason those tests fail
const char* aBlacklist[] = {
@@ -1264,6 +1266,13 @@ void Test::testA4AndBorders()
CPPUNIT_ASSERT_EQUAL_MESSAGE("Incorrect Page Height (mm)", sal_Int32(297), getProperty<sal_Int32>(xPageStyle, "Height") / 100);
}
+void Test::testFdo68787()
+{
+ uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+ // This was 25, the 'lack of w:separator' <-> '0 line width' mapping was missing.
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPageStyle, "FootnoteLineRelativeWidth"));
+}
+
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index bfae9a30da3c..973f3b193db5 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -131,7 +131,6 @@ public:
void testTableStyleParprop();
void testTablePagebreak();
void testFdo68607();
- void testFdo68787();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -229,7 +228,6 @@ void Test::run()
{"table-style-parprop.docx", &Test::testTableStyleParprop},
{"table-pagebreak.docx", &Test::testTablePagebreak},
{"fdo68607.docx", &Test::testFdo68607},
- {"fdo68787.docx", &Test::testFdo68787},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1542,13 +1540,6 @@ void Test::testFdo68607()
CPPUNIT_ASSERT(getPages() > 1);
}
-void Test::testFdo68787()
-{
- uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
- // This was 25, the 'lack of w:separator' <-> '0 line width' mapping was missing.
- CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty<sal_Int32>(xPageStyle, "FootnoteLineRelativeWidth"));
-}
-
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();