diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-12-07 16:09:47 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2017-12-08 21:18:13 +0100 |
| commit | 4ac38b5689458f6dc0da313fbd24b8b462cbcc78 (patch) | |
| tree | 1b098482e62e667f30b378796190761ea47b9d23 /filter | |
| parent | 84b4aae808d904325c841c3b3e778d8bc4769dab (diff) | |
tdf#114308 Export Watermark size as is
* refactoring
* removed size hack
* export/import "trim" attribute
* DOC: export set of parameters to fit shape & frame
Change-Id: Ib00654626ae1e10ac5110d22eada7528e03357e7
Reviewed-on: https://gerrit.libreoffice.org/46036
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
(cherry picked from commit 09da6dfcfb732dd621670f2b919eb5b5bf09b7ec)
Reviewed-on: https://gerrit.libreoffice.org/46107
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 4 | ||||
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 128d1556b4c6..63464150d7be 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -3475,7 +3475,9 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT } // Use gtextFStretch for Watermark like MSO does - nTextPathFlags |= use_gtextFStretch | gtextFStretch; + nTextPathFlags |= use_gtextFBestFit | gtextFBestFit + | use_gtextFStretch | gtextFStretch + | use_gtextFShrinkFit | gtextFShrinkFit; if ( nTextPathFlags != nTextPathFlagsOrg ) AddOpt( DFF_Prop_gtextFStrikethrough, nTextPathFlags ); diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index a90109396b45..1c1243f33fb2 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4441,13 +4441,7 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r sal_Int32 nPaddingY = aObjData.aBoundRect.getHeight() - nNewHeight; if ( nPaddingY > 0 ) - { - // Remember that value because original size have to be exported - aSet.Put( SdrMetricItem( SDRATTR_TEXT_UPPERDIST, nPaddingY ) ); aObjData.aBoundRect.setHeight( nNewHeight ); - } - else - aSet.Put( SdrMetricItem( SDRATTR_TEXT_UPPERDIST, 0 ) ); } } pRet->SetMergedItemSet( aSet ); |