diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2019-01-07 16:32:18 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-07 17:29:44 +0100 |
| commit | 5dfd5755c709e91d2903bd7be4582f7832e89780 (patch) | |
| tree | 8042e24eca1006518f9b312b09281f61f203ad0c /oox/source | |
| parent | c5a7e5d9348d809a61449226ac4169619f89a904 (diff) | |
oox smartart, org chart: fix font color when defined with quick styles
createStyleMatrixContext() assumed that <dgm:style> contains
<dgm:fontRef>, but it contains <a:fontRef> instead.
This resulted in a 0 mnThemedIdx, which meant that since commit
89206c472ecf18bfde6824cea8004921cd404365 (bnc#862510: PPTX import: Wrong
text color inside shape, 2014-12-21) we ignored the theme color in
oox::drawingml::Shape::createAndInsert().
Change-Id: I81045fa58df5cb9e31a4ed3f1b1625224bcd06ad
Reviewed-on: https://gerrit.libreoffice.org/65938
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'oox/source')
| -rw-r--r-- | oox/source/drawingml/diagram/diagramfragmenthandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx index 402c6cccea7b..c30aee51eaae 100644 --- a/oox/source/drawingml/diagram/diagramfragmenthandler.cxx +++ b/oox/source/drawingml/diagram/diagramfragmenthandler.cxx @@ -111,7 +111,7 @@ DiagramQStylesFragmentHandler::DiagramQStylesFragmentHandler( XmlFilterBase& rFi const AttributeList& rAttribs, ShapeStyleRef& o_rStyle ) { - o_rStyle.mnThemedIdx = (nElement == DGM_TOKEN(fontRef)) ? + o_rStyle.mnThemedIdx = (nElement == A_TOKEN(fontRef)) ? rAttribs.getToken( XML_idx, XML_none ) : rAttribs.getInteger( XML_idx, 0 ); return new ColorContext( *this, o_rStyle.maPhClr ); } |