sw/source/ui/vba/vbabookmarks.cxx | 8 ++++----
sw/source/ui/vba/vbafont.cxx | 16 ++++++++--------
sw/source/ui/vba/vbaheadersfooters.cxx | 12 ++++++------
sw/source/ui/vba/vbarows.cxx | 10 +++++-----
4 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit 77e0c4b5d255c34ccf6cd3977a90ee3575abc081
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jan 16 08:09:04 2023 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jan 16 07:56:18 2023 +0000
sw: prefix members of BookmarkCollectionHelper, ...
... HeadersFootersEnumWrapper, RowsEnumWrapper and UnderLineMapper
See tdf#94879 for motivation.
Change-Id: Id4c63d3ebf83dc358747143dabe3b66edea94749
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145550
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/vba/vbabookmarks.cxx
b/sw/source/ui/vba/vbabookmarks.cxx
index 997579521a8e..6755413796e4 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -56,7 +56,7 @@ class BookmarkCollectionHelper : public
::cppu::WeakImplHelper< container::XName
private:
uno::Reference< container::XNameAccess > mxNameAccess;
uno::Reference< container::XIndexAccess > mxIndexAccess;
- uno::Any cachePos;
+ uno::Any m_cachePos;
public:
/// @throws uno::RuntimeException
explicit BookmarkCollectionHelper( uno::Reference< container::XIndexAccess
> xIndexAccess ) : mxIndexAccess(std::move( xIndexAccess ))
@@ -71,7 +71,7 @@ public:
{
if ( !hasByName(aName) )
throw container::NoSuchElementException();
- return cachePos;
+ return m_cachePos;
}
virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override
{
@@ -81,7 +81,7 @@ public:
{
if( mxNameAccess->hasByName( aName ) )
{
- cachePos = mxNameAccess->getByName( aName );
+ m_cachePos = mxNameAccess->getByName( aName );
return true;
}
else
@@ -92,7 +92,7 @@ public:
OUString aBookmarkName = xNamed->getName();
if( aName.equalsIgnoreAsciiCase( aBookmarkName ) )
{
- cachePos <<= xNamed;
+ m_cachePos <<= xNamed;
return true;
}
}
diff --git a/sw/source/ui/vba/vbafont.cxx b/sw/source/ui/vba/vbafont.cxx
index e7a1f30a1381..de37a6c74e18 100644
--- a/sw/source/ui/vba/vbafont.cxx
+++ b/sw/source/ui/vba/vbafont.cxx
@@ -68,15 +68,15 @@ namespace {
class UnderLineMapper
{
- ConstToConst MSO2OOO;
- ConstToConst OOO2MSO;
+ ConstToConst m_MSO2OOO;
+ ConstToConst m_OOO2MSO;
private:
UnderLineMapper()
{
for ( auto const & index: UnderLineTable )
{
- MSO2OOO[ index.nMSOConst ] = index.nOOOConst;
- OOO2MSO[ index.nOOOConst ] = index.nMSOConst;
+ m_MSO2OOO[ index.nMSOConst ] = index.nOOOConst;
+ m_OOO2MSO[ index.nOOOConst ] = index.nMSOConst;
}
}
public:
@@ -94,16 +94,16 @@ public:
/// @throws lang::IllegalArgumentException
sal_Int32 getOOOFromMSO( sal_Int32 nMSOConst )
{
- ConstToConst::iterator it = MSO2OOO.find( nMSOConst );
- if ( it == MSO2OOO.end() )
+ ConstToConst::iterator it = m_MSO2OOO.find( nMSOConst );
+ if ( it == m_MSO2OOO.end() )
throw lang::IllegalArgumentException();
return it->second;
}
/// @throws lang::IllegalArgumentException
sal_Int32 getMSOFromOOO( sal_Int32 nOOOConst )
{
- ConstToConst::iterator it = OOO2MSO.find( nOOOConst );
- if ( it == OOO2MSO.end() )
+ ConstToConst::iterator it = m_OOO2MSO.find( nOOOConst );
+ if ( it == m_OOO2MSO.end() )
throw lang::IllegalArgumentException();
return it->second;
}
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx
b/sw/source/ui/vba/vbaheadersfooters.cxx
index 34c3ea00b364..be205d8e13db 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -63,19 +63,19 @@ public:
class HeadersFootersEnumWrapper : public EnumerationHelper_BASE
{
- SwVbaHeadersFooters* pHeadersFooters;
- sal_Int32 nIndex;
+ SwVbaHeadersFooters* m_pHeadersFooters;
+ sal_Int32 m_nIndex;
public:
- explicit HeadersFootersEnumWrapper( SwVbaHeadersFooters* _pHeadersFooters
) : pHeadersFooters( _pHeadersFooters ), nIndex( 0 ) {}
+ explicit HeadersFootersEnumWrapper( SwVbaHeadersFooters* _pHeadersFooters
) : m_pHeadersFooters( _pHeadersFooters ), m_nIndex( 0 ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nIndex < pHeadersFooters->getCount() );
+ return ( m_nIndex < m_pHeadersFooters->getCount() );
}
virtual uno::Any SAL_CALL nextElement( ) override
{
- if ( nIndex < pHeadersFooters->getCount() )
- return pHeadersFooters->Item( uno::Any( ++nIndex ), uno::Any() );
+ if ( m_nIndex < m_pHeadersFooters->getCount() )
+ return m_pHeadersFooters->Item( uno::Any( ++m_nIndex ), uno::Any()
);
throw container::NoSuchElementException();
}
};
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index f5df5283b873..2b757ff31fb0 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -40,23 +40,23 @@ class RowsEnumWrapper : public EnumerationHelper_BASE
uno::Reference< uno::XComponentContext > mxContext;
uno::Reference< text::XTextTable > mxTextTable;
uno::Reference< container::XIndexAccess > mxIndexAccess;
- sal_Int32 nIndex;
+ sal_Int32 m_nIndex;
public:
- RowsEnumWrapper( const uno::Reference< XHelperInterface >& xParent,
uno::Reference< uno::XComponentContext > xContext, uno::Reference<
text::XTextTable > xTextTable ) : mxParent( xParent ), mxContext(std::move(
xContext )), mxTextTable(std::move( xTextTable )), nIndex( 0 )
+ RowsEnumWrapper( const uno::Reference< XHelperInterface >& xParent,
uno::Reference< uno::XComponentContext > xContext, uno::Reference<
text::XTextTable > xTextTable ) : mxParent( xParent ), mxContext(std::move(
xContext )), mxTextTable(std::move( xTextTable )), m_nIndex( 0 )
{
mxIndexAccess = mxTextTable->getRows();
}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nIndex < mxIndexAccess->getCount() );
+ return ( m_nIndex < mxIndexAccess->getCount() );
}
virtual uno::Any SAL_CALL nextElement( ) override
{
- if( nIndex < mxIndexAccess->getCount() )
+ if( m_nIndex < mxIndexAccess->getCount() )
{
- return uno::Any( uno::Reference< word::XRow > ( new SwVbaRow(
mxParent, mxContext, mxTextTable, nIndex++ ) ) );
+ return uno::Any( uno::Reference< word::XRow > ( new SwVbaRow(
mxParent, mxContext, mxTextTable, m_nIndex++ ) ) );
}
throw container::NoSuchElementException();
}
