summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorRegényi Balázs <regenyi.balazs+gerrit@gmail.com>2020-04-28 09:18:24 +0200
committerLászló Németh <nemeth@numbertext.org>2020-04-29 16:20:37 +0200
commitd0124728059088cd72cb173e33df89d785ae2ab5 (patch)
tree919716b3acf8fc807095690f8a7660460479cb74 /oox
parent40613706f742541cce3ee53bf5398d815c1c5192 (diff)
tdf#132491 DOCX DrawingML shape import: fix missing underline color
The import of underline color was unhandled. Co-Author: Szabolcs Toth Change-Id: I47dce90966c7130ca67941ee47b0e4b2ba7eb972 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93108 Tested-by: Jenkins Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/textcharacterpropertiescontext.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 8c6eb4aee22a..8fecb8bd2735 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -201,6 +201,13 @@ ContextHandlerRef TextCharacterPropertiesContext::onCreateContext( sal_Int32 aEl
mrTextCharacterProperties.moUnderline = XML_dash;
else if (attrib == "none")
mrTextCharacterProperties.moUnderline = XML_none;
+ auto colorAttrib = rAttribs.getIntegerHex(W_TOKEN(color));
+ if (colorAttrib.has())
+ {
+ oox::drawingml::Color theColor;
+ theColor.setSrgbClr(colorAttrib.get());
+ mrTextCharacterProperties.maUnderlineColor = theColor;
+ }
break;
}
case W_TOKEN( spacing ):