diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-03-13 22:28:52 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-03-13 22:29:46 +0100 |
| commit | 38d3e115c159f19f22de73ece1abe609d75a041e (patch) | |
| tree | 63ffe74cb9b8fcc52617b616d02cc2504a0d0e11 /svx | |
| parent | 913f175b321caf7a99957fd7c4dc536f4101ab53 (diff) | |
vcl: make Region ctors explicit to prevent overloading desasters
Change-Id: Id36d125b4940418833bec31a4710d6cd545629e0
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/framelink.cxx | 4 | ||||
| -rw-r--r-- | svx/source/gallery2/galobj.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdibrow.cxx | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index d1d49ae265cd..43811e395e7e 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -715,7 +715,7 @@ inline Polygon lclCreatePolygon( const PointVec& rPoints ) } /** Returns a polygon constructed from the five passed points. */ -Polygon lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4, const Point& rP5 ) +Region lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4, const Point& rP5 ) { PointVec aPoints; aPoints.reserve( 5 ); @@ -724,7 +724,7 @@ Polygon lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, aPoints.push_back( rP3 ); aPoints.push_back( rP4 ); aPoints.push_back( rP5 ); - return lclCreatePolygon( aPoints ); + return Region(lclCreatePolygon(aPoints)); } /** Sets the color of the passed frame style to the output device. diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx index 53975595b624..686c41f8e09e 100644 --- a/svx/source/gallery2/galobj.cxx +++ b/svx/source/gallery2/galobj.cxx @@ -568,7 +568,9 @@ sal_Bool SgaObjectSvDraw::DrawCentered( OutputDevice* pOut, const FmFormModel& r pOut->Push(); pOut->SetMapMode( aMap ); aView.ShowSdrPage( const_cast< FmFormPage* >( pPage )); - aView.CompleteRedraw( pOut, Rectangle( pOut->PixelToLogic( Point() ), pOut->GetOutputSize() ) ); + aView.CompleteRedraw( pOut, + Region(Rectangle(pOut->PixelToLogic(Point()), + pOut->GetOutputSize()))); pOut->Pop(); bRet = sal_True; diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 6337a4f2ef29..5ee5d0b43325 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -363,7 +363,7 @@ void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRe rDev.DrawText(rRect.TopLeft(),pEntry->aName); } } else { - rDev.SetClipRegion(aR); + rDev.SetClipRegion(Region(aR)); rDev.DrawText(aR.TopLeft(),GetCellText(nAktPaintRow,nColumnId)); rDev.SetClipRegion(); } |