From ded5b1ecdef42fab84fa57ab504b4cc006a4df91 Mon Sep 17 00:00:00 2001 From: Umesh Kadam Date: Fri, 18 Jul 2014 13:02:19 +0530 Subject: fdo#78301 : Size of word-arts change during import. - Do not resize the fallback geometry for Word-Arts(VML), since the overlay geometry is constructed using the properties of the fallback geometry. - The resize autoshape to fit text attr of FontWork/Word-Art should always be false for the fallback geometry(the SdrObject). Change-Id: If8badb382c525875a07a0a9e6268cec036739001 Reviewed-on: https://gerrit.libreoffice.org/10486 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- sw/qa/extras/ooxmlimport/data/WordArt.docx | Bin 0 -> 10417 bytes sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 15 +++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 sw/qa/extras/ooxmlimport/data/WordArt.docx (limited to 'sw') diff --git a/sw/qa/extras/ooxmlimport/data/WordArt.docx b/sw/qa/extras/ooxmlimport/data/WordArt.docx new file mode 100644 index 000000000000..3960a15aadf4 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/WordArt.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index eca47da487e2..371b303b8ef0 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -982,6 +982,21 @@ DECLARE_OOXMLIMPORT_TEST(testN792778, "n792778.docx") CPPUNIT_ASSERT_EQUAL(sal_Int32(11684), xInnerShape->getPosition().Y); } +DECLARE_OOXMLIMPORT_TEST(testWordArtResizing, "WordArt.docx") +{ + /* The Word-Arts and watermarks were getting resized automatically, It was as if they were + getting glued to the fallback geometry(the sdrObj) and were getting bound to the font size. + The test-case esures the original height and width of the word-art is not changed while importing*/ + + uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xDrawPage(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount()); + + uno::Reference xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(10105), xShape->getSize().Width); + CPPUNIT_ASSERT_EQUAL(sal_Int32(4755), xShape->getSize().Height); +} + DECLARE_OOXMLIMPORT_TEST(testGroupshapeLine, "groupshape-line.docx") { /* -- cgit