diff options
| author | Noel Grandin <noel@peralex.com> | 2012-07-19 13:12:17 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-25 14:13:45 +0200 |
| commit | 63f792d9b1482c518f37b4d0681082ea49957a1e (patch) | |
| tree | 20a971bd0aff47a6bfea9bba60ff189dba75829c /sw/source/ui | |
| parent | 9532d9bc22b411f20d8203b9495aea2eae158e72 (diff) | |
Convert SV_DECL_PTRARR_SORT(SwOutlineNodes) to o3tl::sorted_vector
Change-Id: I17c40bda4ab401bde42b64d090fd7e3259e79026
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/app/docsh.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/app/docsh2.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/uno/unotxdoc.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 9d51d7e6edaa..21f125e210ae 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -1010,7 +1010,7 @@ void SwDocShell::GetState(SfxItemSet& rSet) case FN_ABSTRACT_NEWDOC: case FN_OUTLINE_TO_CLIPBOARD: { - if ( !GetDoc()->GetNodes().GetOutLineNds().Count() ) + if ( GetDoc()->GetNodes().GetOutLineNds().empty() ) rSet.DisableItem( nWhich ); } break; diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index d2d6013a2928..32ee54712484 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -1256,10 +1256,10 @@ void SwDocShell::Execute(SfxRequest& rReq) bool bOutline[MAXLEVEL] = {false}; const SwOutlineNodes& rOutlNds = pDoc->GetNodes().GetOutLineNds(); - if( rOutlNds.Count() ) + if( !rOutlNds.empty() ) { int nLevel; - for(sal_uInt16 n = 0; n < rOutlNds.Count(); ++n ) + for(sal_uInt16 n = 0; n < rOutlNds.size(); ++n ) if( ( nLevel = rOutlNds[n]->GetTxtNode()->GetAttrOutlineLevel()) > 0 && ! bOutline[nLevel-1] ) { diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx index d62ef84e32be..09b5beccfab2 100644 --- a/sw/source/ui/uno/unotxdoc.cxx +++ b/sw/source/ui/uno/unotxdoc.cxx @@ -3452,7 +3452,7 @@ Any SwXLinkNameAccessWrapper::getByName(const OUString& rName) if(!pxDoc->GetDocShell()) throw RuntimeException(); SwDoc* pDoc = pxDoc->GetDocShell()->GetDoc(); - sal_uInt16 nOutlineCount = pDoc->GetNodes().GetOutLineNds().Count(); + sal_uInt16 nOutlineCount = pDoc->GetNodes().GetOutLineNds().size(); for (sal_uInt16 i = 0; i < nOutlineCount && !bFound; ++i) { @@ -3495,7 +3495,7 @@ Sequence< OUString > SwXLinkNameAccessWrapper::getElementNames(void) SwDoc* pDoc = pxDoc->GetDocShell()->GetDoc(); const SwOutlineNodes& rOutlineNodes = pDoc->GetNodes().GetOutLineNds(); - sal_uInt16 nOutlineCount = rOutlineNodes.Count(); + sal_uInt16 nOutlineCount = rOutlineNodes.size(); aRet.realloc(nOutlineCount); OUString* pResArr = aRet.getArray(); String sSuffix = rtl::OUString('|'); @@ -3539,7 +3539,7 @@ sal_Bool SwXLinkNameAccessWrapper::hasByName(const OUString& rName) if(!pxDoc->GetDocShell()) throw RuntimeException(); SwDoc* pDoc = pxDoc->GetDocShell()->GetDoc(); - sal_uInt16 nOutlineCount = pDoc->GetNodes().GetOutLineNds().Count(); + sal_uInt16 nOutlineCount = pDoc->GetNodes().GetOutLineNds().size(); for (sal_uInt16 i = 0; i < nOutlineCount && !bRet; ++i) { |