include/svtools/brwbox.hxx | 2 +-
svtools/source/brwbox/brwbox1.cxx | 10 +++++-----
svtools/source/brwbox/brwbox2.cxx | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 4739593c39158fffd745ca6af43d41017c9cbe39
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Oct 23 10:17:35 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Oct 23 11:35:06 2021 +0200
Prefix just nDataRowHeight in brwbox so we can fix a typo
The other variable members should also be prefixed
but I don't have an IDE to do it easily
Change-Id: Ifce210a4de89ed4d7f05126e33555da231553283
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124089
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx
index 035334f5f77f..6f65c6b3040b 100644
--- a/include/svtools/brwbox.hxx
+++ b/include/svtools/brwbox.hxx
@@ -276,7 +276,7 @@ private:
VclPtr<ScrollBar> aHScroll; // horizontal scrollbar
VclPtr<MeasureStatusBar> aStatusBarHeight; // statusbar, just to measure
its height
- tools::Long nDataRowHeight; // height of a single data-row
+ tools::Long m_nDataRowHeight; // height of a single data-row
sal_uInt16 nTitleLines; // number of lines in title row
sal_uLong nControlAreaWidth; // width of fixed area beneath hscroll
bool bColumnCursor; // single columns and fields selectable
diff --git a/svtools/source/brwbox/brwbox1.cxx
b/svtools/source/brwbox/brwbox1.cxx
index 593536615c15..64efb0e7023f 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -72,7 +72,7 @@ void BrowseBox::ConstructImpl( BrowserMode nMode )
InitSettings_Impl( pDataWin );
bBootstrapped = false;
- nDataRowHeight = 0;
+ m_nDataRowHeight = 0;
nTitleLines = 1;
nFirstCol = 0;
nTopRow = 0;
@@ -848,16 +848,16 @@ sal_uInt16 BrowseBox::ColCount() const
tools::Long BrowseBox::ImpGetDataRowHeight() const
{
BrowseBox *pThis = const_cast<BrowseBox*>(this);
- pThis->nDataRowHeight = pThis->CalcReverseZoom(pDataWin->GetTextHeight() +
4);
+ pThis->m_nDataRowHeight = pThis->CalcReverseZoom(pDataWin->GetTextHeight()
+ 4);
pThis->Resize();
pDataWin->Invalidate();
- return nDataRowHeight;
+ return m_nDataRowHeight;
}
void BrowseBox::SetDataRowHeight( tools::Long nPixel )
{
- nDataRowHeight = CalcReverseZoom(nPixel);
+ m_nDataRowHeight = CalcReverseZoom(nPixel);
Resize();
pDataWin->Invalidate();
}
@@ -2283,7 +2283,7 @@ bool BrowseBox::IsCursorMoveAllowed( sal_Int32,
sal_uInt16 ) const
tools::Long BrowseBox::GetDataRowHeight() const
{
- return CalcZoom(nDataRowHeight ? nDataRowHeight : ImpGetDataRowHeight());
+ return CalcZoom(m_nDataRowHeight ? m_nDataRowHeight :
ImpGetDataRowHeight());
}
diff --git a/svtools/source/brwbox/brwbox2.cxx
b/svtools/source/brwbox/brwbox2.cxx
index f91752c53c08..0f1079b16678 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -669,13 +669,13 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point&
rPos, SystemTextColorFlag
// we're drawing onto a foreign device, so we have to fake the
DataRowHeight for the subsequent ImplPaintData
// (as it is based on the settings of our data window, not the foreign
device)
- if (!nDataRowHeight)
+ if (!m_nDataRowHeight)
ImpGetDataRowHeight();
- tools::Long nHeightLogic = PixelToLogic(Size(0, nDataRowHeight),
MapMode(MapUnit::Map10thMM)).Height();
+ tools::Long nHeightLogic = PixelToLogic(Size(0, m_nDataRowHeight),
MapMode(MapUnit::Map10thMM)).Height();
tools::Long nForeignHeightPixel = pDev->LogicToPixel(Size(0,
nHeightLogic), MapMode(MapUnit::Map10thMM)).Height();
- tools::Long nOriginalHeight = nDataRowHeight;
- nDataRowHeight = nForeignHeightPixel;
+ tools::Long nOriginalHeight = m_nDataRowHeight;
+ m_nDataRowHeight = nForeignHeightPixel;
// this counts for the column widths, too
size_t nPos;
@@ -759,7 +759,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point&
rPos, SystemTextColorFlag
ImplPaintData( *pDev, tools::Rectangle( aRealPos, aRealSize ), true );
// restore the column widths/data row height
- nDataRowHeight = nOriginalHeight;
+ m_nDataRowHeight = nOriginalHeight;
for ( nPos = 0; nPos < mvCols.size(); ++nPos )
{
BrowserColumn* pCurrent = mvCols[ nPos ].get();
