sw/source/core/doc/DocumentStylePoolManager.cxx | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
New commits:
commit a25c88daab20f1b7fc82b54171f260c4f20b9ba0
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Thu Feb 24 10:11:18 2022 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Feb 25 11:44:07 2022 +0100
Resolves tdf#142423 - Use absolute values for Writer styles
Avoid rounding trouble when converting to DOCX
Change-Id: Ie30f66671654b64b0b2596b14dc89d6f9befa8d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130475
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
(cherry picked from commit 3c94c670fa3c3a4e00e88de7463c5e35f32b866e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130455
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index f5d2aa7918df..42e05e0a9aad 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -88,8 +88,10 @@ namespace
const sal_uInt16 PT_3 = 3 * 20; // 3 pt
const sal_uInt16 PT_6 = 6 * 20; // 6 pt
const sal_uInt16 PT_7 = 7 * 20; // 7 pt
+ const sal_uInt16 PT_9 = 9 * 20; // 9 pt
const sal_uInt16 PT_10 = 10 * 20; // 10 pt
const sal_uInt16 PT_12 = 12 * 20; // 12 pt
+ const sal_uInt16 PT_13 = 13 * 20; // 13 pt
const sal_uInt16 PT_14 = 14 * 20; // 14 pt
const sal_uInt16 PT_16 = 16 * 20; // 16 pt
const sal_uInt16 PT_18 = 18 * 20; // 18 pt
@@ -100,8 +102,9 @@ namespace
const sal_uInt16 aHeadlineSizes[ 2 * MAXLEVEL ] = {
// we do everything percentual now:
- 130, 115, 101, 95, 85,
- 85, 80, 80, 75, 75, // normal
+ PT_18, PT_16, PT_14, PT_13, PT_12,
+ PT_12, PT_10, PT_10, PT_9, PT_9, // normal
+
PT_24, PT_18, PT_14, PT_12, PT_10,
PT_7, PT_7, PT_7, PT_7, PT_7 // HTML mode
};
@@ -180,7 +183,7 @@ namespace
if( bHTMLMode )
aHItem.SetHeight( aHeadlineSizes[ MAXLEVEL + nLevel ] );
else
- aHItem.SetHeight( PT_14, aHeadlineSizes[ nLevel ] );
+ aHItem.SetHeight( aHeadlineSizes[ nLevel ] );
SetAllScriptItem( rSet, aHItem );
if( bItalic && !bHTMLMode )
