diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-07-30 22:14:52 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-31 20:26:44 +0200 |
| commit | 51bbbc6a58d0d9cfd39a2d95ce60871a619bea64 (patch) | |
| tree | fec9f40ac51b22a8837b4ed4114957726bc16c85 /sw | |
| parent | 953a08b2dea5e07efb487b4d9bfccce5960193fc (diff) | |
SwRedlineItr: convert to STL
Change-Id: Idf3031a0a39d9154ba2894684ea51125553776b3
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/text/redlnitr.cxx | 12 | ||||
| -rw-r--r-- | sw/source/core/text/redlnitr.hxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx index 0e63f7616cf3..05f0cc9a1514 100644 --- a/sw/source/core/text/redlnitr.cxx +++ b/sw/source/core/text/redlnitr.cxx @@ -275,7 +275,7 @@ short SwRedlineItr::_Seek( SwFont& rFnt, xub_StrLen nNew, xub_StrLen nOld ) const_cast<SwDoc&>(rDoc), *const_cast<SfxPoolItem*>(pItem) ); pAttr->SetPriorityAttr( sal_True ); - aHints.C40_INSERT( SwTxtAttr, pAttr, aHints.Count()); + m_Hints.push_back(pAttr); rAttrHandler.PushAndChg( *pAttr, rFnt ); if( RES_CHRATR_COLOR == nWhich ) rFnt.SetNoCol( sal_True ); @@ -338,10 +338,10 @@ void SwRedlineItr::_Clear( SwFont* pFnt ) { OSL_ENSURE( bOn, "SwRedlineItr::Clear: Off?" ); bOn = sal_False; - while( aHints.Count() ) + while (!m_Hints.empty()) { - SwTxtAttr *pPos = aHints[ 0 ]; - aHints.Remove(0); + SwTxtAttr *pPos = m_Hints.front(); + m_Hints.pop_front(); if( pFnt ) rAttrHandler.PopAndChg( *pPos, *pFnt ); else @@ -377,9 +377,9 @@ sal_Bool SwRedlineItr::_ChkSpecialUnderline() const // Wenn die Unterstreichung oder das Escapement vom Redling kommt, // wenden wir immer das SpecialUnderlining, d.h. die Unterstreichung // unter der Grundlinie an. - for( MSHORT i = 0; i < aHints.Count(); ++i ) + for (MSHORT i = 0; i < m_Hints.size(); ++i) { - MSHORT nWhich = aHints[i]->Which(); + MSHORT nWhich = m_Hints[i]->Which(); if( RES_CHRATR_UNDERLINE == nWhich || RES_CHRATR_ESCAPEMENT == nWhich ) return sal_True; diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx index 8cbc1178dce1..42f1c24053e6 100644 --- a/sw/source/core/text/redlnitr.hxx +++ b/sw/source/core/text/redlnitr.hxx @@ -66,7 +66,7 @@ public: class SwRedlineItr { - SwpHtStart_SAR aHints; + std::deque<SwTxtAttr *> m_Hints; const SwDoc& rDoc; const SwTxtNode& rNd; SwAttrHandler& rAttrHandler; |