ooo-build r15009 - in branches/opensuse-11-1: . patches/dev300

[ameliaw svn gnome org]

Author: ameliaw
Date: Wed Jan  7 03:29:32 2009
New Revision: 15009
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15009&view=rev

Log:
fixed problem with outline numbering broken in master document


Added:
   branches/opensuse-11-1/patches/dev300/sw-outline-numbering-broken-fix.diff
Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/apply

Modified: branches/opensuse-11-1/patches/dev300/apply
==============================================================================
--- branches/opensuse-11-1/patches/dev300/apply	(original)
+++ branches/opensuse-11-1/patches/dev300/apply	Wed Jan  7 03:29:32 2009
@@ -2296,6 +2296,8 @@
 svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
 goodies-eps-filter-unix.diff, n#200053, rodo
 xmloff-import-crash-fix-for-i90562.diff, i#90562, flr
+# fix problem with outline numbering broken in master document
+sw-outline-numbering-broken-fix.diff, i#96092, n#445536, Amelia Wang
 
 [ EMFPlus ]
 SectionOwner => rodo

Added: branches/opensuse-11-1/patches/dev300/sw-outline-numbering-broken-fix.diff
==============================================================================
--- (empty file)
+++ branches/opensuse-11-1/patches/dev300/sw-outline-numbering-broken-fix.diff	Wed Jan  7 03:29:32 2009
@@ -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.