sw/source/ui/dbui/mmresultdialogs.cxx | 8 ++++----
sw/source/ui/vba/vbacells.cxx | 10 +++++-----
sw/source/ui/vba/vbacolumns.cxx | 10 +++++-----
sw/source/ui/vba/vbatablehelper.cxx | 20 ++++++++++----------
sw/source/ui/vba/vbatablehelper.hxx | 2 +-
5 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit dc3b969b25f897f5cdf5e824865b187b973b3f82
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Dec 12 08:00:46 2022 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Dec 12 07:44:27 2022 +0000
sw: prefix members of CellsEnumWrapper, ColumnsEnumWrapper, ...
... SwSendQueryBox_Impl and SwVbaTableHelper
See tdf#94879 for motivation.
Change-Id: I5cb6ffe8604ba473c93318058c7955d8caa4bbea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143978
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx
b/sw/source/ui/dbui/mmresultdialogs.cxx
index 03d7e43cf63e..3c23b05820f3 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -164,7 +164,7 @@ public:
class SwSendQueryBox_Impl : public SwMessageAndEditDialog
{
- bool bIsEmptyAllowed;
+ bool m_bIsEmptyAllowed;
DECL_LINK( ModifyHdl, weld::Entry&, void);
public:
SwSendQueryBox_Impl(weld::Window* pParent, const OString& rID,
@@ -183,7 +183,7 @@ public:
void SetIsEmptyTextAllowed(bool bSet)
{
- bIsEmptyAllowed = bSet;
+ m_bIsEmptyAllowed = bSet;
ModifyHdl(*m_xEdit);
}
};
@@ -212,7 +212,7 @@ IMPL_LINK( SwSaveWarningBox_Impl, ModifyHdl, weld::Entry&,
rEdit, void)
SwSendQueryBox_Impl::SwSendQueryBox_Impl(weld::Window* pParent, const OString&
rID,
const OUString& rUIXMLDescription)
: SwMessageAndEditDialog(pParent, rID, rUIXMLDescription)
- , bIsEmptyAllowed(true)
+ , m_bIsEmptyAllowed(true)
{
m_xEdit->connect_changed(LINK(this, SwSendQueryBox_Impl, ModifyHdl));
ModifyHdl(*m_xEdit);
@@ -220,7 +220,7 @@ SwSendQueryBox_Impl::SwSendQueryBox_Impl(weld::Window*
pParent, const OString& r
IMPL_LINK( SwSendQueryBox_Impl, ModifyHdl, weld::Entry&, rEdit, void)
{
- m_xOKPB->set_sensitive(bIsEmptyAllowed || !rEdit.get_text().isEmpty());
+ m_xOKPB->set_sensitive(m_bIsEmptyAllowed || !rEdit.get_text().isEmpty());
}
namespace {
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index f1c98bfb5b06..e30c2ed370ff 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -30,22 +30,22 @@ namespace {
class CellsEnumWrapper : public EnumerationHelper_BASE
{
uno::Reference< container::XIndexAccess > mxIndexAccess;
- sal_Int32 nIndex;
+ sal_Int32 mnIndex;
public:
- explicit CellsEnumWrapper( uno::Reference< container::XIndexAccess >
xIndexAccess ) : mxIndexAccess(std::move( xIndexAccess )), nIndex( 0 )
+ explicit CellsEnumWrapper( uno::Reference< container::XIndexAccess >
xIndexAccess ) : mxIndexAccess(std::move( xIndexAccess )), mnIndex( 0 )
{
}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nIndex < mxIndexAccess->getCount() );
+ return ( mnIndex < mxIndexAccess->getCount() );
}
virtual 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/vbacolumns.cxx b/sw/source/ui/vba/vbacolumns.cxx
index 9b061b42653d..ffaf662029f0 100644
--- a/sw/source/ui/vba/vbacolumns.cxx
+++ b/sw/source/ui/vba/vbacolumns.cxx
@@ -33,23 +33,23 @@ class ColumnsEnumWrapper : public EnumerationHelper_BASE
uno::Reference< uno::XComponentContext > mxContext;
uno::Reference< text::XTextTable > mxTextTable;
uno::Reference< container::XIndexAccess > mxIndexAccess;
- sal_Int32 nIndex;
+ sal_Int32 mnIndex;
public:
- ColumnsEnumWrapper( 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 )
+ ColumnsEnumWrapper( 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 )), mnIndex( 0 )
{
mxIndexAccess = mxTextTable->getColumns();
}
virtual sal_Bool SAL_CALL hasMoreElements( ) override
{
- return ( nIndex < mxIndexAccess->getCount() );
+ return ( mnIndex < mxIndexAccess->getCount() );
}
virtual uno::Any SAL_CALL nextElement( ) override
{
- if( nIndex < mxIndexAccess->getCount() )
+ if( mnIndex < mxIndexAccess->getCount() )
{
- return uno::Any( uno::Reference< word::XColumn > ( new
SwVbaColumn( mxParent, mxContext, mxTextTable, nIndex++ ) ) );
+ return uno::Any( uno::Reference< word::XColumn > ( new
SwVbaColumn( mxParent, mxContext, mxTextTable, mnIndex++ ) ) );
}
throw container::NoSuchElementException();
}
diff --git a/sw/source/ui/vba/vbatablehelper.cxx
b/sw/source/ui/vba/vbatablehelper.cxx
index f6892f7493e5..8252436227c2 100644
--- a/sw/source/ui/vba/vbatablehelper.cxx
+++ b/sw/source/ui/vba/vbatablehelper.cxx
@@ -31,7 +31,7 @@ using namespace ::ooo::vba;
SwVbaTableHelper::SwVbaTableHelper( uno::Reference< text::XTextTable >
xTextTable ) : mxTextTable(std::move( xTextTable ))
{
- pTable = GetSwTable( mxTextTable );
+ m_pTable = GetSwTable( mxTextTable );
}
SwTable* SwVbaTableHelper::GetSwTable( const uno::Reference< text::XTextTable
>& xTextTable )
@@ -52,9 +52,9 @@ SwTable* SwVbaTableHelper::GetSwTable( const uno::Reference<
text::XTextTable >&
sal_Int32 SwVbaTableHelper::getTabColumnsCount( sal_Int32 nRowIndex )
{
sal_Int32 nRet = 0;
- if(!pTable->IsTableComplex())
+ if(!m_pTable->IsTableComplex())
{
- SwTableLines& rLines = pTable->GetTabLines();
+ SwTableLines& rLines = m_pTable->GetTabLines();
SwTableLine* pLine = rLines[ nRowIndex ];
nRet = pLine->GetTabBoxes().size();
}
@@ -64,7 +64,7 @@ sal_Int32 SwVbaTableHelper::getTabColumnsCount( sal_Int32
nRowIndex )
sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( )
{
sal_Int32 nRet = 0;
- sal_Int32 nRowCount = pTable->GetTabLines().size();
+ sal_Int32 nRowCount = m_pTable->GetTabLines().size();
for( sal_Int32 index = 0; index < nRowCount; index++ )
{
sal_Int32 nColCount = getTabColumnsCount( index );
@@ -77,20 +77,20 @@ sal_Int32 SwVbaTableHelper::getTabColumnsMaxCount( )
sal_Int32 SwVbaTableHelper::getTabRowIndex( const OUString& rCellName )
{
sal_Int32 nRet = 0;
- SwTableBox* pBox = const_cast<SwTableBox*>(pTable->GetTableBox( rCellName
));
+ SwTableBox* pBox = const_cast<SwTableBox*>(m_pTable->GetTableBox(
rCellName ));
if( !pBox )
throw uno::RuntimeException();
const SwTableLine* pLine = pBox->GetUpper();
const SwTableLines* pLines = pLine->GetUpper()
- ? &pLine->GetUpper()->GetTabLines() :
&pTable->GetTabLines();
+ ? &pLine->GetUpper()->GetTabLines() :
&m_pTable->GetTabLines();
nRet = pLines->GetPos( pLine );
return nRet;
}
sal_Int32 SwVbaTableHelper::getTabColIndex( const OUString& rCellName )
{
- const SwTableBox* pBox = pTable->GetTableBox( rCellName );
+ const SwTableBox* pBox = m_pTable->GetTableBox( rCellName );
if( !pBox )
throw uno::RuntimeException();
return pBox->GetUpper()->GetBoxPos( pBox );
@@ -137,7 +137,7 @@ sal_Int32 SwVbaTableHelper::getTableWidth( ) const
SwTableBox* SwVbaTableHelper::GetTabBox( sal_Int32 nCol, sal_Int32 nRow )
{
- SwTableLines& rLines = pTable->GetTabLines();
+ SwTableLines& rLines = m_pTable->GetTabLines();
sal_Int32 nRowCount = rLines.size();
if (nRow < 0 || nRow >= nRowCount)
throw uno::RuntimeException();
@@ -161,7 +161,7 @@ void SwVbaTableHelper::InitTabCols( SwTabCols& rCols, const
SwTableBox *pStart )
rCols.SetLeft ( 0 );
rCols.SetRight ( UNO_TABLE_COLUMN_SUM );
rCols.SetRightMax( UNO_TABLE_COLUMN_SUM );
- pTable->GetTabCols( rCols, pStart );
+ m_pTable->GetTabCols( rCols, pStart );
}
sal_Int32 SwVbaTableHelper::GetColCount( SwTabCols const & rCols )
@@ -271,7 +271,7 @@ void SwVbaTableHelper::SetColWidth( sal_Int32 _width,
sal_Int32 nCol, sal_Int32
else
aCols.SetRight( std::min( static_cast<tools::Long>(nNewWidth),
aCols.GetRightMax()) );
- pTable->SetTabCols(aCols, aOldCols, pStart, bCurRowOnly );
+ m_pTable->SetTabCols(aCols, aOldCols, pStart, bCurRowOnly );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbatablehelper.hxx
b/sw/source/ui/vba/vbatablehelper.hxx
index 5fb00cbba55f..b3b48dc0056d 100644
--- a/sw/source/ui/vba/vbatablehelper.hxx
+++ b/sw/source/ui/vba/vbatablehelper.hxx
@@ -27,7 +27,7 @@ class SwVbaTableHelper
{
private:
css::uno::Reference< css::text::XTextTable > mxTextTable;
- SwTable* pTable;
+ SwTable* m_pTable;
private:
/// @throws css::uno::RuntimeException
