From 1b02ba03bd62a712e15c15384a3d105d2c088120 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Tue, 13 Feb 2018 21:49:57 +0900 Subject: shapes: don't use "GraphicURL" property, always use "Graphic" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With GraphicURL property on shapes (XShape) we transported the external or internal URL to the model, which also included the GraphicObject uniqueID style URLs. This changes that - now we always use "Graphic" property and transfer XGraphic to and from graphic filters. "Graphic" property is already present for XShape so it wasn't needed to add it. Filters changed are: OOXML (oox), ODF (xmloff), RTF and binary MS (esherex). Also start using originURL on Graphic which now transports the URL of the external (linked) graphic/image if it was created that way. Change-Id: Ic338c60b7cfaaae354cf1e1ca3ae7a6373220230 Reviewed-on: https://gerrit.libreoffice.org/49648 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- include/oox/export/drawingml.hxx | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include/oox') diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx index 2f02f783462c..216fe5316a13 100644 --- a/include/oox/export/drawingml.hxx +++ b/include/oox/export/drawingml.hxx @@ -38,6 +38,8 @@ #include #include #include +#include +#include #ifndef OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY // Our rotation is counter-clockwise and is in 100ths of a degree. @@ -198,7 +200,14 @@ public: void WritePattFill( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); void WritePattFill(const css::uno::Reference& rXPropSet, const css::drawing::Hatch& rHatch); + + void WriteGraphicCropProperties(css::uno::Reference const & rxPropertySet, + Size const & rOriginalSize, MapMode const & rMapMode); + void WriteSrcRect( const css::uno::Reference< css::beans::XPropertySet >&, const OUString& ); + void WriteSrcRectXGraphic(css::uno::Reference const & rxPropertySet, + css::uno::Reference const & rxGraphic); + void WriteOutline( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet ); void WriteStretch( const css::uno::Reference< css::beans::XPropertySet >& rXPropSet, const OUString& rURL ); -- cgit