diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-10-26 18:13:05 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-10-27 16:24:35 +0200 |
| commit | cee6f65b0b03263b8706ae2797e07b67a0ccab89 (patch) | |
| tree | 7bc9b3648116532e4a6b373a02668052a3a1d683 | |
| parent | 91263493eac70464fa6036cf9d8676e5ed452869 (diff) | |
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.klos@collabora.com>
Tested-by: Szymon Kłos <szymon.klos@collabora.com>
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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; |