From 6cef4a01e0ef59cd025cf3ee3e5d93eb0a89dda1 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 26 Jun 2015 09:02:31 +0200 Subject: 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. (cherry picked from commit eab89b7f024a8c86decdcb3362c40c40a7df37df) Change-Id: I1300aa0397a8098df2a3170af795fbba47fd2a9e Reviewed-on: https://gerrit.libreoffice.org/16502 Tested-by: Jenkins Reviewed-by: Christian Lohmaier --- writerfilter/source/dmapper/NumberingManager.cxx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx index 481dbdf317ea..b19b8618b2f7 100644 --- a/writerfilter/source/dmapper/NumberingManager.cxx +++ b/writerfilter/source/dmapper/NumberingManager.cxx @@ -887,6 +887,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; -- cgit