summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-03-21 10:42:02 +0100
committerMichael Stahl <mstahl@redhat.com>2012-03-21 12:08:36 +0100
commita4788b254268aa2d61b14678301f22cdbd27d2e7 (patch)
tree2e3cf50afc560f3367b8a78e413c3f16a4a23f84
parentcc99bb9f383a65912d004e227a5b6a88b401bbba (diff)
Revert "sw-outline-numbering-broken-fix.diff: outline numbering fix in master docs"
This reverts commit 9a11bd42af0db32fd06c84dd955ee563134665ce. Removing attributes from the _source_ node in SwTxtNode::MakeCopy does not make any sens at all, and the cited issue i#96092 was apparently fixed independently in CWS sw31bf04 by the change to ndtxt.cxx in 1524aa18b9ddf7a4181e3f278155c48655084452.
-rw-r--r--sw/source/core/docnode/ndcopy.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/docnode/ndcopy.cxx b/sw/source/core/docnode/ndcopy.cxx
index 24615052be10..4aabfbaab488 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -266,7 +266,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!
- pCpyAttrNd->ResetAllAttr();
+ pTxtNd->ResetAllAttr();
// if Copy-Textnode unequal to Copy-Attrnode, then copy first
// the attributes into the new Node.