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 /sw | |
| parent | 913f175b321caf7a99957fd7c4dc536f4101ab53 (diff) | |
vcl: make Region ctors explicit to prevent overloading desasters
Change-Id: Id36d125b4940418833bec31a4710d6cd545629e0
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/doc/notxtfrm.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/envelp/labfmt.cxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index f0b041f6eb3d..05935356fc0f 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -279,7 +279,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const FindFlyFrm()->GetContour( aPoly, sal_True ) ) { - pOut->SetClipRegion( aPoly ); + pOut->SetClipRegion(Region(aPoly)); bClip = false; } diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index a23f3f6b512b..a261fb4026e0 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -2370,7 +2370,7 @@ void SwTabFrmPainter::PaintLines( OutputDevice& rDev, const SwRect& rRect ) cons Size aSize( rRect.SSize() ); // Hack! Necessary, because the layout is not pixel aligned! aSize.Width() += nPixelSzW; aSize.Height() += nPixelSzH; - rDev.SetClipRegion( Rectangle( rRect.Pos(), aSize ) ); + rDev.SetClipRegion(Region(Rectangle(rRect.Pos(), aSize))); // The following stuff if necessary to have the new table borders fit // into a ::SwAlignRect adjusted world. @@ -4010,7 +4010,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const ViewShell *pSh = getRootFrm()->GetCurrShell(); if ( !pOut->GetConnectMetaFile() || !pSh || !pSh->GetWin() ) { - pOut->SetClipRegion( aPoly ); + pOut->SetClipRegion(Region(aPoly)); } for ( sal_uInt16 i = 0; i < aRegion.size(); ++i ) PaintBackground( aRegion[i], pPage, rAttrs, sal_False, sal_True ); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 23a445337a41..bab1b18ca3e0 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -158,7 +158,7 @@ void SwLabPreview::Paint(const Rectangle &) DrawLine(Point(lX0, lY0 + lOutlineH - 1), Point(lX0 + lOutlineW - 1, lY0 + lOutlineH - 1)); // Down // Labels - SetClipRegion (Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH))); + SetClipRegion(Region(Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH)))); SetFillColor( COL_LIGHTGRAYBLUE ); for (sal_uInt16 nRow = 0; nRow < Min((sal_uInt16) 2, (sal_uInt16) aItem.nRows); nRow++) for (sal_uInt16 nCol = 0; nCol < Min((sal_uInt16) 2, (sal_uInt16) aItem.nCols); nCol++) |