ooo-build r11493 - in trunk: . patches/src680

[strba svn gnome org]

Author: strba
Date: Sun Feb  3 18:11:42 2008
New Revision: 11493
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11493&view=rev

Log:
two sw fixes

Added:
   trunk/patches/src680/sw-debug-build.diff
   trunk/patches/src680/sw-my-mess.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Sun Feb  3 18:11:42 2008
@@ -473,6 +473,12 @@
 #document ( containing macros ) crashing
 save-doc-withembedded-doc-with-vba-crash.diff, n#339946, i#83632, noelpwer
 
+# enable build debug=t in sw module on x86_64
+sw-debug-build.diff, fridrich
+
+# fix a regression created by my header/footer patch
+sw-my-mess.diff, fridrich
+
 [ Fixes < ooh680-m4 ]
 #fix conversion of date/time strings in Dutch Word documents
 sw-special-locales-date-string.diff, i#84469, n#344306, fridrich

Added: trunk/patches/src680/sw-debug-build.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sw-debug-build.diff	Sun Feb  3 18:11:42 2008
@@ -0,0 +1,33 @@
+--- sw/source/core/doc/dbgoutsw.cxx	2008-02-01 11:57:43.000000000 +0100
++++ sw/source/core/doc/dbgoutsw.cxx	2008-02-01 13:44:53.000000000 +0100
+@@ -295,7 +295,7 @@
+         if (!bFirst)
+             aStr += String(", ", RTL_TEXTENCODING_ASCII_US);
+ 
+-        if ((sal_uInt32)pItem != 0xffffffff)
++        if ((sal_IntPtr)pItem != (sal_IntPtr)-1)
+             aStr += lcl_dbg_out(*pItem);
+         else
+             aStr += String("invalid", RTL_TEXTENCODING_ASCII_US);
+--- sw/source/core/text/frmform.cxx	2008-02-01 11:57:43.000000000 +0100
++++ sw/source/core/text/frmform.cxx	2008-02-01 13:57:30.000000000 +0100
+@@ -2208,7 +2208,7 @@
+     {
+         //DBG_LOOP; shadows declaration above.
+ 		//resolved into:
+-#if OSL_DEBUG_LEVEL > 1
++#ifndef PRODUCT
+ 		DbgLoop aDbgLoop2( (const void*) this );
+ #endif
+ 		nStart = aLine.FormatLine( nStart );
+--- sw/source/core/text/frmpaint.cxx	2008-02-01 11:57:43.000000000 +0100
++++ sw/source/core/text/frmpaint.cxx	2008-02-01 14:03:30.000000000 +0100
+@@ -789,7 +789,7 @@
+ 			{
+ 				//DBG_LOOP; shadows declaration above.
+ 				//resolved into:
+-#if  OSL_DEBUG_LEVEL > 1
++#ifndef PRODUCT
+ 				DbgLoop aDbgLoop2( (const void*) this );
+ #endif
+ 				aLine.DrawTextLine( rRect, aClip, IsUndersized() );

Added: trunk/patches/src680/sw-my-mess.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/sw-my-mess.diff	Sun Feb  3 18:11:42 2008
@@ -0,0 +1,74 @@
+diff -u -r sw/source/filter/ww8/wrtw8sty.cxx sw/source/filter/ww8/wrtw8sty.cxx
+--- sw/source/filter/ww8/wrtw8sty.cxx	2008-02-02 10:09:08.000000000 +0100
++++ sw/source/filter/ww8/wrtw8sty.cxx	2008-02-02 10:17:40.000000000 +0100
+@@ -1054,6 +1054,7 @@
+ {
+     if( nFlag & nHFFlags )
+     {
++        rWrt.bHasHdr = true;
+         const SwFmtHeader& rHd = rFmt.GetHeader();
+         ASSERT( rHd.GetHeaderFmt(), "KopfText nicht richtig da" );
+         const SwFmtCntnt& rCntnt = rHd.GetHeaderFmt()->GetCntnt();
+@@ -1065,8 +1066,12 @@
+     else if( rWrt.bWrtWW8 )
+     {
+         pTxtPos->Append( rCpPos );
+-        rWrt.WriteStringAsPara( aEmptyStr ); // CR ans Ende ( sonst mault WW )
+-        rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() );
++        if (rWrt.bHasHdr)
++        {
++            rWrt.WriteStringAsPara( aEmptyStr ); // Empty paragraph for empty header
++            rWrt.WriteStringAsPara( aEmptyStr ); // a CR that WW8 needs for end of the stream
++            rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() );
++        }
+     }
+ }
+ void WW8_WrPlcSepx::OutFooter( SwWW8Writer& rWrt, const SwFmt& rFmt,
+@@ -1074,6 +1079,7 @@
+ {
+     if( nFlag & nHFFlags )
+     {
++        rWrt.bHasFtr = true;
+         const SwFmtFooter& rFt = rFmt.GetFooter();
+         ASSERT( rFt.GetFooterFmt(), "KopfText nicht richtig da" );
+         const SwFmtCntnt& rCntnt = rFt.GetFooterFmt()->GetCntnt();
+@@ -1085,8 +1091,12 @@
+     else if( rWrt.bWrtWW8 )
+     {
+         pTxtPos->Append( rCpPos );
+-        rWrt.WriteStringAsPara( aEmptyStr ); // CR ans Ende ( sonst mault WW )
+-        rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() );
++        if (rWrt.bHasFtr)
++        {
++            rWrt.WriteStringAsPara( aEmptyStr ); // Empty paragraph for empty footer
++            rWrt.WriteStringAsPara( aEmptyStr ); // a CR that WW8 needs for end of the stream
++            rCpPos = rWrt.Fc2Cp( rWrt.Strm().Tell() );
++        }
+     }
+ }
+ 
+diff -u -r sw/source/filter/ww8/wrtww8.cxx sw/source/filter/ww8/wrtww8.cxx
+--- sw/source/filter/ww8/wrtww8.cxx	2008-02-02 10:09:08.000000000 +0100
++++ sw/source/filter/ww8/wrtww8.cxx	2008-02-02 10:10:12.000000000 +0100
+@@ -2553,7 +2553,8 @@
+ SwWW8Writer::SwWW8Writer(const String& rFltName, const String& rBaseURL)
+     : aMainStg(sMainStream), pISet(0), pUsedNumTbl(0), mpTopNodeOfHdFtPage(0),
+     pBmpPal(0), pKeyMap(0), pOLEExp(0), pOCXExp(0), pOleMap(0), nUniqueList(0),
+-    mnHdFtIndex(0), pAktPageDesc(0), pPapPlc(0), pChpPlc(0), pChpIter(0), pO(0)
++    mnHdFtIndex(0), pAktPageDesc(0), pPapPlc(0), pChpPlc(0), pChpIter(0), pO(0),
++    bHasHdr(false), bHasFtr(false)
+ {
+     SetBaseURL( rBaseURL );
+     bWrtWW8 = rFltName.EqualsAscii(FILTER_WW8);
+diff -u -r sw/source/filter/ww8/wrtww8.hxx sw/source/filter/ww8/wrtww8.hxx
+--- sw/source/filter/ww8/wrtww8.hxx	2008-02-02 10:09:08.000000000 +0100
++++ sw/source/filter/ww8/wrtww8.hxx	2008-02-02 10:10:12.000000000 +0100
+@@ -536,6 +536,8 @@
+     BYTE bInWriteTOX : 1;       // true: all content are in a TOX
+     BYTE bFtnAtTxtEnd : 1;      // true: all FTN at Textend
+     BYTE bEndAtTxtEnd : 1;      // true: all END at Textend
++    BYTE bHasHdr : 1;
++    BYTE bHasFtr : 1;
+ 
+ 
+