diff options
| author | Justin Luth <justin.luth@collabora.com> | 2018-11-28 16:17:22 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2019-01-15 19:50:35 +0100 |
| commit | 3539a1efb41a787237e4333ebc715db96ffacb5b (patch) | |
| tree | a671c2f9d57a33bd6e55d5835223c30461f557c1 /sw/source/filter/ww8/ww8par6.cxx | |
| parent | e1e772e40f83a8f1d7c4947c5784e1fe8b640d5b (diff) | |
tdf#116071 ww8import: import to XATTR_FILL instead of RES_BACKGROUND
The new XATTR_FILL* was introduced a few years ago and the UI
changed to that, but .doc import was still importing into
RES_BACKGROUND and although the property showed up OK, it
couldn't be changed or seen by the UI and somehow
hidden/unavailable as UNO properties.
Change-Id: Iea1805a321a306994ab23bb66a354dca8e3a3d40
Reviewed-on: https://gerrit.libreoffice.org/64186
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/source/filter/ww8/ww8par6.cxx')
| -rw-r--r-- | sw/source/filter/ww8/ww8par6.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx index 2b12c2619a1b..1f2487dfa51b 100644 --- a/sw/source/filter/ww8/ww8par6.cxx +++ b/sw/source/filter/ww8/ww8par6.cxx @@ -68,6 +68,8 @@ #include <editeng/frmdiritem.hxx> #include <editeng/charhiddenitem.hxx> #include <i18nlangtag/mslangid.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xflclit.hxx> #include "sprmids.hxx" #include <fmtpdsc.hxx> #include <node.hxx> @@ -4877,7 +4879,8 @@ void SwWW8ImplReader::Read_Shade( sal_uInt16, const sal_uInt8* pData, short nLen aSHD.SetWWValue( *reinterpret_cast<SVBT16 const *>(pData) ); SwWW8Shade aSh( m_bVer67, aSHD ); - NewAttr(SvxBrushItem(aSh.aColor, RES_BACKGROUND)); + NewAttr( XFillStyleItem(drawing::FillStyle_SOLID) ); + NewAttr( XFillColorItem(OUString(), aSh.aColor) ); } } @@ -4893,7 +4896,9 @@ void SwWW8ImplReader::Read_ParaBackColor(sal_uInt16, const sal_uInt8* pData, sho OSL_ENSURE(nLen == 10, "Len of para back colour not 10!"); if (nLen != 10) return; - NewAttr(SvxBrushItem(ExtractColour(pData, m_bVer67), RES_BACKGROUND)); + + NewAttr( XFillStyleItem(drawing::FillStyle_SOLID) ); + NewAttr( XFillColorItem(OUString(), ExtractColour(pData, m_bVer67)) ); } } |