sw/source/ui/vba/vbalistlevel.cxx | 40 +++++++++++++++++-----------------
sw/source/ui/vba/vbalistlevel.hxx | 2 -
sw/source/ui/vba/vbalistlevels.cxx | 18 +++++++--------
sw/source/ui/vba/vbalistlevels.hxx | 2 -
sw/source/ui/vba/vbalisttemplates.cxx | 12 +++++-----
5 files changed, 37 insertions(+), 37 deletions(-)
New commits:
commit d24fc94281458b57368ff4fef1fe1182dadbea72
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Jan 9 13:51:37 2023 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jan 9 19:09:00 2023 +0000
sw: prefix members of ListLevelsEnumWrapper, ListTemplatesEnumWrapper, ...
... SwVbaListLevel and SwVbaListLevels
See tdf#94879 for motivation.
Change-Id: I8f3b88b71ba2696179e2f48c9c6e66f5fc947553
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145187
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/vba/vbalistlevel.cxx
b/sw/source/ui/vba/vbalistlevel.cxx
index dcd06a2e998a..43f16e85243f 100644
--- a/sw/source/ui/vba/vbalistlevel.cxx
+++ b/sw/source/ui/vba/vbalistlevel.cxx
@@ -27,7 +27,7 @@
using namespace ::ooo::vba;
using namespace ::com::sun::star;
-SwVbaListLevel::SwVbaListLevel( const uno::Reference<
ooo::vba::XHelperInterface >& rParent, const uno::Reference<
uno::XComponentContext >& rContext, SwVbaListHelperRef pHelper, sal_Int32
nLevel ) : SwVbaListLevel_BASE( rParent, rContext ), pListHelper(std::move(
pHelper )), mnLevel( nLevel )
+SwVbaListLevel::SwVbaListLevel( const uno::Reference<
ooo::vba::XHelperInterface >& rParent, const uno::Reference<
uno::XComponentContext >& rContext, SwVbaListHelperRef pHelper, sal_Int32
nLevel ) : SwVbaListLevel_BASE( rParent, rContext ), m_pListHelper(std::move(
pHelper )), mnLevel( nLevel )
{
}
@@ -38,7 +38,7 @@ SwVbaListLevel::~SwVbaListLevel()
::sal_Int32 SAL_CALL SwVbaListLevel::getAlignment()
{
sal_Int16 nAlignment = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "Adjust" ) >>=
nAlignment;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "Adjust" ) >>=
nAlignment;
switch( nAlignment )
{
case text::HoriOrientation::LEFT:
@@ -89,7 +89,7 @@ void SAL_CALL SwVbaListLevel::setAlignment( ::sal_Int32
_alignment )
throw uno::RuntimeException();
}
}
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "Adjust",
uno::Any( nAlignment ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "Adjust",
uno::Any( nAlignment ) );
}
uno::Reference< ::ooo::vba::word::XFont > SAL_CALL SwVbaListLevel::getFont()
@@ -134,8 +134,8 @@ float SAL_CALL SwVbaListLevel::getNumberPosition()
// indentAt + firstlineindent
sal_Int32 nIndentAt = 0;
sal_Int32 nFirstLineIndent = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent"
) >>= nFirstLineIndent;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
"FirstLineIndent" ) >>= nFirstLineIndent;
sal_Int32 nResult = nIndentAt + nFirstLineIndent;
@@ -147,16 +147,16 @@ void SAL_CALL SwVbaListLevel::setNumberPosition( float
_numberposition )
sal_Int32 nNumberPosition = Millimeter::getInHundredthsOfOneMillimeter(
_numberposition );
sal_Int32 nIndentAt = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
sal_Int32 nFirstLineIndent = nNumberPosition - nIndentAt;
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent",
uno::Any( nFirstLineIndent ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
"FirstLineIndent", uno::Any( nFirstLineIndent ) );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getNumberStyle()
{
sal_Int16 nNumberingType = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "NumberingType" )
>>= nNumberingType;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "NumberingType"
) >>= nNumberingType;
switch( nNumberingType )
{
case style::NumberingType::CHAR_SPECIAL:
@@ -288,7 +288,7 @@ void SAL_CALL SwVbaListLevel::setNumberStyle( ::sal_Int32
_numberstyle )
}
}
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "NumberingType",
uno::Any( nNumberingType ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "NumberingType",
uno::Any( nNumberingType ) );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getResetOnHigher()
@@ -305,20 +305,20 @@ void SAL_CALL SwVbaListLevel::setResetOnHigher(
::sal_Int32 /*_resetonhigher*/ )
::sal_Int32 SAL_CALL SwVbaListLevel::getStartAt()
{
sal_Int16 nStartWith = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "StartWith" ) >>=
nStartWith;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "StartWith" )
>>= nStartWith;
return nStartWith;
}
void SAL_CALL SwVbaListLevel::setStartAt( ::sal_Int32 _startat )
{
sal_Int16 nStartWith = static_cast<sal_Int16>(_startat);
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "StartWith",
uno::Any( nStartWith ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "StartWith",
uno::Any( nStartWith ) );
}
float SAL_CALL SwVbaListLevel::getTabPosition()
{
sal_Int32 nTabPosition = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
"ListtabStopPosition" ) >>= nTabPosition;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
"ListtabStopPosition" ) >>= nTabPosition;
return static_cast< float >( Millimeter::getInPoints( nTabPosition ) );
}
@@ -326,14 +326,14 @@ float SAL_CALL SwVbaListLevel::getTabPosition()
void SAL_CALL SwVbaListLevel::setTabPosition( float _tabposition )
{
sal_Int32 nTabPosition = Millimeter::getInHundredthsOfOneMillimeter(
_tabposition );
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
"ListtabStopPosition", uno::Any( nTabPosition ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
"ListtabStopPosition", uno::Any( nTabPosition ) );
}
float SAL_CALL SwVbaListLevel::getTextPosition()
{
// indentAt
sal_Int32 nIndentAt = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
return static_cast< float >( Millimeter::getInPoints( nIndentAt ) );
}
@@ -342,21 +342,21 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float
_textposition )
{
sal_Int32 nIndentAt = 0;
sal_Int32 nFirstLineIndent = 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent"
) >>= nFirstLineIndent;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "IndentAt" ) >>=
nIndentAt;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
"FirstLineIndent" ) >>= nFirstLineIndent;
sal_Int32 nAlignedAt = nIndentAt + nFirstLineIndent;
nIndentAt = Millimeter::getInHundredthsOfOneMillimeter( _textposition );
nFirstLineIndent = nAlignedAt - nIndentAt;
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "IndentAt",
uno::Any( nIndentAt ) );
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "FirstLineIndent",
uno::Any( nFirstLineIndent ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "IndentAt",
uno::Any( nIndentAt ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
"FirstLineIndent", uno::Any( nFirstLineIndent ) );
}
::sal_Int32 SAL_CALL SwVbaListLevel::getTrailingCharacter()
{
sal_Int16 nLabelFollowedBy= 0;
- pListHelper->getPropertyValueWithNameAndLevel( mnLevel, "LabelFollowedBy"
) >>= nLabelFollowedBy;
+ m_pListHelper->getPropertyValueWithNameAndLevel( mnLevel,
"LabelFollowedBy" ) >>= nLabelFollowedBy;
return nLabelFollowedBy;
}
@@ -364,7 +364,7 @@ void SAL_CALL SwVbaListLevel::setTextPosition( float
_textposition )
void SAL_CALL SwVbaListLevel::setTrailingCharacter( ::sal_Int32
_trailingcharacter )
{
sal_Int16 nLabelFollowedBy = static_cast<sal_Int16>(_trailingcharacter);
- pListHelper->setPropertyValueWithNameAndLevel( mnLevel, "LabelFollowedBy",
uno::Any( nLabelFollowedBy ) );
+ m_pListHelper->setPropertyValueWithNameAndLevel( mnLevel,
"LabelFollowedBy", uno::Any( nLabelFollowedBy ) );
}
OUString
diff --git a/sw/source/ui/vba/vbalistlevel.hxx
b/sw/source/ui/vba/vbalistlevel.hxx
index edb1d44675f0..e9a8e23e13df 100644
--- a/sw/source/ui/vba/vbalistlevel.hxx
+++ b/sw/source/ui/vba/vbalistlevel.hxx
@@ -28,7 +28,7 @@ typedef InheritedHelperInterfaceWeakImpl<
ooo::vba::word::XListLevel > SwVbaList
class SwVbaListLevel : public SwVbaListLevel_BASE
{
private:
- SwVbaListHelperRef pListHelper;
+ SwVbaListHelperRef m_pListHelper;
sal_Int32 mnLevel;
public:
diff --git a/sw/source/ui/vba/vbalistlevels.cxx
b/sw/source/ui/vba/vbalistlevels.cxx
index 433a9bf8e8a8..3f0d83e47896 100644
--- a/sw/source/ui/vba/vbalistlevels.cxx
+++ b/sw/source/ui/vba/vbalistlevels.cxx
@@ -28,32 +28,32 @@ namespace {
class ListLevelsEnumWrapper : public EnumerationHelper_BASE
{
- SwVbaListLevels* pListLevels;
- sal_Int32 nIndex;
+ SwVbaListLevels* m_pListLevels;
+ sal_Int32 m_nIndex;
public:
- explicit ListLevelsEnumWrapper( SwVbaListLevels* pLevels ) : pListLevels(
pLevels ), nIndex( 1 ) {}
+ explicit ListLevelsEnumWrapper( SwVbaListLevels* pLevels ) :
m_pListLevels( pLevels ), m_nIndex( 1 ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nIndex <= pListLevels->getCount() );
+ return ( m_nIndex <= m_pListLevels->getCount() );
}
virtual uno::Any SAL_CALL nextElement( ) override
{
- if ( nIndex <= pListLevels->getCount() )
- return pListLevels->Item( uno::Any( nIndex++ ), uno::Any() );
+ if ( m_nIndex <= m_pListLevels->getCount() )
+ return m_pListLevels->Item( uno::Any( m_nIndex++ ), uno::Any() );
throw container::NoSuchElementException();
}
};
}
-SwVbaListLevels::SwVbaListLevels( const uno::Reference< XHelperInterface >&
xParent, const uno::Reference< uno::XComponentContext > & xContext,
SwVbaListHelperRef pHelper ) : SwVbaListLevels_BASE( xParent, xContext,
uno::Reference< container::XIndexAccess >() ), pListHelper(std::move( pHelper ))
+SwVbaListLevels::SwVbaListLevels( const uno::Reference< XHelperInterface >&
xParent, const uno::Reference< uno::XComponentContext > & xContext,
SwVbaListHelperRef pHelper ) : SwVbaListLevels_BASE( xParent, xContext,
uno::Reference< container::XIndexAccess >() ), m_pListHelper(std::move( pHelper
))
{
}
::sal_Int32 SAL_CALL SwVbaListLevels::getCount()
{
- sal_Int32 nGalleryType = pListHelper->getGalleryType();
+ sal_Int32 nGalleryType = m_pListHelper->getGalleryType();
if( nGalleryType == word::WdListGalleryType::wdBulletGallery
|| nGalleryType == word::WdListGalleryType::wdNumberGallery )
return 1;
@@ -70,7 +70,7 @@ uno::Any SAL_CALL SwVbaListLevels::Item( const uno::Any&
Index1, const uno::Any&
if( nIndex <=0 || nIndex > getCount() )
throw uno::RuntimeException("Index out of bounds" );
- return uno::Any( uno::Reference< word::XListLevel >( new SwVbaListLevel(
this, mxContext, pListHelper, nIndex - 1 ) ) );
+ return uno::Any( uno::Reference< word::XListLevel >( new SwVbaListLevel(
this, mxContext, m_pListHelper, nIndex - 1 ) ) );
}
// XEnumerationAccess
diff --git a/sw/source/ui/vba/vbalistlevels.hxx
b/sw/source/ui/vba/vbalistlevels.hxx
index 69fdbf3b6ae2..2b3bb44d0f61 100644
--- a/sw/source/ui/vba/vbalistlevels.hxx
+++ b/sw/source/ui/vba/vbalistlevels.hxx
@@ -27,7 +27,7 @@ typedef CollTestImplHelper< ooo::vba::word::XListLevels >
SwVbaListLevels_BASE;
class SwVbaListLevels : public SwVbaListLevels_BASE
{
private:
- SwVbaListHelperRef pListHelper;
+ SwVbaListHelperRef m_pListHelper;
public:
/// @throws css::uno::RuntimeException
diff --git a/sw/source/ui/vba/vbalisttemplates.cxx
b/sw/source/ui/vba/vbalisttemplates.cxx
index 7da831c30bfb..a9cc52d4bc9a 100644
--- a/sw/source/ui/vba/vbalisttemplates.cxx
+++ b/sw/source/ui/vba/vbalisttemplates.cxx
@@ -28,19 +28,19 @@ namespace {
class ListTemplatesEnumWrapper : public EnumerationHelper_BASE
{
- SwVbaListTemplates* pListTemplates;
- sal_Int32 nIndex;
+ SwVbaListTemplates* m_pListTemplates;
+ sal_Int32 m_nIndex;
public:
- explicit ListTemplatesEnumWrapper( SwVbaListTemplates* pTemplates ) :
pListTemplates( pTemplates ), nIndex( 1 ) {}
+ explicit ListTemplatesEnumWrapper( SwVbaListTemplates* pTemplates ) :
m_pListTemplates( pTemplates ), m_nIndex( 1 ) {}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nIndex <= pListTemplates->getCount() );
+ return ( m_nIndex <= m_pListTemplates->getCount() );
}
virtual uno::Any SAL_CALL nextElement( ) override
{
- if ( nIndex <= pListTemplates->getCount() )
- return pListTemplates->Item( uno::Any( nIndex++ ), uno::Any() );
+ if ( m_nIndex <= m_pListTemplates->getCount() )
+ return m_pListTemplates->Item( uno::Any( m_nIndex++ ), uno::Any()
);
throw container::NoSuchElementException();
}
};
