diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-03-02 16:55:35 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-03-02 22:15:38 +0100 |
| commit | 8716721f4645078b04770271c71f7687a2b21e07 (patch) | |
| tree | 0b3d98081a9c5a116df090d5e250d6e6df984e3e /oox | |
| parent | 3cb30369d699a4836043d434833ba4c3d3d257c3 (diff) | |
Related: tdf#147283 set a concrete weight for the bullet font
otherwise it's unknown and on a glyph fallback the resolved true weight
won't match so glyph fallback cache can't be hit
Change-Id: I2dcce3dc1532e9ee00a1e1980752df9f5053c77c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130892
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/textparagraphproperties.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx index 70f1ac0c937b..75dbf6bcea4a 100644 --- a/oox/source/drawingml/textparagraphproperties.cxx +++ b/oox/source/drawingml/textparagraphproperties.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> +#include <com/sun/star/awt/FontWeight.hpp> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -303,6 +304,7 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P OUString aBulletFontName; sal_Int16 nBulletFontPitch = 0; sal_Int16 nBulletFontFamily = 0; + float nBulletFontWeight = css::awt::FontWeight::NORMAL; bool bSymbolFont = false; if( pFilterBase) { if (maBulletFont.getFontData( aBulletFontName, nBulletFontPitch, nBulletFontFamily, *pFilterBase ) ) @@ -316,6 +318,7 @@ void BulletList::pushToPropMap( const ::oox::core::XmlFilterBase* pFilterBase, P aFontDesc.Name = aBulletFontName; aFontDesc.Pitch = nBulletFontPitch; aFontDesc.Family = nBulletFontFamily; + aFontDesc.Weight = nBulletFontWeight; if ( aBulletFontName.equalsIgnoreAsciiCase("Wingdings") || aBulletFontName.equalsIgnoreAsciiCase("Wingdings 2") || aBulletFontName.equalsIgnoreAsciiCase("Wingdings 3") || |