diff options
author | Michael Stahl <mstahl@redhat.com> | 2013-10-08 18:37:35 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-10-09 13:14:36 +0000 |
commit | a1d37630ae191f526cc83b0c964df9b9bcb7d41d (patch) | |
tree | 671c0290010beec51266f34b3b6da1ada8622567 | |
parent | ff8112e22eeb00dd0ed3b2232704d96e92333d76 (diff) |
fdo#70201: sw: eliminate no-extent RSID-only AUTOFMT hints
These are already filtered out in SwpHints::TryInsertHint(), but they
can be produced by a SwTxtNode::Update() following some deletion like in
SwTxtNode::ReplaceText() (or maybe CutImpl() and RstAttr() too?).
So in order to prevent SwHistorySetTxt being created for these,
filter them out in SwpHints::MergePortions(), which has the advantage
that it's one location to change; probably filtering in Update() and
RstAttr() both would work too.
(regression from 6db39dbd7378351f6476f6db25eb7110c9cfb291)
Change-Id: I597a9ab290dcc3fb1b624dd2dca241c462acf256
(cherry picked from commit 91159b1c31a7fd474ba0b97828f593604790ce3c)
Reviewed-on: https://gerrit.libreoffice.org/6167
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sw/source/core/txtnode/thints.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index 0893dac325a5..34dac0af8c44 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -2528,6 +2528,15 @@ bool SwpHints::MergePortions( SwTxtNode& rNode ) pHt->GetAutoFmt().GetStyleHandle()); if ((pSet->Count() == 1) && pSet->GetItem(RES_CHRATR_RSID, false)) { + // fdo#70201: eliminate no-extent RSID-only AUTOFMT + // could be produced by ReplaceText or (maybe?) RstAttr + if (*pHt->GetStart() == *pHt->GetEnd()) + { + SwpHintsArray::DeleteAtPos(i); // kill it without History! + SwTxtAttr::Destroy(pHt, rNode.GetDoc()->GetAttrPool()); + --i; + continue; + } // fdo#52028: this one has _only_ RSID => ignore it completely if (!pHt->IsFormatIgnoreStart() || !pHt->IsFormatIgnoreEnd()) { |