include/svx/paraprev.hxx | 36 ++++++++++++++++++------------------ svx/source/dialog/paraprev.cxx | 36 ++++++++++++++++++------------------ 2 files changed, 36 insertions(+), 36 deletions(-)
New commits: commit a94cf807f32c5fd5c1c0c1658ecac1f4b0b6a4c0 Author: Miklos Vajna <[email protected]> AuthorDate: Mon Feb 9 08:54:01 2026 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Feb 9 09:48:36 2026 +0100 svx: prefix members of SvxParaPrevWindow See tdf#94879 for motivation. Change-Id: I7ae347cbb0ca3200ac01f32a5569bb16dfac507b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198942 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index c571efe98432..84adfd48366a 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -36,21 +36,21 @@ enum class SvxPrevLineSpace class SVX_DLLPUBLIC SvxParaPrevWindow final : public weld::CustomWidgetController { - Size aSize; + Size m_aSize; // indentation - tools::Long nLeftMargin; - tools::Long nRightMargin; - short nFirstLineOffset; + tools::Long m_nLeftMargin; + tools::Long m_nRightMargin; + short m_nFirstLineOffset; // distances - sal_uInt16 nUpper; - sal_uInt16 nLower; + sal_uInt16 m_nUpper; + sal_uInt16 m_nLower; // adjustment - SvxAdjust eAdjust; + SvxAdjust m_eAdjust; // last line in justification - SvxAdjust eLastLine; + SvxAdjust m_eLastLine; // line distance - SvxPrevLineSpace eLine; + SvxPrevLineSpace m_eLine; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override; @@ -61,39 +61,39 @@ public: void SetFirstLineOffset( short nNew ) { - nFirstLineOffset = nNew; + m_nFirstLineOffset = nNew; } void SetLeftMargin( tools::Long nNew ) { - nLeftMargin = nNew; + m_nLeftMargin = nNew; } void SetRightMargin( tools::Long nNew ) { - nRightMargin = nNew; + m_nRightMargin = nNew; } void SetUpper( sal_uInt16 nNew ) { - nUpper = nNew; + m_nUpper = nNew; } void SetLower( sal_uInt16 nNew ) { - nLower = nNew; + m_nLower = nNew; } void SetAdjust( SvxAdjust eNew ) { - eAdjust = eNew; + m_eAdjust = eNew; } void SetLastLine( SvxAdjust eNew ) { - eLastLine = eNew; + m_eLastLine = eNew; } void SetLineSpace( SvxPrevLineSpace eNew ) { - eLine = eNew; + m_eLine = eNew; } void SetSize( Size aNew ) { - aSize = aNew; + m_aSize = aNew; } }; diff --git a/svx/source/dialog/paraprev.cxx b/svx/source/dialog/paraprev.cxx index d77ad513a2ba..d812fd4917ea 100644 --- a/svx/source/dialog/paraprev.cxx +++ b/svx/source/dialog/paraprev.cxx @@ -24,16 +24,16 @@ #include <vcl/settings.hxx> SvxParaPrevWindow::SvxParaPrevWindow() : - nLeftMargin ( 0 ), - nRightMargin ( 0 ), - nFirstLineOffset ( 0 ), - nUpper ( 0 ), - nLower ( 0 ), - eAdjust ( SvxAdjust::Left ), - eLastLine ( SvxAdjust::Left ), - eLine ( SvxPrevLineSpace::N1 ) + m_nLeftMargin ( 0 ), + m_nRightMargin ( 0 ), + m_nFirstLineOffset ( 0 ), + m_nUpper ( 0 ), + m_nLower ( 0 ), + m_eAdjust ( SvxAdjust::Left ), + m_eLastLine ( SvxAdjust::Left ), + m_eLine ( SvxPrevLineSpace::N1 ) { - aSize = Size(11905, 16837); + m_aSize = Size(11905, 16837); } void SvxParaPrevWindow::SetDrawingArea(weld::DrawingArea* pDrawingArea) @@ -84,7 +84,7 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) if (i == 3) { rRenderContext.SetFillColor(COL_GRAY); - auto nTop = nUpper * aLineSiz.Height() / aSize.Height(); + auto nTop = m_nUpper * aLineSiz.Height() / m_aSize.Height(); aPnt.AdjustY(nTop * 2 ); } @@ -93,8 +93,8 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) if (3 <= i && 6 > i) { - tools::Long nLeft = nLeftMargin * aLineSiz.Width() / aSize.Width(); - tools::Long nFirst = nFirstLineOffset * aLineSiz.Width() / aSize.Width(); + tools::Long nLeft = m_nLeftMargin * aLineSiz.Width() / m_aSize.Width(); + tools::Long nFirst = m_nFirstLineOffset * aLineSiz.Width() / m_aSize.Width(); tools::Long nTmp = nLeft + nFirst; if (i == 3) @@ -107,13 +107,13 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) aPnt.AdjustX(nLeft ); aSiz.AdjustWidth( -nLeft ); } - tools::Long nRight = nRightMargin * aLineSiz.Width() / aSize.Width(); + tools::Long nRight = m_nRightMargin * aLineSiz.Width() / m_aSize.Width(); aSiz.AdjustWidth( -nRight ); } if (4 == i || 5 == i || 6 == i) { - switch (eLine) + switch (m_eLine) { case SvxPrevLineSpace::N1: break; @@ -154,7 +154,7 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) if (nLW > aSiz.Width()) nLW = aSiz.Width(); - switch (eAdjust) + switch (m_eAdjust) { case SvxAdjust::Left: break; @@ -166,11 +166,11 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) break; default: ; //prevent warning } - if (SvxAdjust::Block == eAdjust) + if (SvxAdjust::Block == m_eAdjust) { if(5 == i) { - switch( eLastLine ) + switch( m_eLastLine ) { case SvxAdjust::Left: break; @@ -198,7 +198,7 @@ void SvxParaPrevWindow::DrawParagraph(vcl::RenderContext& rRenderContext) if (5 == i) { - auto nBottom = nLower * aLineSiz.Height() / aSize.Height(); + auto nBottom = m_nLower * aLineSiz.Height() / m_aSize.Height(); aPnt.AdjustY(nBottom * 2 ); }
