Kaydet (Commit) 7c181e5e authored tarafından Michaël Lefèvre's avatar Michaël Lefèvre Kaydeden (comit) Noel Grandin

fdo#75757 Remove inheritance to std::vector

Change-Id: I5d5746869e47a1d25d6bec28452394e215d4427d
Reviewed-on: https://gerrit.libreoffice.org/13483Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 53421edf
......@@ -140,11 +140,21 @@ public:
void dumpAsXml(xmlTextWriterPtr w) const;
};
class SwTOXTypes : public std::vector<SwTOXType*> {
class SwTOXTypes {
private:
typedef std::vector<SwTOXType*> _SwTOXTypes;
_SwTOXTypes items;
public:
/// the destructor will free all objects still in the vector
~SwTOXTypes();
sal_uInt16 GetPos(const SwTOXType* pTOXType) const;
size_t size() const { return items.size(); };
SwTOXType* operator[] (size_t n) { return items[n]; };
const SwTOXType* operator[] (size_t n) const { return items[n]; };
void push_back ( SwTOXType* value) { items.push_back(value); };
void clear() { items.clear(); };
_SwTOXTypes::const_iterator begin() const { return items.begin(); };
_SwTOXTypes::const_iterator end() const { return items.end(); };
};
class SW_DLLPUBLIC SwNumRuleTbl : public std::vector<SwNumRule*> {
......
......@@ -860,13 +860,13 @@ const SwFormTokens& SwForm::GetPattern(sal_uInt16 nLevel) const
sal_uInt16 SwTOXTypes::GetPos(const SwTOXType* pTOXType) const
{
const_iterator it = std::find(begin(), end(), pTOXType);
return it == end() ? USHRT_MAX : it - begin();
_SwTOXTypes::const_iterator it = std::find(items.begin(), items.end(), pTOXType);
return it == items.end() ? USHRT_MAX : it - items.begin();
}
SwTOXTypes::~SwTOXTypes()
{
for(const_iterator it = begin(); it != end(); ++it)
for(_SwTOXTypes::const_iterator it = items.begin(); it != items.end(); ++it)
delete *it;
}
......
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