summaryrefslogtreecommitdiff
path: root/sw/qa
diff options
context:
space:
mode:
Diffstat (limited to 'sw/qa')
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport19.cxx17
-rw-r--r--sw/qa/extras/ooxmlimport/data/A019_min.docx (renamed from sw/qa/extras/ooxmlexport/data/A019_min.docx)bin15478 -> 15478 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport2.cxx20
3 files changed, 20 insertions, 17 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport19.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport19.cxx
index 1e5552b7a4b5..ef8da13a9f15 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport19.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport19.cxx
@@ -1280,23 +1280,6 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf148952_2010)
CPPUNIT_ASSERT_EQUAL(u"Black"_ustr, title);
}
-DECLARE_OOXMLEXPORT_TEST(testTdf153196, "A019_min.docx")
-{
- uno::Reference<beans::XPropertySet> xPageStyle;
- getStyles("PageStyles")->getByName("Converted1") >>= xPageStyle;
- sal_Int32 nLeftMargin{};
- xPageStyle->getPropertyValue("LeftMargin") >>= nLeftMargin;
- // Without the accompanying fix in place, this test would have failed with:
- // - Expected: 4265
- // - Actual : 0
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4265), nLeftMargin);
- sal_Int32 nRightMargin{};
- xPageStyle->getPropertyValue("RightMargin") >>= nRightMargin;
- // - Expected: 0
- // - Actual : 4265
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), nRightMargin);
-}
-
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/extras/ooxmlexport/data/A019_min.docx b/sw/qa/extras/ooxmlimport/data/A019_min.docx
index c7c0c890accf..c7c0c890accf 100644
--- a/sw/qa/extras/ooxmlexport/data/A019_min.docx
+++ b/sw/qa/extras/ooxmlimport/data/A019_min.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 9e5daa6dab96..38ac0159960c 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -1333,6 +1333,26 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf154370)
CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DIRECT_VALUE, ePropertyState);
}
}
+
+CPPUNIT_TEST_FIXTURE(Test, testTdf153196)
+{
+ createSwDoc("A019_min.docx");
+
+ uno::Reference<beans::XPropertySet> xPageStyle;
+ getStyles("PageStyles")->getByName("Converted1") >>= xPageStyle;
+ sal_Int32 nLeftMargin{};
+ xPageStyle->getPropertyValue("LeftMargin") >>= nLeftMargin;
+ // Without the accompanying fix in place, this test would have failed with:
+ // - Expected: 4265
+ // - Actual : 0
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(4265), nLeftMargin);
+ sal_Int32 nRightMargin{};
+ xPageStyle->getPropertyValue("RightMargin") >>= nRightMargin;
+ // - Expected: 0
+ // - Actual : 4265
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), nRightMargin);
+}
+
// tests should only be added to ooxmlIMPORT *if* they fail round-tripping in ooxmlEXPORT
} // end of anonymous namespace