diff options
author | Khaled Hosny <khaled@libreoffice.org> | 2023-07-25 17:18:48 +0300 |
---|---|---|
committer | خالد حسني <khaled@libreoffice.org> | 2023-07-26 04:19:12 +0200 |
commit | 24d0a62bd75b9a895c419aa165da648ab18f134d (patch) | |
tree | b5f77f44b89dfe489c2a4eee8b1fa4819681a97e /sw/source/core/edit/edfcol.cxx | |
parent | ba57377698e7453638233524bc38e6bada5cd7e0 (diff) |
tdf#156368: Fix setting watermark font for CJK/CTL text
We were setting only Western font when getting the shape, so if there is
no Western characters in the text the default font would be used. There
is no separate setting for CJK/CTL fonts, so we sets the same font for
all the three.
Change-Id: If2ba2a206f95e0efe9139b9d092b1d6dbf05967c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154894
Tested-by: Jenkins
Reviewed-by: خالد حسني <khaled@libreoffice.org>
Diffstat (limited to 'sw/source/core/edit/edfcol.cxx')
-rw-r--r-- | sw/source/core/edit/edfcol.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 2d7f1e4f5884..9462de2f16bb 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -1578,6 +1578,8 @@ static void lcl_placeWatermarkInHeader(const SfxWatermarkItem& rWatermark, xPropertySet->setPropertyValue(UNO_NAME_HORI_ORIENT_RELATION, uno::Any(text::RelOrientation::PAGE_PRINT_AREA)); xPropertySet->setPropertyValue(UNO_NAME_VERT_ORIENT_RELATION, uno::Any(text::RelOrientation::PAGE_PRINT_AREA)); xPropertySet->setPropertyValue(UNO_NAME_CHAR_FONT_NAME, uno::Any(sFont)); + xPropertySet->setPropertyValue(UNO_NAME_CHAR_FONT_NAME_ASIAN, uno::Any(sFont)); + xPropertySet->setPropertyValue(UNO_NAME_CHAR_FONT_NAME_COMPLEX, uno::Any(sFont)); xPropertySet->setPropertyValue(UNO_NAME_CHAR_HEIGHT, uno::Any(WATERMARK_AUTO_SIZE)); xPropertySet->setPropertyValue("Transformation", uno::Any(aMatrix)); |