diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-03 11:35:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-03 12:16:13 +0000 |
| commit | 5256953397b495e9271cec92cc78514d772acaf5 (patch) | |
| tree | 4fb0ff2d5938a849c19f675be5016c423fd3ea7e /framework | |
| parent | 7dc5e8731fdc3a11ca429e717ec4a05e67ea1d21 (diff) | |
inline some use-once typedefs
Change-Id: I55cc82c8e180cce371c996690608090b1bfdfda4
Reviewed-on: https://gerrit.libreoffice.org/17494
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/classes/framecontainer.hxx | 2 | ||||
| -rw-r--r-- | framework/source/classes/framecontainer.cxx | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index 4c43a82f3834..fb7cf04e3b89 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -41,8 +41,6 @@ namespace framework{ typedef ::std::vector< css::uno::Reference< css::frame::XFrame > > TFrameContainer; -typedef TFrameContainer::iterator TFrameIterator; -typedef TFrameContainer::const_iterator TConstFrameIterator; /*-************************************************************************************************************ @short implement a container to hold children of frame, task or desktop diff --git a/framework/source/classes/framecontainer.cxx b/framework/source/classes/framecontainer.cxx index 002d4532a5b2..bd83d57db55a 100644 --- a/framework/source/classes/framecontainer.cxx +++ b/framework/source/classes/framecontainer.cxx @@ -86,7 +86,7 @@ void FrameContainer::remove( const css::uno::Reference< css::frame::XFrame >& xF { SolarMutexGuard g; - TFrameIterator aSearchedItem = ::std::find( m_aContainer.begin(), m_aContainer.end(), xFrame ); + TFrameContainer::iterator aSearchedItem = ::std::find( m_aContainer.begin(), m_aContainer.end(), xFrame ); if (aSearchedItem!=m_aContainer.end()) { m_aContainer.erase( aSearchedItem ); @@ -188,7 +188,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > FrameContainer:: SolarMutexGuard g; sal_Int32 nPosition = 0; css::uno::Sequence< css::uno::Reference< css::frame::XFrame > > lElements ( (sal_uInt32)m_aContainer.size() ); - for (TConstFrameIterator pItem=m_aContainer.begin(); pItem!=m_aContainer.end(); ++pItem) + for (TFrameContainer::const_iterator pItem=m_aContainer.begin(); pItem!=m_aContainer.end(); ++pItem) lElements[nPosition++] = *pItem; return lElements; } @@ -245,7 +245,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnAllChildrens( // Step over all child frames. But if direct child isn't the right one search on his children first - before // you go to next direct child of this container! css::uno::Reference< css::frame::XFrame > xSearchedFrame; - for( TConstFrameIterator pIterator=m_aContainer.begin(); pIterator!=m_aContainer.end(); ++pIterator ) + for( TFrameContainer::const_iterator pIterator=m_aContainer.begin(); pIterator!=m_aContainer.end(); ++pIterator ) { if ((*pIterator)->getName()==sName) { @@ -277,7 +277,7 @@ css::uno::Reference< css::frame::XFrame > FrameContainer::searchOnDirectChildren { SolarMutexGuard g; css::uno::Reference< css::frame::XFrame > xSearchedFrame; - for( TConstFrameIterator pIterator=m_aContainer.begin(); pIterator!=m_aContainer.end(); ++pIterator ) + for( TFrameContainer::const_iterator pIterator=m_aContainer.begin(); pIterator!=m_aContainer.end(); ++pIterator ) { if ((*pIterator)->getName()==sName) { |