summaryrefslogtreecommitdiff
path: root/sw/qa/extras/ooxmlimport
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-08-22 16:42:52 +0200
committerMiklos Vajna <vmiklos@suse.cz>2013-08-22 16:48:41 +0200
commit84184f957d004e1f7b7a361935d34b1fc2af51d6 (patch)
treee8b98ea832c29776fad7b8fcf64e0fa96f65e437 /sw/qa/extras/ooxmlimport
parentf2bfb0d4a4b206852c811b18b25ca508a40aee7f (diff)
DOCX tests: move testTableFloatingMargins to the export suite
This was added to the import suite temporarily, to be sure the import part does not regress till the export part passes, which is now the case. Change-Id: Ib9291ab3ef0beaa407f025c6f81bda9cdf9f75e9
Diffstat (limited to 'sw/qa/extras/ooxmlimport')
-rwxr-xr-xsw/qa/extras/ooxmlimport/data/table-floating-margins.docxbin14346 -> 0 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx14
2 files changed, 0 insertions, 14 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/table-floating-margins.docx b/sw/qa/extras/ooxmlimport/data/table-floating-margins.docx
deleted file mode 100755
index 81f6f6cf1ffa..000000000000
--- a/sw/qa/extras/ooxmlimport/data/table-floating-margins.docx
+++ /dev/null
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 524ef5896f66..f9d341603825 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -128,7 +128,6 @@ public:
void testFdo66474();
void testGroupshapeRotation();
void testBnc780044Spacing();
- void testTableFloatingMargins();
CPPUNIT_TEST_SUITE(Test);
#if !defined(MACOSX) && !defined(WNT)
@@ -222,7 +221,6 @@ void Test::run()
{"fdo66474.docx", &Test::testFdo66474},
{"groupshape-rotation.docx", &Test::testGroupshapeRotation},
{"bnc780044_spacing.docx", &Test::testBnc780044Spacing},
- {"table-floating-margins.docx", &Test::testTableFloatingMargins},
};
header();
for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1552,18 +1550,6 @@ void Test::testBnc780044Spacing()
CPPUNIT_ASSERT_EQUAL(sal_Int16(1), xCursor->getPage());
}
-void Test::testTableFloatingMargins()
-{
- // In case the table had custom left cell margin, the horizontal position was still incorrect (too small, -199).
- uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY);
- uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY);
- uno::Reference<beans::XPropertySet> xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY);
- CPPUNIT_ASSERT_EQUAL(sal_Int32(-499), getProperty<sal_Int32>(xFrame, "HoriOrientPosition"));
- // These were 0 as well, due to lack of import.
- CPPUNIT_ASSERT_EQUAL(sal_Int32(1000), getProperty<sal_Int32>(xFrame, "TopMargin"));
- CPPUNIT_ASSERT_EQUAL(sal_Int32(2000), getProperty<sal_Int32>(xFrame, "BottomMargin"));
-}
-
CPPUNIT_TEST_SUITE_REGISTRATION(Test);
CPPUNIT_PLUGIN_IMPLEMENT();