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 /include/xmloff/PageMasterStyleMap.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 'include/xmloff/PageMasterStyleMap.hxx')
| -rw-r--r-- | include/xmloff/PageMasterStyleMap.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/xmloff/PageMasterStyleMap.hxx b/include/xmloff/PageMasterStyleMap.hxx index 859f3e0e6e84..59f04df2abd9 100644 --- a/include/xmloff/PageMasterStyleMap.hxx +++ b/include/xmloff/PageMasterStyleMap.hxx @@ -96,6 +96,7 @@ #define CTF_PM_FILLHATCHNAME (XML_PM_CTF_START + 0x0040) #define CTF_PM_FILLBITMAPNAME (XML_PM_CTF_START + 0x0041) #define CTF_PM_FILLTRANSNAME (XML_PM_CTF_START + 0x0042) +#define CTF_PM_FILLBITMAPMODE (XML_PM_CTF_START + 0x0043) #define CTF_PM_SCALETO (XML_PM_CTF_START + 0x0051) // calc specific #define CTF_PM_SCALETOPAGES (XML_PM_CTF_START + 0x0052) |