From d72145f9307c732ced4a546ac1e5093ec7c1a982 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Thu, 1 Mar 2018 08:39:11 +0900 Subject: Move BackGraphicURL property & friends to BackGraphic + fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This moves BackGraphicURL, HeaderGraphicURL, FooterGraphicURL and ParaBackGraphicURL properties to BackGraphic, HeaderBackGraphic, FooterBackGraphic and ParaBackGraphic. With this the property type changes from String to XGraphic. This change also fixes a bunch of test failures, changes the tests to use the new properties and the correct type, changes the import and export filters like xmloff and oox, to make the tests happy. Change-Id: Ie66097514203c6dc36ab27420faf265322e9279e Reviewed-on: https://gerrit.libreoffice.org/50760 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl --- include/oox/helper/modelobjecthelper.hxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/oox') diff --git a/include/oox/helper/modelobjecthelper.hxx b/include/oox/helper/modelobjecthelper.hxx index 67980b57f6c8..694bdf13ddb7 100644 --- a/include/oox/helper/modelobjecthelper.hxx +++ b/include/oox/helper/modelobjecthelper.hxx @@ -27,7 +27,8 @@ #include namespace com { namespace sun { namespace star { - namespace awt { struct Gradient; } + namespace awt { struct Gradient; + class XBitmap; } namespace graphic { class XGraphic; } namespace container { class XNameContainer; } namespace drawing { struct LineDash; } @@ -113,6 +114,7 @@ public: OUString insertFillBitmapXGraphic(css::uno::Reference const & rxGraphic); OUString getFillBitmapUrl( const OUString& rGraphicName ); + css::uno::Reference getFillBitmap(OUString const & rGraphicName); private: ObjectContainer maMarkerContainer; ///< Contains all named line markers (line end polygons). -- cgit