diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-09-29 16:16:34 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-09-29 16:20:30 +0100 |
| commit | 8dd2a4f0c80db25f744147206ff1e69cf976f73f (patch) | |
| tree | 63c79312e0e9f939a75edc6b2fe587de9adb038c | |
| parent | cc335e4a72ca2814ef17ef4245a349184fdb937e (diff) | |
revert hunk that makes sw_ooxmlexport tests fail
though it did seem on the face of it a good additional safety check
Change-Id: I76e613c0f42662d87f976d9b3bf98a4cb44b3c4e
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 0f999251dad6..678c65f0fb20 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -850,13 +850,21 @@ void MSWordExportBase::OutputFormat( const SwFmt& rFmt, bool bPapFmt, bool bChpF if (SfxItemState::SET != aSet.GetItemState(RES_SURROUND)) aSet.Put(SwFmtSurround(SURROUND_NONE)); - // Construct an SvxBrushItem, as expected by the exporters. - if (rFrmFmt.IsAdaptedToNewFillProperties()) + const XFillStyleItem* pXFillStyleItem(static_cast< const XFillStyleItem* >(rFrmFmt.GetAttrSet().GetItem(XATTR_FILLSTYLE))); + if (pXFillStyleItem) { - const XFillStyleItem* pXFillStyleItem(static_cast< const XFillStyleItem* >(rFrmFmt.GetAttrSet().GetItem(XATTR_FILLSTYLE))); - if (pXFillStyleItem) + switch (pXFillStyleItem->GetValue()) { + case drawing::FillStyle_NONE: + break; + case drawing::FillStyle_SOLID: + { + // Construct an SvxBrushItem, as expected by the exporters. aSet.Put(getSvxBrushItemFromSourceSet(rFrmFmt.GetAttrSet(), RES_BACKGROUND)); + break; + } + default: + break; } } |