diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-09 09:01:46 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-09 09:02:41 +0200 |
commit | 50637913f1c3f84eae19213d59c271766b2233fe (patch) | |
tree | a350e08b40468d4b6fd0b41a74962ce5d4dde6d2 /writerfilter | |
parent | 2e99e4e11d33679aed674eea0d6054d16d39d6df (diff) |
writerfilter: avoid PropValVector inheriting from an STL container
Change-Id: Ic77b40ef7b518ad34b60530984fb6180d4426e39
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 9e652eadd06a..4cd4d8f9ccb0 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -866,9 +866,9 @@ void StyleSheetTable::lcl_entry(int /*pos*/, writerfilter::Reference<Properties> /*------------------------------------------------------------------------- sorting helper -----------------------------------------------------------------------*/ -typedef std::vector< beans::PropertyValue > _PropValVector; -class PropValVector : public _PropValVector +class PropValVector { + std::vector<beans::PropertyValue> m_aValues; public: PropValVector(){} @@ -879,25 +879,25 @@ public: void PropValVector::Insert(const beans::PropertyValue& rVal) { - _PropValVector::iterator aIt = begin(); - while(aIt != end()) + auto aIt = m_aValues.begin(); + while (aIt != m_aValues.end()) { - if(aIt->Name > rVal.Name) + if (aIt->Name > rVal.Name) { - insert( aIt, rVal ); + m_aValues.insert( aIt, rVal ); return; } ++aIt; } - push_back(rVal); + m_aValues.push_back(rVal); } uno::Sequence< uno::Any > PropValVector::getValues() { - uno::Sequence< uno::Any > aRet( size() ); + uno::Sequence< uno::Any > aRet( m_aValues.size() ); uno::Any* pValues = aRet.getArray(); sal_Int32 nVal = 0; - _PropValVector::iterator aIt = begin(); - while(aIt != end()) + auto aIt = m_aValues.begin(); + while (aIt != m_aValues.end()) { pValues[nVal++] = aIt->Value; ++aIt; @@ -906,11 +906,11 @@ uno::Sequence< uno::Any > PropValVector::getValues() } uno::Sequence< OUString > PropValVector::getNames() { - uno::Sequence< OUString > aRet( size() ); + uno::Sequence< OUString > aRet( m_aValues.size() ); OUString* pNames = aRet.getArray(); sal_Int32 nVal = 0; - _PropValVector::iterator aIt = begin(); - while(aIt != end()) + auto aIt = m_aValues.begin(); + while (aIt != m_aValues.end()) { pNames[nVal++] = aIt->Name; ++aIt; |