cui/source/tabpages/paragrph.cxx | 3 +-- svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 2 +- svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
New commits: commit fee9ef889ac85c6758aef9fb2b8101424cf3c870 Author: Gabor Kelemen <kelem...@ubuntu.com> AuthorDate: Sat Jun 18 19:45:02 2022 +0200 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Mon Jun 20 10:06:50 2022 +0200 tdf#68335 Increase default para spacing before/after to 56 cm and fixed line spacing as well. These may be set to 1584 pt in Word, but the UI incorrectly showed even the correctly imported values as 10 cm. Turns out this is only a UI limitation, so lift it for UX interop. Save/reload already works fine to odt, docx, doc, rtf formats. Change-Id: I69a772e860ad24a1b317dc041b0c55f0a9d461de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136102 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> (cherry picked from commit a8b704e1367b61119b5747e32fda3088bd8d0a18) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136124 Reviewed-by: Caolán McNamara <caol...@redhat.com> diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 0a0cb96487d8..b43c77cbd894 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -65,8 +65,7 @@ const WhichRangesContainer SvxExtParagraphTabPage::pExtRanges(svl::Items< SID_ATTR_PARA_MODEL, SID_ATTR_PARA_KEEP // 10065 - 10066 >); -#define MAX_DURCH 5670 // 10 cm makes sense as maximum interline lead - // according to BP +#define MAX_DURCH 31680 // tdf#68335: 1584 pt for UX interoperability with Word #define FIX_DIST_DEF 283 // standard fix distance 0,5 cm namespace { diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 77962e065aeb..f4e2fd83bb52 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -38,7 +38,7 @@ using namespace css::uno; namespace svx::sidebar { #define DEFAULT_VALUE 0 -#define MAX_DURCH 5670 +#define MAX_DURCH 31680 // tdf#68335: 1584 pt for UX interoperability with Word #define MAX_SW 1709400 #define MAX_SC_SD 116220200 diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index 917933018f9f..fa164dd024c6 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -28,7 +28,7 @@ using namespace svx; #define DEFAULT_VALUE 0 -#define MAX_DURCH 5670 +#define MAX_DURCH 31680 // tdf#68335: 1584 pt for UX interoperability with Word #define MAX_SW 1709400 #define MAX_SC_SD 116220200 #define NEGA_MAXVALUE -10000000