sw/inc/docary.hxx | 12 +++++++++++- sw/source/core/tox/tox.cxx | 6 +++--- 2 files changed, 14 insertions(+), 4 deletions(-)
New commits: commit 7c181e5e0aa218ba0abff6c8ea42e107f59bf3f0 Author: Michaël Lefèvre <[email protected]> Date: Mon Dec 15 15:46:32 2014 +0100 fdo#75757 Remove inheritance to std::vector Change-Id: I5d5746869e47a1d25d6bec28452394e215d4427d Reviewed-on: https://gerrit.libreoffice.org/13483 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Noel Grandin <[email protected]> diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 2f388b1..bd96c3c 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -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*> { diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx index a66278c..3e13274 100644 --- a/sw/source/core/tox/tox.cxx +++ b/sw/source/core/tox/tox.cxx @@ -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; }
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
