[Libreoffice-commits] .: sd/source

[Joseph Powers]

 sd/source/ui/view/drviewsc.cxx |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

New commits:
commit 07f6088eb941cd99810a835708fdb2aea2008adf
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sat Jan 1 10:58:45 2011 -0800

    Remove DECLARE_LIST( TargetList, String* )

diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index 73cc59f..d99a8b4 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -2,7 +2,7 @@
 /*************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
+ *
  * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
@@ -64,8 +64,8 @@
 #include "drawdoc.hxx"
 #include "DrawDocShell.hxx"
 #include "drawview.hxx"
-#include "sdabstdlg.hxx" 
-#include "brkdlg.hrc" 
+#include "sdabstdlg.hxx"
+#include "brkdlg.hrc"
 namespace sd {
 
 #define	MIN_ACTIONS_FOR_DIALOG	5000	// bei mehr als 1600 Metaobjekten
@@ -121,7 +121,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
                 OSL_ENSURE(pFact, "Dialogdiet fail!");
                 AbstractSvxObjectNameDialog* pDlg = pFact->CreateSvxObjectNameDialog(NULL, aName);
                 OSL_ENSURE(pDlg, "Dialogdiet fail!");
-                
+
                 pDlg->SetCheckNameHdl(LINK(this, DrawViewShell, NameObjectHdl));
 
                 if(RET_OK == pDlg->Execute())
@@ -200,7 +200,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
             rReq.Done ();
         }
         break;
-        
+
         case SID_COMBINE:  // BASIC
         {
             // #88224# End text edit to avoid conflicts
@@ -962,13 +962,8 @@ void DrawViewShell::UpdateIMapDlg( SdrObject* pObj )
         // TargetListe kann von uns wieder geloescht werden
         if ( pTargetList )
         {
-            String* pEntry = pTargetList->First();
-            while( pEntry )
-            {
-                delete pEntry;
-                pEntry = pTargetList->Next();
-            }
-
+            for ( size_t i = 0, n = pTargetList->size(); i < n; ++i )
+                delete pTargetList->at( i );
             delete pTargetList;
         }
     }