ooo-build r14388 - trunk/patches/dev300

[ameliaw svn gnome org]

Author: ameliaw
Date: Wed Oct 22 03:54:10 2008
New Revision: 14388
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14388&view=rev

Log:


Modified:
   trunk/patches/dev300/sw-import-TOC.diff

Modified: trunk/patches/dev300/sw-import-TOC.diff
==============================================================================
--- trunk/patches/dev300/sw-import-TOC.diff	(original)
+++ trunk/patches/dev300/sw-import-TOC.diff	Wed Oct 22 03:54:10 2008
@@ -1,6 +1,6 @@
-diff -uNr ooo300-m9-orig/sw/inc/doc.hxx ooo300-m9/sw/inc/doc.hxx
---- ooo300-m9-orig/sw/inc/doc.hxx	2008-10-21 11:49:46.000000000 +0800
-+++ ooo300-m9/sw/inc/doc.hxx	2008-10-17 17:18:12.000000000 +0800
+diff -uNr sw/inc/doc.hxx sw/inc/doc.hxx
+--- sw/inc/doc.hxx	2008-10-21 11:49:46.000000000 +0800
++++ sw/inc/doc.hxx	2008-10-17 17:18:12.000000000 +0800
 @@ -483,6 +483,7 @@
      bool mbInReading             : 1;    // TRUE: Dokument wird gerade gelesen
      bool mbInXMLImport           : 1;    // TRUE: During xml import, attribute portion building is not necessary
@@ -19,9 +19,9 @@
  	const String&	GetTOIAutoMarkURL() const {return sTOIAutoMarkURL;}
  	void			SetTOIAutoMarkURL(const String& rSet)  {sTOIAutoMarkURL = rSet;}
  	void 			ApplyAutoMark();
-diff -uNr ooo300-m9-orig/sw/source/core/doc/docnew.cxx ooo300-m9/sw/source/core/doc/docnew.cxx
---- ooo300-m9-orig/sw/source/core/doc/docnew.cxx	2008-10-21 11:49:47.000000000 +0800
-+++ ooo300-m9/sw/source/core/doc/docnew.cxx	2008-10-17 17:18:12.000000000 +0800
+diff -uNr sw/source/core/doc/docnew.cxx sw/source/core/doc/docnew.cxx
+--- sw/source/core/doc/docnew.cxx	2008-10-21 11:49:47.000000000 +0800
++++ sw/source/core/doc/docnew.cxx	2008-10-17 17:18:12.000000000 +0800
 @@ -316,6 +316,7 @@
  	mbInReading =
      mbInXMLImport =
@@ -30,9 +30,9 @@
  	mbInLoadAsynchron =
  	mbHTMLMode =
  	mbInCallModified =
-diff -uNr ooo300-m9-orig/sw/source/core/doc/doctxm.cxx ooo300-m9/sw/source/core/doc/doctxm.cxx
---- ooo300-m9-orig/sw/source/core/doc/doctxm.cxx	2008-10-21 11:49:47.000000000 +0800
-+++ ooo300-m9/sw/source/core/doc/doctxm.cxx	2008-10-17 17:58:18.000000000 +0800
+diff -uNr sw/source/core/doc/doctxm.cxx sw/source/core/doc/doctxm.cxx
+--- sw/source/core/doc/doctxm.cxx	2008-10-21 11:49:47.000000000 +0800
++++ sw/source/core/doc/doctxm.cxx	2008-10-17 17:58:18.000000000 +0800
 @@ -940,10 +940,26 @@
  		pDoc->CorrAbs( aSttIdx, aEndIdx, aPos, TRUE );
  
@@ -86,9 +86,9 @@
  		aSortArr[ nCnt ]->pTOXNd = pTOXNd;
  
  		// Generierung: Form auswerten und Platzhalter
-diff -uNr ooo300-m9-orig/sw/source/filter/ww8/ww8par5.cxx ooo300-m9/sw/source/filter/ww8/ww8par5.cxx
---- ooo300-m9-orig/sw/source/filter/ww8/ww8par5.cxx	2008-10-21 11:49:47.000000000 +0800
-+++ ooo300-m9/sw/source/filter/ww8/ww8par5.cxx	2008-10-17 17:18:12.000000000 +0800
+diff -uNr sw/source/filter/ww8/ww8par5.cxx sw/source/filter/ww8/ww8par5.cxx
+--- sw/source/filter/ww8/ww8par5.cxx	2008-10-21 11:49:47.000000000 +0800
++++ sw/source/filter/ww8/ww8par5.cxx	2008-10-17 17:18:12.000000000 +0800
 @@ -684,6 +684,12 @@
          nRet = maFieldStack.back().mnFieldId;
          switch (nRet)