diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-03-28 13:35:19 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-03-28 13:35:47 -0400 |
| commit | d192756c71519b1f013bbaa1a0594d46606a6336 (patch) | |
| tree | 0c4c3db0cab646122b015621e500a5004d29cd13 | |
| parent | 38e07aab9eb8c3c1d18038857b5dda28aace5bff (diff) | |
No more CharAttribArray.
| -rw-r--r-- | editeng/source/editeng/editdbg.cxx | 12 | ||||
| -rw-r--r-- | editeng/source/editeng/editdoc.hxx | 5 |
2 files changed, 7 insertions, 10 deletions
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx index fc9c56223166..a1b457579473 100644 --- a/editeng/source/editeng/editdbg.cxx +++ b/editeng/source/editeng/editdbg.cxx @@ -496,19 +496,19 @@ sal_Bool ParaPortion::DbgCheckTextPortions() } #endif -sal_Bool CheckOrderedList( CharAttribArray& rAttribs, sal_Bool bStart ) +bool CheckOrderedList(const CharAttribList::AttribsType& rAttribs, bool bStart) { sal_uInt16 nPrev = 0; - for ( sal_uInt16 nAttr = 0; nAttr < rAttribs.Count(); nAttr++ ) + for (size_t nAttr = 0; nAttr < rAttribs.size(); ++nAttr) { - EditCharAttrib* pAttr = rAttribs[nAttr]; - sal_uInt16 nCur = bStart ? pAttr->GetStart() : pAttr->GetEnd(); + const EditCharAttrib& rAttr = rAttribs[nAttr]; + sal_uInt16 nCur = bStart ? rAttr.GetStart() : rAttr.GetEnd(); if ( nCur < nPrev ) - return sal_False; + return false; nPrev = nCur; } - return sal_True; + return true; } #endif diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index 2bd515110d64..11149907a6c7 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -117,9 +117,6 @@ struct WritingDirectionInfo typedef std::deque< WritingDirectionInfo > WritingDirectionInfos; -typedef EditCharAttrib* EditCharAttribPtr; -SV_DECL_PTRARR( CharAttribArray, EditCharAttribPtr, 0 ) - class ContentAttribsInfo { private: @@ -804,7 +801,7 @@ inline EditCharAttrib* GetAttrib(CharAttribList::AttribsType& rAttribs, size_t n return (nAttr < rAttribs.size()) ? &rAttribs[nAttr] : NULL; } -sal_Bool CheckOrderedList( CharAttribArray& rAttribs, sal_Bool bStart ); +bool CheckOrderedList(const CharAttribList::AttribsType& rAttribs, bool bStart); // ------------------------------------------------------------------------- // class EditEngineItemPool |