diff options
Diffstat (limited to 'ucb/source/inc/regexpmap.hxx')
-rw-r--r-- | ucb/source/inc/regexpmap.hxx | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index 6194b187b8dd..f8f5450596a7 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -119,8 +119,6 @@ private: RegexpMapImpl< Val > * m_pMap; int m_nList; mutable bool m_bEntrySet; - - void setEntry() const; }; template< typename Val > @@ -143,20 +141,6 @@ inline RegexpMapIterImpl< Val >::RegexpMapIterImpl(MapImpl * pTheMap, {} template< typename Val > -void RegexpMapIterImpl< Val >::setEntry() const -{ - if (!m_bEntrySet) - { - Entry< Val > const & rTheEntry - = m_nList == -1 ? *m_pMap->m_pDefault : *m_aIndex; - m_aEntry - = RegexpMapEntry< Val >(rTheEntry.m_aRegexp.getRegexp(), - const_cast< Val * >(&rTheEntry.m_aValue)); - m_bEntrySet = true; - } -} - -template< typename Val > RegexpMapIterImpl< Val >::RegexpMapIterImpl(RegexpMapImpl< Val > * pTheMap, bool bBegin): m_aEntry(rtl::OUString(), 0), @@ -243,7 +227,15 @@ void RegexpMapIterImpl< Val >::next() template< typename Val > RegexpMapEntry< Val > & RegexpMapIterImpl< Val >::get() { - setEntry(); + if (!m_bEntrySet) + { + Entry< Val > const & rTheEntry + = m_nList == -1 ? *m_pMap->m_pDefault : *m_aIndex; + m_aEntry + = RegexpMapEntry< Val >(rTheEntry.m_aRegexp.getRegexp(), + const_cast< Val * >(&rTheEntry.m_aValue)); + m_bEntrySet = true; + } return m_aEntry; } |