[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - filter/source

[Chr. Rossmanith]

 filter/source/svg/svgexport.cxx |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 4542e5bd0a9b3838794c72becd1f7caa41846c07
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date:   Sat Apr 4 20:55:29 2015 +0200

    tdf#56467 / tdf#88117: SVG export further improved
    
    omitting the clip-path from the <svg> element and keeping it only in
    the slides enables rendering of exported selection in viewers like
    firefox and inkscape
    
    Change-Id: If296a78a3f948728e8b2ec257849be129bec5d92
    Reviewed-on: https://gerrit.libreoffice.org/15155
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Reviewed-on: https://gerrit.libreoffice.org/15312
    Tested-by: Norbert Thiebaud <nthiebaud at gmail.com>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 7d0914a..a73ce92 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -799,13 +799,9 @@ bool SVGFilter::implExportDocument()
 
     aAttr += OUString::number(nDocWidth) + " " + OUString::number(nDocHeight);
 
-    msClipPathId = "presentation_clip_path";
-    OUString sClipPathAttrValue = "url(#" + msClipPathId + ")";
-
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "viewBox", aAttr );
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "preserveAspectRatio", "xMidYMid" );
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "fill-rule", "evenodd" );
-    mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clip-path", sClipPathAttrValue );
 
     // standard line width is based on 1 pixel on a 90 DPI device (0.28222mmm)
     mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke-width", OUString::number( 28.222 ) );
@@ -822,6 +818,7 @@ bool SVGFilter::implExportDocument()
         mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "ClipPathGroup" );
         SvXMLElementExport aDefsElem( *mpSVGExport, XML_NAMESPACE_NONE, "defs", true, true );
         {
+            msClipPathId = "presentation_clip_path";
             mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "id", msClipPathId );
             mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "clipPathUnits", "userSpaceOnUse" );
             SvXMLElementExport aClipPathElem( *mpSVGExport, XML_NAMESPACE_NONE, "clipPath", true, true );