From d6ee755e35fbe9017aea9c5c908b3cbd4076e056 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Mon, 10 Feb 2014 12:41:39 +0100 Subject: [PATCH] drawingML import: ignore zero relative size Zero means ignore me, use absolute size in this context. Change-Id: I872810a9abf9e25c576f483a77494e1b87f3510a --- .../data/dml-rectangle-relsize.docx | Bin 14807 -> 17858 bytes sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 5 ++++- writerfilter/source/dmapper/GraphicImport.cxx | 9 ++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx b/sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx index 391d737bf1247fa2849df12bdbca43f9a7f152dd..265dcbb4ee77ee5d79e7a3c7bd86ad4d47383267 100644 GIT binary patch literal 17858 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.Height); + CPPUNIT_ASSERT(getShape(1)->getSize().Height > 21000); + + // This was around 0: relative size of 0% was imported as 0, not "fall back to absolute size". + CPPUNIT_ASSERT(getShape(2)->getSize().Height > 300); } DECLARE_OOXMLEXPORT_TEST(testGradientFillPreservation, "gradient-fill-preservation.docx") diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 9528cd543ef3..2009bf54c851 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -955,9 +955,12 @@ void GraphicImport::lcl_sprm(Sprm & rSprm) sal_Int16 nPositivePercentage = rtl::math::round(m_pImpl->m_rPositivePercentages.front().toDouble() / oox::drawingml::PER_PERCENT); m_pImpl->m_rPositivePercentages.pop(); - uno::Reference xPropertySet(m_xShape, uno::UNO_QUERY); - OUString aProperty = nSprmId == NS_ooxml::LN_CT_SizeRelH_pctWidth ? OUString("RelativeWidth") : OUString("RelativeHeight"); - xPropertySet->setPropertyValue(aProperty, uno::makeAny(nPositivePercentage)); + if (nPositivePercentage) + { + uno::Reference xPropertySet(m_xShape, uno::UNO_QUERY); + OUString aProperty = nSprmId == NS_ooxml::LN_CT_SizeRelH_pctWidth ? OUString("RelativeWidth") : OUString("RelativeHeight"); + xPropertySet->setPropertyValue(aProperty, uno::makeAny(nPositivePercentage)); + } } break; case 0x271b: