diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-12-16 21:10:55 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-12-16 21:25:26 +0100 |
| commit | 8275fd953666198e67e82e517bd1bab8bf742683 (patch) | |
| tree | 961daf22afa665436a9888dcbdc4c1fde2175b3e /sw/source/filter | |
| parent | 402e020c09ff0a003cfd8f84719ff3cde633a295 (diff) | |
fdo#86857: sw: fix HTML export of page style background color
SwPageDesc no longer contains RES_BACKGROUND but XATTR_FOO.
Change-Id: Ie722b0279f9d9831338f6613a4722010afd1543e
(cherry picked from commit 298e144f8235bb4fe48e204764ec0ba936f3b0c0)
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/html/wrthtml.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sw/source/filter/html/wrthtml.cxx b/sw/source/filter/html/wrthtml.cxx index 28049c23957c..13add63752ed 100644 --- a/sw/source/filter/html/wrthtml.cxx +++ b/sw/source/filter/html/wrthtml.cxx @@ -30,6 +30,7 @@ #include <i18nlangtag/languagetag.hxx> #include <sfx2/frmhtmlw.hxx> #include <svx/xoutbmp.hxx> +#include <svx/unobrushitemhelper.hxx> #include <sfx2/htmlmode.hxx> #include <editeng/lrspitem.hxx> #include <editeng/colritem.hxx> @@ -1047,7 +1048,10 @@ const SwPageDesc *SwHTMLWriter::MakeHeader( sal_uInt16 &rHeaderAttrs ) const SfxItemSet& rItemSet = pPageDesc->GetMaster().GetAttrSet(); - OutBackground( rItemSet, true ); + // fdo#86857 page styles now contain the XATTR_*, not RES_BACKGROUND + SvxBrushItem const aBrushItem( + getSvxBrushItemFromSourceSet(rItemSet, RES_BACKGROUND)); + OutBackground(&aBrushItem, true); nDirection = GetHTMLDirection( rItemSet ); OutDirection( nDirection ); |