[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - svgio/source

[Xisco Fauli]

 svgio/source/svgreader/svgstyleattributes.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 897f9e6eff9f0f0a40b6abb5f6a93d7ebcc7fad5
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Tue May 31 00:37:20 2016 +0200

    SVGIO: Add support for "inherit" in font-family
    
    Change-Id: I180ab3b119af124d2d1113df055986168d39d30d
    Reviewed-on: https://gerrit.libreoffice.org/25694
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Xisco Faulí <anistenis at gmail.com>
    (cherry picked from commit 5d613f920510a5a16ddb50c1577d8c29f1a8e069)
    Reviewed-on: https://gerrit.libreoffice.org/25729
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index ff4a185..8be96e6 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;
             }