summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYong Lin Ma <mayongl@apache.org>2012-07-10 01:07:14 +0000
committerYong Lin Ma <mayongl@apache.org>2012-07-10 01:07:14 +0000
commit4034798d137593863fdc9041ec9cd55ad88fbf84 (patch)
treed7250fa1cf3c0548b844448991e85863fb964f3d
parent472d5610c71b7a74e6d279d8f625cec8b41b8e81 (diff)
56806: Page background lost when export to doc format
Patch by: Chen ZuoJun Review by: mayongl
Notes
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx9
-rw-r--r--sw/source/filter/ww8/ww8par.cxx4
2 files changed, 13 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 7b0225625737..6191d36ec7fa 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -1995,6 +1995,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 7aa187acba5f..7f837441598b 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3391,6 +3391,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