summaryrefslogtreecommitdiff
path: root/xmloff/inc
diff options
context:
space:
mode:
authorTomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>2018-03-01 08:39:11 +0900
committerTomaž Vajngerl <quikee@gmail.com>2018-03-07 02:37:36 +0100
commitd72145f9307c732ced4a546ac1e5093ec7c1a982 (patch)
tree648cf88d30ba3da260edb22829d8cd8be0c9345e /xmloff/inc
parent6b39ed0eaffabb6ffe11496d833053c094c72f7b (diff)
Move BackGraphicURL property & friends to BackGraphic + fixes
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 <ci@libreoffice.org> Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'xmloff/inc')
-rw-r--r--xmloff/inc/XMLBackgroundImageContext.hxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx
index e965935206a6..8080f3f3b458 100644
--- a/xmloff/inc/XMLBackgroundImageContext.hxx
+++ b/xmloff/inc/XMLBackgroundImageContext.hxx
@@ -35,11 +35,11 @@ class XMLBackgroundImageContext : public XMLElementPropertyContext
XMLPropertyState aTransparencyProp;
css::style::GraphicLocation ePos;
- OUString sURL;
+ OUString m_sURL;
OUString sFilter;
sal_Int8 nTransparency;
- css::uno::Reference < css::io::XOutputStream > xBase64Stream;
+ css::uno::Reference < css::io::XOutputStream > m_xBase64Stream;
private:
void ProcessAttrs(