filter/source/msfilter/msdffimp.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit cee6f65b0b03263b8706ae2797e07b67a0ccab89 Author: Szymon KÅos <szymon.k...@collabora.com> Date: Thu Oct 26 18:13:05 2017 +0200 tdf#113162 corect the size only for watermark 2 Missing part for: 91d909ac8ec53ea135401babe8227f9c41b779b8 Change-Id: Id35d61084e034c7381c8e8016e50dd66aaf41d59 Reviewed-on: https://gerrit.libreoffice.org/43915 Reviewed-by: Szymon KÅos <szymon.k...@collabora.com> Tested-by: Szymon KÅos <szymon.k...@collabora.com> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index bd5e717ef2e3..5f2dab8ec0f2 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4420,7 +4420,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r aFont.SetFamilyName( aFontName ); auto nTextWidth = pOut->GetTextWidth( aObjectText ); - if ( nTextWidth && aObjData.eShapeType == mso_sptTextPlainText ) + OUString aObjName = GetPropertyString(DFF_Prop_wzName, rSt); + if ( nTextWidth && aObjData.eShapeType == mso_sptTextPlainText && aObjName.match("PowerPlusWaterMarkObject")) { fRatio = aFont.GetFontSize().Height(); fRatio /= nTextWidth;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits