diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2011-03-22 17:38:22 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2011-03-22 17:38:22 +0100 |
commit | 81b6e47acf8549f865f7bb365976d192e07abfb8 (patch) | |
tree | cbdb6b251ac715bbcdbaaf0d5b40381a4dbfe2d1 /sw/source/core/txtnode/thints.cxx | |
parent | cf8775536c487590c5c698511289e2dd7bb084b4 (diff) | |
parent | ea129aa54826091152b59817a295ed0c7075b3bd (diff) |
CWS-TOOLING: integrate CWS sw34bf04
Notes
Notes:
split repo tag: writer_ooo/DEV300_m104
Diffstat (limited to 'sw/source/core/txtnode/thints.cxx')
-rw-r--r-- | sw/source/core/txtnode/thints.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx index cfda0e1bd529..74039a66ca58 100644 --- a/sw/source/core/txtnode/thints.cxx +++ b/sw/source/core/txtnode/thints.cxx @@ -2101,7 +2101,7 @@ struct RemovePresentAttrs const SwTxtAttr* const pAutoStyle(i_rAttrSpan.second); SfxItemIter aIter(m_rAttrSet); const SfxPoolItem* pItem(aIter.GetCurItem()); - while (true) + while (pItem) { const sal_uInt16 nWhich(pItem->Which()); if (CharFmt::IsItemIncluded(nWhich, pAutoStyle)) @@ -2143,7 +2143,8 @@ lcl_CollectHintSpans(const SwpHints& i_rHints, const sal_uInt16 nLength, const AttrSpan_t aSpan(*pHint->GetStart(), *pHint->GetEnd()); o_rSpanMap.insert(AttrSpanMap_t::value_type(aSpan, pHint)); - if (aSpan.first != nLastEnd) + // < not != because there may be multiple CHARFMT at same range + if (nLastEnd < aSpan.first) { // insert dummy span covering the gap o_rSpanMap.insert(AttrSpanMap_t::value_type( |