From eab89b7f024a8c86decdcb3362c40c40a7df37df Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 26 Jun 2015 09:02:31 +0200 Subject: [PATCH] tdf#89890 DOCX import: fix too large num pic bullet Reading SwWW8ImplReader::CoreLoad()'s "update graphic bullet information" block, it turns out that the numbering picture bullet's height should be independent from the supplied bitmap, and only its aspect ratio should be respected. Change-Id: I1300aa0397a8098df2a3170af795fbba47fd2a9e Reviewed-on: https://gerrit.libreoffice.org/16500 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- sw/qa/extras/ooxmlexport/data/tdf89890.docx | Bin 0 -> 41925 bytes sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 23 ++++++++++++++++++ sw/qa/extras/ooxmlexport/ooxmlexport4.cxx | 2 +- .../source/dmapper/NumberingManager.cxx | 14 +++++++++++ 4 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 sw/qa/extras/ooxmlexport/data/tdf89890.docx diff --git a/sw/qa/extras/ooxmlexport/data/tdf89890.docx b/sw/qa/extras/ooxmlexport/data/tdf89890.docx new file mode 100644 index 0000000000000000000000000000000000000000..8b3e8ebe189bf24c4ca27fe98a0063a39d7d0a08 GIT binary patch literal 41925 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, xDrawPage->getCount()); } +DECLARE_OOXMLEXPORT_TEST(testTdf89890, "tdf89890.docx") +{ + // Numbering picture bullet was too large. + uno::Reference xPropertySet(getStyles("NumberingStyles")->getByName("WWNum1"), uno::UNO_QUERY); + uno::Reference xLevels(xPropertySet->getPropertyValue("NumberingRules"), uno::UNO_QUERY); + uno::Sequence aProps; + xLevels->getByIndex(0) >>= aProps; // 1st level + + bool bFound = false; + for (int i = 0; i < aProps.getLength(); ++i) + { + const beans::PropertyValue& rProp = aProps[i]; + + if (rProp.Name == "GraphicSize") + { + // Height of the graphic was too large: 4382 after import, then 2485 after roundtrip. + CPPUNIT_ASSERT_EQUAL(static_cast(279), rProp.Value.get().Height); + bFound = true; + } + } + CPPUNIT_ASSERT(bFound); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx index cfeea16433b8..f14190096e50 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx @@ -353,7 +353,7 @@ DECLARE_OOXMLEXPORT_TEST(testFDO74215, "FDO74215.docx") xmlDocPtr pXmlDoc = parseExport("word/numbering.xml"); if (!pXmlDoc) return; - assertXPath(pXmlDoc, "/w:numbering/w:numPicBullet[2]/w:pict/v:shape", "style", "width:6.4pt;height:6.4pt"); + assertXPath(pXmlDoc, "/w:numbering/w:numPicBullet[2]/w:pict/v:shape", "style", "width:7.9pt;height:7.9pt"); } DECLARE_OOXMLEXPORT_TEST(testColumnBreak_ColumnCountIsZero,"fdo74153.docx") diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 4d4dae12f7bb..8d93fb8aa0cc 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -859,6 +859,20 @@ void ListsManager::lcl_sprm( Sprm& rSprm ) case NS_ooxml::LN_CT_NumPicBullet_pict: { uno::Reference xShape = m_rDMapper.PopPendingShape(); + + // Respect only the aspect ratio of the picture, not its size. + awt::Size aPrefSize = xShape->getSize(); + // See SwDefBulletConfig::InitFont(), default height is 14. + const int nFontHeight = 14; + // Point -> mm100. + const int nHeight = nFontHeight * 35; + if (aPrefSize.Height * aPrefSize.Width != 0) + { + int nWidth = (nHeight * aPrefSize.Width) / aPrefSize.Height; + awt::Size aSize(nWidth, nHeight); + xShape->setSize(aSize); + } + m_pCurrentNumPicBullet->SetShape(xShape); } break;