diff options
| author | Tünde Tóth <toth.tunde@nisz.hu> | 2022-02-18 10:30:54 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2022-02-28 15:39:07 +0100 |
| commit | 7d6212e218d4d5c76c8bc60983b548a6893fc6a5 (patch) | |
| tree | ac923f849eb196062ccfdee41af7a1de197dcdb6 /oox/inc | |
| parent | f29c14e8c36819296d0c66bb995201acf0a2647e (diff) | |
tdf#103800 PPTX shape import: fix regression of text color
defined by list styles. Properties in a:lstStyle of p:txBody
should take precedence over the same properties defined in
a:fontRef of style elements.
Change-Id: I02cc886eb9eba94f49fe413a63bf7c46c9e3c127
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130237
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox/inc')
| -rw-r--r-- | oox/inc/drawingml/textparagraph.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/oox/inc/drawingml/textparagraph.hxx b/oox/inc/drawingml/textparagraph.hxx index 021434d6a5fb..1f43249372a5 100644 --- a/oox/inc/drawingml/textparagraph.hxx +++ b/oox/inc/drawingml/textparagraph.hxx @@ -63,6 +63,7 @@ public: TextCharacterProperties getCharacterStyle( const TextCharacterProperties& rTextStyleProperties, + const TextListStyle& rMasterTextListStyle, const TextListStyle& rTextListStyle) const; TextParagraphProperties* getParagraphStyle( @@ -73,6 +74,7 @@ public: const css::uno::Reference < css::text::XText > & xText, const css::uno::Reference < css::text::XTextCursor > &xAt, const TextCharacterProperties& rTextStyleProperties, + const TextListStyle& rMasterTextListStyle, const TextListStyle& rTextListStyle, bool bFirst, float nDefaultCharHeight) const; |