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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 2 | ||||
| -rw-r--r-- | cui/uiconfig/ui/paraindentspacing.ui | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 61cdb6603321..8d00045bcebd 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -124,7 +124,7 @@ void SetLineSpace_Impl( SvxLineSpacingItem& rLineSpace, case LLINESPACE_PROP: rLineSpace.SetLineSpaceRule( SvxLineSpaceRule::Auto ); - rLineSpace.SetPropLineSpace( static_cast<sal_uInt8>(lValue) ); + rLineSpace.SetPropLineSpace( static_cast<sal_uInt16>(lValue) ); break; case LLINESPACE_MIN: diff --git a/cui/uiconfig/ui/paraindentspacing.ui b/cui/uiconfig/ui/paraindentspacing.ui index fa98c493d871..7bb095e945f0 100644 --- a/cui/uiconfig/ui/paraindentspacing.ui +++ b/cui/uiconfig/ui/paraindentspacing.ui @@ -14,8 +14,8 @@ <property name="page_increment">10</property> </object> <object class="GtkAdjustment" id="adjustmentLINEDISTPERCENT"> - <property name="lower">50</property> - <property name="upper">200</property> + <property name="lower">6</property> + <property name="upper">65535</property> <property name="value">100</property> <property name="step_increment">1</property> <property name="page_increment">10</property> |