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

New commits:
commit 2662df924f7d5e2d65ec727be99e39c18e1e3e7b
Author: Joren De Cuyper <jore...@libreoffice.org>
Date:   Tue Jul 22 17:33:03 2014 +0200

    Fix build: incorrect revertion svgio
    
    Incorrect revertion in commit 3d3401a6397e893808309ec374f5d8f890144906
    
    Change-Id: If4abac2670b083ebbc75c2fe06ae9e100072ef00
    Reviewed-on: https://gerrit.libreoffice.org/10466
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/svgio/source/svgreader/svgstyleattributes.cxx 
b/svgio/source/svgreader/svgstyleattributes.cxx
index 9c24753..cece396 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -208,7 +208,7 @@ namespace svgio
                 return getCssStyleParent();
             }
 
-            if(mrOwner.getParent())
+            if(mrOwner.supportsParentStyle() && mrOwner.getParent())
             {
                 return mrOwner.getParent()->getSvgStyleAttributes();
             }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to