Kaydet (Commit) 7cd37851 authored tarafından Yong Lin Ma's avatar Yong Lin Ma Kaydeden (comit) Caolán McNamara

Resolves: #i56806# Page background lost when export to doc format

Patch by: Chen ZuoJun
Review by: mayongl
(cherry picked from commit 4034798d)

Change-Id: I76eb50834eae00837caaf4e49d547d7d0e309f30
üst e32fd065
...@@ -2091,6 +2091,15 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt) ...@@ -2091,6 +2091,15 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, WW8Export& rWW8Wrt)
{ {
const SvxBrushItem* pBrush = (const SvxBrushItem*)pItem; const SvxBrushItem* pBrush = (const SvxBrushItem*)pItem;
WriteBrushAttr(*pBrush, aPropOpt); 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_lineColor, 0x8000001 );
aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080008 ); aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080008 );
......
...@@ -3803,6 +3803,10 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection, ...@@ -3803,6 +3803,10 @@ void wwSectionManager::SetSegmentToPageDesc(const wwSection &rSection,
SwFrmFmt &rFmt = rPage.GetMaster(); SwFrmFmt &rFmt = rPage.GetMaster();
if(mrReader.pWDop->fUseBackGroundInAllmodes) // #i56806# Make sure mrReader is initialized
mrReader.GrafikCtor();
if (mrReader.pWDop->fUseBackGroundInAllmodes && mrReader.pMSDffManager) if (mrReader.pWDop->fUseBackGroundInAllmodes && mrReader.pMSDffManager)
{ {
Rectangle aRect(0, 0, 100, 100); //A dummy, we don't care about the size Rectangle aRect(0, 0, 100, 100); //A dummy, we don't care about the size
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment