include/svx/measctrl.hxx | 4 ++-- svx/source/dialog/measctrl.cxx | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit b78438854dfd246b9495a9407bbf9876bd138ad7 Author: Miklos Vajna <[email protected]> AuthorDate: Mon Mar 2 08:31:37 2026 +0100 Commit: Miklos Vajna <[email protected]> CommitDate: Mon Mar 2 11:53:16 2026 +0100 svx: prefix members of SvxXMeasurePreview See tdf#94879 for motivation. Change-Id: Ica2fd132985cd791c5aa087be39627222867a63e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200767 Reviewed-by: Miklos Vajna <[email protected]> Tested-by: Jenkins diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index eb3c4953e4d5..6d376667392d 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -35,8 +35,8 @@ class SVX_DLLPUBLIC SvxXMeasurePreview final : public weld::CustomWidgetControll private: MapMode m_aMapMode; - std::unique_ptr<SdrModel> pModel; - rtl::Reference<SdrMeasureObj> pMeasureObj; + std::unique_ptr<SdrModel> m_pModel; + rtl::Reference<SdrMeasureObj> m_pMeasureObj; void ResizeImpl(const Size& rSize); diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 19b743601955..6bdb76396527 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -41,8 +41,8 @@ void SvxXMeasurePreview::SetDrawingArea(weld::DrawingArea* pDrawingArea) Size aSize(getPreviewStripSize(pDrawingArea->get_ref_device())); pDrawingArea->set_size_request(aSize.Width(), aSize.Height()); - pModel.reset(new SdrModel(nullptr, nullptr, true)); - pMeasureObj = new SdrMeasureObj(*pModel, Point(), Point()); + m_pModel.reset(new SdrModel(nullptr, nullptr, true)); + m_pMeasureObj = new SdrMeasureObj(*m_pModel, Point(), Point()); ResizeImpl(aSize); Invalidate(); @@ -57,9 +57,9 @@ void SvxXMeasurePreview::ResizeImpl(const Size& rSize) Size aSize = rRefDevice.PixelToLogic(rSize); Point aPt1(aSize.Width() / 5, static_cast<tools::Long>(aSize.Height() / 2)); - pMeasureObj->SetPoint(aPt1, 0); + m_pMeasureObj->SetPoint(aPt1, 0); Point aPt2(aSize.Width() * 4 / 5, static_cast<tools::Long>(aSize.Height() / 2)); - pMeasureObj->SetPoint(aPt2, 1); + m_pMeasureObj->SetPoint(aPt2, 1); } void SvxXMeasurePreview::Resize() @@ -81,12 +81,12 @@ void SvxXMeasurePreview::Paint(vcl::RenderContext& rRenderContext, const tools:: bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode(); rRenderContext.SetDrawMode(bHighContrast ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR); - pMeasureObj->SingleObjectPainter(rRenderContext); + m_pMeasureObj->SingleObjectPainter(rRenderContext); } void SvxXMeasurePreview::SetAttributes(const SfxItemSet& rInAttrs) { - pMeasureObj->SetMergedItemSetAndBroadcast(rInAttrs); + m_pMeasureObj->SetMergedItemSetAndBroadcast(rInAttrs); Invalidate(); }
