diff options
-rw-r--r-- | include/svx/graphichelper.hxx | 12 | ||||
-rw-r--r-- | sc/source/ui/drawfunc/chartsh.cxx | 9 | ||||
-rw-r--r-- | svx/source/core/graphichelper.cxx | 83 |
3 files changed, 80 insertions, 24 deletions
diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx index 2f723b830493..1d3c6ee58227 100644 --- a/include/svx/graphichelper.hxx +++ b/include/svx/graphichelper.hxx @@ -24,6 +24,10 @@ #include <svx/svxdllapi.h> namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::lang +{ +class XComponent; +} namespace weld { class Widget; } namespace weld { class Window; } @@ -34,7 +38,13 @@ public: static void GetPreferredExtension( OUString& rExtension, const Graphic& rGraphic ); static OUString GetImageType(const Graphic& rGraphic); static OUString ExportGraphic(weld::Window* pWin, const Graphic& rGraphic, const OUString& rGraphicName); - static void SaveShapeAsGraphic(weld::Window* pWin, const css::uno::Reference< css::drawing::XShape >& xShape); + static void + SaveShapeAsGraphicToPath(const css::uno::Reference<css::lang::XComponent>& xComponent, + const css::uno::Reference<css::drawing::XShape>& xShape, + const OUString& rMimeType, const OUString& rPath); + static void SaveShapeAsGraphic(weld::Window* pWin, + const css::uno::Reference<css::lang::XComponent>& xComponent, + const css::uno::Reference<css::drawing::XShape>& xShape); static short HasToSaveTransformedImage(weld::Widget* pWin); }; diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx index 95b06385335e..2f714c976cf8 100644 --- a/sc/source/ui/drawfunc/chartsh.cxx +++ b/sc/source/ui/drawfunc/chartsh.cxx @@ -137,8 +137,15 @@ void ScChartShell::ExecuteExportAsGraphic( SfxRequest& ) if( dynamic_cast<const SdrOle2Obj*>( pObject) ) { vcl::Window* pWin = GetViewData().GetActiveWin(); + css::uno::Reference<css::lang::XComponent> xComponent; + const SfxObjectShell* pShell = GetObjectShell(); + if (pShell) + { + xComponent = pShell->GetModel(); + } Reference< drawing::XShape > xSourceDoc( pObject->getUnoShape(), UNO_QUERY_THROW ); - GraphicHelper::SaveShapeAsGraphic(pWin ? pWin->GetFrameWeld() : nullptr, xSourceDoc); + GraphicHelper::SaveShapeAsGraphic(pWin ? pWin->GetFrameWeld() : nullptr, xComponent, + xSourceDoc); } } 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& ) |