summaryrefslogtreecommitdiff
path: root/include/oox/vml
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2018-02-21 20:26:56 +0900
committerTomaž Vajngerl <quikee@gmail.com>2018-02-25 13:14:28 +0100
commitcfc2715f1500d98671834254f2d8c4de19ff8507 (patch)
tree2509dc6d6e5ae6af71f93f4d52d049186d93b62b /include/oox/vml
parente2d0945c41a3558264491d01bd269a8ec5bcf796 (diff)
Use "Graphic" instead of "GraphicURL" property for SimpleShape
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 <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'include/oox/vml')
-rw-r--r--include/oox/vml/vmlshape.hxx5
1 files changed, 4 insertions, 1 deletions
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::Reference<css::drawing::XShape>createEmbeddedPictureObject(
const css::uno::Reference< css::drawing::XShapes >& rxShapes,
const css::awt::Rectangle& rShapeRect, OUString const & rGraphicPath ) const;
+
css::uno::Reference<css::drawing::XShape>createPictureObject(
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<css::graphic::XGraphic> const & rxGraphic) const;
private:
OUString maService; ///< Name of the UNO shape service.