From 5d613f920510a5a16ddb50c1577d8c29f1a8e069 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Tue, 31 May 2016 00:37:20 +0200 Subject: SVGIO: Add support for "inherit" in font-family MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I180ab3b119af124d2d1113df055986168d39d30d Reviewed-on: https://gerrit.libreoffice.org/25694 Tested-by: Jenkins Reviewed-by: Xisco FaulĂ­ --- svgio/source/svgreader/svgstyleattributes.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svgio') 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; } -- cgit