From 3a2e38a8f3b1a324738c23ca59efc51544c2f29e Mon Sep 17 00:00:00 2001 From: Henry Castro Date: Tue, 25 Jul 2023 15:28:39 -0400 Subject: [PATCH] sc: filter: rtf: prefix m_* private members MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Henry Castro Change-Id: If8389b6e63a90616131d0dd9fbb5a7b8b96ffe3d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154904 Tested-by: Jenkins CollaboraOffice Reviewed-by: Caolán McNamara Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155259 (cherry picked from commit 3b310294851b91ca63eb2696bbada3caaeb79c10) --- sc/source/filter/inc/rtfexp.hxx | 2 +- sc/source/filter/rtf/rtfexp.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx index 9a4fe43d9d02..14ee8ec023f7 100644 --- a/sc/source/filter/inc/rtfexp.hxx +++ b/sc/source/filter/inc/rtfexp.hxx @@ -25,7 +25,7 @@ class ScRTFExport : public ScExportBase { - std::unique_ptr pCellX; // cumulative range in a table + std::unique_ptr m_pCellX; // cumulative range in a table SvMemoryStream m_aDocStrm; void WriteTab( SCTAB nTab ); diff --git a/sc/source/filter/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index f669c289e0ba..152b8ff5d57f 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.cxx @@ -46,7 +46,7 @@ void ScFormatFilterPluginImpl::ScExportRTF( SvStream& rStrm, ScDocument* pDoc, ScRTFExport::ScRTFExport( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rRangeP ) : ScExportBase( rStrmP, pDocP, rRangeP ), - pCellX( new sal_uLong[ pDoc->MaxCol()+2 ] ) + m_pCellX( new sal_uLong[ pDoc->MaxCol()+2 ] ) { } @@ -77,12 +77,12 @@ void ScRTFExport::WriteTab( SCTAB nTab ) m_aDocStrm.WriteChar( '{' ).WriteOString( SAL_NEWLINE_STRING ); if ( pDoc->HasTable( nTab ) ) { - memset( &pCellX[0], 0, (pDoc->MaxCol()+2) * sizeof(sal_uLong) ); + memset( &m_pCellX[0], 0, (pDoc->MaxCol()+2) * sizeof(sal_uLong) ); SCCOL nCol; SCCOL nEndCol = aRange.aEnd.Col(); for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ ) { - pCellX[nCol+1] = pCellX[nCol] + pDoc->GetColWidth( nCol, nTab ); + m_pCellX[nCol+1] = m_pCellX[nCol] + pDoc->GetColWidth( nCol, nTab ); } SCROW nEndRow = aRange.aEnd.Row(); @@ -128,7 +128,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) if ( pChar ) m_aDocStrm.WriteOString( pChar ); - m_aDocStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteOString( OString::number(pCellX[nCol+1]) ); + m_aDocStrm.WriteOString( OOO_STRING_SVTOOLS_RTF_CELLX ).WriteOString( OString::number(m_pCellX[nCol+1]) ); if ( (nCol & 0x0F) == 0x0F ) m_aDocStrm.WriteOString( SAL_NEWLINE_STRING ); // Do not let lines get too long } -- 2.11.4.GIT