[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - filter/Library_svgfilter.mk filter/source svgio/source

[Armin Le Grand]

 filter/Library_svgfilter.mk           |    1 
 filter/source/svg/svgfilter.cxx       |   76 +++++++++++++++++++++++++++-------
 svgio/source/svgreader/svgsvgnode.cxx |   17 +++++++
 3 files changed, 80 insertions(+), 14 deletions(-)

New commits:
commit 1ebbe4193f5a7ea928fd4940c2a62bcb773c4a00
Author: Armin Le Grand <Armin.Le.Grand at cib.de>
Date:   Wed Jul 11 18:26:48 2018 +0200

    tdf#118232 Allow load and insert of SVGs with no Geometry
    
    Change-Id: Iaf3d6a0423c5f11dda1e623dd730af01dbd6551c
    Reviewed-on: https://gerrit.libreoffice.org/57284
    Tested-by: Jenkins
    Reviewed-by: Armin Le Grand <Armin.Le.Grand at cib.de>
    (cherry picked from commit 0613ce41da0b94bc481b94b8141afcf15df8abe7)
    Reviewed-on: https://gerrit.libreoffice.org/57350

diff --git a/filter/Library_svgfilter.mk b/filter/Library_svgfilter.mk
index bdd917a50a0c..21318aa1fd03 100644
--- a/filter/Library_svgfilter.mk
+++ b/filter/Library_svgfilter.mk
@@ -56,6 +56,7 @@ $(eval $(call gb_Library_use_libraries,svgfilter,\
 	sax \
 	salhelper \
 	comphelper \
+	drawinglayer \
 	basegfx \
 	cppuhelper \
 	cppu \
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 9c50869ab593..a5f8ce32b072 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -49,6 +49,9 @@
 #include <unotools/streamwrap.hxx>
 #include <tools/zcodec.hxx>
 
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
+
 #include "svgfilter.hxx"
 #include "svgwriter.hxx"
 
@@ -208,17 +211,59 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
                 break;
             }
 
+            // tdf#118232 Get the sequence of primitives and check if geometry is completely
+            // hidden. If so, there is no need to add a SdrObject at all
+            const VectorGraphicDataPtr& rVectorGraphicData(aGraphic.getVectorGraphicData());
+            bool bContainsNoGeometry(false);
+
+            if(bool(rVectorGraphicData) && VectorGraphicDataType::Svg == rVectorGraphicData->getVectorGraphicDataType())
+            {
+                const drawinglayer::primitive2d::Primitive2DContainer aContainer(rVectorGraphicData->getPrimitive2DSequence());
+
+                if(!aContainer.empty())
+                {
+                    bool bAllAreHiddenGeometry(true);
+
+                    for(const auto& rCandidate : aContainer)
+                    {
+                        if(rCandidate.is())
+                        {
+                            // try to cast to BasePrimitive2D implementation
+                            const drawinglayer::primitive2d::BasePrimitive2D* pBasePrimitive(
+                                dynamic_cast< const drawinglayer::primitive2d::BasePrimitive2D* >(rCandidate.get()));
+
+                            if(pBasePrimitive && PRIMITIVE2D_ID_HIDDENGEOMETRYPRIMITIVE2D != pBasePrimitive->getPrimitive2DID())
+                            {
+                                bAllAreHiddenGeometry = false;
+                                break;
+                            }
+                        }
+                    }
+
+                    if(bAllAreHiddenGeometry)
+                    {
+                        bContainsNoGeometry = true;
+                    }
+                }
+            }
+
             // create a SdrModel-GraphicObject to insert to page
             SdrPage* pTargetSdrPage(pSvxDrawPage->GetSdrPage());
-            std::unique_ptr< SdrGrafObj, SdrObjectFreeOp > aNewSdrGrafObj(
-                new SdrGrafObj(
-                    pTargetSdrPage->getSdrModelFromSdrPage(),
-                    aGraphic));
+            std::unique_ptr< SdrGrafObj, SdrObjectFreeOp > aNewSdrGrafObj;
 
-            if(!aNewSdrGrafObj.get())
+            // tdf#118232 only add an SdrGrafObj when we have Geometry
+            if(!bContainsNoGeometry)
             {
-                // could not create GraphicObject
-                break;
+                aNewSdrGrafObj.reset(
+                    new SdrGrafObj(
+                        pTargetSdrPage->getSdrModelFromSdrPage(),
+                        aGraphic));
+
+                if(!aNewSdrGrafObj.get())
+                {
+                    // could not create GraphicObject
+                    break;
+                }
             }
 
             // Evtl. adapt the GraphicPrefSize to target-MapMode of target-Model
@@ -264,15 +309,18 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
                 nAllBorder,
                 nAllBorder);
 
-            // set pos/size at SdrGraphicObj - use zero position for
+            // tdf#118232 set pos/size at SdrGraphicObj - use zero position for
             // better turn-around results
-            aNewSdrGrafObj->SetSnapRect(
-                tools::Rectangle(
-                    Point(0, 0),
-                    aGraphicSize));
+            if(!bContainsNoGeometry)
+            {
+                aNewSdrGrafObj->SetSnapRect(
+                    tools::Rectangle(
+                        Point(0, 0),
+                        aGraphicSize));
 
-            // insert to page (owner change of SdrGrafObj)
-            pTargetSdrPage->InsertObject(aNewSdrGrafObj.release());
+                // insert to page (owner change of SdrGrafObj)
+                pTargetSdrPage->InsertObject(aNewSdrGrafObj.release());
+            }
 
             // done - set positive result now
             bRet = true;
diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx
index 524e6d360030..606bff113810 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -713,6 +713,23 @@ namespace svgio
                     }
                 }
             }
+
+            if(aSequence.empty() && !getParent() && getViewBox())
+            {
+                // tdf#118232 No geometry, Outermost SVG element and we have a ViewBox.
+                // Create a HiddenGeometry Primitive containing an expanded
+                // hairline geometry to have the size contained
+                const drawinglayer::primitive2d::Primitive2DReference xLine(
+                    new drawinglayer::primitive2d::PolygonHairlinePrimitive2D(
+                        basegfx::utils::createPolygonFromRect(
+                            *getViewBox()),
+                        basegfx::BColor(0.0, 0.0, 0.0)));
+                const drawinglayer::primitive2d::Primitive2DReference xHidden(
+                    new drawinglayer::primitive2d::HiddenGeometryPrimitive2D(
+                        drawinglayer::primitive2d::Primitive2DContainer { xLine }));
+
+                rTarget.push_back(xHidden);
+            }
         }
 
         const basegfx::B2DRange SvgSvgNode::getCurrentViewPort() const