summaryrefslogtreecommitdiff
path: root/filter
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2017-10-26 18:13:05 +0200
committerAndras Timar <andras.timar@collabora.com>2017-10-31 10:06:40 +0100
commitd4a84bf09c42faa7e0954477834cd4c4e83248f5 (patch)
treebf5bd49449f4e96fd233751bdadcfda322217bc0 /filter
parent3d454b7496d256140ab16a6e5c93f2c10aed3c1a (diff)
tdf#113162 corect the size only for watermark 2
Missing part for: 91d909ac8ec53ea135401babe8227f9c41b779b8 Change-Id: Id35d61084e034c7381c8e8016e50dd66aaf41d59 Reviewed-on: https://gerrit.libreoffice.org/43950 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'filter')
-rw-r--r--filter/source/msfilter/msdffimp.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 6e92dfe58c56..1a8d53138700 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4416,7 +4416,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;