[Libreoffice-commits] .: 3 commits - sd/source

[Joseph Powers]

 sd/source/core/drawdoc2.cxx      |   22 ++++++++++------------
 sd/source/filter/eppt/epptso.cxx |    1 -
 sd/source/filter/html/htmlex.cxx |   15 +++++++--------
 3 files changed, 17 insertions(+), 21 deletions(-)

New commits:
commit f8976086a437d3bb5b5263cf8c953f6047f6d28f
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Sun May 8 14:24:52 2011 -0430

    Remove deprecated List in HtmlExport::CreateHtmlForPresPages.
    
    Exchange for std::vector<SdrObject*>.

diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 64e2b7e..dd5ffc6 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1489,7 +1489,7 @@ bool HtmlExport::CreateHtmlForPresPages()
 {
     bool bOk = true;
 
-    List aClickableObjects;
+    std::vector<SdrObject*> aClickableObjects;
 
     for(sal_uInt16 nSdPage = 0; nSdPage < mnSdPageCount && bOk; nSdPage++)
     {
@@ -1527,7 +1527,7 @@ bool HtmlExport::CreateHtmlForPresPages()
                       pInfo->meClickAction == presentation::ClickAction_LASTPAGE)) ||
                      pIMapInfo)
                 {
-                    aClickableObjects.Insert(pObject, LIST_APPEND);
+                    aClickableObjects.push_back(pObject);
                 }
 
                 pObject = aIter.Next();
@@ -1538,7 +1538,6 @@ bool HtmlExport::CreateHtmlForPresPages()
             else
                 bMasterDone = true;
         }
-        sal_uLong nClickableObjectCount = aClickableObjects.Count();
 
 // HTML Head
         String aStr(maHTMLHeader);
@@ -1603,7 +1602,7 @@ bool HtmlExport::CreateHtmlForPresPages()
         aStr += StringToURL( *mpImageFiles[nSdPage] );
         aStr.AppendAscii( "\" alt=\"\"" );
 
-        if (nClickableObjectCount > 0)
+        if (!aClickableObjects.empty())
             aStr.AppendAscii( " USEMAP=\"#map0\"" );
 
         aStr.AppendAscii( "></center>\r\n" );
@@ -1628,13 +1627,13 @@ bool HtmlExport::CreateHtmlForPresPages()
         }
 
 // ggfs. Imagemap erzeugen
-        if (nClickableObjectCount > 0)
+        if (!aClickableObjects.empty())
         {
             aStr.AppendAscii( "<map name=\"map0\">\r\n" );
 
-            for (sal_uLong nObject = 0; nObject < nClickableObjectCount; nObject++)
+            for (sal_uInt32 nObject = 0, n = aClickableObjects.size(); nObject < n; nObject++)
             {
-                SdrObject* pObject = (SdrObject*)aClickableObjects.GetObject(nObject);
+                SdrObject* pObject = aClickableObjects[nObject];
                 SdAnimationInfo* pInfo	   = mpDoc->GetAnimationInfo(pObject);
                 SdIMapInfo* 	 pIMapInfo = mpDoc->GetIMapInfo(pObject);
 
@@ -1848,7 +1847,7 @@ bool HtmlExport::CreateHtmlForPresPages()
 
             aStr.AppendAscii( "</map>\r\n" );
         }
-        aClickableObjects.Clear();
+        aClickableObjects.clear();
 
         aStr.AppendAscii( "</body>\r\n</html>" );
 
commit ca3c1eb218b4568b59e4be5dbbb528edc3e0efcd
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Sun May 8 14:24:27 2011 -0430

    Remove unused List in PPTWriter::ImplWritePage.

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 3be71ed..9a5db3a 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -2281,7 +2281,6 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, EscherSolverContainer& a
             sal_Bool bPolyPolygon  = mType == "drawing.PolyPolygon";
             sal_Bool bPolyLine = mType == "drawing.PolyLine";
 
-            List        aAdjustmentList;
             Rectangle   aPolyBoundRect;
 
             const ::com::sun::star::awt::Size   aSize100thmm( mXShape->getSize() );
commit 6b7356394ea59750bb4cc00e054b95520e673eb2
Author: Rafael Dominguez <venccsralph at gmail.com>
Date:   Sun May 8 14:23:27 2011 -0430

    Remove deprecated List in SdDrawDocument::MovePages.
    
    Exchange for std::vector<SdPage*>

diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index bd306a9..9956618 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -786,14 +786,13 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
         BegUndo(String(SdResId(STR_UNDO_MOVEPAGES)));
 
     // Liste mit selektierten Seiten
-    List	aPageList;
+    std::vector<SdPage*> aPageList;
     for (nPage = 0; nPage < nNoOfPages; nPage++)
     {
         pPage = GetSdPage(nPage, PK_STANDARD);
+
         if (pPage->IsSelected())
-        {
-            aPageList.Insert(pPage, LIST_APPEND);
-        }
+            aPageList.push_back(pPage);
     }
 
     // falls noetig, nach vorne hangeln, bis nicht selektierte Seite gefunden
@@ -816,11 +815,10 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
     // vor der ersten Seite einfuegen
     if (nPage == (sal_uInt16)-1)
     {
-        while (aPageList.Count() > 0)
+        std::vector<SdPage*>::reverse_iterator iter;
+        for (iter = aPageList.rbegin(); iter != aPageList.rend(); ++iter)
         {
-            aPageList.Last();
-
-            nPage = ( (SdPage*) aPageList.GetCurObject() )->GetPageNum();
+            nPage = (*iter)->GetPageNum();
             if (nPage != 0)
             {
                 SdrPage* pPg = GetPage(nPage);
@@ -833,7 +831,6 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
                 MovePage(nPage+1, 2);
                 bSomethingHappened = sal_True;
             }
-            aPageList.Remove();
         }
     }
     // hinter <nPage> einfuegen
@@ -841,9 +838,11 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
     {
         nTargetPage = nPage;
         nTargetPage = 2 * nTargetPage + 1;	  // PK_STANDARD --> absolut
-        while (aPageList.Count() > 0)
+
+        std::vector<SdPage*>::iterator iter;
+        for (iter = aPageList.begin(); iter != aPageList.end(); ++iter)
         {
-            pPage = (SdPage*)aPageList.GetObject(0);
+            pPage = *iter;
             nPage = pPage->GetPageNum();
             if (nPage > nTargetPage)
             {
@@ -877,7 +876,6 @@ sal_Bool SdDrawDocument::MovePages(sal_uInt16 nTargetPage)
                     bSomethingHappened = sal_True;
                 }
             }
-            aPageList.Remove((sal_uLong)0);
             nTargetPage = pPage->GetPageNum();
         }
     }