mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Patch by: Chen ZuoJun
Review by: mayongl
(cherry picked from commit 4034798d137593863fdc9041ec9cd55ad88fbf84)

Change-Id: I76eb50834eae00837caaf4e49d547d7d0e309f30
This commit is contained in:
Yong Lin Ma
2012-07-10 01:07:14 +00:00
committed by Caolán McNamara
parent e32fd06507
commit 7cd378518b
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sw/source/filter/ww8/wrtw8esh.cxx
View File

@@ -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 );

4
sw/source/filter/ww8/ww8par.cxx
View File

@@ -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