[Libreoffice-commits] core.git: sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Jan 30 09:54:30 UTC 2017
sw/source/core/access/accfrmobjslist.cxx | 74 +++++++++++++++----------------
sw/source/core/access/accfrmobjslist.hxx | 20 ++++----
2 files changed, 47 insertions(+), 47 deletions(-)
New commits:
commit fc53cce64400430cdc21f79c959d75fb9a26d13d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Jan 30 08:56:35 2017 +0100
sw: prefix members of SwAccessibleChildSList_const_iterator
Change-Id: I1420a8c655dac568f6227dbea21506a0c5806a42
Reviewed-on: https://gerrit.libreoffice.org/33685
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 36d6a880..5741b41 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -30,20 +30,20 @@ using namespace ::sw::access;
SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
const SwAccessibleChildSList& rLst,
SwAccessibleMap& rAccMap )
- : rList( rLst ),
- aCurr( rList.GetFrame().GetLower() ),
- nNextObj( 0 )
+ : m_rList( rLst ),
+ m_aCurr( m_rList.GetFrame().GetLower() ),
+ m_nNextObj( 0 )
{
- if( !aCurr.GetSwFrame() )
+ if( !m_aCurr.GetSwFrame() )
{
- const SwFrame& rFrame = rList.GetFrame();
+ const SwFrame& rFrame = m_rList.GetFrame();
if( rFrame.IsPageFrame() )
{
const SwPageFrame& rPgFrame = static_cast< const SwPageFrame& >( rFrame );
const SwSortedObjs *pObjs = rPgFrame.GetSortedObjs();
if( pObjs && pObjs->size() )
{
- aCurr = (*pObjs)[nNextObj++]->GetDrawObj();
+ m_aCurr = (*pObjs)[m_nNextObj++]->GetDrawObj();
}
}
else if( rFrame.IsTextFrame() )
@@ -51,34 +51,34 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
const SwSortedObjs *pObjs = rFrame.GetDrawObjs();
if ( pObjs && pObjs->size() )
{
- aCurr = (*pObjs)[nNextObj++]->GetDrawObj();
- while( aCurr.IsValid() && !aCurr.IsBoundAsChar() )
+ m_aCurr = (*pObjs)[m_nNextObj++]->GetDrawObj();
+ while( m_aCurr.IsValid() && !m_aCurr.IsBoundAsChar() )
{
- aCurr = (nNextObj < pObjs->size())
- ? (*pObjs)[nNextObj++]->GetDrawObj()
+ m_aCurr = (m_nNextObj < pObjs->size())
+ ? (*pObjs)[m_nNextObj++]->GetDrawObj()
: static_cast< const SdrObject *>( nullptr );
}
}
- if ( !aCurr.IsValid() )
+ if ( !m_aCurr.IsValid() )
{
::rtl::Reference < SwAccessibleContext > xAccImpl =
rAccMap.GetContextImpl( &rFrame, false );
if( xAccImpl.is() )
{
SwAccessibleContext* pAccImpl = xAccImpl.get();
- aCurr = SwAccessibleChild( pAccImpl->GetAdditionalAccessibleChild( 0 ) );
- ++nNextObj;
+ m_aCurr = SwAccessibleChild( pAccImpl->GetAdditionalAccessibleChild( 0 ) );
+ ++m_nNextObj;
}
}
}
}
- if( rList.IsVisibleChildrenOnly() )
+ if( m_rList.IsVisibleChildrenOnly() )
{
// Find the first visible
- while( aCurr.IsValid() &&
- !aCurr.AlwaysIncludeAsChild() &&
- !aCurr.GetBox( rAccMap ).IsOver( rList.GetVisArea() ) )
+ while( m_aCurr.IsValid() &&
+ !m_aCurr.AlwaysIncludeAsChild() &&
+ !m_aCurr.GetBox( rAccMap ).IsOver( m_rList.GetVisArea() ) )
{
next();
}
@@ -88,14 +88,14 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::next()
{
bool bNextTaken( true );
- if( aCurr.GetDrawObject() || aCurr.GetWindow() )
+ if( m_aCurr.GetDrawObject() || m_aCurr.GetWindow() )
{
bNextTaken = false;
}
- else if( aCurr.GetSwFrame() )
+ else if( m_aCurr.GetSwFrame() )
{
- aCurr = aCurr.GetSwFrame()->GetNext();
- if( !aCurr.GetSwFrame() )
+ m_aCurr = m_aCurr.GetSwFrame()->GetNext();
+ if( !m_aCurr.GetSwFrame() )
{
bNextTaken = false;
}
@@ -103,37 +103,37 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
if( !bNextTaken )
{
- const SwFrame& rFrame = rList.GetFrame();
+ const SwFrame& rFrame = m_rList.GetFrame();
if( rFrame.IsPageFrame() )
{
const SwPageFrame& rPgFrame = static_cast< const SwPageFrame& >( rFrame );
const SwSortedObjs *pObjs = rPgFrame.GetSortedObjs();
- aCurr = ( pObjs && nNextObj < pObjs->size() )
- ? (*pObjs)[nNextObj++]->GetDrawObj()
+ m_aCurr = ( pObjs && m_nNextObj < pObjs->size() )
+ ? (*pObjs)[m_nNextObj++]->GetDrawObj()
: static_cast< const SdrObject *>( nullptr );
}
else if( rFrame.IsTextFrame() )
{
const SwSortedObjs* pObjs = rFrame.GetDrawObjs();
const size_t nObjsCount = pObjs ? pObjs->size() : 0;
- aCurr = ( pObjs && nNextObj < nObjsCount )
- ? (*pObjs)[nNextObj++]->GetDrawObj()
+ m_aCurr = ( pObjs && m_nNextObj < nObjsCount )
+ ? (*pObjs)[m_nNextObj++]->GetDrawObj()
: static_cast< const SdrObject *>( nullptr );
- while( aCurr.IsValid() && !aCurr.IsBoundAsChar() )
+ while( m_aCurr.IsValid() && !m_aCurr.IsBoundAsChar() )
{
- aCurr = ( nNextObj < nObjsCount )
- ? (*pObjs)[nNextObj++]->GetDrawObj()
+ m_aCurr = ( m_nNextObj < nObjsCount )
+ ? (*pObjs)[m_nNextObj++]->GetDrawObj()
: static_cast< const SdrObject *>( nullptr );
}
- if ( !aCurr.IsValid() )
+ if ( !m_aCurr.IsValid() )
{
::rtl::Reference < SwAccessibleContext > xAccImpl =
- rList.GetAccMap().GetContextImpl( &rFrame, false );
+ m_rList.GetAccMap().GetContextImpl( &rFrame, false );
if( xAccImpl.is() )
{
SwAccessibleContext* pAccImpl = xAccImpl.get();
- aCurr = SwAccessibleChild( pAccImpl->GetAdditionalAccessibleChild( nNextObj - nObjsCount ) );
- ++nNextObj;
+ m_aCurr = SwAccessibleChild( pAccImpl->GetAdditionalAccessibleChild( m_nNextObj - nObjsCount ) );
+ ++m_nNextObj;
}
}
}
@@ -145,9 +145,9 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::next_visible()
{
next();
- while( aCurr.IsValid() &&
- !aCurr.AlwaysIncludeAsChild() &&
- !aCurr.GetBox( rList.GetAccMap() ).IsOver( rList.GetVisArea() ) )
+ while( m_aCurr.IsValid() &&
+ !m_aCurr.AlwaysIncludeAsChild() &&
+ !m_aCurr.GetBox( m_rList.GetAccMap() ).IsOver( m_rList.GetVisArea() ) )
{
next();
}
@@ -157,7 +157,7 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::operator++()
{
- return rList.IsVisibleChildrenOnly() ? next_visible() : next();
+ return m_rList.IsVisibleChildrenOnly() ? next_visible() : next();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx
index 863d86e..0ade63d 100644
--- a/sw/source/core/access/accfrmobjslist.hxx
+++ b/sw/source/core/access/accfrmobjslist.hxx
@@ -31,13 +31,13 @@ class SwAccessibleChildSList_const_iterator
private:
friend class SwAccessibleChildSList;
- const SwAccessibleChildSList& rList; // The frame we are iterating over
- sw::access::SwAccessibleChild aCurr; // The current object
- size_t nNextObj; // The index of the current sdr object
+ const SwAccessibleChildSList& m_rList; // The frame we are iterating over
+ sw::access::SwAccessibleChild m_aCurr; // The current object
+ size_t m_nNextObj; // The index of the current sdr object
inline SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList& rLst )
- : rList( rLst )
- , nNextObj( 0 )
+ : m_rList( rLst )
+ , m_nNextObj( 0 )
{}
SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList& rLst,
@@ -48,14 +48,14 @@ private:
public:
inline SwAccessibleChildSList_const_iterator( const SwAccessibleChildSList_const_iterator& rIter )
- : rList( rIter.rList )
- , aCurr( rIter.aCurr )
- , nNextObj( rIter.nNextObj )
+ : m_rList( rIter.m_rList )
+ , m_aCurr( rIter.m_aCurr )
+ , m_nNextObj( rIter.m_nNextObj )
{}
inline bool operator==( const SwAccessibleChildSList_const_iterator& r ) const
{
- return aCurr == r.aCurr;
+ return m_aCurr == r.m_aCurr;
}
inline bool operator!=(
@@ -68,7 +68,7 @@ public:
inline const sw::access::SwAccessibleChild& operator*() const
{
- return aCurr;
+ return m_aCurr;
}
};
More information about the Libreoffice-commits
mailing list