diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-07-12 16:02:43 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-07-12 15:28:50 +0000 |
commit | a179db327c739f3580cf11201b1f6c8520bc2dcb (patch) | |
tree | 309a069635e554d4d09893621d23993c23f66ed3 | |
parent | 6fb427e8d233f7adf416d7ac48c7afb4435518d4 (diff) |
bnc#828598 fdo#59643 SwFormatClipboard: fix undo of paragraph attributes
Paragraph attributes were set directly on the SwTxtNodes, instead of
going through SwWrtShell::SetAttr(), which handles undo/redo.
Regression from 357fac9713875302d30185feabaf5c165e040ca4.
(cherry picked from commit b1cd73d3e62c5192bc3d77f5ecd1036ff42bde61)
Change-Id: I5dc86e20e3c006dab60a075355ce9ad1f1b67bb6
Reviewed-on: https://gerrit.libreoffice.org/4870
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r-- | sw/source/ui/uiview/formatclipboard.cxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx index 59ac47cbb1ea..7ee8a6355a64 100644 --- a/sw/source/ui/uiview/formatclipboard.cxx +++ b/sw/source/ui/uiview/formatclipboard.cxx @@ -538,19 +538,8 @@ void SwFormatClipboard::Paste( SwWrtShell& rWrtShell, SfxStyleSheetBasePool* pPo // remove attribute that were applied by named text and paragraph formatting lcl_RemoveEqualItems( *pTemplateItemSet, aItemVector ); - // it can't be a multiple selection - SwPaM* pCrsr = rWrtShell.GetCrsr(); - // apply the paragraph automatic attributes to all the nodes in the selection - for (SwNodeIndex pNodeIndexIterator = pCrsr->Start()->nNode, - pNodeIndexEnd = pCrsr->End()->nNode; - pNodeIndexIterator != pNodeIndexEnd; - ++pNodeIndexIterator ) - { - pNodeIndexIterator.GetNode().GetCntntNode()->SetAttr( *pTemplateItemSet ); - } - // same as pCrsr->End()->nNode.GetNode().GetCntntNode()->SetAttr - pCrsr->GetCntntNode()->SetAttr( *pTemplateItemSet ); + rWrtShell.SetAttr(*pTemplateItemSet); // store the attributes in aItemVector in order not to apply them as // text automatic formating attributes later in the code |