diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-07-06 19:00:50 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-07-06 20:28:05 +0200 |
| commit | 13d71843510964a98d3c480d1e42533bdd34deab (patch) | |
| tree | dd9bb2745c787d1afe04b88d3fe4f3e7fce652b8 /svx/source | |
| parent | 11419c34eb38b1d15bd83ca8c511346a7bc30537 (diff) | |
make tools::Poly*gon single-arg constructors explicit
which will help avoid ambiguity in method calls in an upcoming patch
Change-Id: Ic7607ac7d95559e0942a84fb3226cfdd6ade22bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154146
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/contwnd.cxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/frmsel.cxx | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 95a5cb650e35..976897b6bae2 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -246,8 +246,8 @@ void ContourWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Recta { tools::PolyPolygon _aPolyPoly(2); rTarget.Push(vcl::PushFlags::FILLCOLOR); - _aPolyPoly.Insert(tools::Rectangle(Point(), GetGraphicSize())); - _aPolyPoly.Insert(aWorkRect); + _aPolyPoly.Insert(tools::Polygon(tools::Rectangle(Point(), GetGraphicSize()))); + _aPolyPoly.Insert(tools::Polygon(aWorkRect)); rTarget.SetFillColor(COL_LIGHTRED); rTarget.DrawTransparent(_aPolyPoly, 50); rTarget.Pop(); diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 31dce82e0a84..5f2ca0e4c718 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -166,7 +166,7 @@ void FrameBorder::SetState( FrameBorderState eState ) void FrameBorder::AddFocusPolygon( const tools::Polygon& rFocus ) { - lclPolyPolyUnion( maFocusArea, rFocus ); + lclPolyPolyUnion( maFocusArea, tools::PolyPolygon(rFocus) ); } void FrameBorder::MergeFocusToPolyPolygon( tools::PolyPolygon& rPPoly ) const @@ -176,7 +176,7 @@ void FrameBorder::MergeFocusToPolyPolygon( tools::PolyPolygon& rPPoly ) const void FrameBorder::AddClickRect( const tools::Rectangle& rRect ) { - lclPolyPolyUnion( maClickArea, tools::Polygon( rRect ) ); + lclPolyPolyUnion( maClickArea, tools::PolyPolygon( rRect ) ); } bool FrameBorder::ContainsClickPoint( const Point& rPos ) const @@ -410,12 +410,12 @@ void FrameSelectorImpl::InitBorderGeometry() maHor.ClearFocusArea(); maBottom.ClearFocusArea(); - maLeft.AddFocusPolygon( tools::Rectangle( mnLine1 - mnFocusOffs, mnLine1 - mnFocusOffs, mnLine1 + mnFocusOffs, mnLine3 + mnFocusOffs ) ); - maVer.AddFocusPolygon( tools::Rectangle( mnLine2 - mnFocusOffs, mnLine1 - mnFocusOffs, mnLine2 + mnFocusOffs, mnLine3 + mnFocusOffs ) ); - maRight.AddFocusPolygon( tools::Rectangle( mnLine3 - mnFocusOffs, mnLine1 - mnFocusOffs, mnLine3 + mnFocusOffs, mnLine3 + mnFocusOffs ) ); - maTop.AddFocusPolygon( tools::Rectangle( mnLine1 - mnFocusOffs, mnLine1 - mnFocusOffs, mnLine3 + mnFocusOffs, mnLine1 + mnFocusOffs ) ); - maHor.AddFocusPolygon( tools::Rectangle( mnLine1 - mnFocusOffs, mnLine2 - mnFocusOffs, mnLine3 + mnFocusOffs, mnLine2 + mnFocusOffs ) ); - maBottom.AddFocusPolygon( tools::Rectangle( mnLine1 - mnFocusOffs, mnLine3 - mnFocusOffs, mnLine3 + mnFocusOffs, mnLine3 + mnFocusOffs ) ); + maLeft.AddFocusPolygon( tools::Polygon(tools::Rectangle( mnLine1 - mnFocusOffs, mnLine1 - mnFocusOffs, mnLine1 + mnFocusOffs, mnLine3 + mnFocusOffs )) ); + maVer.AddFocusPolygon( tools::Polygon(tools::Rectangle( mnLine2 - mnFocusOffs, mnLine1 - mnFocusOffs, mnLine2 + mnFocusOffs, mnLine3 + mnFocusOffs )) ); + maRight.AddFocusPolygon( tools::Polygon(tools::Rectangle( mnLine3 - mnFocusOffs, mnLine1 - mnFocusOffs, mnLine3 + mnFocusOffs, mnLine3 + mnFocusOffs )) ); + maTop.AddFocusPolygon( tools::Polygon(tools::Rectangle( mnLine1 - mnFocusOffs, mnLine1 - mnFocusOffs, mnLine3 + mnFocusOffs, mnLine1 + mnFocusOffs )) ); + maHor.AddFocusPolygon( tools::Polygon(tools::Rectangle( mnLine1 - mnFocusOffs, mnLine2 - mnFocusOffs, mnLine3 + mnFocusOffs, mnLine2 + mnFocusOffs )) ); + maBottom.AddFocusPolygon( tools::Polygon(tools::Rectangle( mnLine1 - mnFocusOffs, mnLine3 - mnFocusOffs, mnLine3 + mnFocusOffs, mnLine3 + mnFocusOffs )) ); maTLBR.ClearFocusArea(); maBLTR.ClearFocusArea(); |