summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2012-06-12 15:41:27 +0200
committerMichael Stahl <mstahl@redhat.com>2012-06-12 23:25:10 +0200
commit2a360b68475d6fff5b6618feddb0b52f3a4a2373 (patch)
tree451af5b0f0f86241f578cf123818886436e31894 /sd
parent3a27dcd0ccac691307648c3d7a96c28412e0a311 (diff)
Convert SV_DECL_PTRARR(SvBaseLinks) to std::vector
Change-Id: I9197dc4fd7ed32f030de8121913265ec78c83585
Diffstat (limited to 'sd')
-rw-r--r--sd/source/core/drawdoc.cxx6
-rw-r--r--sd/source/core/drawdoc2.cxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index e897fc561a27..4c7c98985ab9 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -399,9 +399,9 @@ SdDrawDocument::~SdDrawDocument()
if (pLinkManager)
{
// BaseLinks freigeben
- if ( pLinkManager->GetLinks().Count() )
+ if ( !pLinkManager->GetLinks().empty() )
{
- pLinkManager->Remove( 0, pLinkManager->GetLinks().Count() );
+ pLinkManager->Remove( 0, pLinkManager->GetLinks().size() );
}
delete pLinkManager;
@@ -714,7 +714,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
/** updates all links, only links in this document should by resolved */
void SdDrawDocument::UpdateAllLinks()
{
- if ( !pDocLockedInsertingLinks && pLinkManager && pLinkManager->GetLinks().Count() )
+ if ( !pDocLockedInsertingLinks && pLinkManager && !pLinkManager->GetLinks().empty() )
{
pDocLockedInsertingLinks = this; // lock inserting links. only links in this document should by resolved
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 819debc6c6c5..f423d3f2d1ec 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -891,7 +891,7 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
sal_uLong SdDrawDocument::GetLinkCount()
{
- return ( pLinkManager->GetLinks().Count() );
+ return pLinkManager->GetLinks().size();
}
/*************************************************************************