diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2022-06-18 19:45:02 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2022-06-19 21:48:40 +0200 |
| commit | 352284e77f905bc5f09c1dfdab35059e0a3de6bf (patch) | |
| tree | 16b73c9a2480495b4b795f2fbcff8ceed2021438 | |
| parent | 994ff7a1d36382c21cff34f7a89b2b6690f2edd5 (diff) | |
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.behrens@allotropia.de>
| -rw-r--r-- | cui/source/tabpages/paragrph.cxx | 3 | ||||
| -rw-r--r-- | svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 2 |
3 files changed, 3 insertions, 4 deletions
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 |