sc/source/ui/vba/vbaborders.cxx | 10 +++++-----
sw/source/ui/vba/vbapanes.cxx | 10 +++++-----
sw/source/ui/vba/vbastyles.cxx | 22 +++++++++++-----------
3 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 1f474cbb8acdf6855db1f835fe58d198bdbabcbc
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jan 30 08:50:38 2023 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jan 30 14:28:20 2023 +0000
sw: prefix members of PanesEnumWrapper, RangeBorderEnumWrapper, ...
... StyleCollectionHelper and StylesEnumWrapper
See tdf#94879 for motivation.
Change-Id: Ibbce6f1d068ace5374fdc14e50e079a01872773f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146336
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 7572935816e0..ae5716e871c0 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -367,18 +367,18 @@ namespace {
class RangeBorderEnumWrapper : public EnumerationHelper_BASE
{
uno::Reference<container::XIndexAccess > m_xIndexAccess;
- sal_Int32 nIndex;
+ sal_Int32 m_nIndex;
public:
- explicit RangeBorderEnumWrapper( uno::Reference< container::XIndexAccess >
xIndexAccess ) : m_xIndexAccess(std::move( xIndexAccess )), nIndex( 0 ) {}
+ explicit RangeBorderEnumWrapper( uno::Reference< container::XIndexAccess >
xIndexAccess ) : m_xIndexAccess(std::move( xIndexAccess )), m_nIndex( 0 ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nIndex < m_xIndexAccess->getCount() );
+ return ( m_nIndex < m_xIndexAccess->getCount() );
}
virtual uno::Any SAL_CALL nextElement( ) override
{
- if ( nIndex < m_xIndexAccess->getCount() )
- return m_xIndexAccess->getByIndex( nIndex++ );
+ if ( m_nIndex < m_xIndexAccess->getCount() )
+ return m_xIndexAccess->getByIndex( m_nIndex++ );
throw container::NoSuchElementException();
}
};
diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx
index a5e884da24b2..05b288e29074 100644
--- a/sw/source/ui/vba/vbapanes.cxx
+++ b/sw/source/ui/vba/vbapanes.cxx
@@ -61,18 +61,18 @@ public:
class PanesEnumWrapper : public EnumerationHelper_BASE
{
uno::Reference<container::XIndexAccess > m_xIndexAccess;
- sal_Int32 nIndex;
+ sal_Int32 m_nIndex;
public:
- explicit PanesEnumWrapper( uno::Reference< container::XIndexAccess >
xIndexAccess ) : m_xIndexAccess(std::move( xIndexAccess )), nIndex( 0 ) {}
+ explicit PanesEnumWrapper( uno::Reference< container::XIndexAccess >
xIndexAccess ) : m_xIndexAccess(std::move( xIndexAccess )), m_nIndex( 0 ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nIndex < m_xIndexAccess->getCount() );
+ return ( m_nIndex < m_xIndexAccess->getCount() );
}
virtual uno::Any SAL_CALL nextElement( ) override
{
- if ( nIndex < m_xIndexAccess->getCount() )
- return m_xIndexAccess->getByIndex( nIndex++ );
+ if ( m_nIndex < m_xIndexAccess->getCount() )
+ return m_xIndexAccess->getByIndex( m_nIndex++ );
throw container::NoSuchElementException();
}
};
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index 12217e15324c..5e9ce270ff9e 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -174,7 +174,7 @@ class StyleCollectionHelper : public
::cppu::WeakImplHelper< container::XNameAcc
{
private:
uno::Reference< container::XNameAccess > mxParaStyles;
- uno::Any cachePos;
+ uno::Any m_cachePos;
public:
explicit StyleCollectionHelper( const uno::Reference< frame::XModel >&
_xModel )
{
@@ -191,7 +191,7 @@ public:
{
if ( !hasByName(aName) )
throw container::NoSuchElementException();
- return cachePos;
+ return m_cachePos;
}
virtual uno::Sequence< OUString > SAL_CALL getElementNames( ) override
{
@@ -208,7 +208,7 @@ public:
OUString sStyleName = OUString::createFromAscii(
pTable->pOOoStyleName );
if( mxParaStyles->hasByName( sStyleName ) )
{
- cachePos = mxParaStyles->getByName( sStyleName );
+ m_cachePos = mxParaStyles->getByName( sStyleName );
return true;
}
return false;
@@ -217,7 +217,7 @@ public:
if( mxParaStyles->hasByName( aName ) )
{
- cachePos = mxParaStyles->getByName( aName );
+ m_cachePos = mxParaStyles->getByName( aName );
return true;
}
else
@@ -227,7 +227,7 @@ public:
[&aName](const OUString& rStyleName) { return
rStyleName.equalsIgnoreAsciiCase( aName ); });
if (pStyleName != sElementNames.end())
{
- cachePos = mxParaStyles->getByName( *pStyleName );
+ m_cachePos = mxParaStyles->getByName( *pStyleName );
return true;
}
}
@@ -257,19 +257,19 @@ public:
class StylesEnumWrapper : public EnumerationHelper_BASE
{
- SwVbaStyles* pStyles;
- sal_Int32 nIndex;
+ SwVbaStyles* m_pStyles;
+ sal_Int32 m_nIndex;
public:
- explicit StylesEnumWrapper( SwVbaStyles* _pStyles ) : pStyles( _pStyles ),
nIndex( 1 ) {}
+ explicit StylesEnumWrapper( SwVbaStyles* _pStyles ) : m_pStyles( _pStyles
), m_nIndex( 1 ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nIndex <= pStyles->getCount() );
+ return ( m_nIndex <= m_pStyles->getCount() );
}
virtual uno::Any SAL_CALL nextElement( ) override
{
- if ( nIndex <= pStyles->getCount() )
- return pStyles->Item( uno::Any( nIndex++ ), uno::Any() );
+ if ( m_nIndex <= m_pStyles->getCount() )
+ return m_pStyles->Item( uno::Any( m_nIndex++ ), uno::Any() );
throw container::NoSuchElementException();
}
};
