Kaydet (Commit) f24323d4 authored tarafından Noel Grandin's avatar Noel Grandin

sc: boost::ptr_vector->std::vector

Change-Id: I66c59a40a551d844da85fc39367ec2d79fcf0d18
üst 77470788
......@@ -22,7 +22,7 @@
#include "address.hxx"
#include <boost/ptr_container/ptr_vector.hpp>
#include <vector>
class ScDocument;
class ScAreaLink;
......@@ -40,7 +40,6 @@ private:
public:
ScAreaLinkSaver( const ScAreaLink& rSource );
ScAreaLinkSaver( const ScAreaLinkSaver& rCopy );
~ScAreaLinkSaver();
bool IsEqual( const ScAreaLink& rCompare ) const;
bool IsEqualSource( const ScAreaLink& rCompare ) const;
......@@ -51,7 +50,7 @@ public:
class ScAreaLinkSaveCollection
{
typedef ::boost::ptr_vector<ScAreaLinkSaver> DataType;
typedef ::std::vector<ScAreaLinkSaver> DataType;
DataType maData;
public:
ScAreaLinkSaveCollection();
......@@ -67,7 +66,7 @@ public:
ScAreaLinkSaver& operator[](size_t nIndex);
const ScAreaLinkSaver& operator[](size_t nIndex) const;
size_t size() const;
void push_back(ScAreaLinkSaver* p);
void push_back(const ScAreaLinkSaver&);
};
#endif
......
......@@ -44,8 +44,6 @@ ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLinkSaver& rCopy ) :
{
}
ScAreaLinkSaver::~ScAreaLinkSaver() {}
bool ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const
{
return ( aFileName.equals(rCompare.GetFile()) &&
......@@ -178,8 +176,7 @@ ScAreaLinkSaveCollection* ScAreaLinkSaveCollection::CreateFromDoc( const ScDocum
if (!pColl)
pColl = new ScAreaLinkSaveCollection;
ScAreaLinkSaver* pSaver = new ScAreaLinkSaver( *static_cast<ScAreaLink*>(pBase ));
pColl->push_back(pSaver);
pColl->push_back( ScAreaLinkSaver( *static_cast<ScAreaLink*>(pBase ) ) );
}
}
}
......@@ -202,7 +199,7 @@ size_t ScAreaLinkSaveCollection::size() const
return maData.size();
}
void ScAreaLinkSaveCollection::push_back(ScAreaLinkSaver* p)
void ScAreaLinkSaveCollection::push_back(const ScAreaLinkSaver& p)
{
maData.push_back(p);
}
......
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