diff options
| author | Noel Grandin <noel@peralex.com> | 2012-05-16 11:48:48 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-25 00:17:05 +0200 |
| commit | f5af47f432185881ce82956d8ed520948feab296 (patch) | |
| tree | 842ae2a2a0fd31e8453b0eb02db7746cab5c025b /sw | |
| parent | Convert SV_DECL_PTRARR_DEL(SwGetINetAttrs) to boost::ptr_vector (diff) | |
| download | core-f5af47f432185881ce82956d8ed520948feab296.tar.gz core-f5af47f432185881ce82956d8ed520948feab296.zip | |
Convert SV_DECL_PTRARR(SwOLENodes) to std::vector
Change-Id: I384e152b89ed6951417296a5722f831f8ba7cb46
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/docary.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/doc/docdesc.cxx | 8 | ||||
| -rw-r--r-- | sw/source/core/docnode/node.cxx | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index ab10e5bfe189..ef267c7f46e3 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -29,6 +29,7 @@ #define _DOCARY_HXX #include <com/sun/star/i18n/ForbiddenCharacters.hpp> +#include <vector> class SwFieldType; class SwFrmFmt; @@ -115,8 +116,7 @@ public: typedef SwUnoCrsr* SwUnoCrsrPtr; SV_DECL_PTRARR_DEL( SwUnoCrsrTbl, SwUnoCrsrPtr, 0 ) -typedef SwOLENode* SwOLENodePtr; -SV_DECL_PTRARR(SwOLENodes,SwOLENodePtr,16) +class SwOLENodes : public std::vector<SwOLENode*> {}; #endif //_DOCARY_HXX diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index dea6c0c183e6..0ca72d72d0b9 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -691,10 +691,10 @@ void SwDoc::PrtOLENotify( sal_Bool bAll ) if ( pNodes ) { ::StartProgress( STR_STATSTR_SWGPRTOLENOTIFY, - 0, pNodes->Count(), GetDocShell()); + 0, pNodes->size(), GetDocShell()); GetCurrentLayout()->StartAllAction(); - for( sal_uInt16 i = 0; i < pNodes->Count(); ++i ) + for( sal_uInt16 i = 0; i < pNodes->size(); ++i ) { ::SetProgressState( i, GetDocShell() ); @@ -751,11 +751,11 @@ IMPL_LINK( SwDoc, DoUpdateModifiedOLE, Timer *, ) if( pNodes ) { ::StartProgress( STR_STATSTR_SWGPRTOLENOTIFY, - 0, pNodes->Count(), GetDocShell()); + 0, pNodes->size(), GetDocShell()); GetCurrentLayout()->StartAllAction(); SwMsgPoolItem aMsgHint( RES_UPDATE_ATTR ); - for( sal_uInt16 i = 0; i < pNodes->Count(); ++i ) + for( sal_uInt16 i = 0; i < pNodes->size(); ++i ) { ::SetProgressState( i, GetDocShell() ); diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 55c592c371a5..f79573203267 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1948,7 +1948,7 @@ SwOLENodes* SwCntntNode::CreateOLENodesArray( const SwFmtColl& rColl, bool bOnly { if ( !pNodes ) pNodes = new SwOLENodes; - pNodes->Insert( pONd, pNodes->Count() ); + pNodes->push_back( pONd ); } } |