diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-14 09:10:04 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-09-14 09:10:48 +0200 |
commit | 6621da38b3cd217314c2d2295fd1e71be7e1875e (patch) | |
tree | 685ef3f3f6a1c322ed52c4f55f26938fd4a2adac /xmloff/inc/XMLBackgroundImageContext.hxx | |
parent | e1f812e939b5d4dcde15e7ccee8da45ab5751790 (diff) |
tdf#92586 xmloff: fix import of stretched background image
The bug document has:
<style:page-layout-properties ... style:repeat="no-repeat">
<style:background-image ... style:repeat="stretch"/>
</style:page-layout-properties>
When a stretched background image is set on a page style using the Writer UI,
then these two style:repeat attributes always match, but not in the bugdoc.
The later used to have priority, till commit
7d9bb549d498d6beed2c4050c402d09643febdfa (Related: #i124638# Second step of
DrawingLayer FillAttributes..., 2014-06-02).
Fix the problem by extending XMLBackgroundImageContext::EndElement(): if we
know that the <style:page-layout-properties> sets the FillBitmapMode property,
then don't blindly set BackGraphicLocation, but try to overwrite the exiting
FillBitmapMode one.
Change-Id: I64ab4363b20cc95003d35acd63ea421472b1c071
Diffstat (limited to 'xmloff/inc/XMLBackgroundImageContext.hxx')
-rw-r--r-- | xmloff/inc/XMLBackgroundImageContext.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xmloff/inc/XMLBackgroundImageContext.hxx b/xmloff/inc/XMLBackgroundImageContext.hxx index 3fb3ca15f4ce..36f68fe224b1 100644 --- a/xmloff/inc/XMLBackgroundImageContext.hxx +++ b/xmloff/inc/XMLBackgroundImageContext.hxx @@ -30,6 +30,7 @@ namespace com { namespace sun { namespace star { class XMLBackgroundImageContext : public XMLElementPropertyContext { XMLPropertyState aPosProp; + sal_Int32 m_nBitmapModeIdx; XMLPropertyState aFilterProp; XMLPropertyState aTransparencyProp; @@ -58,6 +59,7 @@ public: sal_Int32 nPosIdx, sal_Int32 nFilterIdx, sal_Int32 nTransparencyIdx, + sal_Int32 nBitmapModeIdx, ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLBackgroundImageContext(); |