sc export chart as graphic: handle PDFmimo-7.2.6.2.M1

The context menu for Calc charts would call into
GraphicFilter::ExportGraphic(), which has explicit code for e.g. SVG,
but not for PDF. The graphic exporter to PDF is only meant to work with
images backed with PDF data, not with all shapes.

Fix the problem by explicitly handling PDF in
GraphicHelper::SaveShapeAsGraphic() in svx/, and invoking the normal PDF
export in that case. Continue to fall back to XGraphicExportFilter for
other formats.

This requires passing down the current document from sc/.

(cherry picked from commit 77d2bbaa18e0be5347d7bd7167b245264789e0a4)

Conflicts:
	sc/source/ui/drawfunc/chartsh.cxx
	svx/Module_svx.mk
	svx/source/core/graphichelper.cxx

Change-Id: Ia5f78bffa1d26989bb0ad3ed265b922e609f076f

1 files changed, 61 insertions, 22 deletions

diff --git a/svx/source/core/graphichelper.cxx b/svx/source/core/graphichelper.cxx
index ae31bb0d8f37..0e201b49a4c7 100644
--- a/svx/source/core/graphichelper.cxx
+++ b/svx/source/core/graphichelper.cxx
@@ -46,9 +46,14 @@
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/task/ErrorCodeIOException.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/drawing/ShapeCollection.hpp>
 
 #include <map>
 
+#include <sfx2/objsh.hxx>
+#include <unotools/streamwrap.hxx>
+#include <comphelper/propertyvalue.hxx>
+
 using namespace css::uno;
 using namespace css::lang;
 using namespace css::graphic;
@@ -382,7 +387,61 @@ OUString GraphicHelper::ExportGraphic(weld::Window* pParent, const Graphic& rGra
     return OUString();
 }
 
-void GraphicHelper::SaveShapeAsGraphic(weld::Window* pParent,  const Reference< drawing::XShape >& xShape)
+void GraphicHelper::SaveShapeAsGraphicToPath(
+    const css::uno::Reference<css::lang::XComponent>& xComponent,
+    const css::uno::Reference<css::drawing::XShape>& xShape, const OUString& aExportMimeType,
+    const OUString& sPath)
+{
+    Reference<XComponentContext> xContext(::comphelper::getProcessComponentContext());
+    Reference<XInputStream> xGraphStream;
+
+    if (xGraphStream.is())
+    {
+        Reference<XSimpleFileAccess3> xFileAccess = SimpleFileAccess::create(xContext);
+        xFileAccess->writeFile(sPath, xGraphStream);
+    }
+    else if (xComponent.is() && aExportMimeType == "application/pdf")
+    {
+        css::uno::Reference<css::lang::XMultiServiceFactory> xMSF(xContext->getServiceManager(),
+                                                                  css::uno::UNO_QUERY);
+        css::uno::Reference<css::document::XExporter> xExporter(
+            xMSF->createInstance("com.sun.star.comp.PDF.PDFFilter"), css::uno::UNO_QUERY);
+        xExporter->setSourceDocument(xComponent);
+
+        css::uno::Reference<css::drawing::XShapes> xShapes
+            = css::drawing::ShapeCollection::create(comphelper::getProcessComponentContext());
+        xShapes->add(xShape);
+        css::uno::Sequence<PropertyValue> aFilterData{
+            comphelper::makePropertyValue("Selection", xShapes),
+        };
+        SvFileStream aStream(sPath, StreamMode::READWRITE | StreamMode::TRUNC);
+        css::uno::Reference<css::io::XOutputStream> xStream(new utl::OStreamWrapper(aStream));
+        css::uno::Sequence<PropertyValue> aDescriptor{
+            comphelper::makePropertyValue("FilterData", aFilterData),
+            comphelper::makePropertyValue("OutputStream", xStream)
+        };
+        css::uno::Reference<css::document::XFilter> xFilter(xExporter, css::uno::UNO_QUERY);
+        xFilter->filter(aDescriptor);
+    }
+    else
+    {
+        Reference<css::drawing::XGraphicExportFilter> xGraphicExporter = css::drawing::GraphicExportFilter::create( xContext );
+
+        Sequence<PropertyValue> aDescriptor( 2 );
+        aDescriptor[0].Name = "MediaType";
+        aDescriptor[0].Value <<= aExportMimeType;
+        aDescriptor[1].Name = "URL";
+        aDescriptor[1].Value <<= sPath;
+
+        Reference< XComponent > xSourceDocument( xShape, UNO_QUERY_THROW );
+        xGraphicExporter->setSourceDocument( xSourceDocument );
+        xGraphicExporter->filter( aDescriptor );
+    }
+}
+
+void GraphicHelper::SaveShapeAsGraphic(weld::Window* pParent,
+                                       const css::uno::Reference<css::lang::XComponent>& xComponent,
+                                       const Reference<drawing::XShape>& xShape)
 {
     try
     {
@@ -430,27 +489,7 @@ void GraphicHelper::SaveShapeAsGraphic(weld::Window* pParent,  const Reference<
             OUString sPath( xFilePicker->getFiles().getConstArray()[0] );
             OUString aExportMimeType( aMimeTypeMap[xFilePicker->getCurrentFilter()] );
 
-            Reference< XInputStream > xGraphStream;
-
-            if( xGraphStream.is() )
-            {
-                Reference<XSimpleFileAccess3> xFileAccess = SimpleFileAccess::create( xContext );
-                xFileAccess->writeFile( sPath, xGraphStream );
-            }
-            else
-            {
-                Reference<css::drawing::XGraphicExportFilter> xGraphicExporter = css::drawing::GraphicExportFilter::create( xContext );
-
-                Sequence<PropertyValue> aDescriptor( 2 );
-                aDescriptor[0].Name = "MediaType";
-                aDescriptor[0].Value <<= aExportMimeType;
-                aDescriptor[1].Name = "URL";
-                aDescriptor[1].Value <<= sPath;
-
-                Reference< XComponent > xSourceDocument( xShape, UNO_QUERY_THROW );
-                xGraphicExporter->setSourceDocument( xSourceDocument );
-                xGraphicExporter->filter( aDescriptor );
-            }
+            GraphicHelper::SaveShapeAsGraphicToPath(xComponent, xShape, aExportMimeType, sPath);
         }
     }
     catch( Exception& )