From cfc2715f1500d98671834254f2d8c4de19ff8507 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Wed, 21 Feb 2018 20:26:56 +0900 Subject: Use "Graphic" instead of "GraphicURL" property for SimpleShape MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We don't need to create an URL when we get the XGraphic from the signatures, that use SimpleShape. We can just use the XGraphic directly and set the "Graphic" property on creation of SimpleShape. Change-Id: I82b1f76cd358fca29f5b9dfbed0e735bd1f38e15 Reviewed-on: https://gerrit.libreoffice.org/50141 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- include/oox/vml/vmlshape.hxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/oox/vml') diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx index 9b2683e95bea..55e7afedcb50 100644 --- a/include/oox/vml/vmlshape.hxx +++ b/include/oox/vml/vmlshape.hxx @@ -35,6 +35,7 @@ namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } namespace drawing { class XShape; } namespace drawing { class XShapes; } + namespace graphic { class XGraphic; } } } } namespace oox { @@ -304,9 +305,11 @@ protected: css::uno::ReferencecreateEmbeddedPictureObject( const css::uno::Reference< css::drawing::XShapes >& rxShapes, const css::awt::Rectangle& rShapeRect, OUString const & rGraphicPath ) const; + css::uno::ReferencecreatePictureObject( const css::uno::Reference< css::drawing::XShapes >& rxShapes, - const css::awt::Rectangle& rShapeRect, OUString const & rGraphicUrl ) const; + const css::awt::Rectangle& rShapeRect, + css::uno::Reference const & rxGraphic) const; private: OUString maService; ///< Name of the UNO shape service. -- cgit