ooo-build r14651 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri Nov 28 14:59:01 2008
New Revision: 14651
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14651&view=rev

Log:
2008-11-28  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply
	* patches/dev300/sw-ww8-fieldandcharstyle.diff
	* patches/dev300/sw-ww8-fieldandcharstyle-m35.diff: Differentiate
	for m35 vs. m36 and later.



Added:
   trunk/patches/dev300/sw-ww8-fieldandcharstyle-m35.diff   (props changed)
      - copied unchanged from r14648, /trunk/patches/dev300/sw-ww8-fieldandcharstyle.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/sw-ww8-fieldandcharstyle.diff

Modified: trunk/patches/dev300/sw-ww8-fieldandcharstyle.diff
==============================================================================
--- trunk/patches/dev300/sw-ww8-fieldandcharstyle.diff	(original)
+++ trunk/patches/dev300/sw-ww8-fieldandcharstyle.diff	Fri Nov 28 14:59:01 2008
@@ -135,16 +135,16 @@
 +    bool bUnicode = IsUnicode();
 +    WW8_WrPlcFld* pFldP = CurrentFieldPlc();
  
-     if (WRITEFIELD_START & nMode)
-     {
+     // --> OD 2008-08-14 #158418#
+     const bool bIncludeEmptyPicLocation = ( eFldType == ww::ePAGE );
 @@ -1820,6 +1834,7 @@ void SwWW8Writer::OutField(const SwField* pFld, ww::eField eFldType,
      {
          static const BYTE aFld14[2] = { 0x14, 0xff };
          pFldP->Append( Fc2Cp( Strm().Tell() ), aFld14 );
 +        pFldP->ResultAdded();
+         // --> OD 2008-08-14 #158418#
          InsertSpecialChar( *this, 0x14 );
      }
-     if (WRITEFIELD_END & nMode)
 @@ -1847,16 +1862,25 @@ void SwWW8Writer::OutField(const SwField* pFld, ww::eField eFldType,
                      BYTE aArr[12];
                      BYTE *pArr = aArr;