chart2/source/controller/main/DragMethod_PieSegment.cxx | 2 +- chart2/source/controller/main/DragMethod_PieSegment.hxx | 2 +- include/svx/sdr/table/tablecontroller.hxx | 2 +- include/svx/svddrgmt.hxx | 6 +++--- svx/source/svdraw/svddrgm1.hxx | 6 +++--- svx/source/svdraw/svddrgmt.cxx | 12 ++++++------ svx/source/table/tablecontroller.cxx | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-)
New commits: commit 6f652725fcbb068b8b482a74ef021396d4d0f133 Author: Noel Grandin <[email protected]> AuthorDate: Fri Mar 4 21:34:21 2022 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Mar 5 11:59:04 2022 +0100 make some svx methods const Change-Id: If04a160c46b8dbf641ca9d115d1560f17e87ce4d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131043 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx index c2c5db234bd7..3adc6103e6ab 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.cxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx @@ -128,7 +128,7 @@ bool DragMethod_PieSegment::EndSdrDrag(bool /*bCopy*/) return true; } -basegfx::B2DHomMatrix DragMethod_PieSegment::getCurrentTransformation() +basegfx::B2DHomMatrix DragMethod_PieSegment::getCurrentTransformation() const { basegfx::B2DHomMatrix aRetval; diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx index 8a36dbd4c876..8cb498373f33 100644 --- a/chart2/source/controller/main/DragMethod_PieSegment.hxx +++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx @@ -36,7 +36,7 @@ public: virtual void MoveSdrDrag(const Point& rPnt) override; virtual bool EndSdrDrag(bool bCopy) override; - virtual basegfx::B2DHomMatrix getCurrentTransformation() override; + virtual basegfx::B2DHomMatrix getCurrentTransformation() const override; protected: virtual void createSdrDragEntries() override; diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index 997cea48b69a..ab9f1d28f0c6 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -152,7 +152,7 @@ private: SVX_DLLPRIVATE const CellPos& getSelectionStart(); SVX_DLLPRIVATE void setSelectionStart( const CellPos& rPos ); SVX_DLLPRIVATE const CellPos& getSelectionEnd(); - SVX_DLLPRIVATE void checkCell( CellPos& rPos ); + SVX_DLLPRIVATE void checkCell( CellPos& rPos ) const; SVX_DLLPRIVATE void MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, sal_Int32 nLastCol, sal_Int32 nLastRow ); diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index bb2ee6188b7c..fe71ad5d60cd 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -206,7 +206,7 @@ public: const sdr::contact::ObjectContact& rObjectContact); void destroyOverlayGeometry(); - virtual basegfx::B2DHomMatrix getCurrentTransformation(); + virtual basegfx::B2DHomMatrix getCurrentTransformation() const; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget); virtual void applyCurrentTransformationToPolyPolygon(basegfx::B2DPolyPolygon& rTarget); @@ -247,7 +247,7 @@ public: virtual bool EndSdrDrag(bool bCopy) override; virtual PointerStyle GetSdrDragPointer() const override; - virtual basegfx::B2DHomMatrix getCurrentTransformation() override; + virtual basegfx::B2DHomMatrix getCurrentTransformation() const override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; }; @@ -269,7 +269,7 @@ public: virtual bool EndSdrDrag(bool bCopy) override; virtual PointerStyle GetSdrDragPointer() const override; - virtual basegfx::B2DHomMatrix getCurrentTransformation() override; + virtual basegfx::B2DHomMatrix getCurrentTransformation() const override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; }; diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx index b8aa2280964b..54214b9563e8 100644 --- a/svx/source/svdraw/svddrgm1.hxx +++ b/svx/source/svdraw/svddrgm1.hxx @@ -62,7 +62,7 @@ public: virtual bool EndSdrDrag(bool bCopy) override; virtual PointerStyle GetSdrDragPointer() const override; - virtual basegfx::B2DHomMatrix getCurrentTransformation() override; + virtual basegfx::B2DHomMatrix getCurrentTransformation() const override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; }; @@ -87,7 +87,7 @@ public: virtual bool EndSdrDrag(bool bCopy) override; virtual PointerStyle GetSdrDragPointer() const override; - virtual basegfx::B2DHomMatrix getCurrentTransformation() override; + virtual basegfx::B2DHomMatrix getCurrentTransformation() const override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; }; @@ -110,7 +110,7 @@ public: virtual bool EndSdrDrag(bool bCopy) override; virtual PointerStyle GetSdrDragPointer() const override; - virtual basegfx::B2DHomMatrix getCurrentTransformation() override; + virtual basegfx::B2DHomMatrix getCurrentTransformation() const override; virtual void applyCurrentTransformationToSdrObject(SdrObject& rTarget) override; }; diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index d6f2fa9ed8ab..40fd8df27081 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -654,7 +654,7 @@ void SdrDragMethod::Hide() getSdrDragView().HideDragObj(); } -basegfx::B2DHomMatrix SdrDragMethod::getCurrentTransformation() +basegfx::B2DHomMatrix SdrDragMethod::getCurrentTransformation() const { return basegfx::B2DHomMatrix(); } @@ -1496,7 +1496,7 @@ bool SdrDragMove::BeginSdrDrag() return true; } -basegfx::B2DHomMatrix SdrDragMove::getCurrentTransformation() +basegfx::B2DHomMatrix SdrDragMove::getCurrentTransformation() const { return basegfx::utils::createTranslateB2DHomMatrix(DragStat().GetDX(), DragStat().GetDY()); } @@ -1812,7 +1812,7 @@ bool SdrDragResize::BeginSdrDrag() return true; } -basegfx::B2DHomMatrix SdrDragResize::getCurrentTransformation() +basegfx::B2DHomMatrix SdrDragResize::getCurrentTransformation() const { basegfx::B2DHomMatrix aRetval(basegfx::utils::createTranslateB2DHomMatrix( -DragStat().GetRef1().X(), -DragStat().GetRef1().Y())); @@ -2102,7 +2102,7 @@ bool SdrDragRotate::BeginSdrDrag() return false; } -basegfx::B2DHomMatrix SdrDragRotate::getCurrentTransformation() +basegfx::B2DHomMatrix SdrDragRotate::getCurrentTransformation() const { return basegfx::utils::createRotateAroundPoint( DragStat().GetRef1().X(), DragStat().GetRef1().Y(), @@ -2248,7 +2248,7 @@ bool SdrDragShear::BeginSdrDrag() return true; } -basegfx::B2DHomMatrix SdrDragShear::getCurrentTransformation() +basegfx::B2DHomMatrix SdrDragShear::getCurrentTransformation() const { basegfx::B2DHomMatrix aRetval(basegfx::utils::createTranslateB2DHomMatrix( -DragStat().GetRef1().X(), -DragStat().GetRef1().Y())); @@ -2535,7 +2535,7 @@ bool SdrDragMirror::BeginSdrDrag() } } -basegfx::B2DHomMatrix SdrDragMirror::getCurrentTransformation() +basegfx::B2DHomMatrix SdrDragMirror::getCurrentTransformation() const { basegfx::B2DHomMatrix aRetval; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 1fb980055a51..3a60e5c773ac 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -1988,7 +1988,7 @@ void SvxTableController::MergeRange( sal_Int32 nFirstCol, sal_Int32 nFirstRow, s } -void SvxTableController::checkCell( CellPos& rPos ) +void SvxTableController::checkCell( CellPos& rPos ) const { if( !mxTable.is() ) return;
