summaryrefslogtreecommitdiff
path: root/svgio
diff options
context:
space:
mode:
authorXisco Fauli <anistenis@gmail.com>2016-05-31 00:37:20 +0200
committerXisco FaulĂ­ <anistenis@gmail.com>2016-05-31 07:39:05 +0000
commit5d613f920510a5a16ddb50c1577d8c29f1a8e069 (patch)
tree7090fb06afee2bd3759973db927a1e8ca7c873ed /svgio
parentbe0c898587f9464cd7a11be5e6b1d4e8dbd078d8 (diff)
SVGIO: Add support for "inherit" in font-family
Change-Id: I180ab3b119af124d2d1113df055986168d39d30d Reviewed-on: https://gerrit.libreoffice.org/25694 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Xisco FaulĂ­ <anistenis@gmail.com>
Diffstat (limited to 'svgio')
-rw-r--r--svgio/source/svgreader/svgstyleattributes.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index db20d64902f8..59c0d465f02b 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2334,7 +2334,7 @@ namespace svgio
const SvgStringVector& SvgStyleAttributes::getFontFamily() const
{
- if(!maFontFamily.empty())
+ if(!maFontFamily.empty() && !maFontFamily[0].startsWith("inherit"))
{
return maFontFamily;
}