diff options
author | Eike Rathke <erack@redhat.com> | 2012-02-10 17:26:44 +0100 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2012-02-10 17:27:27 +0100 |
commit | 43aa1115c88f1300c73337a3622c2c03faa699f7 (patch) | |
tree | df60e4e395da7cc4f74534a784bd3286821fe702 /sc/inc/detdata.hxx | |
parent | d4a31e6ae28825a42cb8b1935fdfd777cda41e8f (diff) |
changes to "convert detdata.cxx in SC module to boost:ptr_vector"
* for includes from other modules use <> instead of "", i.e.
<boost/ptr_container/ptr_vector.hpp>
* use size_t instead of int for container positions and count
* no need for DeleteAndDestroy(), in fact delete p followed by
ptr_vector::erase() attempted to delete the instance twice and would crash
* adapted places that accessed DeleteAndDestroy() to operate on the vector
instead
* introduced GetDataVector() for that
* changed the DeleteOnTab() loop that used DeleteAndDestroy() to properly
iterate over the container instead
* changed UpdateReference() to a loop using iterator
* changed operator==() to use size_t instead of sal_uInt16
* note aside: mixing sal_uInt16 with a container's size isn't a good idea
* adapted places that access Count() and GetObject() to use size_t instead of
sal_uInt16
* made GetObject() const and return const ScDetOpData*
* changed indentation to 4 spaces per level
Diffstat (limited to 'sc/inc/detdata.hxx')
-rw-r--r-- | sc/inc/detdata.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/inc/detdata.hxx b/sc/inc/detdata.hxx index 891c803d8b18..6ba78c706f34 100644 --- a/sc/inc/detdata.hxx +++ b/sc/inc/detdata.hxx @@ -30,8 +30,8 @@ #define SC_DETDATA_HXX #include <svl/svarray.hxx> +#include <boost/ptr_container/ptr_vector.hpp> #include "global.hxx" -#include "boost/ptr_container/ptr_vector.hpp" //------------------------------------------------------------------------ @@ -79,7 +79,7 @@ typedef boost::ptr_vector<ScDetOpData> ScDetOpDataVector; class ScDetOpList { sal_Bool bHasAddError; // updated in append - ScDetOpDataVector aDetOpDataVector; + ScDetOpDataVector aDetOpDataVector; public: ScDetOpList() : bHasAddError(false) {} @@ -93,11 +93,11 @@ public: sal_Bool operator==( const ScDetOpList& r ) const; // for ref-undo void Append( ScDetOpData* pData ); - ScDetOpData* GetObject(int i); - void DeleteAndDestroy(int i); + ScDetOpDataVector& GetDataVector() { return aDetOpDataVector; } + const ScDetOpData* GetObject( size_t nPos ) const; sal_Bool HasAddError() const { return bHasAddError; } - int Count() const { return aDetOpDataVector.size(); } + size_t Count() const { return aDetOpDataVector.size(); } }; |