|
 |
6d8dfbe |
From 5903235d57acb13d9d5286d23b443a01aeab9a3c Mon Sep 17 00:00:00 2001
|
|
|
6d8dfbe |
From: Xisco Fauli <anistenis@gmail.com>
|
|
|
6d8dfbe |
Date: Fri, 16 Dec 2016 14:52:18 +0100
|
|
|
6d8dfbe |
Subject: [PATCH] tdf#104339 Partially revert
|
|
|
6d8dfbe |
d5649ae7b76278cb3155f951d6327157c7c92b65
|
|
|
6d8dfbe |
MIME-Version: 1.0
|
|
|
6d8dfbe |
Content-Type: text/plain; charset=UTF-8
|
|
|
6d8dfbe |
Content-Transfer-Encoding: 8bit
|
|
|
6d8dfbe |
|
|
|
6d8dfbe |
Change-Id: I5160c6efe7cf58351955d9d1d3066e3b33bdfe20
|
|
|
6d8dfbe |
Reviewed-on: https://gerrit.libreoffice.org/32082
|
|
|
6d8dfbe |
Tested-by: Jenkins <ci@libreoffice.org>
|
|
|
6d8dfbe |
Reviewed-by: Xisco FaulĂ <xiscofauli@libreoffice.org>
|
|
|
6d8dfbe |
---
|
|
|
6d8dfbe |
svgio/source/svgreader/svgstyleattributes.cxx | 19 +------------------
|
|
|
6d8dfbe |
1 file changed, 1 insertion(+), 18 deletions(-)
|
|
|
6d8dfbe |
|
|
|
6d8dfbe |
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
|
|
|
6d8dfbe |
index 948f361..8cb6bb5 100644
|
|
|
6d8dfbe |
--- a/svgio/source/svgreader/svgstyleattributes.cxx
|
|
|
6d8dfbe |
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
|
|
|
6d8dfbe |
@@ -2677,24 +2677,7 @@ namespace svgio
|
|
|
6d8dfbe |
|
|
|
6d8dfbe |
OUString SvgStyleAttributes::getClipPathXLink() const
|
|
|
6d8dfbe |
{
|
|
|
6d8dfbe |
- if(mbIsClipPathContent)
|
|
|
6d8dfbe |
- {
|
|
|
6d8dfbe |
- return maClipPathXLink;
|
|
|
6d8dfbe |
- }
|
|
|
6d8dfbe |
-
|
|
|
6d8dfbe |
- if(!maClipPathXLink.isEmpty())
|
|
|
6d8dfbe |
- {
|
|
|
6d8dfbe |
- return maClipPathXLink;
|
|
|
6d8dfbe |
- }
|
|
|
6d8dfbe |
-
|
|
|
6d8dfbe |
- const SvgStyleAttributes* pSvgStyleAttributes = getParentStyle();
|
|
|
6d8dfbe |
-
|
|
|
6d8dfbe |
- if(pSvgStyleAttributes && !pSvgStyleAttributes->maClipPathXLink.isEmpty())
|
|
|
6d8dfbe |
- {
|
|
|
6d8dfbe |
- return pSvgStyleAttributes->getClipPathXLink();
|
|
|
6d8dfbe |
- }
|
|
|
6d8dfbe |
-
|
|
|
6d8dfbe |
- return OUString();
|
|
|
6d8dfbe |
+ return maClipPathXLink;
|
|
|
6d8dfbe |
}
|
|
|
6d8dfbe |
|
|
|
6d8dfbe |
const SvgClipPathNode* SvgStyleAttributes::accessClipPathXLink() const
|
|
|
6d8dfbe |
--
|
|
|
6d8dfbe |
2.9.3
|
|
|
6d8dfbe |
|