ooo-build r14918 - in branches/ooo-build-3-0-1: . patches/dev300

[ameliaw svn gnome org]

Author: ameliaw
Date: Wed Dec 24 10:03:20 2008
New Revision: 14918
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14918&view=rev

Log:
add a fix sw-outline-numbering-broken-fix.diff, it fixes problem with
 outline numbering broken in master document.


Added:
   branches/ooo-build-3-0-1/patches/dev300/sw-outline-numbering-broken-fix.diff
Modified:
   branches/ooo-build-3-0-1/ChangeLog
   branches/ooo-build-3-0-1/patches/dev300/apply

Modified: branches/ooo-build-3-0-1/patches/dev300/apply
==============================================================================
--- branches/ooo-build-3-0-1/patches/dev300/apply	(original)
+++ branches/ooo-build-3-0-1/patches/dev300/apply	Wed Dec 24 10:03:20 2008
@@ -2651,6 +2651,8 @@
 # Make tooltips for the icon on the desktop and in the Start Menu on
 # Windows less lame
 win32-tooltips.diff, tml
+# fix problem with outline numbering broken in master document
+sw-outline-numbering-broken-fix.diff, i#96092, n#445536, Amelia Wang
 
 [ OxygenOfficeDefaultSettings ]
 #Create langpack and full installers

Added: branches/ooo-build-3-0-1/patches/dev300/sw-outline-numbering-broken-fix.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-3-0-1/patches/dev300/sw-outline-numbering-broken-fix.diff	Wed Dec 24 10:03:20 2008
@@ -0,0 +1,13 @@
+diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
+index 4f62703..05d073e 100644
+--- sw/source/core/docnode/ndcopy.cxx
++++ sw/source/core/docnode/ndcopy.cxx
+@@ -112,7 +112,7 @@ SwCntntNode* SwTxtNode::MakeCopy( SwDoc* pDoc, const SwNodeIndex& rIdx ) const
+ 	// kopiere Attribute/Text
+     if( !pCpyAttrNd->HasSwAttrSet() )
+ 		// wurde ein AttrSet fuer die Numerierung angelegt, so loesche diesen!
+-		pTxtNd->ResetAllAttr();
++		pCpyAttrNd->ResetAllAttr();
+ 
+ 	// if Copy-Textnode unequal to Copy-Attrnode, then copy first
+ 	// the attributes into the new Node.