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 @@ ...@@ -22,7 +22,7 @@
#include "address.hxx" #include "address.hxx"
#include <boost/ptr_container/ptr_vector.hpp> #include <vector>
class ScDocument; class ScDocument;
class ScAreaLink; class ScAreaLink;
...@@ -40,18 +40,17 @@ private: ...@@ -40,18 +40,17 @@ private:
public: public:
ScAreaLinkSaver( const ScAreaLink& rSource ); ScAreaLinkSaver( const ScAreaLink& rSource );
ScAreaLinkSaver( const ScAreaLinkSaver& rCopy ); ScAreaLinkSaver( const ScAreaLinkSaver& rCopy );
~ScAreaLinkSaver();
bool IsEqual( const ScAreaLink& rCompare ) const; bool IsEqual( const ScAreaLink& rCompare ) const;
bool IsEqualSource( const ScAreaLink& rCompare ) const; bool IsEqualSource( const ScAreaLink& rCompare ) const;
void WriteToLink( ScAreaLink& rLink ) const; void WriteToLink( ScAreaLink& rLink ) const;
void InsertNewLink( ScDocument* pDoc ); void InsertNewLink( ScDocument* pDoc );
}; };
class ScAreaLinkSaveCollection class ScAreaLinkSaveCollection
{ {
typedef ::boost::ptr_vector<ScAreaLinkSaver> DataType; typedef ::std::vector<ScAreaLinkSaver> DataType;
DataType maData; DataType maData;
public: public:
ScAreaLinkSaveCollection(); ScAreaLinkSaveCollection();
...@@ -67,7 +66,7 @@ public: ...@@ -67,7 +66,7 @@ public:
ScAreaLinkSaver& operator[](size_t nIndex); ScAreaLinkSaver& operator[](size_t nIndex);
const ScAreaLinkSaver& operator[](size_t nIndex) const; const ScAreaLinkSaver& operator[](size_t nIndex) const;
size_t size() const; size_t size() const;
void push_back(ScAreaLinkSaver* p); void push_back(const ScAreaLinkSaver&);
}; };
#endif #endif
......
...@@ -44,8 +44,6 @@ ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLinkSaver& rCopy ) : ...@@ -44,8 +44,6 @@ ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLinkSaver& rCopy ) :
{ {
} }
ScAreaLinkSaver::~ScAreaLinkSaver() {}
bool ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const bool ScAreaLinkSaver::IsEqualSource( const ScAreaLink& rCompare ) const
{ {
return ( aFileName.equals(rCompare.GetFile()) && return ( aFileName.equals(rCompare.GetFile()) &&
...@@ -173,13 +171,12 @@ ScAreaLinkSaveCollection* ScAreaLinkSaveCollection::CreateFromDoc( const ScDocum ...@@ -173,13 +171,12 @@ ScAreaLinkSaveCollection* ScAreaLinkSaveCollection::CreateFromDoc( const ScDocum
for (sal_uInt16 i=0; i<nLinkCount; i++) for (sal_uInt16 i=0; i<nLinkCount; i++)
{ {
::sfx2::SvBaseLink* pBase = rLinks[i].get(); ::sfx2::SvBaseLink* pBase = rLinks[i].get();
if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr) if (dynamic_cast<const ScAreaLink*>( pBase) != nullptr)
{ {
if (!pColl) if (!pColl)
pColl = new ScAreaLinkSaveCollection; pColl = new ScAreaLinkSaveCollection;
ScAreaLinkSaver* pSaver = new ScAreaLinkSaver( *static_cast<ScAreaLink*>(pBase )); pColl->push_back( ScAreaLinkSaver( *static_cast<ScAreaLink*>(pBase ) ) );
pColl->push_back(pSaver);
} }
} }
} }
...@@ -202,7 +199,7 @@ size_t ScAreaLinkSaveCollection::size() const ...@@ -202,7 +199,7 @@ size_t ScAreaLinkSaveCollection::size() const
return maData.size(); return maData.size();
} }
void ScAreaLinkSaveCollection::push_back(ScAreaLinkSaver* p) void ScAreaLinkSaveCollection::push_back(const ScAreaLinkSaver& p)
{ {
maData.push_back(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