summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-07-12 16:02:43 +0200
committerPetr Mladek <pmladek@suse.cz>2013-07-15 09:21:11 +0000
commit09b20c794a6647d3dd364e0f12d139532a1689bd (patch)
tree5845332a7637e1443b684e46c79d849d24033d59
parenteb1da44288bd02763644a6d7fa410abe6313ae0b (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/4868 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 5156749cde88c5274b36a22dab7b561d59b93cf1) Reviewed-on: https://gerrit.libreoffice.org/4871 Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org> Reviewed-by: Petr Mladek <pmladek@suse.cz> Tested-by: Petr Mladek <pmladek@suse.cz>
-rw-r--r--sw/source/ui/uiview/formatclipboard.cxx13
1 files changed, 1 insertions, 12 deletions
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx
index 5dd7ef2a0722..f7e41a6b19cf 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