diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-20 18:18:43 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-20 18:18:43 +0200 |
commit | b64c730520204a6aa81e705532bb191450510519 (patch) | |
tree | bfb7d617cdaa385b44817073c973da5486d8e0a8 /sw/source/core/doc/dbgoutsw.cxx | |
parent | 104567a5340db731f08ee6eef03f0deef9e5118d (diff) |
Adapt DBG_UTIL code to 1015cd4ff73ee25e55b4da8c8bc55a41e652da87
Change-Id: I196f7a6211a3c11d976a95d592af4205476fe81f
Diffstat (limited to 'sw/source/core/doc/dbgoutsw.cxx')
-rw-r--r-- | sw/source/core/doc/dbgoutsw.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx index 03fdce558399..89bc16e6b956 100644 --- a/sw/source/core/doc/dbgoutsw.cxx +++ b/sw/source/core/doc/dbgoutsw.cxx @@ -72,13 +72,13 @@ String lcl_dbg_out_SvPtrArr(const T & rArr) { String aStr("[ ", RTL_TEXTENCODING_ASCII_US); - for (sal_Int16 n = 0; n < rArr.Count(); n++) + for (typename T::const_iterator i(rArr.begin()); i != rArr.end(); ++i) { - if (n > 0) + if (i != rArr.begin()) aStr += String(", ", RTL_TEXTENCODING_ASCII_US); - if (rArr[n]) - aStr += lcl_dbg_out(*rArr[n]); + if (*i) + aStr += lcl_dbg_out(**i); else aStr += String("(null)", RTL_TEXTENCODING_ASCII_US); } @@ -473,9 +473,10 @@ const String lcl_AnchoredFrames(const SwNode & rNode) if (pFrmFmts) { bool bFirst = true; - for (sal_uInt16 nI = 0; nI < pFrmFmts->Count(); nI++) + for (SwFrmFmts::const_iterator i(pFrmFmts->begin()); + i != pFrmFmts->end(); ++i) { - const SwFmtAnchor & rAnchor = (*pFrmFmts)[nI]->GetAnchor(); + const SwFmtAnchor & rAnchor = (*i)->GetAnchor(); const SwPosition * pPos = rAnchor.GetCntntAnchor(); if (pPos && &pPos->nNode.GetNode() == &rNode) @@ -483,8 +484,8 @@ const String lcl_AnchoredFrames(const SwNode & rNode) if (! bFirst) aResult += String(", ", RTL_TEXTENCODING_ASCII_US); - if ((*pFrmFmts)[nI]) - aResult += lcl_dbg_out(*(*pFrmFmts)[nI]); + if (*i) + aResult += lcl_dbg_out(**i); bFirst = false; } } |