[Libreoffice-commits] .: binfilter/bf_svx binfilter/inc

[Joseph Powers]

 binfilter/bf_svx/source/engine3d/svx_scene3d.cxx |   16 ++++++++--------
 binfilter/inc/bf_svx/label3d.hxx                 |    6 ++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit 29e37bf646584e92dfe35e0840c3a2bae3c617b6
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu Jan 20 08:06:30 2011 -0800

    Remove DECLARE_LIST(E3dLabelList, E3dLabelObj*)

diff --git a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx b/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
index c5522b8..17ffb2b 100644
--- a/binfilter/bf_svx/source/engine3d/svx_scene3d.cxx
+++ b/binfilter/bf_svx/source/engine3d/svx_scene3d.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
@@ -221,7 +221,7 @@ namespace binfilter {
 /*N*/ 	GetCameraSet().SetViewportRectangle((Rectangle&)rCam.GetDeviceWindow());
 /*N*/
 /*N*/ 	// E3dLabel-Objekte muessen neu an die Projektion angepasst werden
-/*N*/ 	if ( aLabelList.Count() > 0 )
+/*N*/ 	if ( !aLabelList.empty() )
 /*N*/ 	{
 /*N*/ 		SetBoundVolInvalid();
 /*N*/ 		SetRectsDirty();
@@ -243,7 +243,7 @@ namespace binfilter {
 /*N*/
 /*N*/ 	if ( p3DObj->ISA(E3dLabelObj) )
 /*N*/ 	{
-/*N*/ 		aLabelList.Insert((E3dLabelObj*) p3DObj, LIST_APPEND);
+/*N*/ 		aLabelList.push_back( (E3dLabelObj*) p3DObj );
 /*N*/ 	}
 /*N*/
 /*N*/ 	// falls Unterobjekte vorhanden sind, auch diese pruefen
@@ -257,7 +257,7 @@ namespace binfilter {
 /*N*/
 /*N*/ 			if ( pObj->ISA(E3dLabelObj) )
 /*N*/ 			{
-/*N*/ 				aLabelList.Insert((E3dLabelObj*) pObj, LIST_APPEND);
+/*N*/ 				aLabelList.push_back( (E3dLabelObj*) pObj );
 /*N*/ 			}
 /*N*/ 		}
 /*N*/ 	}
@@ -322,7 +322,7 @@ namespace binfilter {
 /*N*/ 	}
 /*N*/
 /*N*/ 	// Labels behandeln
-/*N*/ 	ULONG nLabelCnt = aLabelList.Count();
+/*N*/ 	size_t nLabelCnt = aLabelList.size();
 /*N*/ 	if ( nLabelCnt > 0 )
 /*N*/ 	{
 /*N*/ 		// Vorlaeufige Projektion bestimmen und Transformation in
@@ -357,9 +357,9 @@ namespace binfilter {
 /*N*/ 		Matrix4D aMatViewToWorld(aMatWorldToView);
 /*N*/ 		aMatViewToWorld.Invert();
 /*N*/
-/*N*/ 		for (ULONG i = 0; i < nLabelCnt; i++)
+/*N*/ 		for (size_t i = 0; i < nLabelCnt; i++)
 /*N*/ 		{
-/*N*/ 			E3dLabelObj* p3DObj = aLabelList.GetObject(i);
+/*N*/ 			E3dLabelObj* p3DObj = aLabelList[ i ];
 /*N*/ 			const SdrObject* pObj = p3DObj->Get2DLabelObj();
 /*N*/
 /*N*/ 			// View- Abmessungen des Labels holen
@@ -721,7 +721,7 @@ namespace binfilter {
 /*N*/ void E3dScene::RebuildLists()
 /*N*/ {
 /*N*/ 	// zuerst loeschen
-/*N*/ 	aLabelList.Clear();
+/*N*/ 	aLabelList.clear();
 /*N*/ 	SdrLayerID nLclLayerID = GetLayer();
 /*N*/
 /*N*/ 	SdrObjListIter a3DIterator(*pSub, IM_FLAT);
diff --git a/binfilter/inc/bf_svx/label3d.hxx b/binfilter/inc/bf_svx/label3d.hxx
index 7d71c4f..45ac927 100644
--- a/binfilter/inc/bf_svx/label3d.hxx
+++ b/binfilter/inc/bf_svx/label3d.hxx
@@ -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
@@ -30,6 +30,8 @@
 #define _E3D_LABEL3D_HXX
 
 #include <bf_svx/pntobj3d.hxx>
+#include <vector>
+
 namespace binfilter {
 
 class Viewport3D;
@@ -39,7 +41,7 @@ class E3dLabelObj;
 /************************************************************************/
 
 class E3dLabelObj;
-DECLARE_LIST(E3dLabelList, E3dLabelObj*)//STRIP008 DECLARE_LIST(E3dLabelList, E3dLabelObj*);
+typedef ::std::vector< E3dLabelObj* > E3dLabelList;
 
 /*************************************************************************
 |*