[Libreoffice-commits] core.git: sw/source

[Yong Lin Ma]

 sw/source/filter/ww8/wrtw8esh.cxx |    9 +++++++++
 sw/source/filter/ww8/ww8par.cxx   |    4 ++++
 2 files changed, 13 insertions(+)

New commits:
commit 7cd378518b38def9cda5a0055a1d7525aad1c427
Author: Yong Lin Ma <mayongl at apache.org>
Date:   Tue Jul 10 01:07:14 2012 +0000

    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

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index d721e8c..a39f12f 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 f78da7b..4c2ab5e 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