sw/source/ui/vba/vbaformfields.cxx | 10 +++++-----
sw/source/ui/vba/vbaframes.cxx | 8 ++++----
sw/source/ui/vba/vbalistgalleries.cxx | 12 ++++++------
sw/source/ui/vba/vbalisttemplate.cxx | 6 +++---
sw/source/ui/vba/vbalisttemplate.hxx | 2 +-
5 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit 773baa53608c4fd36de469c92b39f54672889f88
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jan 2 08:14:43 2023 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jan 2 11:47:46 2023 +0000
sw: prefix members of FormFieldsEnumWrapper, FramesEnumeration, ...
... ListGalleriesEnumWrapper and SwVbaListTemplate
See tdf#94879 for motivation.
Change-Id: Ib7fd42f4cc1f1ee6ade2d81c379deb571b40e128
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144929
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/vba/vbaformfields.cxx
b/sw/source/ui/vba/vbaformfields.cxx
index 187f41f3b4f7..586393e35818 100644
--- a/sw/source/ui/vba/vbaformfields.cxx
+++ b/sw/source/ui/vba/vbaformfields.cxx
@@ -78,21 +78,21 @@ namespace
class FormFieldsEnumWrapper : public EnumerationHelper_BASE
{
uno::Reference<container::XIndexAccess> mxIndexAccess;
- sal_Int32 nIndex;
+ sal_Int32 mnIndex;
public:
explicit FormFieldsEnumWrapper(uno::Reference<container::XIndexAccess>
xIndexAccess)
: mxIndexAccess(xIndexAccess)
- , nIndex(0)
+ , mnIndex(0)
{
}
- sal_Bool SAL_CALL hasMoreElements() override { return (nIndex <
mxIndexAccess->getCount()); }
+ sal_Bool SAL_CALL hasMoreElements() override { return (mnIndex <
mxIndexAccess->getCount()); }
uno::Any SAL_CALL nextElement() override
{
- if (nIndex < mxIndexAccess->getCount())
+ if (mnIndex < mxIndexAccess->getCount())
{
- return mxIndexAccess->getByIndex(nIndex++);
+ return mxIndexAccess->getByIndex(mnIndex++);
}
throw container::NoSuchElementException();
}
diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx
index a6495da08d71..376082054b18 100644
--- a/sw/source/ui/vba/vbaframes.cxx
+++ b/sw/source/ui/vba/vbaframes.cxx
@@ -34,22 +34,22 @@ private:
uno::Reference< uno::XComponentContext > mxContext;
uno::Reference< container::XIndexAccess> mxIndexAccess;
uno::Reference< frame::XModel > mxModel;
- sal_Int32 nCurrentPos;
+ sal_Int32 mnCurrentPos;
public:
/// @throws uno::RuntimeException
- FramesEnumeration( uno::Reference< XHelperInterface > xParent,
uno::Reference< uno::XComponentContext > xContext, uno::Reference<
container::XIndexAccess > xIndexAccess, uno::Reference< frame::XModel >
xModel ) : mxParent(std::move( xParent )), mxContext(std::move( xContext)),
mxIndexAccess(std::move( xIndexAccess )), mxModel(std::move( xModel )),
nCurrentPos(0)
+ FramesEnumeration( uno::Reference< XHelperInterface > xParent,
uno::Reference< uno::XComponentContext > xContext, uno::Reference<
container::XIndexAccess > xIndexAccess, uno::Reference< frame::XModel >
xModel ) : mxParent(std::move( xParent )), mxContext(std::move( xContext)),
mxIndexAccess(std::move( xIndexAccess )), mxModel(std::move( xModel )),
mnCurrentPos(0)
{
}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nCurrentPos < mxIndexAccess->getCount() );
+ return ( mnCurrentPos < mxIndexAccess->getCount() );
}
virtual uno::Any SAL_CALL nextElement( ) override
{
if ( !hasMoreElements() )
throw container::NoSuchElementException();
- uno::Reference< text::XTextFrame > xTextFrame(
mxIndexAccess->getByIndex( nCurrentPos++ ), uno::UNO_QUERY_THROW );
+ uno::Reference< text::XTextFrame > xTextFrame(
mxIndexAccess->getByIndex( mnCurrentPos++ ), uno::UNO_QUERY_THROW );
return uno::Any( uno::Reference< word::XFrame > ( new SwVbaFrame(
mxParent, mxContext, mxModel, xTextFrame ) ) );
}
diff --git a/sw/source/ui/vba/vbalistgalleries.cxx
b/sw/source/ui/vba/vbalistgalleries.cxx
index 56c2116c328c..9c047b1b6490 100644
--- a/sw/source/ui/vba/vbalistgalleries.cxx
+++ b/sw/source/ui/vba/vbalistgalleries.cxx
@@ -28,19 +28,19 @@ namespace {
class ListGalleriesEnumWrapper : public EnumerationHelper_BASE
{
- SwVbaListGalleries* pListGalleries;
- sal_Int32 nIndex;
+ SwVbaListGalleries* m_pListGalleries;
+ sal_Int32 m_nIndex;
public:
- explicit ListGalleriesEnumWrapper( SwVbaListGalleries* pGalleries ) :
pListGalleries( pGalleries ), nIndex( 1 ) {}
+ explicit ListGalleriesEnumWrapper( SwVbaListGalleries* pGalleries ) :
m_pListGalleries( pGalleries ), m_nIndex( 1 ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nIndex <= pListGalleries->getCount() );
+ return ( m_nIndex <= m_pListGalleries->getCount() );
}
virtual uno::Any SAL_CALL nextElement( ) override
{
- if ( nIndex <= pListGalleries->getCount() )
- return pListGalleries->Item( uno::Any( nIndex++ ), uno::Any() );
+ if ( m_nIndex <= m_pListGalleries->getCount() )
+ return m_pListGalleries->Item( uno::Any( m_nIndex++ ), uno::Any()
);
throw container::NoSuchElementException();
}
};
diff --git a/sw/source/ui/vba/vbalisttemplate.cxx
b/sw/source/ui/vba/vbalisttemplate.cxx
index b2b69ee67318..032bc98162f5 100644
--- a/sw/source/ui/vba/vbalisttemplate.cxx
+++ b/sw/source/ui/vba/vbalisttemplate.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star;
SwVbaListTemplate::SwVbaListTemplate( const uno::Reference<
ooo::vba::XHelperInterface >& rParent, const uno::Reference<
uno::XComponentContext >& rContext, const uno::Reference< text::XTextDocument
>& xTextDoc, sal_Int32 nGalleryType, sal_Int32 nTemplateType ) :
SwVbaListTemplate_BASE( rParent, rContext )
{
- pListHelper = std::make_shared<SwVbaListHelper>( xTextDoc, nGalleryType,
nTemplateType );
+ m_pListHelper = std::make_shared<SwVbaListHelper>( xTextDoc, nGalleryType,
nTemplateType );
}
SwVbaListTemplate::~SwVbaListTemplate()
@@ -35,7 +35,7 @@ SwVbaListTemplate::~SwVbaListTemplate()
uno::Any SAL_CALL
SwVbaListTemplate::ListLevels( const uno::Any& index )
{
- uno::Reference< XCollection > xCol( new SwVbaListLevels( mxParent,
mxContext, pListHelper ) );
+ uno::Reference< XCollection > xCol( new SwVbaListLevels( mxParent,
mxContext, m_pListHelper ) );
if ( index.hasValue() )
return xCol->Item( index, uno::Any() );
return uno::Any( xCol );
@@ -43,7 +43,7 @@ SwVbaListTemplate::ListLevels( const uno::Any& index )
void SwVbaListTemplate::applyListTemplate( uno::Reference< beans::XPropertySet
> const & xProps )
{
- uno::Reference< container::XIndexReplace > xNumberingRules =
pListHelper->getNumberingRules();
+ uno::Reference< container::XIndexReplace > xNumberingRules =
m_pListHelper->getNumberingRules();
xProps->setPropertyValue("NumberingRules", uno::Any( xNumberingRules ) );
}
diff --git a/sw/source/ui/vba/vbalisttemplate.hxx
b/sw/source/ui/vba/vbalisttemplate.hxx
index 902695cb2700..a690b6c820e4 100644
--- a/sw/source/ui/vba/vbalisttemplate.hxx
+++ b/sw/source/ui/vba/vbalisttemplate.hxx
@@ -29,7 +29,7 @@ typedef InheritedHelperInterfaceWeakImpl<
ooo::vba::word::XListTemplate > SwVbaL
class SwVbaListTemplate : public SwVbaListTemplate_BASE
{
private:
- SwVbaListHelperRef pListHelper;
+ SwVbaListHelperRef m_pListHelper;
public:
/// @throws css::uno::RuntimeException
