diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2017-12-07 16:09:47 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-01-17 08:40:36 +0100 |
| commit | dd7dfd16ce50e12ebefe9f041908f775e729f3a8 (patch) | |
| tree | 7b1166df7b7da17da386226edc7bf49f48de201c /filter | |
| parent | f2ed1dc45434e1ac96b6f86bbf341851aad60e18 (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>
Reviewed-on: https://gerrit.libreoffice.org/46154
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 1aca81256407be27fd4a7e027e27c51486c2dc31)
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 d315b41323e9..74fed8f9f290 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -3495,7 +3495,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 7e756a0aa714..9f7651e95d3f 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -4428,13 +4428,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 ); |