summaryrefslogtreecommitdiff
path: root/ucb/source/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2016-10-25 13:46:23 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2016-10-26 06:49:46 +0000
commit47317f041693db1a9d4618a1d9f7dcefe52b2904 (patch)
tree612afa75bf969dc70c7fce9accc17263c5aab5e8 /ucb/source/inc
parentfe1f1247fad782bdf43322532fdeb1ba9f03135a (diff)
loplugin:expandablemethods in ucb..ucbhelper
Change-Id: I42d077d7ebcfb77447d011644f8d64e80eae69c2 Reviewed-on: https://gerrit.libreoffice.org/30266 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'ucb/source/inc')
-rw-r--r--ucb/source/inc/regexpmap.hxx26
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;
}