diff options
| author | Yong Lin Ma <mayongl@apache.org> | 2012-07-10 01:07:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-04-04 15:13:45 +0100 |
| commit | 7cd378518b38def9cda5a0055a1d7525aad1c427 (patch) | |
| tree | 3c049e37bc50f4af5abfea91d43583cfc086afbb | |
| parent | e32fd065075d2baccb9284d1bf55538418806865 (diff) | |
Resolves: #i56806# Page background lost when export to doc format
Patch by: Chen ZuoJun
Review by: mayongl
(cherry picked from commit 4034798d137593863fdc9041ec9cd55ad88fbf84)
Change-Id: I76eb50834eae00837caaf4e49d547d7d0e309f30
| -rw-r--r-- | sw/source/filter/ww8/wrtw8esh.cxx | 9 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx index d721e8cc4cd6..a39f12ff86a1 100644 --- a/sw/source/filter/ww8/wrtw8esh.cxx +++ b/sw/source/filter/ww8/wrtw8esh.cxx @@ -2091,6 +2091,15 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) { const SvxBrushItem* pBrush = (const SvxBrushItem*)pItem; WriteBrushAttr(*pBrush, aPropOpt); + + SvxGraphicPosition ePos = pBrush->GetGraphicPos(); + if( ePos != GPOS_NONE && ePos != GPOS_AREA ) + { + /* #i56806# 0x033F parameter specifies a 32-bit field of shape boolean properties. + 0x10001 means fBackground and fUsefBackground flag are true thus background + picture will be shown as "tiled" fill.*/ + aPropOpt.AddOpt( ESCHER_Prop_fBackground, 0x10001 ); + } } aPropOpt.AddOpt( ESCHER_Prop_lineColor, 0x8000001 ); aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080008 ); diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index f78da7ba3128..4c2ab5ef65a4 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -3803,6 +3803,10 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection, SwFrmFmt &rFmt = rPage.GetMaster(); + if(mrReader.pWDop->fUseBackGroundInAllmodes) // #i56806# Make sure mrReader is initialized + mrReader.GrafikCtor(); + + if (mrReader.pWDop->fUseBackGroundInAllmodes && mrReader.pMSDffManager) { Rectangle aRect(0, 0, 100, 100); //A dummy, we don't care about the size |