commit 5f4df4b39722b9b3aa45d669e932d054d264ffbf
author Tamás Zolnai <tamas.zolnai@collabora.com> Fri Mar 01 11:11:46 2019 +0100
committer Tamás Zolnai <tamas.zolnai@collabora.com> Fri Mar 01 13:47:55 2019 +0100
tree 4ac618777e69b1696a8dc1f633e29362db0274c9
parent d559c28e9e65f3be415ec2e36ee90aa147e65b84

tdf#123780: Fix SVG export of Writer images

Used for LO online to generate preview.

Change-Id: I25107bedecc5a60e6a3ac094b7defd5dcb822138
Reviewed-on: https://gerrit.libreoffice.org/68543
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>

filter/source/svg/svgexport.cxx

diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 6f1c759..c6f9ce9 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -704,8 +704,6 @@
        SdrGrafObj* pGraphicObj = new SdrGrafObj(pSvxDrawPage->GetSdrPage()->getSdrModelFromSdrPage(), aGraphic, tools::Rectangle( aPos, aSize ));
        uno::Reference< drawing::XShape > xShape = GetXShapeForSdrObject(pGraphicObj);
        uno::Reference< XPropertySet > xShapePropSet(xShape, uno::UNO_QUERY);
        css::awt::Rectangle aBoundRect (aPos.X(), aPos.Y(), aSize.Width(), aSize.Height());
        xShapePropSet->setPropertyValue("BoundRect", uno::Any(aBoundRect));
        xShapePropSet->setPropertyValue("Graphic", uno::Any(xGraphic));

        maShapeSelection = drawing::ShapeCollection::create(comphelper::getProcessComponentContext());

filter/source/svg/svgfilter.cxx

diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index 19db16e..183e3eb 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -577,6 +577,13 @@
    if (!xSelection.is())
        return false;

    // Select only one draw page
    uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSupplier( mxSrcDoc, uno::UNO_QUERY );
    uno::Reference<drawing::XDrawPages> xDrawPages = xDrawPagesSupplier->getDrawPages();
    uno::Reference< drawing::XDrawPage > xDrawPage( xDrawPages->getByIndex(0), uno::UNO_QUERY );
    mSelectedPages.resize( 1 );
    mSelectedPages[0] = xDrawPage;

    bool bGotSelection = xSelection->getSelection() >>= maShapeSelection;

    if (!bGotSelection)
@@ -590,13 +597,6 @@
            return false;
    }

    // Select only one draw page
    uno::Reference< drawing::XDrawPagesSupplier > xDrawPagesSupplier( mxSrcDoc, uno::UNO_QUERY );
    uno::Reference<drawing::XDrawPages> xDrawPages = xDrawPagesSupplier->getDrawPages();
    uno::Reference< drawing::XDrawPage > xDrawPage( xDrawPages->getByIndex(0), uno::UNO_QUERY );
    mSelectedPages.resize( 1 );
    mSelectedPages[0] = xDrawPage;

    return implExport( rDescriptor );
}