incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mayo...@apache.org
Subject svn commit: r1359457 - in /incubator/ooo/trunk/main/sw/source/filter/ww8: wrtw8esh.cxx ww8par.cxx
Date Tue, 10 Jul 2012 02:07:14 GMT
Author: mayongl
Date: Tue Jul 10 02:07:14 2012
New Revision: 1359457

URL: http://svn.apache.org/viewvc?rev=1359457&view=rev
Log:
56806: Page background lost when export to doc format

Patch by: Chen ZuoJun
Review by: mayongl

Modified:
    incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx
    incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par.cxx

Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx?rev=1359457&r1=1359456&r2=1359457&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/filter/ww8/wrtw8esh.cxx Tue Jul 10 02:07:14 2012
@@ -1995,7 +1995,16 @@ SwEscherEx::SwEscherEx(SvStream* pStrm, 
             {
                 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 );
             aPropOpt.AddOpt( ESCHER_Prop_shadowColor, 0x8000002 );

Modified: incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par.cxx?rev=1359457&r1=1359456&r2=1359457&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/filter/ww8/ww8par.cxx Tue Jul 10 02:07:14 2012
@@ -3390,6 +3390,10 @@ void wwSectionManager::SetSegmentToPageD
     SetNumberingType(rSection, rPage);
 
     SwFrmFmt &rFmt = rPage.GetMaster();
+	
+    if(mrReader.pWDop->fUseBackGroundInAllmodes)  // #i56806# Make sure mrReader is initialized
+		mrReader.GrafikCtor(); 
+	
 
     if (mrReader.pWDop->fUseBackGroundInAllmodes && mrReader.pMSDffManager)
     {



Mime
View raw message