Kaydet (Commit) 29845c06 authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Michael Stahl

Convert SV_DECL_PTRARR(SdrObjects) to std::vector

üst 25394600
...@@ -386,7 +386,7 @@ SV_DECL_PTRARR_DEL(HTMLTableRows,HTMLTableRowPtr,5) ...@@ -386,7 +386,7 @@ SV_DECL_PTRARR_DEL(HTMLTableRows,HTMLTableRowPtr,5)
typedef HTMLTableColumn* HTMLTableColumnPtr; typedef HTMLTableColumn* HTMLTableColumnPtr;
SV_DECL_PTRARR_DEL(HTMLTableColumns,HTMLTableColumnPtr,5) SV_DECL_PTRARR_DEL(HTMLTableColumns,HTMLTableColumnPtr,5)
SV_DECL_PTRARR(SdrObjects,SdrObject *,1) typedef std::vector<SdrObject *> SdrObjects;
class HTMLTable class HTMLTable
{ {
...@@ -2760,7 +2760,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail, ...@@ -2760,7 +2760,7 @@ void HTMLTable::MakeTable( SwTableBox *pBox, sal_uInt16 nAbsAvail,
if( pResizeDrawObjs ) if( pResizeDrawObjs )
{ {
sal_uInt16 nCount = pResizeDrawObjs->Count(); sal_uInt16 nCount = pResizeDrawObjs->size();
for( sal_uInt16 i=0; i<nCount; i++ ) for( sal_uInt16 i=0; i<nCount; i++ )
{ {
SdrObject *pObj = (*pResizeDrawObjs)[i]; SdrObject *pObj = (*pResizeDrawObjs)[i];
...@@ -2802,7 +2802,7 @@ void HTMLTable::RegisterDrawObject( SdrObject *pObj, sal_uInt8 nPrcWidth ) ...@@ -2802,7 +2802,7 @@ void HTMLTable::RegisterDrawObject( SdrObject *pObj, sal_uInt8 nPrcWidth )
{ {
if( !pResizeDrawObjs ) if( !pResizeDrawObjs )
pResizeDrawObjs = new SdrObjects; pResizeDrawObjs = new SdrObjects;
pResizeDrawObjs->C40_INSERT( SdrObject, pObj, pResizeDrawObjs->Count() ); pResizeDrawObjs->push_back( pObj );
if( !pDrawObjPrcWidths ) if( !pDrawObjPrcWidths )
pDrawObjPrcWidths = new std::vector<sal_uInt16>; pDrawObjPrcWidths = new std::vector<sal_uInt16>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment