diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-02 08:54:59 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2018-04-03 09:43:56 +0200 |
| commit | b9955b2083ffdc1f99bc8be6b09d806fa3279a16 (patch) | |
| tree | 8deabb3c56c55833392d8454feac519740caaafd /sw/source/filter/ww8/ww8par6.cxx | |
| parent | 14198f2191f216592f00b72221771704b3ce4636 (diff) | |
tdf#93173: Remove arbitrary line spacing limit
OASIS Open Document Format for Office Applications (OpenDocument) v.1.2
doesn't limit the value of fo:line-height. But we have arbitrary limits
in proportional mode for both minimal (50%) and maximal (200%) values.
The implementation uses sal_uInt16 to store the value, so fix places
where sal_uInt8 was unreasonably used to set it, change the upper limit
to max sal_uInt16 value, and set lower limit to 6% (to match Word's
minimal factor of 0.06).
Change-Id: I4c2ac5f0acf65d7573328e71bcf36ac9abb5ffd5
Reviewed-on: https://gerrit.libreoffice.org/52252
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'sw/source/filter/ww8/ww8par6.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 2f6e45f1d373..353e0226dad5 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -4224,9 +4224,8 @@ void SwWW8ImplReader::Read_LineSpace( sal_uInt16, const sal_uInt8* pData, short { long n = nSpace * 10 / 24; // WW: 240 = 100%, SW: 100 = 100% - // as discussed with AMA, the limit is nonsensical - if( n>200 ) n = 200; // SW_UI maximum - aLSpc.SetPropLineSpace( static_cast<sal_uInt8>(n) ); + if( n>SAL_MAX_UINT16 ) n = SAL_MAX_UINT16; + aLSpc.SetPropLineSpace( static_cast<sal_uInt16>(n) ); const SvxFontHeightItem* pH = static_cast<const SvxFontHeightItem*>( GetFormatAttr( RES_CHRATR_FONTSIZE )); nSpaceTw = static_cast<sal_uInt16>( n * pH->GetHeight() / 100 ); |