diff options
| author | Noel Grandin <noel@peralex.com> | 2014-09-27 14:52:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-09-30 09:58:23 +0200 |
| commit | 8dbde0845a3989528614addb9bd0333f60c522a5 (patch) | |
| tree | c1f13bfc8e2841427eb6a07e2147445b309b1e9a | |
| parent | b69478acff4f5b7a9d334a765a1a528d44d7b3a4 (diff) | |
fdo#82577: Handle Region
Put the VCL Region class in the vcl namespace. Avoids clash with the X11
Region typedef.
Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
222 files changed, 755 insertions, 750 deletions
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index b6c7f7f11782..9800c4c5d2bf 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -551,7 +551,7 @@ IMPL_LINK_NOARG(DlgEditor, PaintTimeout) // repaint, get PageView and prepare Region SdrPageView* pPgView = pDlgEdView->GetSdrPageView(); - const Region aPaintRectRegion(aPaintRect); + const vcl::Region aPaintRectRegion(aPaintRect); // #i74769# diff --git a/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx index 4e489f435221..41f2f85d4538 100644 --- a/canvas/source/cairo/cairo_canvashelper_text.cxx +++ b/canvas/source/cairo/cairo_canvashelper_text.cxx @@ -131,7 +131,7 @@ namespace cairocanvas // accumulate non-empty clips into one region // ========================================== - Region aClipRegion; + vcl::Region aClipRegion; if( viewState.Clip.is() ) { @@ -147,7 +147,7 @@ namespace cairocanvas ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix, viewState.AffineTransform ) ); - aClipRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); + aClipRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); } } @@ -166,7 +166,7 @@ namespace cairocanvas if( aClipPoly.count() ) { // setup non-empty clipping - Region aRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); + vcl::Region aRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); if( aClipRegion.IsEmpty() ) aClipRegion = aRegion; diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index 19345b6e2dd9..b565d8c598a4 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -171,7 +171,7 @@ namespace dxcanvas } aClipPoly.transform(aMatrix); - const Region& rClipRegion = Region(PolyPolygon(aClipPoly)); + const vcl::Region& rClipRegion = vcl::Region(PolyPolygon(aClipPoly)); aVirtualDevice.IntersectClipRegion(rClipRegion); } @@ -179,7 +179,7 @@ namespace dxcanvas { ::basegfx::B2DPolyPolygon aClipPoly(dxcanvas::tools::polyPolygonFromXPolyPolygon2D(rRenderState.Clip)); aClipPoly.transform(aWorldTransform); - const Region& rClipRegion = Region(PolyPolygon(aClipPoly)); + const vcl::Region& rClipRegion = vcl::Region(PolyPolygon(aClipPoly)); aVirtualDevice.IntersectClipRegion(rClipRegion); } diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx index 116b4ac116c0..29e4dadb66d0 100644 --- a/canvas/source/vcl/canvashelper.cxx +++ b/canvas/source/vcl/canvashelper.cxx @@ -1232,7 +1232,7 @@ namespace vclcanvas // accumulate non-empty clips into one region // ========================================== - Region aClipRegion(true); + vcl::Region aClipRegion(true); if( viewState.Clip.is() ) { @@ -1247,7 +1247,7 @@ namespace vclcanvas ::basegfx::unotools::homMatrixFromAffineMatrix( aMatrix, viewState.AffineTransform ) ); - aClipRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); + aClipRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); } else { @@ -1270,7 +1270,7 @@ namespace vclcanvas if( aClipPoly.count() ) { // setup non-empty clipping - Region aRegion = Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); + vcl::Region aRegion = vcl::Region::GetRegionFromPolyPolygon( ::PolyPolygon( aClipPoly ) ); aClipRegion.Intersect( aRegion ); } else diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx index d6397c03cd5b..103302593f6f 100644 --- a/canvas/source/vcl/canvashelper_texturefill.cxx +++ b/canvas/source/vcl/canvashelper_texturefill.cxx @@ -607,7 +607,7 @@ namespace vclcanvas } else { - const Region aPolyClipRegion( rPoly ); + const vcl::Region aPolyClipRegion( rPoly ); rOutDev.Push( PUSH_CLIPREGION ); rOutDev.SetClipRegion( aPolyClipRegion ); @@ -1034,7 +1034,7 @@ namespace vclcanvas aPolyPoly.Translate( ::Point( -aPolygonDeviceRect.Left(), -aPolygonDeviceRect.Top() ) ); - const Region aPolyClipRegion( aPolyPoly ); + const vcl::Region aPolyClipRegion( aPolyPoly ); aVDev.SetClipRegion( aPolyClipRegion ); textureFill( aVDev, @@ -1069,7 +1069,7 @@ namespace vclcanvas } else { - const Region aPolyClipRegion( aPolyPoly ); + const vcl::Region aPolyClipRegion( aPolyPoly ); rOutDev.Push( PUSH_CLIPREGION ); rOutDev.SetClipRegion( aPolyClipRegion ); diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx index 08c532cc8421..dd4fd2bac735 100644 --- a/canvas/source/vcl/spritecanvashelper.cxx +++ b/canvas/source/vcl/spritecanvashelper.cxx @@ -89,7 +89,7 @@ namespace vclcanvas // scrolled sprite content outside this area) rOutDev.EnableMapMode( false ); rOutDev.SetAntialiasing( ANTIALIASING_ENABLE_B2DDRAW ); - rOutDev.SetClipRegion(Region(rRequestedArea)); + rOutDev.SetClipRegion(vcl::Region(rRequestedArea)); // repaint affected sprite directly to output device (at // the actual screen output position) @@ -275,7 +275,7 @@ namespace vclcanvas // clips. besides that, will interfere with animations (as for // Window-invalidate repaints, only parts of the window will // be redrawn otherwise) - const Region aFullWindowRegion( Rectangle(aEmptyPoint, + const vcl::Region aFullWindowRegion( Rectangle(aEmptyPoint, aOutDevSize) ); pTargetWindow->ExpandPaintClipRegion(aFullWindowRegion); } diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 0bda848d1f57..ebbd8142d75c 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -262,7 +262,7 @@ namespace vclcanvas rTargetSurface.DrawPolyPolygon(PolyPolygon(aClipPoly)); // #i76339# } - Region aClipRegion( aClipPoly ); + vcl::Region aClipRegion( aClipPoly ); rTargetSurface.SetClipRegion( aClipRegion ); } } diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index a58043df97c0..c62285b4fb04 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -981,7 +981,7 @@ void DataBrowser::PaintCell( // clipping if( aPos.X() < rRect.Right() || aPos.X() + TxtSize.Width() > rRect.Right() || aPos.Y() < rRect.Top() || aPos.Y() + TxtSize.Height() > rRect.Bottom()) - rDev.SetClipRegion(Region(rRect)); + rDev.SetClipRegion(vcl::Region(rRect)); // allow for a disabled control ... bool bEnabled = IsEnabled(); diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index c32ee0141b57..578a5631e123 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -232,7 +232,7 @@ void DrawViewWrapper::setMarkHandleProvider( MarkHandleProvider* pMarkHandleProv m_pMarkHandleProvider = pMarkHandleProvider; } -void DrawViewWrapper::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* /* pRedirector */) +void DrawViewWrapper::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* /* pRedirector */) { svtools::ColorConfig aColorConfig; Color aFillColor = Color( aColorConfig.GetColorValue( svtools::DOCCOLOR ).nColor ); diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx index d7c36d7bda04..3cc9e10c2ce5 100644 --- a/chart2/source/controller/inc/DrawViewWrapper.hxx +++ b/chart2/source/controller/inc/DrawViewWrapper.hxx @@ -66,7 +66,7 @@ public: //pMarkHandleProvider can be NULL; ownership is not taken void setMarkHandleProvider( MarkHandleProvider* pMarkHandleProvider ); - void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0) SAL_OVERRIDE; + void CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0) SAL_OVERRIDE; SdrObject* getSelectedObject() const; SdrObject* getTextEditObject() const; diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 71a233a79527..c367f6563e40 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -495,7 +495,7 @@ void ChartController::execute_Paint( const Rectangle& rRect ) SolarMutexGuard aGuard; DrawViewWrapper* pDrawViewWrapper = m_pDrawViewWrapper; if(pDrawViewWrapper) - pDrawViewWrapper->CompleteRedraw(m_pChartWindow, Region(rRect) ); + pDrawViewWrapper->CompleteRedraw(m_pChartWindow, vcl::Region(rRect) ); } } catch( const uno::Exception & ex ) diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 93712142427c..d54441be729b 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -290,7 +290,7 @@ void ChartWindow::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) m_pOpenGLWindow->Invalidate( rRect, nFlags ); } } -void ChartWindow::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) +void ChartWindow::Invalidate( const vcl::Region& rRegion, sal_uInt16 nFlags ) { if( m_bInPaint ) // #i101928# superfluous paint calls while entering and editing charts" return; diff --git a/chart2/source/controller/main/ChartWindow.hxx b/chart2/source/controller/main/ChartWindow.hxx index 9dee31b22219..2afa38a986d6 100644 --- a/chart2/source/controller/main/ChartWindow.hxx +++ b/chart2/source/controller/main/ChartWindow.hxx @@ -60,7 +60,7 @@ public: void ForceInvalidate(); virtual void Invalidate( sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; - virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; + virtual void Invalidate( const vcl::Region& rRegion, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE; diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 0ac795a618b1..c26ae5236920 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -206,7 +206,7 @@ void AboutDialog::Resize() void AboutDialog::Paint( const Rectangle& rRect ) { - SetClipRegion(Region(rRect)); + SetClipRegion(vcl::Region(rRect)); Size aSize(GetOutputSizePixel()); Point aPos(aSize.Width() - aBackgroundBitmap.GetSizePixel().Width(), diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index dd73fb46be9f..f905137967c5 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -278,7 +278,7 @@ namespace offapp if (m_aSeekRow != m_aSettings.end()) { - rDev.SetClipRegion(Region(rRect)); + rDev.SetClipRegion(vcl::Region(rRect)); sal_uInt16 nStyle = TEXT_DRAW_CLIP; if (!IsEnabled()) diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 8e2b99f0c26a..5d60e63c9b51 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -353,7 +353,7 @@ namespace dbaui if( aPos.X() < rRect.Right() || aPos.X() + aTextSize.Width() > rRect.Right() || aPos.Y() < rRect.Top() || aPos.Y() + aTextSize.Height() > rRect.Bottom() ) { - rDev.SetClipRegion(Region(rRect)); + rDev.SetClipRegion(vcl::Region(rRect)); } rDev.DrawText( aPos, aText ); diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index f334c2b621b1..7a2582e064ce 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -408,7 +408,7 @@ void OTableGrantControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, if( aPos.X() < rRect.Right() || aPos.X() + nWidth > rRect.Right() || aPos.Y() < rRect.Top() || aPos.Y() + nHeight > rRect.Bottom() ) { - rDev.SetClipRegion(Region(rRect)); + rDev.SetClipRegion(vcl::Region(rRect)); } rDev.DrawText( aPos, aText ); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index 08901ac03c97..4617c1310c17 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -144,7 +144,7 @@ namespace dbaui // clipping if (aPos.X() < _rRect.Right() || aPos.X() + TxtSize.Width() > _rRect.Right() || aPos.Y() < _rRect.Top() || aPos.Y() + TxtSize.Height() > _rRect.Bottom()) - _rDev.SetClipRegion(Region(_rRect)); + _rDev.SetClipRegion(vcl::Region(_rRect)); // allow for a disabled control ... bool bEnabled = IsEnabled(); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 97ca36ac2660..1f4c2eaae461 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1207,7 +1207,7 @@ bool OSelectionBrowseBox::SeekRow(long nRow) void OSelectionBrowseBox::PaintCell(OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColumnId) const { - rDev.SetClipRegion(Region(rRect)); + rDev.SetClipRegion(vcl::Region(rRect)); OTableFieldDescRef pEntry = NULL; sal_uInt16 nPos = GetColumnPos(nColumnId); diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 566906a08aba..706f0a56c512 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -311,7 +311,7 @@ void OTableEditorCtrl::PaintCell(OutputDevice& rDev, const Rectangle& rRect, const OUString aText( GetCellText( m_nCurrentPos, nColumnId )); rDev.Push( PUSH_CLIPREGION ); - rDev.SetClipRegion(Region(rRect)); + rDev.SetClipRegion(vcl::Region(rRect)); rDev.DrawText( rRect, aText, TEXT_DRAW_LEFT | TEXT_DRAW_VCENTER ); rDev.Pop(); } diff --git a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx index 5cad9d63da67..8d7032505268 100644 --- a/drawinglayer/source/primitive2d/metafileprimitive2d.cxx +++ b/drawinglayer/source/primitive2d/metafileprimitive2d.cxx @@ -361,20 +361,20 @@ namespace namespace { - /** helper to convert a Region to a B2DPolyPolygon + /** helper to convert a vcl::Region to a B2DPolyPolygon when it does not yet contain one. In the future this may be expanded to merge the polygons created from rectangles or use a special algo to directly turn the spans of regions to a single, already merged PolyPolygon. */ - basegfx::B2DPolyPolygon getB2DPolyPolygonFromRegion(const Region& rRegion) + basegfx::B2DPolyPolygon getB2DPolyPolygonFromRegion(const vcl::Region& rRegion) { basegfx::B2DPolyPolygon aRetval; if(!rRegion.IsEmpty()) { - Region aRegion(rRegion); + vcl::Region aRegion(rRegion); aRetval = aRegion.GetAsB2DPolyPolygon(); } @@ -940,9 +940,9 @@ namespace } /** helper to take needed action on ClipRegion change. This method needs to be called - on any Region change, e.g. at the obvious actions doing this, but also at pop-calls - which change the Region of the current context. It takes care of creating the - current embeddec context, set the new Region at the context and eventually prepare + on any vcl::Region change, e.g. at the obvious actions doing this, but also at pop-calls + which change the vcl::Region of the current context. It takes care of creating the + current embeddec context, set the new vcl::Region at the context and eventually prepare a new target for embracing new geometry to the current region */ void HandleNewClipRegion( @@ -1608,9 +1608,9 @@ namespace It tries to handle clipping no longer as Regions and spans of Rectangles, but as PolyPolygon ClipRegions with (where possible) high precision by using the best possible data quality - from the Region. The Region is unavoidable as data container, but nowadays allows the transport + from the Region. The vcl::Region is unavoidable as data container, but nowadays allows the transport of Polygon-based clip regions. Where this is not used, a Polygon is constructed from the - Region ranges. All primitive clipping uses the MaskPrimitive2D with Polygon-based clipping. + vcl::Region ranges. All primitive clipping uses the MaskPrimitive2D with Polygon-based clipping. I have marked the single MetaActions with: @@ -2505,7 +2505,7 @@ namespace { /** CHECKED, WORKS WELL */ const MetaISectRegionClipRegionAction* pA = (const MetaISectRegionClipRegionAction*)pAction; - const Region& rNewRegion = pA->GetRegion(); + const vcl::Region& rNewRegion = pA->GetRegion(); if(rNewRegion.IsEmpty()) { diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx index bc72beae0fbd..5e368fba4bf5 100644 --- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx @@ -1782,10 +1782,10 @@ namespace drawinglayer if(maClipPolyPolygon.count()) { // set VCL clip region; subdivide before conversion to tools polygon. Subdivision necessary (!) - // Removed subdivision and fixed in Region::ImplPolyPolyRegionToBandRegionFunc() in VCL where + // Removed subdivision and fixed in vcl::Region::ImplPolyPolyRegionToBandRegionFunc() in VCL where // the ClipRegion is built from the Polygon. A AdaptiveSubdivide on the source polygon was missing there mpOutputDevice->Push(PUSH_CLIPREGION); - mpOutputDevice->SetClipRegion(Region(maClipPolyPolygon)); + mpOutputDevice->SetClipRegion(vcl::Region(maClipPolyPolygon)); // recursively paint content // #i121267# Only need to process sub-content when clip polygon is *not* empty. diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 7d292e34ec0d..133d2e9d3cdf 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -262,7 +262,7 @@ void EditEngine::Draw( OutputDevice* pOutDev, const Rectangle& rOutRect, const P bool bClipRegion = pOutDev->IsClipRegion(); bool bMetafile = pOutDev->GetConnectMetaFile(); - Region aOldRegion = pOutDev->GetClipRegion(); + vcl::Region aOldRegion = pOutDev->GetClipRegion(); // If one existed => intersection! // Use Push/pop for creating the Meta file diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx index bdd5065ec6a9..d9d5810b9019 100644 --- a/editeng/source/editeng/impedit.cxx +++ b/editeng/source/editeng/impedit.cxx @@ -141,7 +141,7 @@ void ImpEditView::SetEditSelection( const EditSelection& rEditSelection ) } -void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion, OutputDevice* pTargetDevice ) +void ImpEditView::DrawSelection( EditSelection aTmpSel, vcl::Region* pRegion, OutputDevice* pTargetDevice ) { if ( GetSelectionMode() == EE_SELMODE_HIDDEN ) return; @@ -159,7 +159,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion, OutputD OutputDevice* pTarget = pTargetDevice ? pTargetDevice : pOutWin; bool bClipRegion = pTarget->IsClipRegion(); - Region aOldRegion = pTarget->GetClipRegion(); + vcl::Region aOldRegion = pTarget->GetClipRegion(); if ( !pRegion ) { @@ -286,7 +286,7 @@ void ImpEditView::DrawSelection( EditSelection aTmpSel, Region* pRegion, OutputD if ( pRegion ) { - *pRegion = Region( *pPolyPoly ); + *pRegion = vcl::Region( *pPolyPoly ); delete pPolyPoly; } else diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index b0756c7c73a6..2e3a1cc04bf1 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -308,7 +308,7 @@ public: bool HasSelection() const { return aEditSelection.HasRange(); } void DrawSelection() { DrawSelection( aEditSelection ); } - void DrawSelection( EditSelection, Region* pRegion = NULL, OutputDevice* pTargetDevice = NULL ); + void DrawSelection( EditSelection, vcl::Region* pRegion = NULL, OutputDevice* pTargetDevice = NULL ); vcl::Window* GetWindow() const { return pOutWin; } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 0b26a0738656..f807a4af35f1 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -3771,7 +3771,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev Paint( pVDev, aTmpRect, aStartPos ); bool bClipRegion = false; - Region aOldRegion; + vcl::Region aOldRegion; MapMode aOldMapMode; if ( GetTextRanger() ) { @@ -3790,7 +3790,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev MapMode aNewMapMode( aOldMapMode ); aNewMapMode.SetOrigin( aOrigin ); pTarget->SetMapMode( aNewMapMode ); - pTarget->SetClipRegion( Region( GetTextRanger()->GetPolyPolygon() ) ); + pTarget->SetClipRegion( vcl::Region( GetTextRanger()->GetPolyPolygon() ) ); } pTarget->DrawOutDev( aClipRect.TopLeft(), aClipRect.GetSize(), @@ -3839,7 +3839,7 @@ void ImpEditEngine::Paint( ImpEditView* pView, const Rectangle& rRect, OutputDev } bool bClipRegion = pTarget->IsClipRegion(); - Region aOldRegion = pTarget->GetClipRegion(); + vcl::Region aOldRegion = pTarget->GetClipRegion(); pTarget->IntersectClipRegion( aClipRect ); Paint( pTarget, aClipRect, aStartPos ); diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 38c951c7c171..4956c3fe6566 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -484,7 +484,7 @@ void GridWindow::drawNew() { if( m_nValues && m_pXValues && m_pNewYValues ) { - SetClipRegion(Region(m_aGridArea)); + SetClipRegion(vcl::Region(m_aGridArea)); SetLineColor( Color( COL_YELLOW ) ); for( int i = 0; i < m_nValues-1; i++ ) { diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index 38a7bd155b80..15209ce723ce 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -89,7 +89,7 @@ namespace class BubbleWindow : public FloatingWindow { Point maTipPos; - Region maBounds; + vcl::Region maBounds; Polygon maRectPoly; Polygon maTriPoly; OUString maBubbleTitle; @@ -792,7 +792,7 @@ void BubbleWindow::Resize() Rectangle aRect( 0, TIP_HEIGHT, aSize.Width(), aSize.Height() - TIP_HEIGHT ); maRectPoly = Polygon( aRect, 6, 6 ); - Region aRegion( maRectPoly ); + vcl::Region aRegion( maRectPoly ); long nTipOffset = aSize.Width() - TIP_RIGHT_OFFSET + mnTipOffset; Point aPointArr[4]; @@ -801,7 +801,7 @@ void BubbleWindow::Resize() aPointArr[2] = Point( nTipOffset + TIP_WIDTH , TIP_HEIGHT ); aPointArr[3] = Point( nTipOffset, TIP_HEIGHT ); maTriPoly = Polygon( 4, aPointArr ); - Region aTriRegion( maTriPoly ); + vcl::Region aTriRegion( maTriPoly ); aRegion.Union( aTriRegion); maBounds = aRegion; diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 9037313db95e..7cf09e88b0af 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -207,7 +207,7 @@ private: void ImplPolyPoly( const PolyPolygon & rPolyPolygon, bool bTextOutline = false ); void ImplPolyLine( const Polygon & rPolygon ); - void ImplSetClipRegion( Region& rRegion ); + void ImplSetClipRegion( vcl::Region& rRegion ); void ImplBmp( Bitmap*, Bitmap*, const Point &, double nWidth, double nHeight ); void ImplText( const OUString& rUniString, const Point& rPos, const long* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev ); void ImplSetAttrForText( const Point & rPoint ); @@ -994,7 +994,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) case META_ISECTRECTCLIPREGION_ACTION: { const MetaISectRectClipRegionAction* pA = (const MetaISectRectClipRegionAction*) pMA; - Region aRegion( pA->GetRect() ); + vcl::Region aRegion( pA->GetRect() ); ImplSetClipRegion( aRegion ); } break; @@ -1002,7 +1002,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) case META_CLIPREGION_ACTION: { const MetaClipRegionAction* pA = (const MetaClipRegionAction*) pMA; - Region aRegion( pA->GetRegion() ); + vcl::Region aRegion( pA->GetRegion() ); ImplSetClipRegion( aRegion ); } break; @@ -1010,7 +1010,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev ) case META_ISECTREGIONCLIPREGION_ACTION: { const MetaISectRegionClipRegionAction* pA = (const MetaISectRegionClipRegionAction*) pMA; - Region aRegion( pA->GetRegion() ); + vcl::Region aRegion( pA->GetRegion() ); ImplSetClipRegion( aRegion ); } break; @@ -1692,7 +1692,7 @@ void PSWriter::ImplPolyLine( const Polygon & rPoly ) -void PSWriter::ImplSetClipRegion( Region& rClipRegion ) +void PSWriter::ImplSetClipRegion( vcl::Region& rClipRegion ) { if ( !rClipRegion.IsEmpty() ) { @@ -1782,7 +1782,7 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi bool bDoTrans = false; Rectangle aRect; - Region aRegion; + vcl::Region aRegion; if ( pMaskBitmap ) { @@ -1795,7 +1795,7 @@ void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoi nHeight = 8; } aRect = Rectangle( Point( 0, nHeightOrg - nHeightLeft ), Size( (long)nWidth, (long)nHeight ) ); - aRegion = Region( pMaskBitmap->CreateRegion( COL_BLACK, aRect ) ); + aRegion = vcl::Region( pMaskBitmap->CreateRegion( COL_BLACK, aRect ) ); if( mnLevel == 1 ) { diff --git a/filter/source/graphicfilter/icgm/class0.cxx b/filter/source/graphicfilter/icgm/class0.cxx index 9b0abed2b2f8..76691416eb73 100644 --- a/filter/source/graphicfilter/icgm/class0.cxx +++ b/filter/source/graphicfilter/icgm/class0.cxx @@ -102,8 +102,8 @@ void CGM::ImplDoClass0() mpOutAct->EndFigure(); mbFigure = false; break; - case 0x0d : /*Begin Protection Region */break; - case 0x0e : /*End Protection Region */break; + case 0x0d : /*Begin Protection vcl::Region */break; + case 0x0e : /*End Protection vcl::Region */break; case 0x0f : /*Begin Compound Line */break; case 0x10 : /*End Compound Line */break; case 0x11 : /*Begin Compound Text Path */break; @@ -111,8 +111,8 @@ void CGM::ImplDoClass0() case 0x13 : /*Begin Tile Array */break; // NS case 0x14 : /*End Tile Array */break; // NS case 0xff : /*Filter Setup */break; - case 0xfe : /*Begin Block Text Region */break; - case 0xfd : /*End Block Text Region */break; + case 0xfe : /*Begin Block Text vcl::Region */break; + case 0xfd : /*End Block Text vcl::Region */break; case 0xfc : /*Begin Group*/ mpOutAct->BeginGroup(); break; diff --git a/filter/source/graphicfilter/icgm/class3.cxx b/filter/source/graphicfilter/icgm/class3.cxx index 7af697124f5c..389149050529 100644 --- a/filter/source/graphicfilter/icgm/class3.cxx +++ b/filter/source/graphicfilter/icgm/class3.cxx @@ -117,7 +117,7 @@ void CGM::ImplDoClass3() break; case 0x0b : /*Save Primitive Context */break; // NS case 0x0c : /*Restore Primitive Context */break; // NS - case 0x11 : /*Protection Region Indicator */break; + case 0x11 : /*Protection vcl::Region Indicator */break; case 0x12 : /*Generalized Text Path Mode */break; // NS case 0x13 : /*Mitre Limit*/ pElement->nMitreLimit = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize ); diff --git a/filter/source/graphicfilter/icgm/class5.cxx b/filter/source/graphicfilter/icgm/class5.cxx index 962f3556ef75..5e6fdb2f85f4 100644 --- a/filter/source/graphicfilter/icgm/class5.cxx +++ b/filter/source/graphicfilter/icgm/class5.cxx @@ -416,9 +416,9 @@ void CGM::ImplDoClass5() case 0x31 : /*Symbol Color*/ break; // NS case 0x32 : /*Symbol Size*/ break; // NS case 0x33 : /*Symbol Orientation*/ break; // NS - case 0x50 : /*Block Text Region Margins*/ break; - case 0x51 : /*Block Text Region Expansion*/ break; - case 0x52 : /*Block Text Region Anchor*/ break; + case 0x50 : /*Block Text vcl::Region Margins*/ break; + case 0x51 : /*Block Text vcl::Region Expansion*/ break; + case 0x52 : /*Block Text vcl::Region Anchor*/ break; case 0x53 : /*Block Text Paragraph Horizontal Alignment*/ break; case 0x54 : /*Block Text Paragraph Vertical Alignment*/ break; case 0x55 : /*Block Text Line Flow*/ break; diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index d79aad38072f..89e1c9b6ad4e 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -1634,7 +1634,7 @@ void OS2METReader::ReadOrder(sal_uInt16 nOrderID, sal_uInt16 nOrderLen) pOS2MET->ReadUInt32( nID ); if (nID==0) p=NULL; while (p!=NULL && p->nID!=nID) p=p->pSucc; - if (p!=NULL) pVirDev->SetClipRegion(Region(p->aPPoly)); + if (p!=NULL) pVirDev->SetClipRegion(vcl::Region(p->aPPoly)); else pVirDev->SetClipRegion(); break; } diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 7b313364c02f..2ce4b3d311e2 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1274,7 +1274,7 @@ sal_uLong PictReader::ReadData(sal_uInt16 nOpcode) // but this can be discutable... aRect.setWidth(aRect.getWidth()+1); aRect.setHeight(aRect.getHeight()+1); - pVirDev->SetClipRegion( Region( aRect ) ); + pVirDev->SetClipRegion( vcl::Region( aRect ) ); break; } case 0x0002: // BkPat diff --git a/include/postwin.h b/include/postwin.h index 64ac27eb5837..37bf579c7a42 100644 --- a/include/postwin.h +++ b/include/postwin.h @@ -19,7 +19,6 @@ /* not protected, do only include once! */ -#undef Region #undef PolyPolygon #undef Polygon #undef Rectangle diff --git a/include/postx.h b/include/postx.h index 1b02f2b78c98..0952f7ebabf4 100644 --- a/include/postx.h +++ b/include/postx.h @@ -25,7 +25,6 @@ #endif /* X Types */ -#undef Region #undef Icon #undef Time diff --git a/include/prewin.h b/include/prewin.h index 2ee8d9c3547d..b60372f89d1f 100644 --- a/include/prewin.h +++ b/include/prewin.h @@ -24,7 +24,6 @@ #define Rectangle BLA_Rectangle #define Polygon BLA_Polygon #define PolyPolygon BLA_PolyPolygon -#define Region WIN_Region #define Folder WIN_Folder #define GradientStyle_RECT WIN_GradientStyle_RECT diff --git a/include/prex.h b/include/prex.h index 97fc31352715..7b1a3574fb70 100644 --- a/include/prex.h +++ b/include/prex.h @@ -30,7 +30,6 @@ #define Icon HIDE_XLIB_Icon /* Types from <X11/X.h> that clash, but we do use. */ -#define Region XLIB_Region #define Time XLIB_Time #if defined __cplusplus diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx index 1343ac64000d..829121722825 100644 --- a/include/sfx2/sfxhtml.hxx +++ b/include/sfx2/sfxhtml.hxx @@ -52,7 +52,7 @@ protected: public: // Read the options of an image map // <MAP>: sal_True = Image-Map has a name - // <AREA>: sal_True = Image-Map has now one Region more + // <AREA>: sal_True = Image-Map has now one vcl::Region more static bool ParseMapOptions(ImageMap* pImageMap, const HTMLOptions& rOptions); bool ParseMapOptions(ImageMap * pImageMap) { return ParseMapOptions(pImageMap, GetOptions()); } diff --git a/include/shell/kde_headers.h b/include/shell/kde_headers.h index 74053e4a356d..8a1131f806cf 100644 --- a/include/shell/kde_headers.h +++ b/include/shell/kde_headers.h @@ -39,7 +39,7 @@ /* ********* Hack, but needed because of conflicting types... */ -#define Region QtXRegion +#define vcl::Region QtXRegion /* ********* Qt headers */ diff --git a/include/shell/tde_headers.h b/include/shell/tde_headers.h index c537ea381988..8ffe6b0f6dca 100644 --- a/include/shell/tde_headers.h +++ b/include/shell/tde_headers.h @@ -24,7 +24,7 @@ /* ********* Hack, but needed because of conflicting types... */ -#define Region TQtXRegion +#define vcl::Region TQtXRegion /* ********* TQt headers */ diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index bf53f75998d0..f076d8f51eeb 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -126,7 +126,7 @@ den Handlern gerufen werden: StartDrag - Muss aus dem Commnad-Handler gerufen werden. Als Parameter muss der CommandEvent uebergeben werden und eine Referenz - auf eine Region. Diese Region muss dann bei ExecuteDrag() + auf eine Region. Diese vcl::Region muss dann bei ExecuteDrag() uebergeben werden, wenn der Rueckgabewert sagt, das ExecuteDrag durchgefuehrt werden soll. Falls der Eintrag nicht selektiert ist, wird er vorher als aktueller @@ -495,7 +495,7 @@ public: /** Returns true, if the control draws from right to left (see SetEffectiveRTL()). */ bool IsEffectiveRTL() const; - bool StartDrag( const CommandEvent& rCEvt, Region& rRegion ); + bool StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ); sal_uInt16 ShowDropPos( const Point& rPos ); void HideDropPos(); bool SwitchPage( const Point& rPos ); diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 8ade613810df..e82a4b4ce353 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -277,7 +277,7 @@ private: protected: - bool StartDrag( const CommandEvent& rCEvt, Region& rRegion ); + bool StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ); protected: diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index e36d804b13c9..50f5d98416f9 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -67,7 +67,7 @@ class ListBox; struct GalDragParams { - Region aDragRegion; + vcl::Region aDragRegion; sal_uIntPtr nDragObjPos; OUString aThemeName; OUString aFileName; diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx index a842fc6c4ee4..23190a450f40 100644 --- a/include/svx/sdr/contact/displayinfo.hxx +++ b/include/svx/sdr/contact/displayinfo.hxx @@ -36,7 +36,7 @@ namespace sdr // The redraw area, in logical coordinates of OutputDevice. If Region // is empty, everything needs to be redrawn - Region maRedrawArea; + vcl::Region maRedrawArea; // bitfield @@ -77,8 +77,8 @@ namespace sdr const SetOfByte& GetProcessLayers() const { return maProcessLayers; } // access to RedrawArea - void SetRedrawArea(const Region& rRegion); - const Region& GetRedrawArea() const { return maRedrawArea; } + void SetRedrawArea(const vcl::Region& rRegion); + const vcl::Region& GetRedrawArea() const { return maRedrawArea; } // Access to ControlLayerProcessingActive flag void SetControlLayerProcessingActive(bool bDoPaint); diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index bac055dc6911..4e472702e2c0 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -29,7 +29,7 @@ // predeclarations -class Region; +namespace vcl { class Region; } namespace sdr { namespace contact { class DisplayInfo; diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index fd7437a0509d..5d84de28c865 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -36,7 +36,7 @@ // predeclarations class OutputDevice; -class Region; +namespace vcl { class Region; } namespace sdr { namespace overlay { class OverlayObject; @@ -99,7 +99,7 @@ namespace sdr const drawinglayer::geometry::ViewInformation2D getCurrentViewInformation2D() const; // complete redraw - virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0) const; + virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0) const; // flush. Do buffered updates. virtual void flush(); @@ -108,7 +108,7 @@ namespace sdr virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize); // restore part of background. Implemented form buffered versions only. - virtual void restoreBackground(const Region& rRegion) const; + virtual void restoreBackground(const vcl::Region& rRegion) const; // get the OutputDevice OutputDevice& getOutputDevice() const { return rmOutputDevice; } diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx index 36ea6b864137..078edaf0e201 100644 --- a/include/svx/sdrpagewindow.hxx +++ b/include/svx/sdrpagewindow.hxx @@ -35,7 +35,7 @@ // predeclarations -class Region; +namespace vcl { class Region; } class SdrUnoObj; class SdrPageView; @@ -101,7 +101,7 @@ public: // the repaint method. For migration from pPaintProc, use one more parameter void PrePaint(); - void PrepareRedraw(const Region& rReg); + void PrepareRedraw(const vcl::Region& rReg); void RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedirector) const; void RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectContactRedirector* pRedirector) const; diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index ca65289bf220..3a1f1ef7f986 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -60,7 +60,7 @@ public: ~SdrPreRenderDevice(); void PreparePreRenderDevice(); - void OutputPreRenderDevice(const Region& rExpandedRegion); + void OutputPreRenderDevice(const vcl::Region& rExpandedRegion); OutputDevice& GetOriginalOutputDevice() const { return mrOutputDevice; } OutputDevice& GetPreRenderDevice() { return maPreRenderDevice; } @@ -85,7 +85,7 @@ private: SdrPreRenderDevice* mpPreRenderDevice; // The RedrawRegion used for rendering - Region maRedrawRegion; + vcl::Region maRedrawRegion; // bitfield // #i72889# flag if this is only a temporary target for repaint, default is false @@ -112,7 +112,7 @@ public: rtl::Reference< ::sdr::overlay::OverlayManager > GetOverlayManager() const; // #i73602# add flag if buffer shall be used - void DrawOverlay(const Region& rRegion); + void DrawOverlay(const vcl::Region& rRegion); // calculate visible area and return Rectangle GetVisibleArea() const; @@ -132,12 +132,12 @@ public: // prepare PreRendering (evtl.) void PreparePreRenderDevice(); void DestroyPreRenderDevice(); - void OutputPreRenderDevice(const Region& rExpandedRegion); + void OutputPreRenderDevice(const vcl::Region& rExpandedRegion); SdrPreRenderDevice* GetPreRenderDevice() const { return mpPreRenderDevice; } // RedrawRegion - const Region& GetRedrawRegion() const { return maRedrawRegion;} - void SetRedrawRegion(const Region& rNew); + const vcl::Region& GetRedrawRegion() const { return maRedrawRegion;} + void SetRedrawRegion(const vcl::Region& rNew); // #i72889# read/write access to TempoparyTarget bool getTemporaryTarget() const { return (bool)mbTemporaryTarget; } diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 5d59a1c20df7..334ad3161956 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -35,7 +35,7 @@ class VirtualDevice; class OutputDevice; -class Region; +namespace vcl { class Region; } namespace vcl { class Window; } class SdrHdlList; class SdrMarkView; diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 2450e409617e..9fb2d9568bdc 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -35,7 +35,7 @@ -class Region; +namespace vcl { class Region; } class SdrObjList; class SdrObject; class SdrPage; @@ -166,7 +166,7 @@ public: void PrePaint(); // rReg bezieht sich auf's OutDev, nicht auf die Page - void CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const; + void CompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) const; // write access to mpPreparedPageWindow void setPreparedPageWindow(SdrPageWindow* pKnownTarget); diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index 1c63d3faede7..16bdc9d93136 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -365,7 +365,7 @@ public: // used internally for Draw/Impress/sch/chart2 - virtual void CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); + virtual void CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); // #i72889# used from CompleteRedraw() implementation internally, added to be able to do a complete redraw in single steps @@ -376,16 +376,16 @@ public: // EndCompleteRedraw does the necessary refreshes, evtl. paints text edit and overlay and evtl destroys the // SdrPaintWindow again. This means: the SdrPaintWindow is no longer safe after this closing call. virtual SdrPaintWindow* BeginCompleteRedraw(OutputDevice* pOut); - virtual void DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); + virtual void DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0); virtual void EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); // used for the other applications basctl/sc/sw which call DrawLayer at PageViews // #i74769# Interface change to use common BeginCompleteRedraw/EndCompleteRedraw // #i76114# bDisableIntersect disables intersecting rReg with the Window's paint region - SdrPaintWindow* BeginDrawLayers(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect = false); + SdrPaintWindow* BeginDrawLayers(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect = false); // used when the region passed to BeginDrawLayers needs to be changed - void UpdateDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect = false); + void UpdateDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect = false); void EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLayer); protected: @@ -393,7 +393,7 @@ protected: // used to paint the form layer after the PreRender device is flushed (painted) to the window. void ImpFormLayerDrawing(SdrPaintWindow& rPaintWindow) const; - Region OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect); + vcl::Region OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect); public: bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx index 77c31790c51c..068ed3bfb08a 100644 --- a/include/toolkit/awt/vclxgraphics.hxx +++ b/include/toolkit/awt/vclxgraphics.hxx @@ -33,7 +33,7 @@ #include <vcl/vclenum.hxx> class OutputDevice; -class Region; +namespace vcl { class Region; } #define INITOUTDEV_FONT 0x0001 @@ -63,7 +63,7 @@ private: Color maLineColor; Color maFillColor; RasterOp meRasterOp; - Region* mpClipRegion; + vcl::Region* mpClipRegion; void initAttrs(); diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx index 0aafb8616516..1206a4f6b9c5 100644 --- a/include/toolkit/awt/vclxregion.hxx +++ b/include/toolkit/awt/vclxregion.hxx @@ -40,7 +40,7 @@ class VCLXRegion : public ::com::sun::star::awt::XRegion, { private: ::osl::Mutex maMutex; - Region maRegion; + vcl::Region maRegion; protected: ::osl::Mutex& GetMutex() { return maMutex; } @@ -49,8 +49,8 @@ public: VCLXRegion(); virtual ~VCLXRegion(); - void SetRegion( const Region& rRegion ) { maRegion = rRegion; } - const Region& GetRegion() const { return maRegion; } + void SetRegion( const vcl::Region& rRegion ) { maRegion = rRegion; } + const vcl::Region& GetRegion() const { return maRegion; } // ::com::sun::star::uno::XInterface ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index 08f5a89cb78a..e8a6c9b400f2 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -89,7 +89,7 @@ public: static OutputDevice* GetOutputDevice( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics>& rxGraphics ); // Region - static Region GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ); + static vcl::Region GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ); // Polygon static Polygon CreatePolygon( const ::com::sun::star::uno::Sequence< sal_Int32 >& DataX, const ::com::sun::star::uno::Sequence< sal_Int32 >& DataY ); diff --git a/include/vcl/alpha.hxx b/include/vcl/alpha.hxx index fd8476537f6b..ec89be425e12 100644 --- a/include/vcl/alpha.hxx +++ b/include/vcl/alpha.hxx @@ -72,7 +72,7 @@ public: private: friend class BitmapEx; - friend class OutputDevice; + friend class ::OutputDevice; friend bool VCL_DLLPUBLIC ReadDIBBitmapEx(BitmapEx& rTarget, SvStream& rIStm); SAL_DLLPRIVATE const Bitmap& ImplGetBitmap() const; diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 6f66f9ce8c24..516e4072f05b 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -159,7 +159,7 @@ public: } private: - friend class Bitmap; + friend class ::Bitmap; friend class BitmapEx; friend class Animation; @@ -609,7 +609,7 @@ public: @return the generated region. */ - Region CreateRegion( const Color& rColor, const Rectangle& rRect ) const; + vcl::Region CreateRegion( const Color& rColor, const Rectangle& rRect ) const; /** Replace all pixel where the given mask is on with the specified color diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx index 82f53a2d94c9..7ca4985de04c 100644 --- a/include/vcl/image.hxx +++ b/include/vcl/image.hxx @@ -47,7 +47,7 @@ enum ImageColorTransform class VCL_DLLPUBLIC Image { friend class ImageList; - friend class OutputDevice; + friend class ::OutputDevice; public: Image(); diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index e2eead04c452..d98d9ef87e57 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -1022,7 +1022,7 @@ class VCL_DLLPUBLIC MetaClipRegionAction : public MetaAction { private: - Region maRegion; + vcl::Region maRegion; bool mbClip; virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; @@ -1037,12 +1037,12 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; - MetaClipRegionAction( const Region& rRegion, bool bClip ); + MetaClipRegionAction( const vcl::Region& rRegion, bool bClip ); virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - const Region& GetRegion() const { return maRegion; } + const vcl::Region& GetRegion() const { return maRegion; } bool IsClipping() const { return mbClip; } }; @@ -1076,7 +1076,7 @@ class VCL_DLLPUBLIC MetaISectRegionClipRegionAction : public MetaAction { private: - Region maRegion; + vcl::Region maRegion; virtual bool Compare( const MetaAction& ) const SAL_OVERRIDE; @@ -1090,12 +1090,12 @@ public: virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ) SAL_OVERRIDE; virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ) SAL_OVERRIDE; - explicit MetaISectRegionClipRegionAction( const Region& ); + explicit MetaISectRegionClipRegionAction( const vcl::Region& ); virtual void Move( long nHorzMove, long nVertMove ) SAL_OVERRIDE; virtual void Scale( double fScaleX, double fScaleY ) SAL_OVERRIDE; - const Region& GetRegion() const { return maRegion; } + const vcl::Region& GetRegion() const { return maRegion; } }; class VCL_DLLPUBLIC MetaMoveClipRegionAction : public MetaAction diff --git a/include/vcl/metric.hxx b/include/vcl/metric.hxx index eb144507bd0a..6eb2da736838 100644 --- a/include/vcl/metric.hxx +++ b/include/vcl/metric.hxx @@ -115,7 +115,7 @@ public: private: - friend class OutputDevice; + friend class ::OutputDevice; void Reset( const ImplFontCharMap* pNewMap = NULL ); // prevent assignment and copy construction @@ -125,7 +125,7 @@ private: class VCL_DLLPUBLIC TextRectInfo { - friend class OutputDevice; + friend class ::OutputDevice; private: long mnMaxWidth; diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index a0e18f2c79dc..6dc4f076cba7 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -253,7 +253,7 @@ extern const sal_uLong nVCLLut[ 256 ]; class VCL_DLLPUBLIC OutputDevice: private boost::noncopyable { friend class Application; - friend class Bitmap; + friend class ::Bitmap; friend class ImplImageBmp; friend class Printer; friend class System; @@ -310,7 +310,7 @@ private: ImplThresholdRes maThresRes; OutDevType meOutDevType; OutDevViewType meOutDevViewType; - Region maRegion; // contains the clip region, see SetClipRegion(...) + vcl::Region maRegion; // contains the clip region, see SetClipRegion(...) Color maLineColor; Color maFillColor; vcl::Font maFont; @@ -491,7 +491,7 @@ private: SAL_DLLPRIVATE void ImplGetFrameDev ( const Point& rPt, const Point& rDevPt, const Size& rDevSize, OutputDevice& rOutDev ); SAL_DLLPRIVATE void ImplDrawFrameDev ( const Point& rPt, const Point& rDevPt, const Size& rDevSize, - const OutputDevice& rOutDev, const Region& rRegion ); + const OutputDevice& rOutDev, const vcl::Region& rRegion ); ///@} @@ -611,18 +611,18 @@ private: public: - Region GetClipRegion() const; + vcl::Region GetClipRegion() const; void SetClipRegion(); - void SetClipRegion( const Region& rRegion ); - bool SelectClipRegion( const Region&, SalGraphics* pGraphics = NULL ); + void SetClipRegion( const vcl::Region& rRegion ); + bool SelectClipRegion( const vcl::Region&, SalGraphics* pGraphics = NULL ); bool IsClipRegion() const { return mbClipRegion; } void MoveClipRegion( long nHorzMove, long nVertMove ); void IntersectClipRegion( const Rectangle& rRect ); - void IntersectClipRegion( const Region& rRegion ); + void IntersectClipRegion( const vcl::Region& rRegion ); - virtual Region GetActiveClipRegion() const; + virtual vcl::Region GetActiveClipRegion() const; protected: @@ -631,7 +631,7 @@ protected: private: - SAL_DLLPRIVATE void SetDeviceClipRegion( const Region* pRegion ); + SAL_DLLPRIVATE void SetDeviceClipRegion( const vcl::Region* pRegion ); ///@} @@ -1234,7 +1234,7 @@ public: SAL_DLLPRIVATE bool ImplIsAntiparallel() const ; SAL_DLLPRIVATE void ReMirror( Point &rPoint ) const; SAL_DLLPRIVATE void ReMirror( Rectangle &rRect ) const; - SAL_DLLPRIVATE void ReMirror( Region &rRegion ) const; + SAL_DLLPRIVATE void ReMirror( vcl::Region &rRegion ) const; SAL_DLLPRIVATE bool ImplIsRecordLayout() const; virtual bool HasMirroredGraphics() const; SAL_DLLPRIVATE SalLayout* ImplLayout( const OUString&, sal_Int32 nIndex, sal_Int32 nLen, @@ -1616,7 +1616,7 @@ public: Polygon LogicToPixel( const Polygon& rLogicPoly ) const; PolyPolygon LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const; basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const; - Region LogicToPixel( const Region& rLogicRegion )const; + vcl::Region LogicToPixel( const vcl::Region& rLogicRegion )const; Point LogicToPixel( const Point& rLogicPt, const MapMode& rMapMode ) const; Size LogicToPixel( const Size& rLogicSize, @@ -1631,7 +1631,7 @@ public: const MapMode& rMapMode ) const; basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly, const MapMode& rMapMode ) const; - Region LogicToPixel( const Region& rLogicRegion, + vcl::Region LogicToPixel( const vcl::Region& rLogicRegion, const MapMode& rMapMode ) const; basegfx::B2DPolygon LogicToPixel( const basegfx::B2DPolygon& rLogicPoly ) const; @@ -1641,7 +1641,7 @@ public: Polygon PixelToLogic( const Polygon& rDevicePoly ) const; PolyPolygon PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const; basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly ) const; - Region PixelToLogic( const Region& rDeviceRegion ) const; + vcl::Region PixelToLogic( const vcl::Region& rDeviceRegion ) const; Point PixelToLogic( const Point& rDevicePt, const MapMode& rMapMode ) const; Size PixelToLogic( const Size& rDeviceSize, @@ -1656,7 +1656,7 @@ public: const MapMode& rMapMode ) const; basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly, const MapMode& rMapMode ) const; - Region PixelToLogic( const Region& rDeviceRegion, + vcl::Region PixelToLogic( const vcl::Region& rDeviceRegion, const MapMode& rMapMode ) const; Point LogicToLogic( const Point& rPtSource, @@ -1856,9 +1856,9 @@ private: @param rPixelRect Const reference to region. - @returns Region based on device pixel coordinates and units. + @returns vcl::Region based on device pixel coordinates and units. */ - SAL_DLLPRIVATE Region ImplPixelToDevicePixel( const Region& rRegion ) const; + SAL_DLLPRIVATE vcl::Region ImplPixelToDevicePixel( const vcl::Region& rRegion ) const; /** Invalidate the view transformation. diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx index e53b7c18a923..9b2811a86a6a 100644 --- a/include/vcl/outdevstate.hxx +++ b/include/vcl/outdevstate.hxx @@ -108,7 +108,7 @@ public: MapMode* mpMapMode; bool mbMapActive; - Region* mpClipRegion; + vcl::Region* mpClipRegion; Color* mpLineColor; Color* mpFillColor; vcl::Font* mpFont; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 8cb430d4619b..6de196c8a6c8 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -198,7 +198,7 @@ public: class VCL_DLLPUBLIC Printer : public OutputDevice { - friend class OutputDevice; + friend class ::OutputDevice; private: SalInfoPrinter* mpInfoPrinter; diff --git a/include/vcl/region.hxx b/include/vcl/region.hxx index 6f334f7e11fe..f4d2dd31644a 100644 --- a/include/vcl/region.hxx +++ b/include/vcl/region.hxx @@ -31,18 +31,22 @@ class RegionBand; class Polygon; class PolyPolygon; namespace vcl { class Window; } +class OutputDevice; +class Bitmap; typedef boost::shared_ptr< RegionBand > RegionBandPtr; typedef boost::shared_ptr< PolyPolygon > PolyPolygonPtr; typedef boost::shared_ptr< basegfx::B2DPolyPolygon > B2DPolyPolygonPtr; typedef std::vector< Rectangle > RectangleVector; +namespace vcl { + class VCL_DLLPUBLIC Region { private: - friend class OutputDevice; - friend class vcl::Window; - friend class Bitmap; + friend class ::OutputDevice; + friend class ::vcl::Window; + friend class ::Bitmap; // possible contents B2DPolyPolygonPtr mpB2DPolyPolygon; @@ -66,7 +70,7 @@ public: explicit Region(const Polygon& rPolygon); explicit Region(const PolyPolygon& rPolyPoly); explicit Region(const basegfx::B2DPolyPolygon&); - Region(const Region& rRegion); + Region(const vcl::Region& rRegion); ~Region(); // direct access to contents @@ -87,10 +91,10 @@ public: bool Intersect( const Rectangle& rRegion ); bool Exclude( const Rectangle& rRegion ); bool XOr( const Rectangle& rRegion ); - bool Union( const Region& rRegion ); - bool Intersect( const Region& rRegion ); - bool Exclude( const Region& rRegion ); - bool XOr( const Region& rRegion ); + bool Union( const vcl::Region& rRegion ); + bool Intersect( const vcl::Region& rRegion ); + bool Exclude( const vcl::Region& rRegion ); + bool XOr( const vcl::Region& rRegion ); bool IsEmpty() const; bool IsNull() const { return mbIsNull;} @@ -106,31 +110,32 @@ public: bool IsInside( const Rectangle& rRect ) const; bool IsOver( const Rectangle& rRect ) const; - Region& operator=( const Region& rRegion ); - Region& operator=( const Rectangle& rRect ); + vcl::Region& operator=( const vcl::Region& rRegion ); + vcl::Region& operator=( const Rectangle& rRect ); - bool operator==( const Region& rRegion ) const; - bool operator!=( const Region& rRegion ) const { return !(Region::operator==( rRegion )); } + bool operator==( const vcl::Region& rRegion ) const; + bool operator!=( const vcl::Region& rRegion ) const { return !(Region::operator==( rRegion )); } - friend VCL_DLLPUBLIC SvStream& ReadRegion( SvStream& rIStm, Region& rRegion ); - friend VCL_DLLPUBLIC SvStream& WriteRegion( SvStream& rOStm, const Region& rRegion ); + friend VCL_DLLPUBLIC SvStream& ReadRegion( SvStream& rIStm, vcl::Region& rRegion ); + friend VCL_DLLPUBLIC SvStream& WriteRegion( SvStream& rOStm, const vcl::Region& rRegion ); /* workaround: faster conversion for PolyPolygons * if half of the Polygons contained in rPolyPoly are actually - * rectangles, then the returned Region will be constructed by + * rectangles, then the returned vcl::Region will be constructed by * XOr'ing the contained Polygons together; in the case of * only Rectangles this can be up to eight times faster than * Region( const PolyPolygon& ). - * Caution: this is only useful if the Region is known to be + * Caution: this is only useful if the vcl::Region is known to be * changed to rectangles; e.g. if being set as clip region */ - static Region GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly ); + static vcl::Region GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly ); }; +} /* namespace vcl */ template< typename charT, typename traits > inline std::basic_ostream<charT, traits> & operator <<( - std::basic_ostream<charT, traits> & stream, const Region& rRegion) + std::basic_ostream<charT, traits> & stream, const vcl::Region& rRegion) { if (rRegion.IsEmpty()) return stream << "EMPTY"; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 13a8ddc40f9f..7bde25e90362 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -260,9 +260,9 @@ public: long& rRight, long& rBottom, const ToolBox *pThis ); static SAL_DLLPRIVATE void ImplDrawGrip( ToolBox* pThis ); static SAL_DLLPRIVATE void ImplDrawGradientBackground( ToolBox* pThis, ImplDockingWindowWrapper *pWrapper ); - static SAL_DLLPRIVATE bool ImplDrawNativeBackground( ToolBox* pThis, const Region &rRegion ); - static SAL_DLLPRIVATE void ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegion ); - static SAL_DLLPRIVATE void ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, bool bIsInPopupMode ); + static SAL_DLLPRIVATE bool ImplDrawNativeBackground( ToolBox* pThis, const vcl::Region &rRegion ); + static SAL_DLLPRIVATE void ImplDrawTransparentBackground( ToolBox* pThis, const vcl::Region &rRegion ); + static SAL_DLLPRIVATE void ImplDrawConstantBackground( ToolBox* pThis, const vcl::Region &rRegion, bool bIsInPopupMode ); static SAL_DLLPRIVATE void ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ); static SAL_DLLPRIVATE void ImplErase( ToolBox* pThis, const Rectangle &rRect, bool bHighlight = false, bool bHasOpenPopup = false ); static SAL_DLLPRIVATE void ImplDrawBorder( ToolBox* pWin ); diff --git a/include/vcl/virdev.hxx b/include/vcl/virdev.hxx index 8c36f52e5f16..624cb2f0f31a 100644 --- a/include/vcl/virdev.hxx +++ b/include/vcl/virdev.hxx @@ -30,7 +30,7 @@ struct SystemGraphicsData; class VCL_DLLPUBLIC VirtualDevice : public OutputDevice { friend class Application; - friend class OutputDevice; + friend class ::OutputDevice; friend class Printer; private: diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index ce75def7b31f..ae9481973ba0 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -354,9 +354,9 @@ struct WindowResHeader namespace vcl { -class VCL_DLLPUBLIC Window : public OutputDevice, public Resource +class VCL_DLLPUBLIC Window : public ::OutputDevice, public Resource { - friend class vcl::Cursor; + friend class ::vcl::Cursor; friend class ::OutputDevice; friend class ::Application; friend class ::SystemWindow; @@ -379,7 +379,7 @@ class VCL_DLLPUBLIC Window : public OutputDevice, public Resource friend class ::ImplPopupFloatWin; friend class ::MenuFloatingWindow; - friend class svt::PopupWindowControllerImpl; + friend class ::svt::PopupWindowControllerImpl; private: // NOTE: to remove many dependencies of other modules @@ -395,7 +395,7 @@ private: // This is a first attempt to start to remove the dependency of Window on // OutputDevice - OutputDevice* mpOutputDevice; + ::OutputDevice* mpOutputDevice; #ifdef DBG_UTIL friend const char* ::ImplDbgCheckWindow( const void* pObj ); @@ -425,8 +425,8 @@ public: SAL_DLLPRIVATE vcl::Window* ImplGetParent() const; SAL_DLLPRIVATE vcl::Window* ImplFindWindow( const Point& rFramePos ); - SAL_DLLPRIVATE void ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ); - SAL_DLLPRIVATE void ImplInvalidateOverlapFrameRegion( const Region& rRegion ); + SAL_DLLPRIVATE void ImplInvalidateFrameRegion( const vcl::Region* pRegion, sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplInvalidateOverlapFrameRegion( const vcl::Region& rRegion ); SAL_DLLPRIVATE bool ImplSetClipFlag( bool bSysObjOnlySmaller = false ); @@ -482,15 +482,15 @@ protected: SAL_DLLPRIVATE Point ImplOutputToFrame( const Point& rPos ); - SAL_DLLPRIVATE void ImplInvalidateParentFrameRegion( Region& rRegion ); - SAL_DLLPRIVATE void ImplValidateFrameRegion( const Region* rRegion, sal_uInt16 nFlags ); - SAL_DLLPRIVATE void ImplValidate( const Region* rRegion, sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplInvalidateParentFrameRegion( vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplValidateFrameRegion( const vcl::Region* rRegion, sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplValidate( const vcl::Region* rRegion, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ); SAL_DLLPRIVATE vcl::Window* ImplGetBorderWindow() const; - SAL_DLLPRIVATE void ImplInvalidate( const Region* rRegion, sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplInvalidate( const vcl::Region* rRegion, sal_uInt16 nFlags ); SAL_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rFramePos ); @@ -499,7 +499,7 @@ protected: SAL_DLLPRIVATE void ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplSaveOverlapBackground(); - SAL_DLLPRIVATE bool ImplRestoreOverlapBackground( Region& rInvRegion ); + SAL_DLLPRIVATE bool ImplRestoreOverlapBackground( vcl::Region& rInvRegion ); SAL_DLLPRIVATE void ImplInvalidateAllOverlapBackgrounds(); SAL_DLLPRIVATE bool ImplSetClipFlagChildren( bool bSysObjOnlySmaller = false ); @@ -540,33 +540,33 @@ private: SAL_DLLPRIVATE void ImplPointToLogic( vcl::Font& rFont ) const; SAL_DLLPRIVATE void ImplLogicToPoint( vcl::Font& rFont ) const; - SAL_DLLPRIVATE bool ImplSysObjClip( const Region* pOldRegion ); + SAL_DLLPRIVATE bool ImplSysObjClip( const vcl::Region* pOldRegion ); SAL_DLLPRIVATE void ImplUpdateSysObjChildrenClip(); SAL_DLLPRIVATE void ImplUpdateSysObjOverlapsClip(); SAL_DLLPRIVATE void ImplUpdateSysObjClip(); - SAL_DLLPRIVATE void ImplIntersectWindowClipRegion( Region& rRegion ); - SAL_DLLPRIVATE void ImplIntersectWindowRegion( Region& rRegion ); - SAL_DLLPRIVATE void ImplExcludeWindowRegion( Region& rRegion ); - SAL_DLLPRIVATE void ImplExcludeOverlapWindows( Region& rRegion ); - SAL_DLLPRIVATE void ImplExcludeOverlapWindows2( Region& rRegion ); + SAL_DLLPRIVATE void ImplIntersectWindowClipRegion( vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplIntersectWindowRegion( vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplExcludeWindowRegion( vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplExcludeOverlapWindows( vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplExcludeOverlapWindows2( vcl::Region& rRegion ); - SAL_DLLPRIVATE void ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ); - SAL_DLLPRIVATE bool ImplClipChildren( Region& rRegion ); - SAL_DLLPRIVATE void ImplClipAllChildren( Region& rRegion ); - SAL_DLLPRIVATE void ImplClipSiblings( Region& rRegion ); + SAL_DLLPRIVATE void ImplClipBoundaries( vcl::Region& rRegion, bool bThis, bool bOverlaps ); + SAL_DLLPRIVATE bool ImplClipChildren( vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplClipAllChildren( vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplClipSiblings( vcl::Region& rRegion ); SAL_DLLPRIVATE void ImplInitWinClipRegion(); SAL_DLLPRIVATE void ImplInitWinChildClipRegion(); - SAL_DLLPRIVATE Region* ImplGetWinChildClipRegion(); + SAL_DLLPRIVATE vcl::Region* ImplGetWinChildClipRegion(); - SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion ); - SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion ); - SAL_DLLPRIVATE void ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion ); - SAL_DLLPRIVATE void ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion, + SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows( const vcl::Region& rInterRegion, vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows2( const vcl::Region& rInterRegion, vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplCalcOverlapRegionOverlaps( const vcl::Region& rInterRegion, vcl::Region& rRegion ); + SAL_DLLPRIVATE void ImplCalcOverlapRegion( const Rectangle& rSourceRect, vcl::Region& rRegion, bool bChildren, bool bParent, bool bSiblings ); - SAL_DLLPRIVATE void ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ); + SAL_DLLPRIVATE void ImplCallPaint( const vcl::Region* pRegion, sal_uInt16 nPaintFlags ); SAL_DLLPRIVATE void ImplCallOverlapPaint(); SAL_DLLPRIVATE void ImplPostPaint(); @@ -636,13 +636,13 @@ private: SAL_DLLPRIVATE bool ImplStopDnd(); SAL_DLLPRIVATE void ImplStartDnd(); - SAL_DLLPRIVATE void ImplPaintToDevice( OutputDevice* pTargetOutDev, const Point& rPos ); + SAL_DLLPRIVATE void ImplPaintToDevice( ::OutputDevice* pTargetOutDev, const Point& rPos ); SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const; public: - virtual Region GetActiveClipRegion() const SAL_OVERRIDE; + virtual vcl::Region GetActiveClipRegion() const SAL_OVERRIDE; protected: // Single argument ctors shall be explicit. @@ -678,8 +678,8 @@ public: Window( vcl::Window* pParent, const ResId& rResId ); virtual ~Window(); - OutputDevice const* GetOutDev() const { return mpOutputDevice; }; - OutputDevice* GetOutDev() { return mpOutputDevice; }; + ::OutputDevice const* GetOutDev() const { return mpOutputDevice; }; + ::OutputDevice* GetOutDev() { return mpOutputDevice; }; virtual void EnableRTL ( bool bEnable = true ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ); @@ -690,10 +690,10 @@ public: virtual void PrePaint(); virtual void Paint( const Rectangle& rRect ); virtual void Erase() SAL_OVERRIDE; - virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { OutputDevice::Erase( rRect ); } + virtual void Erase( const Rectangle& rRect ) SAL_OVERRIDE { ::OutputDevice::Erase( rRect ); } virtual void PostPaint(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); + virtual void Draw( ::OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Move(); virtual void Resize(); virtual void Activate(); @@ -782,7 +782,7 @@ public: void SetCompositionCharRect( const Rectangle* pRect, long nCompositionLength, bool bVertical = false ); - using OutputDevice::SetSettings; + using ::OutputDevice::SetSettings; virtual void SetSettings( const AllSettings& rSettings ) SAL_OVERRIDE; virtual void SetSettings( const AllSettings& rSettings, bool bChild ); void UpdateSettings( const AllSettings& rSettings, bool bChild = false ); @@ -791,8 +791,8 @@ public: void SetPointFont( const vcl::Font& rFont ); vcl::Font GetPointFont() const; void SetZoomedPointFont( const vcl::Font& rFont ); - long GetDrawPixel( OutputDevice* pDev, long nPixels ) const; - vcl::Font GetDrawPixelFont( OutputDevice* pDev ) const; + long GetDrawPixel( ::OutputDevice* pDev, long nPixels ) const; + vcl::Font GetDrawPixelFont( ::OutputDevice* pDev ) const; void SetControlFont(); void SetControlFont( const vcl::Font& rFont ); @@ -811,16 +811,16 @@ public: sal_uInt16 GetParentClipMode() const; void SetWindowRegionPixel(); - void SetWindowRegionPixel( const Region& rRegion ); - const Region& GetWindowRegionPixel() const; + void SetWindowRegionPixel( const vcl::Region& rRegion ); + const vcl::Region& GetWindowRegionPixel() const; bool IsWindowRegionPixel() const; - Region GetWindowClipRegionPixel( sal_uInt16 nFlags = 0 ) const; - Region GetPaintRegion() const; + vcl::Region GetWindowClipRegionPixel( sal_uInt16 nFlags = 0 ) const; + vcl::Region GetPaintRegion() const; bool IsInPaint() const; // while IsInPaint returns true ExpandPaintClipRegion adds the // submitted region to the paint clip region so you can // paint additional parts of your window if necessary - void ExpandPaintClipRegion( const Region& rRegion ); + void ExpandPaintClipRegion( const vcl::Region& rRegion ); void SetParent( vcl::Window* pNewParent ); vcl::Window* GetParent() const; @@ -953,7 +953,7 @@ public: const Rectangle& rRect, sal_uInt16 nFlags = 0 ); virtual void Invalidate( sal_uInt16 nFlags = 0 ); virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); - virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 ); + virtual void Invalidate( const vcl::Region& rRegion, sal_uInt16 nFlags = 0 ); void Validate( sal_uInt16 nFlags = 0 ); bool HasPaintEvent() const; void Update(); @@ -1408,7 +1408,7 @@ public: bool IsNativeWidgetEnabled() const; // a helper method for a Control's Draw method - void PaintToDevice( OutputDevice* pDevice, const Point& rPos, const Size& rSize ); + void PaintToDevice( ::OutputDevice* pDevice, const Point& rPos, const Size& rSize ); /* mark Window for deletion in top of event queue */ diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index eea629ba096d..851ecc375def 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -555,7 +555,7 @@ void OFieldExpressionControl::PaintCell( OutputDevice& rDev, const Rectangle& rR if( aPos.X() < rRect.Right() || aPos.X() + aTextSize.Width() > rRect.Right() || aPos.Y() < rRect.Top() || aPos.Y() + aTextSize.Height() > rRect.Bottom() ) - rDev.SetClipRegion(Region(rRect)); + rDev.SetClipRegion(vcl::Region(rRect)); rDev.DrawText( aPos, aText ); diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 74c2375d7a99..b90145c24335 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -138,7 +138,7 @@ void OReportSection::Paint( const Rectangle& rRect ) ++m_nPaintEntranceCount; // repaint, get PageView and prepare Region SdrPageView* pPgView = m_pView->GetSdrPageView(); - const Region aPaintRectRegion(rRect); + const vcl::Region aPaintRectRegion(rRect); // #i74769# SdrPaintWindow* pTargetPaintWindow = 0; diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 9d565418f098..d8034501b9a7 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -110,7 +110,7 @@ void OStartMarker::Paint( const Rectangle& rRect ) const long nVRulerWidth = m_aVRuler.GetSizePixel().Width(); nSize = aSize.Width() - nVRulerWidth; aSize.Width() += nCornerWidth; - SetClipRegion(Region(PixelToLogic(Rectangle(Point(),Size(nSize,aSize.Height()))))); + SetClipRegion(vcl::Region(PixelToLogic(Rectangle(Point(),Size(nSize,aSize.Height()))))); } Rectangle aWholeRect(Point(),aSize); diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 5001e1e843be..63224f65b536 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -1027,7 +1027,7 @@ EditEngine* ScCsvGrid::GetEditEngine() void ScCsvGrid::ImplSetColumnClipRegion( OutputDevice& rOutDev, sal_uInt32 nColIndex ) { - rOutDev.SetClipRegion( Region( Rectangle( + rOutDev.SetClipRegion( vcl::Region( Rectangle( std::max( GetColumnX( nColIndex ), GetFirstX() ) + 1, 0, std::min( GetColumnX( nColIndex + 1 ), GetLastX() ), GetHeight() - 1 ) ) ); } @@ -1296,7 +1296,7 @@ void ScCsvGrid::ImplDrawHorzScrolled( sal_Int32 nOldPos ) ImplInvertCursor( GetRulerCursorPos() + (nPos - nOldPos) ); Rectangle aRectangle( GetFirstX(), 0, GetLastX(), GetHeight() - 1 ); - Region aClipReg( aRectangle ); + vcl::Region aClipReg( aRectangle ); maBackgrDev.SetClipRegion( aClipReg ); maBackgrDev.CopyArea( aDest, aSrc, maWinSize ); maBackgrDev.SetClipRegion(); diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index e7dd3d526886..8a9649848ba4 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -322,7 +322,7 @@ public: void DrawSelectiveObjects(const sal_uInt16 nLayer); bool SetChangedClip(); // sal_False = not - Region GetChangedAreaRegion(); + vcl::Region GetChangedAreaRegion(); void FindChanged(); void SetPagebreakMode( ScPageBreakData* pPageData ); diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index b058d39c1434..3b0d687f201c 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -37,7 +37,7 @@ private: sal_uInt16 nSelPageIdByMouse; /// Selected page ID, if selected with mouse bool bErrorShown; - void DoDrag( const Region& rRegion ); + void DoDrag( const vcl::Region& rRegion ); sal_uInt16 GetMaxId() const; SCTAB GetPrivatDropPos(const Point& rPos ); diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index c2f73702bddf..08a3565d28ca 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -97,7 +97,7 @@ bool ScDrawView::BeginDrag( vcl::Window* pWindow, const Point& rStartPos ) BrkAction(); Rectangle aMarkedRect = GetAllMarkedRect(); - Region aRegion( aMarkedRect ); + vcl::Region aRegion( aMarkedRect ); aDragStartDiff = rStartPos - aMarkedRect.TopLeft(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index e777df8c87f6..f36db76e22b3 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -4636,7 +4636,7 @@ void ScGridWindow::UpdateFormulas() // #i122149# do not use old GetChangedArea() which used polygon-based Regions, but use // the region-band based new version; anyways, only rectangles are added - Region aChangedRegion( aOutputData.GetChangedAreaRegion() ); // logic (PixelToLogic) + vcl::Region aChangedRegion( aOutputData.GetChangedAreaRegion() ); // logic (PixelToLogic) if(!aChangedRegion.IsEmpty()) { Invalidate(aChangedRegion); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index cbdd99d638fb..0991b7e5bed5 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -144,7 +144,7 @@ static void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, long nTextStart = bLayoutRTL ? aInner.Right() - aTextSize.Width() + 1 : aInner.Left(); bool bWasClip = false; - Region aOldClip; + vcl::Region aOldClip; bool bClip = ( aTextSize.Width() > aOuter.Right() - nBWidth - aInner.Left() ); if ( bClip ) { @@ -155,7 +155,7 @@ static void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, } long nClipStartX = bLayoutRTL ? aOuter.Left() + nBWidth : aInner.Left(); long nClipEndX = bLayoutRTL ? aInner.Right() : aOuter.Right() - nBWidth; - pDev->SetClipRegion( Region(Rectangle( nClipStartX, nButtonY + nVer/2, + pDev->SetClipRegion( vcl::Region(Rectangle( nClipStartX, nButtonY + nVer/2, nClipEndX, nButtonY + nVer/2 + aTextSize.Height())) ); } @@ -603,7 +603,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod if(pDrawView) { // #i74769# Use new BeginDrawLayers() interface - Region aDrawingRegion(aDrawingRectLogic); + vcl::Region aDrawingRegion(aDrawingRectLogic); pTargetPaintWindow = pDrawView->BeginDrawLayers(this, aDrawingRegion); OSL_ENSURE(pTargetPaintWindow, "BeginDrawLayers: Got no SdrPaintWindow (!)"); @@ -1250,7 +1250,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, Out Rectangle aRect = GetListValButtonRect( aListValPos ); aComboButton.SetPosPixel( aRect.TopLeft() ); aComboButton.SetSizePixel( aRect.GetSize() ); - pContentDev->SetClipRegion(Region(aRect)); + pContentDev->SetClipRegion(vcl::Region(aRect)); aComboButton.Draw( false, false ); pContentDev->SetClipRegion(); // always called from Draw() without clip region aComboButton.SetPosPixel( aOldPos ); // restore old state diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index da59eda93515..89ee877e3b7a 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -510,7 +510,7 @@ void ScOutlineWindow::DataChanged( const DataChangedEvent& rDCEvt ) void ScOutlineWindow::SetEntryAreaClipRegion() { - SetClipRegion( Region(Rectangle( + SetClipRegion( vcl::Region(Rectangle( GetPoint( 0, mnMainFirstPos ), GetPoint( GetOutputSizeLevel() - 1, mnMainLastPos )))); } diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 6b19602ec53a..5a622e255dae 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -1483,7 +1483,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) mpDev->IntersectClipRegion( aClipRect ); } else - mpDev->SetClipRegion( Region( aClipRect ) ); + mpDev->SetClipRegion( vcl::Region( aClipRect ) ); svx::frame::Array& rArray = mrTabInfo.maArray; boost::scoped_ptr<drawinglayer::processor2d::BaseProcessor2D> pProcessor(CreateProcessor2D( )); @@ -1822,9 +1822,9 @@ drawinglayer::processor2d::BaseProcessor2D* ScOutputData::CreateProcessor2D( ) // Printer -Region ScOutputData::GetChangedAreaRegion() +vcl::Region ScOutputData::GetChangedAreaRegion() { - Region aRegion; + vcl::Region aRegion; Rectangle aDrawingRect; bool bHad(false); long nPosY = nScrY; @@ -1901,7 +1901,7 @@ bool ScOutputData::SetChangedClip() bool bRet = (aPoly.Count() != 0); if (bRet) - mpDev->SetClipRegion(Region(aPoly)); + mpDev->SetClipRegion(vcl::Region(aPoly)); return bRet; } diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 5bca67950889..04d2a7b87291 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -1958,7 +1958,7 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) mpDev->IntersectClipRegion( aAreaParam.maClipRect ); } else - mpDev->SetClipRegion( Region( aAreaParam.maClipRect ) ); + mpDev->SetClipRegion( vcl::Region( aAreaParam.maClipRect ) ); } Point aURLStart( nJustPosX, nJustPosY ); // copy before modifying for orientation @@ -3039,7 +3039,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) mpDev->IntersectClipRegion( aLogicClip ); } else - mpDev->SetClipRegion( Region( aLogicClip ) ); + mpDev->SetClipRegion( vcl::Region( aLogicClip ) ); } } @@ -3227,7 +3227,7 @@ bool ScOutputData::Clip( DrawEditParam& rParam, const Size& aCellSize, mpDev->IntersectClipRegion( aLogicClip ); } else - mpDev->SetClipRegion( Region( aLogicClip ) ); + mpDev->SetClipRegion( vcl::Region( aLogicClip ) ); } } @@ -4015,7 +4015,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) mpDev->IntersectClipRegion( aLogicClip ); } else - mpDev->SetClipRegion( Region( aLogicClip ) ); + mpDev->SetClipRegion( vcl::Region( aLogicClip ) ); } } @@ -4364,7 +4364,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) mpDev->IntersectClipRegion( aLogicClip ); } else - mpDev->SetClipRegion( Region( aLogicClip ) ); + mpDev->SetClipRegion( vcl::Region( aLogicClip ) ); } } @@ -5090,7 +5090,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) mpDev->IntersectClipRegion( aAreaParam.maClipRect ); } else - mpDev->SetClipRegion( Region( aAreaParam.maClipRect ) ); + mpDev->SetClipRegion( vcl::Region( aAreaParam.maClipRect ) ); } Point aLogicStart; diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index 4cdcd5017ed9..91c8da809d24 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -87,7 +87,7 @@ Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY ) // #i74769# work with SdrPaintWindow directly // #i76114# pass bDisableIntersect = true, because the intersection of the table area // with the Window's paint region can be empty - Region aRectRegion(aRect); + vcl::Region aRectRegion(aRect); mpTargetPaintWindow = pLocalDrawView->BeginDrawLayers(mpDev, aRectRegion, true); OSL_ENSURE(mpTargetPaintWindow, "BeginDrawLayers: Got no SdrPaintWindow (!)"); diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 48697023ecad..87c65ee90c82 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1606,7 +1606,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if( aTableParam.bCellContent ) aOutputData.DrawBackground(); - pDev->SetClipRegion(Region(Rectangle( + pDev->SetClipRegion(vcl::Region(Rectangle( aPos, Size(aOutputData.GetScrW(), aOutputData.GetScrH())))); pDev->SetClipRegion(); @@ -1784,7 +1784,7 @@ void ScPrintFunc::PrintHF( long nPageNo, bool bHeader, long nStartY, // Clipping for Text - pDev->SetClipRegion(Region(Rectangle(aStart, aPaperSize))); + pDev->SetClipRegion(vcl::Region(Rectangle(aStart, aPaperSize))); // left diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 914ead8adf0c..ce52883e9ae1 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -454,14 +454,14 @@ void ScTabControl::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) if (!bDisable) { - Region aRegion( Rectangle(0,0,0,0) ); + vcl::Region aRegion( Rectangle(0,0,0,0) ); CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, true ); // needed for StartDrag if (TabBar::StartDrag( aCEvt, aRegion )) DoDrag( aRegion ); } } -void ScTabControl::DoDrag( const Region& /* rRegion */ ) +void ScTabControl::DoDrag( const vcl::Region& /* rRegion */ ) { ScDocShell* pDocSh = pViewData->GetDocShell(); ScDocument& rDoc = pDocSh->GetDocument(); diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 591e6322f8b9..e6501b00e7b7 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -269,7 +269,7 @@ void SdDocPreviewWin::updateViewSettings() // Use new StandardCheckVisisbilityRedirector StandardCheckVisisbilityRedirector aRedirector; const Rectangle aRedrawRectangle = Rectangle( Point(), aNewSize ); - Region aRedrawRegion(aRedrawRectangle); + vcl::Region aRedrawRegion(aRedrawRectangle); pView->SdrPaintView::CompleteRedraw(&aVDev,aRedrawRegion,&aRedirector); aVDev.Pop(); diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index d4882e594b0f..c0bf1fcf8b34 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -109,7 +109,7 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect) pOut->SetMapMode(aMapMode); } - Region aRegion(aVisArea); + vcl::Region aRegion(aVisArea); pView->CompleteRedraw(pOut, aRegion); if (pOut->GetOutDevType() == OUTDEV_PRINTER) @@ -263,7 +263,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe pView->SetActiveLayer( pFrameView->GetActiveLayer() ); } - pView->CompleteRedraw( &aVDev, Region(Rectangle(aNullPt, aSize)) ); + pView->CompleteRedraw( &aVDev, vcl::Region(Rectangle(aNullPt, aSize)) ); // IsRedrawReady() always gives sal_True while ( !pView->IsRedrawReady() ) {} delete pView; diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 4c3320fedc0f..48357380557b 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -39,7 +39,7 @@ public: DrawViewShell* pShell); virtual ~ClientView (void); - virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; + virtual void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; /* if the view should not do a Invalidate() on the windows, you have to overload the following two methods and do something different */ diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 63493f143865..936ae4786c1a 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -92,7 +92,7 @@ public: ViewShell* pViewSh=NULL); virtual ~View (void); - void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; + void CompleteRedraw( OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; virtual bool GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 7404aa653051..fc909a389388 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -188,7 +188,7 @@ public: virtual bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual void Draw(OutputDevice &rDev, const Region &rReg); + virtual void Draw(OutputDevice &rDev, const ::vcl::Region &rReg); virtual void SetUIUnit(FieldUnit eUnit); virtual void SetDefTabHRuler( sal_uInt16 nDefTab ); diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index d3865bee27a7..7d20d8bd4863 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -42,7 +42,7 @@ public: virtual ~DrawView (void); virtual void MarkListHasChanged() SAL_OVERRIDE; - void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; + void CompleteRedraw(OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false) SAL_OVERRIDE; @@ -56,7 +56,7 @@ public: virtual void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin) SAL_OVERRIDE; virtual void HideSdrPage() SAL_OVERRIDE; // SdrPageView* pPV); - void PresPaint(const Region& rRegion); + void PresPaint(const ::vcl::Region& rRegion); virtual void DeleteMarked() SAL_OVERRIDE; // from SdrView protected: diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 20d627eaedad..9ebfd1e56fa8 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -275,7 +275,7 @@ void SlideSorterController::Paint ( try { - mrView.CompleteRedraw(pWindow, Region(rBBox), 0); + mrView.CompleteRedraw(pWindow, ::vcl::Region(rBBox), 0); } catch (const Exception&) { diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 120315122258..bdf3a05b75f3 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -199,7 +199,7 @@ public: The returned region has to be repainted to reflect the updated selection states. */ - Region RestoreSelection (void); + ::vcl::Region RestoreSelection (void); /** Typically called from controller::Listener this method handles the insertion and deletion of single pages. diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 292405f42725..048c05bca25d 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -88,7 +88,7 @@ public: void RequestRepaint (void); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); void RequestRepaint (const Rectangle& rRepaintBox); - void RequestRepaint (const Region& rRepaintRegion); + void RequestRepaint (const ::vcl::Region& rRepaintRegion); Rectangle GetModelArea (void); @@ -129,7 +129,7 @@ public: virtual void Resize (void); virtual void CompleteRedraw ( OutputDevice* pDevice, - const Region& rPaintArea, + const ::vcl::Region& rPaintArea, sdr::contact::ViewObjectContactRedirector* pRedirector = NULL) SAL_OVERRIDE; void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea); @@ -255,7 +255,7 @@ private: sal_Int32 mnButtonUnderMouse; ::boost::shared_ptr<PageObjectPainter> mpPageObjectPainter; ::boost::shared_ptr<SelectionPainter> mpSelectionPainter; - Region maRedrawRegion; + ::vcl::Region maRedrawRegion; SharedILayerPainter mpBackgroundPainter; ::boost::scoped_ptr<ToolTip> mpToolTip; bool mbIsRearrangePending; diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 6ce44a2c90ba..d90d701371b9 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -505,9 +505,9 @@ void SlideSorterModel::SaveCurrentSelection (void) } } -Region SlideSorterModel::RestoreSelection (void) +vcl::Region SlideSorterModel::RestoreSelection (void) { - Region aRepaintRegion; + vcl::Region aRepaintRegion; PageEnumeration aPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); while (aPages.HasMoreElements()) { diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 8f89c56397cd..51d1a6694ca4 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -575,7 +575,7 @@ void SlideSorterView::RequestRepaint (const Rectangle& rRepaintBox) } } -void SlideSorterView::RequestRepaint (const Region& rRepaintRegion) +void SlideSorterView::RequestRepaint (const vcl::Region& rRepaintRegion) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow) @@ -602,7 +602,7 @@ static double gnLastFrameStart = 0; void SlideSorterView::CompleteRedraw ( OutputDevice* pDevice, - const Region& rPaintArea, + const vcl::Region& rPaintArea, sdr::contact::ViewObjectContactRedirector* pRedirector) { (void)pRedirector; diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 078b7b0c543d..a916b40580c0 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -194,7 +194,7 @@ Point InsertionIndicatorOverlay::PaintRepresentatives ( // paint an overlay that visualizes this. if (rRepresentatives[nIndex].mbIsExcluded) { - const Region aSavedClipRegion (rContent.GetClipRegion()); + const vcl::Region aSavedClipRegion (rContent.GetClipRegion()); rContent.IntersectClipRegion(Rectangle(aPageOffset, aPreviewSize)); // Paint bitmap tiled over the preview to mark it as excluded. const sal_Int32 nIconWidth (aExclusionOverlay.GetSizePixel().Width()); diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index b7ae8cd0eae5..7e0e20b828ba 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -74,7 +74,7 @@ void DeviceCopy ( rSourceDevice); } -void ForAllRectangles (const Region& rRegion, ::boost::function<void(const Rectangle&)> aFunction) +void ForAllRectangles (const vcl::Region& rRegion, ::boost::function<void(const Rectangle&)> aFunction) { OSL_ASSERT(aFunction); RectangleVector aRectangles; @@ -108,7 +108,7 @@ public: void Initialize (const SharedSdWindow& rpTargetWindow); void InvalidateRectangle (const Rectangle& rInvalidationBox); - void InvalidateRegion (const Region& rInvalidationRegion); + void InvalidateRegion (const vcl::Region& rInvalidationRegion); void Validate (const MapMode& rMapMode); void Repaint ( OutputDevice& rTargetDevice, @@ -122,7 +122,7 @@ public: private: ::boost::shared_ptr<VirtualDevice> mpLayerDevice; ::std::vector<SharedILayerPainter> maPainters; - Region maInvalidationRegion; + vcl::Region maInvalidationRegion; void ValidateRectangle (const Rectangle& rBox); }; @@ -190,7 +190,7 @@ void LayeredDevice::InvalidateAllLayers (const Rectangle& rInvalidationArea) (*mpLayers)[nLayer]->InvalidateRectangle(rInvalidationArea); } -void LayeredDevice::InvalidateAllLayers (const Region& rInvalidationRegion) +void LayeredDevice::InvalidateAllLayers (const vcl::Region& rInvalidationRegion) { for (sal_uInt32 nLayer=0; nLayer<mpLayers->size(); ++nLayer) (*mpLayers)[nLayer]->InvalidateRegion(rInvalidationRegion); @@ -254,7 +254,7 @@ void LayeredDevice::RemovePainter ( mpLayers->pop_back(); } -void LayeredDevice::Repaint (const Region& rRepaintRegion) +void LayeredDevice::Repaint (const vcl::Region& rRepaintRegion) { // Validate the contents of all layers (that have their own devices.) ::std::for_each( @@ -396,7 +396,7 @@ void Layer::InvalidateRectangle (const Rectangle& rInvalidationBox) maInvalidationRegion.Union(rInvalidationBox); } -void Layer::InvalidateRegion (const Region& rInvalidationRegion) +void Layer::InvalidateRegion (const vcl::Region& rInvalidationRegion) { maInvalidationRegion.Union(rInvalidationRegion); } @@ -405,7 +405,7 @@ void Layer::Validate (const MapMode& rMapMode) { if (mpLayerDevice && ! maInvalidationRegion.IsEmpty()) { - Region aRegion (maInvalidationRegion); + vcl::Region aRegion (maInvalidationRegion); maInvalidationRegion.SetEmpty(); mpLayerDevice->SetMapMode(rMapMode); @@ -419,7 +419,7 @@ void Layer::ValidateRectangle (const Rectangle& rBox) { if ( ! mpLayerDevice) return; - const Region aSavedClipRegion (mpLayerDevice->GetClipRegion()); + const vcl::Region aSavedClipRegion (mpLayerDevice->GetClipRegion()); mpLayerDevice->IntersectClipRegion(rBox); for (::std::vector<SharedILayerPainter>::const_iterator diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx index 1cf5ea439bd6..454074376fce 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx @@ -54,7 +54,7 @@ public: void InvalidateAllLayers ( const Rectangle& rInvalidationBox); void InvalidateAllLayers ( - const Region& rInvalidationRegion); + const vcl::Region& rInvalidationRegion); void RegisterPainter ( const SharedILayerPainter& rPainter, @@ -65,7 +65,7 @@ public: const sal_Int32 nLayer); bool HandleMapModeChange (void); - void Repaint (const Region& rRepaintRegion); + void Repaint (const vcl::Region& rRepaintRegion); void Resize (void); diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 855e762029cf..e1da6f46da30 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -294,7 +294,7 @@ void PreviewRenderer::PaintPage ( { // Paint the page. Rectangle aPaintRectangle (Point(0,0), pPage->GetSize()); - Region aRegion (aPaintRectangle); + vcl::Region aRegion (aPaintRectangle); // Turn off online spelling and redlining. SdrOutliner* pOutliner = NULL; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index ff86a44f1db2..85fd970c4d93 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1885,7 +1885,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r { ::sd::ClientView* pView = new ::sd::ClientView( mpDocShell, pOut, NULL ); Rectangle aVisArea = Rectangle( Point(), mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1, ePageKind )->GetSize() ); - Region aRegion( aVisArea ); + vcl::Region aRegion( aVisArea ); ::sd::ViewShell* pOldViewSh = mpDocShell->GetViewShell(); ::sd::View* pOldSdView = pOldViewSh ? pOldViewSh->GetView() : NULL; @@ -2253,7 +2253,7 @@ void SdXImpressDocument::paintTile( VirtualDevice& rDevice, Size aSize(nTileWidth, nTileHeight); Rectangle aRect(aPoint, aSize); - pViewSh->GetView()->CompleteRedraw(&rDevice, Region(aRect)); + pViewSh->GetView()->CompleteRedraw(&rDevice, vcl::Region(aRect)); } void SdXImpressDocument::setPart( int nPart ) diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 1a903f74eadb..2a85683d56da 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -300,7 +300,7 @@ namespace { pView->DrawMarkedObj(rPrinter); else rPrintView.CompleteRedraw(&rPrinter, - Region(Rectangle(Point(0,0), rPage.GetSize()))); + vcl::Region(Rectangle(Point(0,0), rPage.GetSize()))); rPrinter.SetMapMode(aOriginalMapMode); diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx index f8900caba5eb..312f1697764d 100644 --- a/sd/source/ui/view/clview.cxx +++ b/sd/source/ui/view/clview.cxx @@ -52,7 +52,7 @@ ClientView::~ClientView() void ClientView::InvalidateOneWin(vcl::Window& rWin) { - Region aRegion; + vcl::Region aRegion; CompleteRedraw(&rWin, aRegion); } @@ -63,10 +63,10 @@ void ClientView::InvalidateOneWin(vcl::Window& rWin) void ClientView::InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) { - CompleteRedraw(&rWin, Region(rRect)); + CompleteRedraw(&rWin, vcl::Region(rRect)); } -void ClientView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector ) +void ClientView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector ) { DrawView::CompleteRedraw(pOutDev, rReg, pRedirector); } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 043abbbcddff..eb94dc6b1372 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -455,7 +455,7 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt * Paint-method: Redirect event to the view */ -void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) +void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) { if( mpVDev ) { @@ -491,7 +491,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::co * Paint-Event during running slide show */ -void DrawView::PresPaint(const Region& rRegion) +void DrawView::PresPaint(const vcl::Region& rRegion) { if(mpViewSh) { diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 8401254133e0..95b19f3f582c 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -425,7 +425,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) character in a symbol font */ GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); - mpDrawView->CompleteRedraw( pWin, Region( rRect ) ); + mpDrawView->CompleteRedraw( pWin, vcl::Region( rRect ) ); if( pWin ) { diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 2871b5baa1da..98d90a4168d8 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -467,7 +467,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP /** * The event will be forwarded to the View */ -void View::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) +void View::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) { // execute ?? if (mnLockRedrawSmph == 0) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 258bc88f9415..1dcf322653a4 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1370,7 +1370,7 @@ void ViewShell::Paint (const Rectangle&, ::sd::Window* ) { } -void ViewShell::Draw(OutputDevice &, const Region &) +void ViewShell::Draw(OutputDevice &, const vcl::Region &) { } diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index c31839e4c522..ce4e923f3872 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -348,7 +348,7 @@ void BackingWindow::Paint( const Rectangle& ) Resize(); Wallpaper aBack( svtools::ColorConfig().GetColorValue(::svtools::APPBACKGROUND).nColor ); - Region aClip( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) ); + vcl::Region aClip( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) ); aClip.Exclude( maStartCentButtons ); diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 19950c02e293..b2c352efdd5c 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -277,14 +277,14 @@ static bool getTextProperty_Impl( Content& rContent, OUString SfxDocumentTemplates::GetFullRegionName ( - sal_uInt16 nIdx // Region Index + sal_uInt16 nIdx // vcl::Region Index ) const /* [Description] Returns the logical name of a region and its path - [Return value] Reference to the Region name + [Return value] Reference to the vcl::Region name */ @@ -313,7 +313,7 @@ OUString SfxDocumentTemplates::GetFullRegionName const OUString& SfxDocumentTemplates::GetRegionName ( - sal_uInt16 nIdx // Region Index + sal_uInt16 nIdx // vcl::Region Index ) const /* [Description] @@ -322,7 +322,7 @@ const OUString& SfxDocumentTemplates::GetRegionName [Return value] - const String& Reference to the Region name + const String& Reference to the vcl::Region name */ { @@ -372,7 +372,7 @@ sal_uInt16 SfxDocumentTemplates::GetRegionCount() const sal_uInt16 SfxDocumentTemplates::GetCount ( - sal_uInt16 nRegion /* Region index whose number is + sal_uInt16 nRegion /* vcl::Region index whose number is to be determined */ ) const @@ -403,7 +403,7 @@ sal_uInt16 SfxDocumentTemplates::GetCount const OUString& SfxDocumentTemplates::GetName ( - sal_uInt16 nRegion, // Region Index, in which the entry lies + sal_uInt16 nRegion, // vcl::Region Index, in which the entry lies sal_uInt16 nIdx // Index of the entry ) const @@ -444,7 +444,7 @@ const OUString& SfxDocumentTemplates::GetName OUString SfxDocumentTemplates::GetPath ( - sal_uInt16 nRegion, // Region Index, in which the entry lies + sal_uInt16 nRegion, // vcl::Region Index, in which the entry lies sal_uInt16 nIdx // Index of the entry ) const @@ -534,9 +534,9 @@ OUString SfxDocumentTemplates::ConvertResourceString ( bool SfxDocumentTemplates::CopyOrMove ( - sal_uInt16 nTargetRegion, // Target Region Index + sal_uInt16 nTargetRegion, // Target vcl::Region Index sal_uInt16 nTargetIdx, // Target position Index - sal_uInt16 nSourceRegion, // Source Region Index + sal_uInt16 nSourceRegion, // Source vcl::Region Index sal_uInt16 nSourceIdx, /* Index to be copied / to moved template */ bool bMove // Copy / Move ) @@ -640,9 +640,9 @@ bool SfxDocumentTemplates::CopyOrMove bool SfxDocumentTemplates::Move ( - sal_uInt16 nTargetRegion, // Target Region Index + sal_uInt16 nTargetRegion, // Target vcl::Region Index sal_uInt16 nTargetIdx, // Target position Index - sal_uInt16 nSourceRegion, // Source Region Index + sal_uInt16 nSourceRegion, // Source vcl::Region Index sal_uInt16 nSourceIdx /* Index to be copied / to moved template */ ) @@ -670,9 +670,9 @@ bool SfxDocumentTemplates::Move bool SfxDocumentTemplates::Copy ( - sal_uInt16 nTargetRegion, // Target Region Index + sal_uInt16 nTargetRegion, // Target vcl::Region Index sal_uInt16 nTargetIdx, // Target position Index - sal_uInt16 nSourceRegion, // Source Region Index + sal_uInt16 nSourceRegion, // Source vcl::Region Index sal_uInt16 nSourceIdx /* Index to be copied / to moved template */ ) @@ -701,7 +701,7 @@ bool SfxDocumentTemplates::Copy bool SfxDocumentTemplates::CopyTo ( - sal_uInt16 nRegion, // Region of the template to be exported + sal_uInt16 nRegion, // vcl::Region of the template to be exported sal_uInt16 nIdx, // Index of the template to be exported const OUString& rName /* File name under which the template is to be created */ @@ -773,7 +773,7 @@ bool SfxDocumentTemplates::CopyTo bool SfxDocumentTemplates::CopyFrom ( - sal_uInt16 nRegion, /* Region in which the template is to be + sal_uInt16 nRegion, /* vcl::Region in which the template is to be imported */ sal_uInt16 nIdx, // Index of the new template in this Region OUString& rName /* File name of the template to be imported @@ -918,7 +918,7 @@ bool SfxDocumentTemplates::CopyFrom bool SfxDocumentTemplates::Delete ( - sal_uInt16 nRegion, // Region Index + sal_uInt16 nRegion, // vcl::Region Index sal_uInt16 nIdx /* Index of the entry or USHRT_MAX, if a directory is meant. */ ) @@ -983,7 +983,7 @@ bool SfxDocumentTemplates::Delete bool SfxDocumentTemplates::InsertDir ( const OUString& rText, // the logical name of the new Region - sal_uInt16 nRegion // Region Index + sal_uInt16 nRegion // vcl::Region Index ) /* [Description] @@ -1103,7 +1103,7 @@ bool SfxDocumentTemplates::SetName( const OUString& rName, sal_uInt16 nRegion, s bool SfxDocumentTemplates::GetFull ( - const OUString &rRegion, // Region Name + const OUString &rRegion, // vcl::Region Name const OUString &rName, // Template Name OUString &rPath // Out: Path + File name ) @@ -1160,7 +1160,7 @@ bool SfxDocumentTemplates::GetFull bool SfxDocumentTemplates::GetLogicNames ( const OUString &rPath, // Full Path to the template - OUString &rRegion, // Out: Region name + OUString &rRegion, // Out: vcl::Region name OUString &rName // Out: Template name ) const @@ -1578,7 +1578,7 @@ void SfxDocTemplate_Impl::DeleteRegion( size_t nIndex ) } -/* AddRegion adds a Region to the RegionList +/* AddRegion adds a vcl::Region to the RegionList */ void SfxDocTemplate_Impl::AddRegion( const OUString& rTitle, Content& rContent ) diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index 7c69dc8a6238..1ce7b6717fdb 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -212,7 +212,7 @@ void SfxObjectShell::DoDraw_Impl( OutputDevice* pDev, // Secure the Device settings pDev->Push(); - Region aRegion; + vcl::Region aRegion; if( pDev->IsClipRegion() && pDev->GetOutDevType() != OUTDEV_PRINTER ) { aRegion = pDev->GetClipRegion(); diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 33ae98f870d4..b66e7333332c 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1315,7 +1315,7 @@ void SmViewShell::Impl_Print( OutputMapMode); rOutDev.SetMapMode(OutputMapMode); - rOutDev.SetClipRegion(Region(aOutRect)); + rOutDev.SetClipRegion(vcl::Region(aOutRect)); GetDoc()->DrawFormula(rOutDev, aPos, false); rOutDev.SetClipRegion(); diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 238cfc3317df..fe822bb3c618 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -821,7 +821,7 @@ void BrowseBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, } // draw our own content (with clipping) - Region aRegion(Rectangle(aRealPos, aRealSize)); + vcl::Region aRegion(Rectangle(aRealPos, aRealSize)); pDev->SetClipRegion( pDev->PixelToLogic( aRegion ) ); // do we have to paint the background @@ -986,7 +986,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, bool aFieldSize.Height() = aOverallAreaBRPos.Y() + 1 - aPos.Y(); } - Region aClipToField(Rectangle(aPos, aFieldSize)); + vcl::Region aClipToField(Rectangle(aPos, aFieldSize)); _rOut.SetClipRegion(aClipToField); } pCol->Draw( *this, _rOut, aPos, false ); diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index e9644ffed580..bff17665e392 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -173,7 +173,7 @@ public: void DoOutstandingInvalidations(); void Invalidate( sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE; - void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE + void Invalidate( const vcl::Region& rRegion, sal_uInt16 nFlags = 0 ) SAL_OVERRIDE { Control::Invalidate( rRegion, nFlags ); } protected: diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index 73eb1c3ff76b..f9fe560da615 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -361,7 +361,7 @@ namespace svt Point aPos( rRect.TopLeft() ); if ( ( aImageSize.Width() > rRect.GetWidth() ) || ( aImageSize.Height() > rRect.GetHeight() ) ) - rDev.SetClipRegion(Region(rRect)); + rDev.SetClipRegion(vcl::Region(rRect)); if ( aImageSize.Width() < rRect.GetWidth() ) aPos.X() += ( rRect.GetWidth() - aImageSize.Width() ) / 2; diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 6e7b1fcc6ae0..671fc676243a 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -684,7 +684,7 @@ void SvxIconChoiceCtrl_Impl::Paint( const Rectangle& rRect ) bool bResetClipRegion = false; if( !pView->IsClipRegion() ) { - Region const aOutputArea( GetOutputRect() ); + vcl::Region const aOutputArea( GetOutputRect() ); bResetClipRegion = true; pView->SetClipRegion( aOutputArea ); } @@ -734,7 +734,7 @@ void SvxIconChoiceCtrl_Impl::RepaintEntries( sal_uInt16 nEntryFlagsMask ) if( !pView->IsClipRegion() ) { bResetClipRegion = true; - pView->SetClipRegion(Region(aOutRect)); + pView->SetClipRegion(vcl::Region(aOutRect)); } for( size_t nCur = 0; nCur < nCount; nCur++ ) { @@ -1813,7 +1813,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P Rectangle aOutputArea( GetOutputRect() ); if( aOutputArea.IsOver(aTextRect) || aOutputArea.IsOver(aBmpRect) ) { - pView->SetClipRegion(Region(aOutputArea)); + pView->SetClipRegion(vcl::Region(aOutputArea)); bResetClipRegion = true; } } @@ -2727,7 +2727,7 @@ void SvxIconChoiceCtrl_Impl::SelectRect( const Rectangle& rRect, bool bAdd, if( !pView->IsClipRegion() ) { bResetClipRegion = true; - pView->SetClipRegion(Region(GetOutputRect())); + pView->SetClipRegion(vcl::Region(GetOutputRect())); } for( size_t nPos = 0; nPos < nCount; nPos++ ) diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index 26514755de0b..c2fb5bd985d4 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -602,8 +602,8 @@ void SvImpLBox::RecalcFocusRect() long nY = GetEntryLine( pCursor ); Rectangle aRect = pView->GetFocusRect( pCursor, nY ); CalcCellFocusRect( pCursor, aRect ); - Region aOldClip( pView->GetClipRegion()); - Region aClipRegion( GetClipRegionRect() ); + vcl::Region aOldClip( pView->GetClipRegion()); + vcl::Region aClipRegion( GetClipRegionRect() ); pView->SetClipRegion( aClipRegion ); pView->ShowFocus( aRect ); pView->SetClipRegion( aOldClip ); @@ -687,8 +687,8 @@ void SvImpLBox::ShowCursor( bool bShow ) { if( !bShow || !pCursor || !pView->HasFocus() ) { - Region aOldClip( pView->GetClipRegion()); - Region aClipRegion( GetClipRegionRect() ); + vcl::Region aOldClip( pView->GetClipRegion()); + vcl::Region aClipRegion( GetClipRegionRect() ); pView->SetClipRegion( aClipRegion ); pView->HideFocus(); pView->SetClipRegion( aOldClip ); @@ -698,8 +698,8 @@ void SvImpLBox::ShowCursor( bool bShow ) long nY = GetEntryLine( pCursor ); Rectangle aRect = pView->GetFocusRect( pCursor, nY ); CalcCellFocusRect( pCursor, aRect ); - Region aOldClip( pView->GetClipRegion()); - Region aClipRegion( GetClipRegionRect() ); + vcl::Region aOldClip( pView->GetClipRegion()); + vcl::Region aClipRegion( GetClipRegionRect() ); pView->SetClipRegion( aClipRegion ); pView->ShowFocus( aRect ); pView->SetClipRegion( aOldClip ); @@ -936,7 +936,7 @@ void SvImpLBox::Paint( const Rectangle& rRect ) nStartLine--; } - Region aClipRegion( GetClipRegionRect() ); + vcl::Region aClipRegion( GetClipRegionRect() ); // first draw the lines, then clip them! pView->SetClipRegion(); @@ -3399,8 +3399,8 @@ void SvImpLBox::ShowFocusRect( const SvTreeListEntry* pEntry ) { long nY = GetEntryLine( (SvTreeListEntry*)pEntry ); Rectangle aRect = pView->GetFocusRect( (SvTreeListEntry*)pEntry, nY ); - Region aOldClip( pView->GetClipRegion()); - Region aClipRegion( GetClipRegionRect() ); + vcl::Region aOldClip( pView->GetClipRegion()); + vcl::Region aClipRegion( GetClipRegionRect() ); pView->SetClipRegion( aClipRegion ); pView->ShowFocus( aRect ); pView->SetClipRegion( aOldClip ); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index faa3367e13ee..c0ed007fc611 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -2890,7 +2890,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT // Did we turn on the scrollbar within PreparePaints? If yes, we have to set // the ClipRegion anew. if( !bHorSBar && pImp->HasHorScrollBar() ) - SetClipRegion( Region(pImp->GetClipRegionRect()) ); + SetClipRegion( vcl::Region(pImp->GetClipRegionRect()) ); Point aEntryPos( GetMapMode().GetOrigin() ); aEntryPos.X() *= -1; // conversion document coordinates @@ -2916,7 +2916,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT if( !bHasClipRegion && nWindowStyle & WB_HSCROLL ) { - SetClipRegion( Region(pImp->GetClipRegionRect()) ); + SetClipRegion( vcl::Region(pImp->GetClipRegionRect()) ); bHasClipRegion = true; } @@ -2959,7 +2959,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT { if( !bHasClipRegion && nX + aSize.Width() >= nMaxRight ) { - SetClipRegion( Region(pImp->GetClipRegionRect()) ); + SetClipRegion( vcl::Region(pImp->GetClipRegionRect()) ); bHasClipRegion = true; } aEntryPos.X() = nX; diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 0e305155723a..b5d56bac97b3 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -646,7 +646,7 @@ void HeaderBar::ImplDrawItem( OutputDevice* pDev, // all UserDraw if required if ( nBits & HIB_USERDRAW ) { - Region aRegion( aRect ); + vcl::Region aRegion( aRect ); if ( pRect ) aRegion.Intersect( *pRect ); pDev->SetClipRegion( aRegion ); @@ -1072,7 +1072,7 @@ void HeaderBar::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, // check for overflow on some systems if ( aItemRect.Right() > 16000 ) aItemRect.Right() = 16000; - Region aRegion( aRect ); + vcl::Region aRegion( aRect ); pDev->SetClipRegion( aRegion ); ImplDrawItem( pDev, i, false, false, aItemRect, &aRect, nFlags ); pDev->SetClipRegion(); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index cf7fafc6dcb2..7360ccf3b8cd 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1079,7 +1079,7 @@ public: maFont(rParent.GetFont()) { // #i36013# exclude push buttons from painting area - mrParent.SetClipRegion( Region(mrParent.GetPageArea()) ); + mrParent.SetClipRegion( vcl::Region(mrParent.GetPageArea()) ); } ~TabBarPaintGuard() @@ -2451,7 +2451,7 @@ OString TabBar::GetHelpId( sal_uInt16 nPageId ) const -bool TabBar::StartDrag( const CommandEvent& rCEvt, Region& rRegion ) +bool TabBar::StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ) { if ( !(mnWinStyle & WB_DRAG) || (rCEvt.GetCommand() != COMMAND_STARTDRAG) ) return false; @@ -2486,7 +2486,7 @@ bool TabBar::StartDrag( const CommandEvent& rCEvt, Region& rRegion ) } mbInSelect = false; - Region aRegion; + vcl::Region aRegion; // assign region rRegion = aRegion; @@ -2618,7 +2618,7 @@ void TabBar::HideDropPos() nX = pItem->maRect.Left(); // immediately call Paint, as it is not possible during drag and drop Rectangle aRect( nX-1, nY1, nX+3, nY2 ); - Region aRegion( aRect ); + vcl::Region aRegion( aRect ); SetClipRegion( aRegion ); Paint( aRect ); SetClipRegion(); @@ -2629,7 +2629,7 @@ void TabBar::HideDropPos() nX = pItem->maRect.Right(); // immediately call Paint, as it is not possible during drag and drop Rectangle aRect( nX-2, nY1, nX+1, nY2 ); - Region aRegion( aRect ); + vcl::Region aRegion( aRect ); SetClipRegion( aRegion ); Paint( aRect ); SetClipRegion(); diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index f7d0fa936015..9bdd65a34705 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -260,7 +260,7 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem, Rectangle aRect ) } if ( (aTxtPos.X()+nTxtWidth) > aRect.Right() ) { - maVirDev.SetClipRegion( Region( aRect ) ); + maVirDev.SetClipRegion( vcl::Region( aRect ) ); maVirDev.DrawText( aTxtPos, pItem->maText ); maVirDev.SetClipRegion(); } @@ -304,7 +304,7 @@ void ValueSet::ImplFormatItem( ValueSetItem* pItem, Rectangle aRect ) if ( aImageSize.Width() > aRectSize.Width() || aImageSize.Height() > aRectSize.Height() ) { - maVirDev.SetClipRegion( Region( aRect ) ); + maVirDev.SetClipRegion( vcl::Region( aRect ) ); maVirDev.DrawImage( aPos, pItem->maImage, nImageStyle); maVirDev.SetClipRegion(); } @@ -2113,7 +2113,7 @@ void ValueSet::EndSelection() mbSelection = false; } -bool ValueSet::StartDrag( const CommandEvent& rEvent, Region& rRegion ) +bool ValueSet::StartDrag( const CommandEvent& rEvent, vcl::Region& rRegion ) { if ( rEvent.GetCommand() != COMMAND_STARTDRAG ) return false; @@ -2143,7 +2143,7 @@ bool ValueSet::StartDrag( const CommandEvent& rEvent, Region& rRegion ) Select(); } - Region aRegion; + vcl::Region aRegion; // assign region rRegion = aRegion; diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index ed55e0932e53..08aaf18995a9 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -595,7 +595,7 @@ bool GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz, } else { - pOut->IntersectClipRegion(Region(aClipPolyPoly)); + pOut->IntersectClipRegion(vcl::Region(aClipPolyPoly)); } } } @@ -734,7 +734,7 @@ bool GraphicObject::StartAnimation( OutputDevice* pOut, const Point& rPt, const if( bRectClip ) pOut->IntersectClipRegion( aClipPolyPoly.GetBoundRect() ); else - pOut->IntersectClipRegion(Region(aClipPolyPoly)); + pOut->IntersectClipRegion(vcl::Region(aClipPolyPoly)); } } diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 00c89b36b425..57a1620d5fa7 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -945,7 +945,7 @@ bool GraphicManager::ImplCreateOutput( OutputDevice* pOutputDevice, if( pOutputDevice->GetOutDevType() == OUTDEV_WINDOW ) { - const Region aPaintRgn( static_cast<vcl::Window*>( pOutputDevice )->GetPaintRegion() ); + const vcl::Region aPaintRgn( static_cast<vcl::Window*>( pOutputDevice )->GetPaintRegion() ); if( !aPaintRgn.IsNull() ) aOutRect.Intersection( pOutputDevice->LogicToPixel( aPaintRgn.GetBoundRect() ) ); } diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 5a2548a9d1e4..79cf3784dd44 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -473,7 +473,7 @@ namespace svt :m_rDevice( i_rImpl.m_rTabBar ) { m_rDevice.Push( PUSH_CLIPREGION ); - m_rDevice.SetClipRegion(Region( + m_rDevice.SetClipRegion(vcl::Region( i_rImpl.m_aNormalizer.getTransformed( i_rImpl.m_aGeometry.getItemsRect(), i_rImpl.m_eTabAlignment ))); @@ -1047,7 +1047,7 @@ namespace svt // background const Rectangle aNormalizedPaintArea( m_pImpl->m_aNormalizer.getNormalized( i_rRect, m_pImpl->m_eTabAlignment ) ); m_pImpl->m_aRenderDevice.Push( PUSH_CLIPREGION ); - m_pImpl->m_aRenderDevice.SetClipRegion(Region(aNormalizedPaintArea)); + m_pImpl->m_aRenderDevice.SetClipRegion(vcl::Region(aNormalizedPaintArea)); m_pImpl->m_pRenderer->renderBackground(); m_pImpl->m_aRenderDevice.Pop(); m_pImpl->CopyFromRenderDevice( aNormalizedPaintArea ); diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 95448b5d0eab..6bcd68fc8293 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -58,8 +58,8 @@ namespace sdr // Internal methods for buffering void ImpPrepareBufferDevice(); void ImpRestoreBackground() const ; - void ImpRestoreBackground(const Region& rRegionPixel) const; - void ImpSaveBackground(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L); + void ImpRestoreBackground(const vcl::Region& rRegionPixel) const; + void ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0L); OverlayManagerBuffered( OutputDevice& rOutputDevice, @@ -71,7 +71,7 @@ namespace sdr bool bRefreshWithPreRendering = false); // complete redraw - virtual void completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const SAL_OVERRIDE; + virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = 0L) const SAL_OVERRIDE; // flush. Do buffered updates. virtual void flush() SAL_OVERRIDE; @@ -80,7 +80,7 @@ namespace sdr virtual void copyArea(const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize) SAL_OVERRIDE; // restore part of background. Implemented form buffered versions only. - virtual void restoreBackground(const Region& rRegion) const SAL_OVERRIDE; + virtual void restoreBackground(const vcl::Region& rRegion) const SAL_OVERRIDE; // invalidate the given range at local OutputDevice virtual void invalidateRange(const basegfx::B2DRange& rRange) SAL_OVERRIDE; diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 28db0b862969..64a8ae3b2e15 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -261,7 +261,7 @@ void ContourWindow::Paint( const Rectangle& rRect ) } // #i75482# - const Region aRepaintRegion(rRect); + const vcl::Region aRepaintRegion(rRect); pView->DoCompleteRedraw(*pPaintWindow, aRepaintRegion); pView->EndCompleteRedraw(*pPaintWindow, true); } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 5845b50daece..32b37bc67ef5 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -168,7 +168,7 @@ void Svx3DPreviewControl::Resize() void Svx3DPreviewControl::Paint(const Rectangle& rRect) { - mp3DView->CompleteRedraw(this, Region(rRect)); + mp3DView->CompleteRedraw(this, vcl::Region(rRect)); } void Svx3DPreviewControl::MouseButtonDown(const MouseEvent& rMEvt) diff --git a/svx/source/dialog/framelink.cxx b/svx/source/dialog/framelink.cxx index d8b6153e1165..190858bdc9fe 100644 --- a/svx/source/dialog/framelink.cxx +++ b/svx/source/dialog/framelink.cxx @@ -719,7 +719,7 @@ inline Polygon lclCreatePolygon( const PointVec& rPoints ) } /** Returns a polygon constructed from the five passed points. */ -Region lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4, const Point& rP5 ) +vcl::Region lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, const Point& rP4, const Point& rP5 ) { PointVec aPoints; aPoints.reserve( 5 ); @@ -728,7 +728,7 @@ Region lclCreatePolygon( const Point& rP1, const Point& rP2, const Point& rP3, c aPoints.push_back( rP3 ); aPoints.push_back( rP4 ); aPoints.push_back( rP5 ); - return Region(lclCreatePolygon(aPoints)); + return vcl::Region(lclCreatePolygon(aPoints)); } /** Sets the color of the passed frame style to the output device. @@ -989,7 +989,7 @@ void lclPushCrossingClipRegion( OutputDevice& rDev, const Rectangle& rRect, bool LinePoints aLPoints( lclGetDiagLineEnds( rRect, !bTLBR, lclGetPrimEnd( rCrossStyle ) ) ); LinePoints aRPoints( lclGetDiagLineEnds( rRect, !bTLBR, lclGetSecnBeg( rCrossStyle ) ) ); - Region aClipReg; + vcl::Region aClipReg; if( bTLBR ) { aClipReg = lclCreatePolygon( diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx index 0fc0d0f1a21c..aa7f8ca434d2 100644 --- a/svx/source/dialog/frmsel.cxx +++ b/svx/source/dialog/frmsel.cxx @@ -175,7 +175,7 @@ void FrameBorder::AddClickRect( const Rectangle& rRect ) bool FrameBorder::ContainsClickPoint( const Point& rPos ) const { - return Region( maClickArea ).IsInside( rPos ); + return vcl::Region( maClickArea ).IsInside( rPos ); } Rectangle FrameBorder::GetClickBoundRect() const diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index c39f9d55e452..0c590d3becce 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -255,7 +255,7 @@ void GraphCtrl::Paint( const Rectangle& rRect ) aGraphic.Draw(&rTarget, Point(), aGraphSize); } - const Region aRepaintRegion(rRect); + const vcl::Region aRepaintRegion(rRect); pView->DoCompleteRedraw(*pPaintWindow, aRepaintRegion); pView->EndCompleteRedraw(*pPaintWindow, true); } diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index a1f8358bc8a8..0d7f66ae6384 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -466,7 +466,7 @@ IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) const void IMapWindow::Command(const CommandEvent& rCEvt) { - Region aRegion; + vcl::Region aRegion; if ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ) { diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index af04a9d0947a..88f328beaf75 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -409,7 +409,7 @@ sal_Int8 GalleryIconView::ExecuteDrop( const ExecuteDropEvent& rEvt ) void GalleryIconView::StartDrag( sal_Int8, const Point& ) { const CommandEvent aEvt( GetPointerPosPixel(), COMMAND_STARTDRAG, true ); - Region aRegion; + vcl::Region aRegion; // call this to initiate dragging for ValueSet ValueSet::StartDrag( aEvt, aRegion ); diff --git a/svx/source/sdr/contact/displayinfo.cxx b/svx/source/sdr/contact/displayinfo.cxx index 052c9a5d0ba9..4b9f2f41ee91 100644 --- a/svx/source/sdr/contact/displayinfo.cxx +++ b/svx/source/sdr/contact/displayinfo.cxx @@ -46,7 +46,7 @@ namespace sdr } // access to RedrawArea - void DisplayInfo::SetRedrawArea(const Region& rRegion) + void DisplayInfo::SetRedrawArea(const vcl::Region& rRegion) { maRedrawArea = rRegion; } diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 8894d9910c06..f778df103307 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -156,7 +156,7 @@ namespace sdr OutputDevice* pOutDev = TryToGetOutputDevice(); OSL_ENSURE(0 != pOutDev, "ObjectContactOfPageView without OutDev, someone has overloaded TryToGetOutputDevice wrong (!)"); bool bClipRegionPushed(false); - const Region& rRedrawArea(rDisplayInfo.GetRedrawArea()); + const vcl::Region& rRedrawArea(rDisplayInfo.GetRedrawArea()); if(!rRedrawArea.IsEmpty()) { diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 80758a01578c..ec754ba54b56 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -236,7 +236,7 @@ namespace sdr } } - void OverlayManager::completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice) const + void OverlayManager::completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice) const { if(!rRegion.IsEmpty() && maOverlayObjects.size()) { @@ -266,7 +266,7 @@ namespace sdr // unbuffered versions do nothing here } - void OverlayManager::restoreBackground(const Region& /*rRegion*/) const + void OverlayManager::restoreBackground(const vcl::Region& /*rRegion*/) const { // unbuffered versions do nothing here } diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index 7cc57642da12..46bd77b0b8c7 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -104,12 +104,12 @@ namespace sdr const Rectangle aRegionRectanglePixel( maBufferRememberedRangePixel.getMinX(), maBufferRememberedRangePixel.getMinY(), maBufferRememberedRangePixel.getMaxX(), maBufferRememberedRangePixel.getMaxY()); - const Region aRegionPixel(aRegionRectanglePixel); + const vcl::Region aRegionPixel(aRegionRectanglePixel); ImpRestoreBackground(aRegionPixel); } - void OverlayManagerBuffered::ImpRestoreBackground(const Region& rRegionPixel) const + void OverlayManagerBuffered::ImpRestoreBackground(const vcl::Region& rRegionPixel) const { // MapModes off const bool bMapModeWasEnabledDest(getOutputDevice().IsMapModeEnabled()); @@ -178,7 +178,7 @@ namespace sdr ((OverlayManagerBuffered*)this)->maBufferDevice.EnableMapMode(bMapModeWasEnabledSource); } - void OverlayManagerBuffered::ImpSaveBackground(const Region& rRegion, OutputDevice* pPreRenderDevice) + void OverlayManagerBuffered::ImpSaveBackground(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice) { // prepare source OutputDevice& rSource = (pPreRenderDevice) ? *pPreRenderDevice : getOutputDevice(); @@ -187,14 +187,14 @@ namespace sdr ImpPrepareBufferDevice(); // build region which needs to be copied - Region aRegion(rSource.LogicToPixel(rRegion)); + vcl::Region aRegion(rSource.LogicToPixel(rRegion)); // limit to PaintRegion if it's a window. This will be evtl. the expanded one, // but always the exact redraw area if(OUTDEV_WINDOW == rSource.GetOutDevType()) { vcl::Window& rWindow = (vcl::Window&)rSource; - Region aPaintRegionPixel = rWindow.LogicToPixel(rWindow.GetPaintRegion()); + vcl::Region aPaintRegionPixel = rWindow.LogicToPixel(rWindow.GetPaintRegion()); aRegion.Intersect(aPaintRegionPixel); // #i72754# Make sure content is completetly rendered, the window @@ -452,7 +452,7 @@ namespace sdr } } - void OverlayManagerBuffered::completeRedraw(const Region& rRegion, OutputDevice* pPreRenderDevice) const + void OverlayManagerBuffered::completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice) const { if(!rRegion.IsEmpty()) { @@ -477,10 +477,10 @@ namespace sdr maBufferDevice.CopyArea(rDestPt, rSrcPt, rSrcSize); } - void OverlayManagerBuffered::restoreBackground(const Region& rRegion) const + void OverlayManagerBuffered::restoreBackground(const vcl::Region& rRegion) const { // restore - const Region aRegionPixel(getOutputDevice().LogicToPixel(rRegion)); + const vcl::Region aRegionPixel(getOutputDevice().LogicToPixel(rRegion)); ImpRestoreBackground(aRegionPixel); // call parent diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 01d5f5cb9b0e..f4cccca0797a 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -165,7 +165,7 @@ void SdrPageWindow::PrePaint() } } -void SdrPageWindow::PrepareRedraw(const Region& rReg) +void SdrPageWindow::PrepareRedraw(const vcl::Region& rReg) { // give OC the chance to do ProcessDisplay preparations if(HasObjectContact()) @@ -280,7 +280,7 @@ void SdrPageWindow::RedrawAll(sdr::contact::ViewObjectContactRedirector* pRedire SetOfByte aProcessLayers = bPrinter ? mrPageView.GetPrintableLayers() : mrPageView.GetVisibleLayers(); // create PaintInfoRec; use Rectangle only temporarily - const Region& rRegion = GetPaintWindow().GetRedrawRegion(); + const vcl::Region& rRegion = GetPaintWindow().GetRedrawRegion(); // create processing data sdr::contact::DisplayInfo aDisplayInfo; @@ -340,7 +340,7 @@ void SdrPageWindow::RedrawLayer(const SdrLayerID* pId, sdr::contact::ViewObjectC const bool bControlLayerProcessingActive(nControlLayerId == *pId); // create PaintInfoRec, use Rectangle only temporarily - const Region& rRegion = GetPaintWindow().GetRedrawRegion(); + const vcl::Region& rRegion = GetPaintWindow().GetRedrawRegion(); // create processing data sdr::contact::DisplayInfo aDisplayInfo; diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 4b6b47d01e25..f64aea30c499 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -141,10 +141,10 @@ void SdrPreRenderDevice::PreparePreRenderDevice() maPreRenderDevice.SetSettings(mrOutputDevice.GetSettings()); } -void SdrPreRenderDevice::OutputPreRenderDevice(const Region& rExpandedRegion) +void SdrPreRenderDevice::OutputPreRenderDevice(const vcl::Region& rExpandedRegion) { // region to pixels - const Region aRegionPixel(mrOutputDevice.LogicToPixel(rExpandedRegion)); + const vcl::Region aRegionPixel(mrOutputDevice.LogicToPixel(rExpandedRegion)); //RegionHandle aRegionHandle(aRegionPixel.BeginEnumRects()); //Rectangle aRegionRectanglePixel; @@ -341,7 +341,7 @@ void SdrPaintWindow::DestroyPreRenderDevice() } } -void SdrPaintWindow::OutputPreRenderDevice(const Region& rExpandedRegion) +void SdrPaintWindow::OutputPreRenderDevice(const vcl::Region& rExpandedRegion) { if(mpPreRenderDevice) { @@ -350,7 +350,7 @@ void SdrPaintWindow::OutputPreRenderDevice(const Region& rExpandedRegion) } // #i73602# add flag if buffer shall be used -void SdrPaintWindow::DrawOverlay(const Region& rRegion) +void SdrPaintWindow::DrawOverlay(const vcl::Region& rRegion) { // ## force creation of OverlayManager since the first repaint needs to // save the background to get a controlled start into overlay mechanism @@ -370,7 +370,7 @@ void SdrPaintWindow::DrawOverlay(const Region& rRegion) } -void SdrPaintWindow::SetRedrawRegion(const Region& rNew) +void SdrPaintWindow::SetRedrawRegion(const vcl::Region& rNew) { maRedrawRegion = rNew; } diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 5b7cd4e30a8d..56028fb6672f 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -301,7 +301,7 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) const if(nViewAnz) { - const Region& rRedrawRegion = rPaintWindow.GetRedrawRegion(); + const vcl::Region& rRedrawRegion = rPaintWindow.GetRedrawRegion(); const Rectangle aCheckRect(rRedrawRegion.GetBoundRect()); for(sal_uInt32 i(0); i < nViewAnz; i++) diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 390bb851adcc..e8a03aa36850 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -358,7 +358,7 @@ void _SdrItemBrowserControl::PaintField(OutputDevice& rDev, const Rectangle& rRe rDev.DrawText(rRect.TopLeft(),pEntry->aName); } } else { - rDev.SetClipRegion(Region(aR)); + rDev.SetClipRegion(vcl::Region(aR)); rDev.DrawText(aR.TopLeft(),GetCellText(nAktPaintRow,nColumnId)); rDev.SetClipRegion(); } diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index c03339346cef..f8ae2586fec4 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -282,7 +282,7 @@ void SdrPageView::PrePaint() } } -void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const +void SdrPageView::CompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) const { if(GetPage()) { @@ -345,11 +345,11 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con // Copy existing paint region to use the same as prepared in BeginDrawLayer SdrPaintWindow& rExistingPaintWindow = pPreparedTarget->GetPaintWindow(); - const Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion(); + const vcl::Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion(); bool bUseRect(false); if (!rRect.IsEmpty()) { - Region r(rExistingRegion); + vcl::Region r(rExistingRegion); r.Intersect(rRect); // fdo#74435: FIXME: visibility check broken if empty if (!r.IsEmpty()) @@ -358,7 +358,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con if (!bUseRect) aTemporaryPaintWindow.SetRedrawRegion(rExistingRegion); else - aTemporaryPaintWindow.SetRedrawRegion(Region(rRect)); + aTemporaryPaintWindow.SetRedrawRegion(vcl::Region(rRect)); // patch the ExistingPageWindow pPreparedTarget->patchPaintWindow(aTemporaryPaintWindow); @@ -386,7 +386,7 @@ void SdrPageView::DrawLayer(SdrLayerID nID, OutputDevice* pGivenTarget, sdr::con { SdrPageWindow* pExistingPageWindow = GetPageWindow(0L); SdrPaintWindow& rExistingPaintWindow = pExistingPageWindow->GetPaintWindow(); - const Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion(); + const vcl::Region& rExistingRegion = rExistingPaintWindow.GetRedrawRegion(); aTemporaryPaintWindow.SetRedrawRegion(rExistingRegion); } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index edd234dd7a6f..e63b6f70363e 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -568,7 +568,7 @@ void SdrPaintView::PrePaint() // #define SVX_REPAINT_TIMER_TEST -void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) +void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) { #ifdef SVX_REPAINT_TIMER_TEST #define REMEMBERED_TIMES_COUNT (10) @@ -593,7 +593,7 @@ void SdrPaintView::CompleteRedraw(OutputDevice* pOut, const Region& rReg, sdr::c // rReg may be made more granular (fine) with using it. Normally, rReg // does come from Window::Paint() anyways and thus is based on a single // rectangle which was derived from exactly that repaint region - Region aOptimizedRepaintRegion(rReg); + vcl::Region aOptimizedRepaintRegion(rReg); if(pOut && OUTDEV_WINDOW == pOut->GetOutDevType()) { @@ -723,7 +723,7 @@ SdrPaintWindow* SdrPaintView::BeginCompleteRedraw(OutputDevice* pOut) return pPaintWindow; } -void SdrPaintView::DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) +void SdrPaintView::DoCompleteRedraw(SdrPaintWindow& rPaintWindow, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector) { // redraw all PageViews with the target. This may expand the RedrawRegion // at the PaintWindow, plus taking care of FormLayer expansion @@ -767,7 +767,7 @@ void SdrPaintView::EndCompleteRedraw(SdrPaintWindow& rPaintWindow, bool bPaintFo -SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect) +SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect) { // #i74769# use BeginCompleteRedraw() as common base SdrPaintWindow* pPaintWindow = BeginCompleteRedraw(pOut); @@ -779,7 +779,7 @@ SdrPaintWindow* SdrPaintView::BeginDrawLayers(OutputDevice* pOut, const Region& if(pKnownTarget) { - Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect ); + vcl::Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect ); // prepare redraw pKnownTarget->PrepareRedraw(aOptimizedRepaintRegion); @@ -804,7 +804,7 @@ void SdrPaintView::EndDrawLayers(SdrPaintWindow& rPaintWindow, bool bPaintFormLa } } -void SdrPaintView::UpdateDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect) +void SdrPaintView::UpdateDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect) { SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut); OSL_ENSURE(pPaintWindow, "SdrPaintView::UpdateDrawLayersRegion: No SdrPaintWindow (!)"); @@ -815,20 +815,20 @@ void SdrPaintView::UpdateDrawLayersRegion(OutputDevice* pOut, const Region& rReg if(pKnownTarget) { - Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect ); + vcl::Region aOptimizedRepaintRegion = OptimizeDrawLayersRegion( pOut, rReg, bDisableIntersect ); pKnownTarget->GetPaintWindow().SetRedrawRegion(aOptimizedRepaintRegion); mpPageView->setPreparedPageWindow(pKnownTarget); // already set actually } } } -Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const Region& rReg, bool bDisableIntersect) +vcl::Region SdrPaintView::OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect) { // #i74769# check if pOut is a win and has a ClipRegion. If Yes, the Region // rReg may be made more granular (fine) with using it. Normally, rReg // does come from Window::Paint() anyways and thus is based on a single // rectangle which was derived from exactly that repaint region - Region aOptimizedRepaintRegion(rReg); + vcl::Region aOptimizedRepaintRegion(rReg); // #i76114# Intersecting the region with the Window's paint region is disabled // for print preview in Calc, because the intersection can be empty (if the paint diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 87a1ce69d312..75a38bef4fa5 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -447,7 +447,7 @@ VirtualDevice* GraphicExporter::CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWid pView->SetHlplVisible( false ); pView->SetGlueVisible( false ); pView->ShowSdrPage(pPage); - Region aRegion (Rectangle( aPoint, aPageSize ) ); + vcl::Region aRegion (Rectangle( aPoint, aPageSize ) ); ImplExportCheckVisisbilityRedirector aRedirector( mpCurrentPage ); @@ -763,7 +763,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, // Use new StandardCheckVisisbilityRedirector ImplExportCheckVisisbilityRedirector aRedirector( mpCurrentPage ); - pView->CompleteRedraw(&aVDev, Region(Rectangle(Point(), aNewSize)), &aRedirector); + pView->CompleteRedraw(&aVDev, vcl::Region(Rectangle(Point(), aNewSize)), &aRedirector); aVDev.Pop(); diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 33dec73e14ea..7a5af46ab5a9 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -71,7 +71,7 @@ class SwTxtFrm; class BitmapEx; struct SwAccessibilityOptions; -class Region; +namespace vcl { class Region; } class SwPostItMgr; class SdrPaintWindow; class SwAccessibleMap; @@ -231,12 +231,12 @@ public: // #i72754# set of Pre/PostPaints with lock counter and initial target OutDev protected: - std::stack<Region> mPrePostPaintRegions; // acts also as a lock counter (empty == not locked) + std::stack<vcl::Region> mPrePostPaintRegions; // acts also as a lock counter (empty == not locked) OutputDevice* mpPrePostOutDev; MapMode maPrePostMapMode; public: void PrePaint(); - void DLPrePaint2(const Region& rRegion); + void DLPrePaint2(const vcl::Region& rRegion); void DLPostPaint2(bool bPaintFormLayer); const MapMode& getPrePostMapMode() const { return maPrePostMapMode; } diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 4045abfa8fff..4ba7002e59a1 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -260,7 +260,7 @@ void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const FindFlyFrm()->GetContour( aPoly, true ) ) { - pOut->SetClipRegion(Region(aPoly)); + pOut->SetClipRegion(vcl::Region(aPoly)); bClip = false; } diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx index e0c1b020a661..1902a01dc0ba 100644 --- a/sw/source/core/layout/layact.cxx +++ b/sw/source/core/layout/layact.cxx @@ -196,7 +196,7 @@ bool SwLayAction::PaintWithoutFlys( const SwRect &rRect, const SwCntntFrm *pCnt, } // OD 19.08.2002 #99657# - // Region of a fly frame with transparent background or a transparent + // vcl::Region of a fly frame with transparent background or a transparent // shadow have not to be subtracted from paint region if ( pFly->IsBackgroundTransparent() || pFly->IsShadowTransparent() ) diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index b3a538a6ee68..a661fd5172a2 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -3247,7 +3247,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c (pPage->Frm().*fnRect->fnGetLeft)(), (pPage->Frm().*fnRect->fnGetWidth)() ); aPageRectTemp._Intersection( pSh->VisArea() ); - Region aPageRectRegion( aPageRectTemp.SVRect() ); + vcl::Region aPageRectRegion( aPageRectTemp.SVRect() ); aPageRectRegion.Exclude( aPaintRect.SVRect() ); pSh->GetWin()->Invalidate( aPageRectRegion, INVALIDATE_CHILDREN ); } @@ -3263,7 +3263,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c { // #i75172# if called from SwViewShell::ImplEndAction it sould no longer // really be used but handled by SwViewShell::ImplEndAction already - const Region aDLRegion(aPaintRect.SVRect()); + const vcl::Region aDLRegion(aPaintRect.SVRect()); pSh->DLPrePaint2(aDLRegion); } @@ -3395,7 +3395,7 @@ void SwRootFrm::Paint(SwRect const& rRect, SwPrintData const*const pPrintData) c // #i75172# if called from SwViewShell::ImplEndAction it sould no longer // really be used but handled by SwViewShell::ImplEndAction already { - const Region aDLRegion(aPaintRect.SVRect()); + const vcl::Region aDLRegion(aPaintRect.SVRect()); pSh->DLPrePaint2(aDLRegion); } @@ -4222,7 +4222,7 @@ void SwFlyFrm::Paint(SwRect const& rRect, SwPrintData const*const) const SwViewShell *pSh = getRootFrm()->GetCurrShell(); if ( !pOut->GetConnectMetaFile() || !pSh || !pSh->GetWin() ) { - pOut->SetClipRegion(Region(aPoly)); + pOut->SetClipRegion(vcl::Region(aPoly)); } for ( sal_uInt16 i = 0; i < aRegion.size(); ++i ) PaintBackground( aRegion[i], pPage, rAttrs, false, true ); @@ -7597,7 +7597,7 @@ Graphic SwFlyFrmFmt::MakeGraphic( ImageMap* pMap ) aOut.SSize().Height()+= 2*nPixelSzH; // #i92711# start Pre/PostPaint encapsulation before pOut is changed to the buffering VDev - const Region aRepaintRegion(aOut.SVRect()); + const vcl::Region aRepaintRegion(aOut.SVRect()); pSh->DLPrePaint2(aRepaintRegion); vcl::Window *pWin = pSh->GetWin(); diff --git a/sw/source/core/text/txtpaint.cxx b/sw/source/core/text/txtpaint.cxx index a872a1111c9b..c7328401e79b 100644 --- a/sw/source/core/text/txtpaint.cxx +++ b/sw/source/core/text/txtpaint.cxx @@ -91,7 +91,7 @@ void SwSaveClip::_ChgClip( const SwRect &rRect, const SwTxtFrm* pFrm, pOut->SetClipRegion(); else { - const Region aClipRegion( aRect ); + const vcl::Region aClipRegion( aRect ); pOut->SetClipRegion( aClipRegion ); } #ifdef DBG_UTIL diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx index f3ef7296f95e..c14c6560cf81 100644 --- a/sw/source/core/text/txtpaint.hxx +++ b/sw/source/core/text/txtpaint.hxx @@ -25,7 +25,7 @@ class SwRect; // SwSaveClip class SwSaveClip { - Region aClip; + vcl::Region aClip; const bool bOn; bool bChg; protected: diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 65e70589d036..3e8004ab1776 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -1101,7 +1101,7 @@ bool SwPagePreviewLayout::Paint( const Rectangle _aOutRect ) const SwRect aPageBorderRect; SwPageFrm::GetBorderAndShadowBoundRect( SwRect( aPageRect ), &mrParentViewShell, aPageBorderRect, (*aPageIter)->pPage->IsLeftShadowNeeded(), (*aPageIter)->pPage->IsRightShadowNeeded(), true ); - const Region aDLRegion(aPageBorderRect.SVRect()); + const vcl::Region aDLRegion(aPageBorderRect.SVRect()); mrParentViewShell.DLPrePaint2(aDLRegion); SwPageFrm::PaintBorderAndShadow( aPageRect, &mrParentViewShell, true, false, true ); mrParentViewShell.DLPostPaint2(true); diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx index 57e66a4b8719..0731c2b07298 100644 --- a/sw/source/core/view/viewsh.cxx +++ b/sw/source/core/view/viewsh.cxx @@ -147,7 +147,7 @@ void SwViewShell::PrePaint() } } -void SwViewShell::DLPrePaint2(const Region& rRegion) +void SwViewShell::DLPrePaint2(const vcl::Region& rRegion) { if(mPrePostPaintRegions.empty()) { @@ -188,7 +188,7 @@ void SwViewShell::DLPostPaint2(bool bPaintFormLayer) if( mPrePostPaintRegions.size() > 1 ) { - Region current = mPrePostPaintRegions.top(); + vcl::Region current = mPrePostPaintRegions.top(); mPrePostPaintRegions.pop(); if( current != mPrePostPaintRegions.top()) Imp()->GetDrawView()->UpdateDrawLayersRegion(mpPrePostOutDev, mPrePostPaintRegions.top()); @@ -345,7 +345,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) // --> OD 2007-07-26 #i79947# // #i72754# start Pre/PostPaint encapsulation before mpOut is changed to the buffering VDev - const Region aRepaintRegion(aRect.SVRect()); + const vcl::Region aRepaintRegion(aRect.SVRect()); DLPrePaint2(aRepaintRegion); // <-- @@ -377,7 +377,7 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd ) // seems to work (and does technically) but fails with transparent objects. Since the // region given to BeginDarwLayers() defines the clip region for DrawingLayer paint, // transparent objects in the single rectangles will indeed be painted multiple times. - DLPrePaint2(Region(aRect.SVRect())); + DLPrePaint2(vcl::Region(aRect.SVRect())); if ( bPaintsFromSystem ) PaintDesktop( aRect ); @@ -458,7 +458,7 @@ void SwViewShell::ImplUnlockPaint( bool bVirDev ) pVout->SetFillColor( mpOut->GetFillColor() ); // #i72754# start Pre/PostPaint encapsulation before mpOut is changed to the buffering VDev - const Region aRepaintRegion(VisArea().SVRect()); + const vcl::Region aRepaintRegion(VisArea().SVRect()); DLPrePaint2(aRepaintRegion); OutputDevice *pOld = mpOut; @@ -1243,7 +1243,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect // is used when mpWin == 0 (wrong but widely used). vcl::Window* pOldWin = mpWin; mpWin = 0; - DLPrePaint2(Region(aRect.SVRect())); + DLPrePaint2(vcl::Region(aRect.SVRect())); mpWin = pOldWin; // SW paint stuff @@ -1337,7 +1337,7 @@ bool SwViewShell::SmoothScroll( long lXDiff, long lYDiff, const Rectangle *pRect { // start paint on logic base const Rectangle aTargetLogic(Imp()->aSmoothRect.SVRect()); - DLPrePaint2(Region(aTargetLogic)); + DLPrePaint2(vcl::Region(aTargetLogic)); // get target rectangle in discrete pixels OutputDevice& rTargetDevice = mpTargetPaintWindow->GetTargetOutputDevice(); @@ -1507,7 +1507,7 @@ void SwViewShell::_PaintDesktop( const SwRegionRects &rRegion ) // to be removed again // #i68597# inform Drawinglayer about display change - DLPrePaint2(Region(aRectangle)); + DLPrePaint2(vcl::Region(aRectangle)); // #i75172# needed to move line/Fill color setters into loop since DLPrePaint2 // may exchange GetOut(), that's it's purpose. This happens e.g. at print preview. @@ -1690,7 +1690,7 @@ void SwViewShell::Paint(const Rectangle &rRect) { // --> OD 2009-08-12 #i101192# // start Pre/PostPaint encapsulation to avoid screen blinking - const Region aRepaintRegion(aRect.SVRect()); + const vcl::Region aRepaintRegion(aRect.SVRect()); DLPrePaint2(aRepaintRegion); // <-- @@ -1722,7 +1722,7 @@ void SwViewShell::Paint(const Rectangle &rRect) if ( mbInEndAction && GetWin() ) { - const Region aRegion(GetWin()->GetPaintRegion()); + const vcl::Region aRegion(GetWin()->GetPaintRegion()); RectangleVector aRectangles; aRegion.GetRegionRectangles(aRectangles); @@ -1741,7 +1741,7 @@ void SwViewShell::Paint(const Rectangle &rRect) GetOut() == GetWin() ) { // #i68597# - const Region aDLRegion(rRect); + const vcl::Region aDLRegion(rRect); DLPrePaint2(aDLRegion); mpOut->Push( PUSH_FILLCOLOR|PUSH_LINECOLOR ); diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index f8ad84f64c01..6d9fac261019 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -349,7 +349,7 @@ void SwDropCapsPict::Paint(const Rectangle &/*rRect*/) Size aOutputSizePixel( GetOutputSizePixel() ); DrawRect(Rectangle(Point(0, 0), aOutputSizePixel )); - SetClipRegion(Region(Rectangle( + SetClipRegion(vcl::Region(Rectangle( Point(BORDER, BORDER), Size (aOutputSizePixel.Width () - 2 * BORDER, aOutputSizePixel.Height() - 2 * BORDER)))); diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 51a9955e8267..dbc8d70c10da 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -156,7 +156,7 @@ void SwLabPreview::Paint(const Rectangle &) DrawLine(Point(lX0, lY0 + lOutlineH - 1), Point(lX0 + lOutlineW - 1, lY0 + lOutlineH - 1)); // Down // Labels - SetClipRegion(Region(Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH)))); + SetClipRegion(vcl::Region(Rectangle(Point(lX0, lY0), Size(lOutlineW, lOutlineH)))); SetFillColor( COL_LIGHTGRAYBLUE ); const sal_Int32 nRows = std::min<sal_Int32>(2, aItem.nRows); const sal_Int32 nCols = std::min<sal_Int32>(2, aItem.nCols); diff --git a/sw/source/uibase/dbui/mailmergehelper.cxx b/sw/source/uibase/dbui/mailmergehelper.cxx index 076a04b6830c..92adafca85d7 100644 --- a/sw/source/uibase/dbui/mailmergehelper.cxx +++ b/sw/source/uibase/dbui/mailmergehelper.cxx @@ -425,7 +425,7 @@ void SwAddressPreview::StateChanged( StateChangedType nStateChange ) void SwAddressPreview::DrawText_Impl( const OUString& rAddress, const Point& rTopLeft, const Size& rSize, bool bIsSelected) { - SetClipRegion( Region( Rectangle(rTopLeft, rSize)) ); + SetClipRegion( vcl::Region( Rectangle(rTopLeft, rSize)) ); if(bIsSelected) { //selection rectangle diff --git a/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx index 5dd5ba521fa0..7ea33536cc40 100644 --- a/toolkit/source/awt/vclxgraphics.cxx +++ b/toolkit/source/awt/vclxgraphics.cxx @@ -278,7 +278,7 @@ void VCLXGraphics::setClipRegion( const uno::Reference< awt::XRegion >& rxRegion delete mpClipRegion; if ( rxRegion.is() ) - mpClipRegion = new Region( VCLUnoHelper::GetRegion( rxRegion ) ); + mpClipRegion = new vcl::Region( VCLUnoHelper::GetRegion( rxRegion ) ); else mpClipRegion = NULL; } @@ -289,9 +289,9 @@ void VCLXGraphics::intersectClipRegion( const uno::Reference< awt::XRegion >& rx if ( rxRegion.is() ) { - Region aRegion( VCLUnoHelper::GetRegion( rxRegion ) ); + vcl::Region aRegion( VCLUnoHelper::GetRegion( rxRegion ) ); if ( !mpClipRegion ) - mpClipRegion = new Region( aRegion ); + mpClipRegion = new vcl::Region( aRegion ); else mpClipRegion->Intersect( aRegion ); } @@ -371,7 +371,7 @@ void VCLXGraphics::draw( const uno::Reference< awt::XDisplayBitmap >& rxBitmapHa } if(nSourceX || nSourceY || aSz.Width() != nSourceWidth || aSz.Height() != nSourceHeight) - mpOutputDevice->IntersectClipRegion(Region(Rectangle(nDestX, nDestY, nDestX + nDestWidth - 1, nDestY + nDestHeight - 1))); + mpOutputDevice->IntersectClipRegion(vcl::Region(Rectangle(nDestX, nDestY, nDestX + nDestWidth - 1, nDestY + nDestHeight - 1))); mpOutputDevice->DrawBitmapEx( aPos, aSz, aBmpEx ); } diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 8e4b75a6f194..f8ab1e11f402 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -126,9 +126,9 @@ vcl::Window* VCLUnoHelper::GetWindow( const ::com::sun::star::uno::Reference< :: return pVCLXWindow ? pVCLXWindow->GetWindow() : NULL; } -Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) +vcl::Region VCLUnoHelper::GetRegion( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XRegion >& rxRegion ) { - Region aRegion; + vcl::Region aRegion; VCLXRegion* pVCLRegion = VCLXRegion::GetImplementation( rxRegion ); if ( pVCLRegion ) aRegion = pVCLRegion->GetRegion(); diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx index c8f1015cb368..401f5c7af5e8 100644 --- a/vcl/generic/print/genpspgraphics.cxx +++ b/vcl/generic/print/genpspgraphics.cxx @@ -312,7 +312,7 @@ void GenPspGraphics::ResetClipRegion() m_pPrinterGfx->ResetClipRegion(); } -bool GenPspGraphics::setClipRegion( const Region& i_rClip ) +bool GenPspGraphics::setClipRegion( const vcl::Region& i_rClip ) { // TODO: support polygonal clipregions here RectangleVector aRectangles; diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index 945f335bccea..ef8f12639b17 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -279,7 +279,7 @@ bool SvpSalGraphics::isClippedSetup( const basegfx::B2IBox &aRange, SvpSalGraphi // ensureClipFor() or ensureClip() need to be called before // real rendering. FIXME: we should prolly push this down to // bitmapdevice instead. -bool SvpSalGraphics::setClipRegion( const Region& i_rClip ) +bool SvpSalGraphics::setClipRegion( const vcl::Region& i_rClip ) { m_aClipRegion = i_rClip; m_aClipMap.reset(); diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index 0f8531d52b7e..e28e51169af7 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -40,8 +40,8 @@ namespace unotools { private: BitmapEx m_aBmpEx; - Bitmap m_aBitmap; - Bitmap m_aAlpha; + ::Bitmap m_aBitmap; + ::Bitmap m_aAlpha; BitmapReadAccess* m_pBmpAcc; BitmapReadAccess* m_pAlphaAcc; com::sun::star::uno::Sequence<sal_Int8> m_aComponentTags; diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/generic/genpspgraphics.h index 5eb34770d016..ec54d5bd66eb 100644 --- a/vcl/inc/generic/genpspgraphics.h +++ b/vcl/inc/generic/genpspgraphics.h @@ -76,7 +76,7 @@ public: virtual long GetGraphicsWidth() const SAL_OVERRIDE; virtual void ResetClipRegion() SAL_OVERRIDE; - virtual bool setClipRegion( const Region& ) SAL_OVERRIDE; + virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE; virtual void SetLineColor() SAL_OVERRIDE; virtual void SetLineColor( SalColor nSalColor ) SAL_OVERRIDE; diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 57e3ce87d434..65a8fc2a15bf 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -120,7 +120,7 @@ public: #endif protected: - Region m_aClipRegion; + vcl::Region m_aClipRegion; protected: virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE; @@ -141,7 +141,7 @@ public: virtual long GetGraphicsWidth() const SAL_OVERRIDE; virtual void ResetClipRegion() SAL_OVERRIDE; - virtual bool setClipRegion( const Region& ) SAL_OVERRIDE; + virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE; virtual void SetLineColor() SAL_OVERRIDE; virtual void SetLineColor( SalColor nSalColor ) SAL_OVERRIDE; diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index deafb418ad4c..5cd5d2a543e3 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -88,7 +88,7 @@ private: class ImplFontMetric { - friend class OutputDevice; + friend class ::OutputDevice; private: long mnAscent; // Ascent diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h index 73e57c697df9..222a08fba7eb 100644 --- a/vcl/inc/quartz/salgdi.h +++ b/vcl/inc/quartz/salgdi.h @@ -225,7 +225,7 @@ public: // InvalidateContext does an UnsetState and sets mrContext to 0 void InvalidateContext(); - virtual bool setClipRegion( const Region& ) SAL_OVERRIDE; + virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE; // draw --> LineColor and FillColor and RasterOp and ClipRegion virtual void drawPixel( long nX, long nY ) SAL_OVERRIDE; diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index 82222aca8c39..bed847472fc6 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -91,7 +91,7 @@ public: virtual ~SalGraphics(); protected: - virtual bool setClipRegion( const Region& ) = 0; + virtual bool setClipRegion( const vcl::Region& ) = 0; // draw --> LineColor and FillColor and RasterOp and ClipRegion virtual void drawPixel( long nX, long nY ) = 0; @@ -317,7 +317,7 @@ public: void mirror( long& nX, long& nWidth, const OutputDevice *pOutDev, bool bBack = false ) const; bool mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( Rectangle& rRect, const OutputDevice*, bool bBack = false ) const; - void mirror( Region& rRgn, const OutputDevice *pOutDev, bool bBack = false ) const; + void mirror( vcl::Region& rRgn, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( ImplControlValue&, const OutputDevice*, bool bBack = false ) const; basegfx::B2DPoint mirror( const basegfx::B2DPoint& i_rPoint, const OutputDevice *pOutDev, bool bBack = false ) const; basegfx::B2DPolygon mirror( const basegfx::B2DPolygon& i_rPoly, const OutputDevice *pOutDev, bool bBack = false ) const; @@ -325,7 +325,7 @@ public: // non virtual methods; these do possible coordinate mirroring and // then delegate to protected virtual methods - bool SetClipRegion( const Region&, const OutputDevice *pOutDev ); + bool SetClipRegion( const vcl::Region&, const OutputDevice *pOutDev ); // draw --> LineColor and FillColor and RasterOp and ClipRegion void DrawPixel( long nX, long nY, const OutputDevice *pOutDev ); diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index 8bd45b0148df..b8b145b218d0 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -117,7 +117,7 @@ private: class GtkSalGraphics : public X11SalGraphics { GtkWidget *m_pWindow; - Region m_aClipRegion; + vcl::Region m_aClipRegion; public: GtkSalGraphics( GtkSalFrame *, GtkWidget *window ); @@ -149,7 +149,7 @@ public: static void refreshFontconfig( GtkSettings *pSettings ); static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer ); - virtual bool setClipRegion( const Region& ) SAL_OVERRIDE; + virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE; virtual void ResetClipRegion() SAL_OVERRIDE; // some themes set the background pixmap of our window EVERY time diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 500b277ae731..978e51421834 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -98,8 +98,8 @@ protected: XID m_aXRenderPicture; CairoFontsCache m_aCairoFontsCache; - XLIB_Region pPaintRegion_; - XLIB_Region mpClipRegion; + Region pPaintRegion_; + Region mpClipRegion; GC pPenGC_; // Pen attributes SalColor nPenColor_; @@ -143,7 +143,7 @@ protected: using SalGraphics::SetClipRegion; void SetClipRegion( GC pGC, - XLIB_Region pXReg = NULL ) const; + Region pXReg = NULL ) const; GC GetTrackingGC(); GC GetInvertGC(); @@ -213,7 +213,7 @@ public: virtual long GetGraphicsHeight() const; virtual void ResetClipRegion() SAL_OVERRIDE; - virtual bool setClipRegion( const Region& ) SAL_OVERRIDE; + virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE; virtual void SetLineColor() SAL_OVERRIDE; virtual void SetLineColor( SalColor nSalColor ) SAL_OVERRIDE; diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h index 7b05d24c5668..957db9103215 100644 --- a/vcl/inc/win/salgdi.h +++ b/vcl/inc/win/salgdi.h @@ -159,7 +159,7 @@ public: float mfCurrentFontScale; HPEN mhPen; // Pen HBRUSH mhBrush; // Brush - HRGN mhRegion; // Region Handle + HRGN mhRegion; // vcl::Region Handle HPEN mhDefPen; // DefaultPen HBRUSH mhDefBrush; // DefaultBrush HFONT mhDefFont; // DefaultFont @@ -200,7 +200,7 @@ public: virtual ~WinSalGraphics(); protected: - virtual bool setClipRegion( const Region& ); + virtual bool setClipRegion( const vcl::Region& ); // draw --> LineColor and FillColor and RasterOp and ClipRegion virtual void drawPixel( long nX, long nY ); virtual void drawPixel( long nX, long nY, SalColor nSalColor ); diff --git a/vcl/inc/window.h b/vcl/inc/window.h index 983c3613cc66..53d077f200e8 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -118,7 +118,7 @@ struct ImplWinData struct ImplOverlapData { VirtualDevice* mpSaveBackDev; //< saved background bitmap - Region* mpSaveBackRgn; //< saved region, which must be invalidated + vcl::Region* mpSaveBackRgn; //< saved region, which must be invalidated vcl::Window* mpNextBackWin; //< next window with saved background sal_uIntPtr mnSaveBackSize; //< bitmap size of saved background bool mbSaveBack; //< true: save background @@ -259,11 +259,11 @@ public: ::std::vector< FixedText* > m_aMnemonicLabels; ImplAccessibleInfos* mpAccessibleInfos; VCLXWindow* mpVCLXWindow; - Region maWinRegion; //< region to 'shape' the VCL window (frame coordinates) - Region maWinClipRegion; //< the (clipping) region that finally corresponds to the VCL window (frame coordinates) - Region maInvalidateRegion; //< region that has to be redrawn (frame coordinates) - Region* mpChildClipRegion; //< child clip region if CLIPCHILDREN is set (frame coordinates) - Region* mpPaintRegion; //< only set during Paint() method call (window coordinates) + vcl::Region maWinRegion; //< region to 'shape' the VCL window (frame coordinates) + vcl::Region maWinClipRegion; //< the (clipping) region that finally corresponds to the VCL window (frame coordinates) + vcl::Region maInvalidateRegion; //< region that has to be redrawn (frame coordinates) + vcl::Region* mpChildClipRegion; //< child clip region if CLIPCHILDREN is set (frame coordinates) + vcl::Region* mpPaintRegion; //< only set during Paint() method call (window coordinates) WinBits mnStyle; WinBits mnPrevStyle; WinBits mnExtendedStyle; diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index 4848fd3d2885..ad15432e1a1f 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -1832,7 +1832,7 @@ bool AquaSalGraphics::supportsOperation( OutDevSupportType eType ) const return bRet; } -bool AquaSalGraphics::setClipRegion( const Region& i_rClip ) +bool AquaSalGraphics::setClipRegion( const vcl::Region& i_rClip ) { // release old clip path if( mxClipPath ) diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 9962c3213578..5d0bb1db13b4 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -561,8 +561,8 @@ void Edit::ImplRepaint(bool bLayout) // save graphics state Push(); // first calculate higlighted and non highlighted clip regions - Region aHiglightClipRegion; - Region aNormalClipRegion; + vcl::Region aHiglightClipRegion; + vcl::Region aNormalClipRegion; Selection aTmpSel( maSelection ); aTmpSel.Justify(); // selection is highlighted @@ -619,7 +619,7 @@ void Edit::ImplRepaint(bool bLayout) { for( int n = 0; n < 2; n++ ) { - Region aRegion; + vcl::Region aRegion; if( n == 0 ) { SetTextColor( aNormalTextColor ); @@ -639,7 +639,7 @@ void Edit::ImplRepaint(bool bLayout) for( i = 0; i < mpIMEInfos->nLen; ) { sal_uInt16 nAttr = mpIMEInfos->pAttribs[i]; - Region aClip; + vcl::Region aClip; int nIndex = i; while( nIndex < mpIMEInfos->nLen && mpIMEInfos->pAttribs[nIndex] == nAttr) // #112631# check nIndex before using it { @@ -1029,7 +1029,7 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd ) if( pBorder ) { // set proper clipping region to not overdraw the whole control - Region aClipRgn = GetPaintRegion(); + vcl::Region aClipRgn = GetPaintRegion(); if( !aClipRgn.IsNull() ) { // transform clipping region to border window's coordinate system @@ -1055,7 +1055,7 @@ void Edit::ImplPaintBorder( long nXStart, long nXEnd ) aClipRgn.Move( aBorderOffs.X(), aBorderOffs.Y() ); } - Region oldRgn( pBorder->GetClipRegion() ); + vcl::Region oldRgn( pBorder->GetClipRegion() ); pBorder->SetClipRegion( aClipRgn ); pBorder->Paint( Rectangle() ); diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index c11bb36654ba..d9ee7576306b 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1270,8 +1270,8 @@ bool ScrollBar::PreNotify( NotifyEvent& rNEvt ) Rectangle* pLastRect = ImplFindPartRect( GetLastPointerPosPixel() ); if( pRect != pLastRect || pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow() ) { - Region aRgn( GetActiveClipRegion() ); - Region aClipRegion; + vcl::Region aRgn( GetActiveClipRegion() ); + vcl::Region aClipRegion; if ( pRect ) aClipRegion.Union( *pRect ); diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx index 00cf7108c981..0ebdc37dc66e 100644 --- a/vcl/source/control/slider.cxx +++ b/vcl/source/control/slider.cxx @@ -193,7 +193,7 @@ void Slider::ImplUpdateRects( bool bUpdate ) Invalidate(); else { - Region aInvalidRegion( aOldThumbRect ); + vcl::Region aInvalidRegion( aOldThumbRect ); aInvalidRegion.Union( maThumbRect ); if( !IsBackground() && GetParent() ) diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index f760aaf669e5..b7d9de824902 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -457,16 +457,16 @@ bool SpinButton::PreNotify( NotifyEvent& rNEvt ) Rectangle* pLastRect = ImplFindPartRect( GetLastPointerPosPixel() ); if( pRect != pLastRect || (pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) ) { - Region aRgn( GetActiveClipRegion() ); + vcl::Region aRgn( GetActiveClipRegion() ); if( pLastRect ) { - SetClipRegion(Region(*pLastRect)); + SetClipRegion(vcl::Region(*pLastRect)); Paint( *pLastRect ); SetClipRegion( aRgn ); } if( pRect ) { - SetClipRegion(Region(*pRect)); + SetClipRegion(vcl::Region(*pRect)); Paint( *pRect ); SetClipRegion( aRgn ); } diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index e71cfbb60406..a6c558317eea 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -98,8 +98,8 @@ bool ImplDrawNativeSpinfield( vcl::Window *pWin, const SpinbuttonValue& rSpinbut // convert from screen space to borderwin space aClipRect.SetPos( pBorder->ScreenToOutputPixel(pWin->OutputToScreenPixel(aClipRect.TopLeft())) ); - Region oldRgn( pBorder->GetClipRegion() ); - pBorder->SetClipRegion( Region( aClipRect ) ); + vcl::Region oldRgn( pBorder->GetClipRegion() ); + pBorder->SetClipRegion( vcl::Region( aClipRect ) ); Point aPt; Size aSize( pBorder->GetOutputSizePixel() ); // the size of the border window, i.e., the whole control @@ -116,7 +116,7 @@ bool ImplDrawNativeSpinfield( vcl::Window *pWin, const SpinbuttonValue& rSpinbut bNativeOK = pBorder->DrawNativeControl( CTRL_SPINBOX, PART_ENTIRE_CONTROL, aRgn, CTRL_STATE_ENABLED, rSpinbuttonValue, OUString() ); - pBorder->SetClipRegion(Region(oldRgn)); + pBorder->SetClipRegion(vcl::Region(oldRgn)); } } return bNativeOK; @@ -879,16 +879,16 @@ bool SpinField::PreNotify( NotifyEvent& rNEvt ) else { // paint directly - Region aRgn( GetActiveClipRegion() ); + vcl::Region aRgn( GetActiveClipRegion() ); if( pLastRect ) { - SetClipRegion(Region(*pLastRect)); + SetClipRegion(vcl::Region(*pLastRect)); Paint( *pLastRect ); SetClipRegion( aRgn ); } if( pRect ) { - SetClipRegion(Region(*pRect)); + SetClipRegion(vcl::Region(*pRect)); Paint( *pRect ); SetClipRegion( aRgn ); } diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 4e377cb103ee..f0aa4dbad2fb 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1102,7 +1102,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) if ( HasFocus() ) nState |= CTRL_STATE_FOCUSED; - Region aClipRgn( GetActiveClipRegion() ); + vcl::Region aClipRgn( GetActiveClipRegion() ); aClipRgn.Intersect( aRect ); if( !rRect.IsEmpty() ) aClipRgn.Intersect( rRect ); @@ -1197,7 +1197,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) ImplTabItem* pItem = &mpTabCtrlData->maItemList[idx]; if ( pItem != pCurItem ) { - Region aClipRgn( GetActiveClipRegion() ); + vcl::Region aClipRgn( GetActiveClipRegion() ); aClipRgn.Intersect( pItem->maRect ); if( !rRect.IsEmpty() ) aClipRgn.Intersect( rRect ); @@ -1213,7 +1213,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout ) if ( pCurItem ) { - Region aClipRgn( GetActiveClipRegion() ); + vcl::Region aClipRgn( GetActiveClipRegion() ); aClipRgn.Intersect( pCurItem->maRect ); if( !rRect.IsEmpty() ) aClipRgn.Intersect( rRect ); @@ -1543,7 +1543,7 @@ bool TabControl::PreNotify( NotifyEvent& rNEvt ) Rectangle* pLastRect = ImplFindPartRect( GetLastPointerPosPixel() ); if( pRect != pLastRect || (pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) ) { - Region aClipRgn; + vcl::Region aClipRgn; if( pLastRect ) { // allow for slightly bigger tabitems diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 19f9bc9db4ba..e0f8d5b31231 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -2047,7 +2047,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan { sal_uInt16 nL; - // 1) Region before Selection + // 1) vcl::Region before Selection if ( aTextStart < *pSelStart ) { nL = pSelStart->GetIndex() - nTmpIndex; @@ -2057,7 +2057,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan nTmpIndex = nTmpIndex + nL; } - // 2) Region with Selection + // 2) vcl::Region with Selection nL = nEnd-nTmpIndex; if ( aTextEnd > *pSelEnd ) nL = pSelEnd->GetIndex() - nTmpIndex; @@ -2073,7 +2073,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan nTmpIndex = nTmpIndex + nL; } - // 3) Region after Selection + // 3) vcl::Region after Selection if ( nTmpIndex < nEnd ) { nL = nEnd-nTmpIndex; diff --git a/vcl/source/filter/sgvmain.cxx b/vcl/source/filter/sgvmain.cxx index 2d6a29b43455..33219b626f99 100644 --- a/vcl/source/filter/sgvmain.cxx +++ b/vcl/source/filter/sgvmain.cxx @@ -409,10 +409,10 @@ void DrawSlideRect(sal_Int16 x1, sal_Int16 y1, sal_Int16 x2, sal_Int16 y2, ObjAr } break; case 0x18: case 0x38: { // circle - Region ClipMerk=rOut.GetClipRegion(); + vcl::Region ClipMerk=rOut.GetClipRegion(); double a; - rOut.SetClipRegion(Region(Rectangle(x1,y1,x2,y2))); + rOut.SetClipRegion(vcl::Region(Rectangle(x1,y1,x2,y2))); cx=(x1+x2) /2; cy=(y1+y2) /2; dx=x2-x1+1; @@ -526,40 +526,40 @@ void DrawSlideCirc(sal_Int16 cx, sal_Int16 cy, sal_Int16 rx, sal_Int16 ry, ObjAr b0=Int1; switch (F.FBFarbe & 0x38) { case 0x08: { // vertical - Region ClipMerk=rOut.GetClipRegion(); + vcl::Region ClipMerk=rOut.GetClipRegion(); i0=y1; i=y1; while (i<=y2) { b=Int1+sal_Int16((sal_Int32)(Int2-Int1)*(sal_Int32)(i-y1) /(sal_Int32)(y2-y1+1)); if (b!=b0) { SgfAreaColorIntens(F.FMuster,(sal_uInt8)Col1,(sal_uInt8)Col2,(sal_uInt8)b0,rOut); - rOut.SetClipRegion(Region(Rectangle(x1,i0,x2,i-1))); + rOut.SetClipRegion(vcl::Region(Rectangle(x1,i0,x2,i-1))); rOut.DrawEllipse(Rectangle(x1,y1,x2,y2)); i0=i; b0=b; } i++; } SgfAreaColorIntens(F.FMuster,(sal_uInt8)Col1,(sal_uInt8)Col2,(sal_uInt8)Int2,rOut); - rOut.SetClipRegion(Region(Rectangle(x1,i0,x2,y2))); + rOut.SetClipRegion(vcl::Region(Rectangle(x1,i0,x2,y2))); rOut.DrawEllipse(Rectangle(x1,y1,x2,y2)); rOut.SetClipRegion(ClipMerk); } break; case 0x28: { // horizontal - Region ClipMerk=rOut.GetClipRegion(); + vcl::Region ClipMerk=rOut.GetClipRegion(); i0=x1; i=x1; while (i<=x2) { b=Int1+sal_Int16((sal_Int32)(Int2-Int1)*(sal_Int32)(i-x1) /(sal_Int32)(x2-x1+1)); if (b!=b0) { SgfAreaColorIntens(F.FMuster,(sal_uInt8)Col1,(sal_uInt8)Col2,(sal_uInt8)b0,rOut); - rOut.SetClipRegion(Region(Rectangle(i0,y1,i-1,y2))); + rOut.SetClipRegion(vcl::Region(Rectangle(i0,y1,i-1,y2))); rOut.DrawEllipse(Rectangle(x1,y1,x2,y2)); i0=i; b0=b; } i++; } SgfAreaColorIntens(F.FMuster,(sal_uInt8)Col1,(sal_uInt8)Col2,(sal_uInt8)Int2,rOut); - rOut.SetClipRegion(Region(Rectangle(i0,y1,x2,y2))); + rOut.SetClipRegion(vcl::Region(Rectangle(i0,y1,x2,y2))); rOut.DrawEllipse(Rectangle(x1,y1,x2,y2)); rOut.SetClipRegion(ClipMerk); } break; diff --git a/vcl/source/filter/wmf/wmfwr.cxx b/vcl/source/filter/wmf/wmfwr.cxx index a4b0b67ebd81..03ac25e6be2e 100644 --- a/vcl/source/filter/wmf/wmfwr.cxx +++ b/vcl/source/filter/wmf/wmfwr.cxx @@ -1773,7 +1773,7 @@ bool WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream, aDstFillColor = aSrcFillColor = Color( COL_WHITE ); CreateSelectDeleteBrush( aDstFillColor ); - aDstClipRegion = aSrcClipRegion = Region(); + aDstClipRegion = aSrcClipRegion = vcl::Region(); bDstIsClipping = bSrcIsClipping = false; vcl::Font aFont; diff --git a/vcl/source/filter/wmf/wmfwr.hxx b/vcl/source/filter/wmf/wmfwr.hxx index a4ce97ace9ca..7647a2b5ccb5 100644 --- a/vcl/source/filter/wmf/wmfwr.hxx +++ b/vcl/source/filter/wmf/wmfwr.hxx @@ -39,7 +39,7 @@ struct WMFWriterAttrStackMember RasterOp eRasterOp; vcl::Font aFont; MapMode aMapMode; - Region aClipRegion; + vcl::Region aClipRegion; PushFlags nFlags; }; @@ -76,7 +76,7 @@ private: vcl::Font aSrcFont; MapMode aSrcMapMode; bool bSrcIsClipping; - Region aSrcClipRegion; + vcl::Region aSrcClipRegion; WMFWriterAttrStackMember * pAttrStack; sal_uInt32 eSrcHorTextAlign; @@ -93,7 +93,7 @@ private: sal_uInt32 eDstHorTextAlign; bool bDstIsClipping; // ???: not taken into account at the moment - Region aDstClipRegion; // ???: not taken into account at the moment + vcl::Region aDstClipRegion; // ???: not taken into account at the moment bool bHandleAllocated[MAXOBJECTHANDLES]; // which handles have been assigned sal_uInt16 nDstPenHandle,nDstFontHandle,nDstBrushHandle; // which handles are owned by // Selected-Objects diff --git a/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx index 24fd842036a2..5f6477a00b82 100644 --- a/vcl/source/gdi/bitmap.cxx +++ b/vcl/source/gdi/bitmap.cxx @@ -1361,9 +1361,9 @@ Bitmap Bitmap::CreateMask( const Color& rTransColor, sal_uLong nTol ) const return aNewBmp; } -Region Bitmap::CreateRegion( const Color& rColor, const Rectangle& rRect ) const +vcl::Region Bitmap::CreateRegion( const Color& rColor, const Rectangle& rRect ) const { - Region aRegion; + vcl::Region aRegion; Rectangle aRect( rRect ); BitmapReadAccess* pReadAcc = ( (Bitmap*) this )->AcquireReadAccess(); diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx index 1da9c12da22e..8ee40c3197d0 100644 --- a/vcl/source/gdi/cvtsvm.cxx +++ b/vcl/source/gdi/cvtsvm.cxx @@ -1005,7 +1005,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( GDI_CLIPREGION_ACTION ): { - Region aRegion; + vcl::Region aRegion; sal_Int16 nRegType; sal_Int16 bIntersect; bool bClip = false; @@ -1023,7 +1023,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) Rectangle aRegRect; ImplReadRect( rIStm, aRegRect ); - aRegion = Region( aRegRect ); + aRegion = vcl::Region( aRegRect ); bClip = true; } break; @@ -1031,7 +1031,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) case( 2 ): { ImplReadPoly( rIStm, aActionPoly ); - aRegion = Region( aActionPoly ); + aRegion = vcl::Region( aActionPoly ); bClip = true; } break; @@ -1049,7 +1049,7 @@ void SVMConverter::ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ) aPolyPoly.Insert( aActionPoly ); } - aRegion = Region( aPolyPoly ); + aRegion = vcl::Region( aPolyPoly ); bClip = true; } break; @@ -1937,7 +1937,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, case( META_CLIPREGION_ACTION ): { const MetaClipRegionAction* pAct = static_cast<const MetaClipRegionAction*>(pAction); - const Region& rRegion = pAct->GetRegion(); + const vcl::Region& rRegion = pAct->GetRegion(); Rectangle aClipRect; rOStm.WriteInt16( GDI_CLIPREGION_ACTION ); diff --git a/vcl/source/gdi/gdimetafiletools.cxx b/vcl/source/gdi/gdimetafiletools.cxx index a0afe289a93f..97cea08278c3 100644 --- a/vcl/source/gdi/gdimetafiletools.cxx +++ b/vcl/source/gdi/gdimetafiletools.cxx @@ -297,7 +297,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) if(pA->IsClipping()) { - const Region& rRegion = pA->GetRegion(); + const vcl::Region& rRegion = pA->GetRegion(); const basegfx::B2DPolyPolygon aNewClip(rRegion.GetAsB2DPolyPolygon()); aClips.back() = aNewClip; @@ -333,7 +333,7 @@ void clipMetafileContentAgainstOwnRegions(GDIMetaFile& rSource) case META_ISECTREGIONCLIPREGION_ACTION : { const MetaISectRegionClipRegionAction* pA = static_cast< const MetaISectRegionClipRegionAction* >(pAction); - const Region& rRegion = pA->GetRegion(); + const vcl::Region& rRegion = pA->GetRegion(); if(!rRegion.IsEmpty() && aClips.size() && aClips.back().count()) { diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx index ff71ff3212c9..b631331bad5f 100644 --- a/vcl/source/gdi/gdimtf.cxx +++ b/vcl/source/gdi/gdimtf.cxx @@ -531,7 +531,7 @@ void GDIMetaFile::ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, void GDIMetaFile::Play( OutputDevice* pOut, const Point& rPos, const Size& rSize, size_t nPos ) { - Region aDrawClipRegion; + vcl::Region aDrawClipRegion; MapMode aDrawMap( GetPrefMapMode() ); Size aDestSize( pOut->LogicToPixel( rSize ) ); @@ -843,7 +843,7 @@ void GDIMetaFile::Clip( const Rectangle& i_rClipRect ) else if( nType == META_CLIPREGION_ACTION ) { MetaClipRegionAction* pOldAct = static_cast<MetaClipRegionAction*>(pAct); - Region aNewReg( aCurRect ); + vcl::Region aNewReg( aCurRect ); if( pOldAct->IsClipping() ) aNewReg.Intersect( pOldAct->GetRegion() ); MetaClipRegionAction* pNewAct = new MetaClipRegionAction( aNewReg, true ); @@ -1282,7 +1282,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) MetaClipRegionAction* pAct = static_cast<MetaClipRegionAction*>(pAction); if( pAct->IsClipping() && pAct->GetRegion().HasPolyPolygonOrB2DPolyPolygon() ) - aMtf.AddAction( new MetaClipRegionAction( Region( ImplGetRotatedPolyPolygon( pAct->GetRegion().GetAsPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ), true ) ); + aMtf.AddAction( new MetaClipRegionAction( vcl::Region( ImplGetRotatedPolyPolygon( pAct->GetRegion().GetAsPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ), true ) ); else { pAction->Duplicate(); @@ -1294,7 +1294,7 @@ void GDIMetaFile::Rotate( long nAngle10 ) case( META_ISECTRECTCLIPREGION_ACTION ): { MetaISectRectClipRegionAction* pAct = static_cast<MetaISectRectClipRegionAction*>(pAction); - aMtf.AddAction( new MetaISectRegionClipRegionAction(Region( + aMtf.AddAction( new MetaISectRegionClipRegionAction(vcl::Region( ImplGetRotatedPolygon( pAct->GetRect(), aRotAnchor, aRotOffset, fSin, fCos )) ) ); } @@ -1303,10 +1303,10 @@ void GDIMetaFile::Rotate( long nAngle10 ) case( META_ISECTREGIONCLIPREGION_ACTION ): { MetaISectRegionClipRegionAction* pAct = static_cast<MetaISectRegionClipRegionAction*>(pAction); - const Region& rRegion = pAct->GetRegion(); + const vcl::Region& rRegion = pAct->GetRegion(); if( rRegion.HasPolyPolygonOrB2DPolyPolygon() ) - aMtf.AddAction( new MetaISectRegionClipRegionAction( Region( ImplGetRotatedPolyPolygon( rRegion.GetAsPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ) ) ); + aMtf.AddAction( new MetaISectRegionClipRegionAction( vcl::Region( ImplGetRotatedPolyPolygon( rRegion.GetAsPolyPolygon(), aRotAnchor, aRotOffset, fSin, fCos ) ) ) ); else { pAction->Duplicate(); @@ -2608,7 +2608,7 @@ sal_uLong GDIMetaFile::GetChecksum() const case META_CLIPREGION_ACTION : { MetaClipRegionAction& rAct = static_cast<MetaClipRegionAction&>(*pAction); - const Region& rRegion = rAct.GetRegion(); + const vcl::Region& rRegion = rAct.GetRegion(); if(rRegion.HasPolyPolygonOrB2DPolyPolygon()) { diff --git a/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx index bf36ae962c1a..293b148e7230 100644 --- a/vcl/source/gdi/impanmvw.cxx +++ b/vcl/source/gdi/impanmvw.cxx @@ -155,7 +155,7 @@ void ImplAnimView::ImplGetPosSize( const AnimationBitmap& rAnm, Point& rPosPix, void ImplAnimView::ImplDrawToPos( sal_uLong nPos ) { VirtualDevice aVDev; - boost::scoped_ptr<Region> pOldClip(!maClip.IsNull() ? new Region( mpOut->GetClipRegion() ) : NULL); + boost::scoped_ptr<vcl::Region> pOldClip(!maClip.IsNull() ? new vcl::Region( mpOut->GetClipRegion() ) : NULL); aVDev.SetOutputSizePixel( maSzPix, false ); nPos = std::min( nPos, (sal_uLong) mpParent->Count() - 1UL ); @@ -266,7 +266,7 @@ void ImplAnimView::ImplDraw( sal_uLong nPos, VirtualDevice* pVDev ) if( !pVDev ) { - boost::scoped_ptr<Region> pOldClip(!maClip.IsNull() ? new Region( mpOut->GetClipRegion() ) : NULL); + boost::scoped_ptr<vcl::Region> pOldClip(!maClip.IsNull() ? new vcl::Region( mpOut->GetClipRegion() ) : NULL); if( pOldClip ) mpOut->SetClipRegion( maClip ); diff --git a/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx index 2cb0aecf264a..82e61e3a6964 100644 --- a/vcl/source/gdi/impanmvw.hxx +++ b/vcl/source/gdi/impanmvw.hxx @@ -42,7 +42,7 @@ private: Size maDispSz; Size maRestSz; MapMode maMap; - Region maClip; + vcl::Region maClip; VirtualDevice* mpBackground; VirtualDevice* mpRestore; sal_uLong mnActPos; diff --git a/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx index b1f2f5aac21d..a5c5cf61f400 100644 --- a/vcl/source/gdi/metaact.cxx +++ b/vcl/source/gdi/metaact.cxx @@ -2440,7 +2440,7 @@ MetaClipRegionAction::MetaClipRegionAction() : MetaClipRegionAction::~MetaClipRegionAction() {} -MetaClipRegionAction::MetaClipRegionAction( const Region& rRegion, bool bClip ) : +MetaClipRegionAction::MetaClipRegionAction( const vcl::Region& rRegion, bool bClip ) : MetaAction ( META_CLIPREGION_ACTION ), maRegion ( rRegion ), mbClip ( bClip ) @@ -2552,7 +2552,7 @@ MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction() : MetaISectRegionClipRegionAction::~MetaISectRegionClipRegionAction() {} -MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const Region& rRegion ) : +MetaISectRegionClipRegionAction::MetaISectRegionClipRegionAction( const vcl::Region& rRegion ) : MetaAction ( META_ISECTREGIONCLIPREGION_ACTION ), maRegion ( rRegion ) { diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 2d0a4d0cf551..686ebd4b1eab 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -879,7 +879,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa m_rOuterFace.SetClipRegion( basegfx::B2DPolyPolygon() ); else { - Region aReg( pA->GetRegion() ); + vcl::Region aReg( pA->GetRegion() ); m_rOuterFace.SetClipRegion( aReg.GetAsB2DPolyPolygon() ); } } @@ -898,7 +898,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa case( META_ISECTREGIONCLIPREGION_ACTION ): { const MetaISectRegionClipRegionAction* pA = static_cast<const MetaISectRegionClipRegionAction*>(pAction); - Region aReg( pA->GetRegion() ); + vcl::Region aReg( pA->GetRegion() ); m_rOuterFace.IntersectClipRegion( aReg.GetAsB2DPolyPolygon() ); } break; diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index a901a312564b..3951e5720da3 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -288,7 +288,7 @@ void Printer::EmulateDrawTransparent ( const PolyPolygon& rPolyPoly, } Push( PUSH_CLIPREGION | PUSH_LINECOLOR ); - IntersectClipRegion(Region(rPolyPoly)); + IntersectClipRegion(vcl::Region(rPolyPoly)); SetLineColor( GetFillColor() ); const bool bOldMap = mbMap; EnableMapMode( false ); @@ -868,7 +868,7 @@ void Printer::DrawDeviceMask( const Bitmap& rMask, const Color& rMaskColor, pMapY[ nY ] = aDestPt.Y() + FRound( (double) aDestSz.Height() * nY / nSrcHeight ); // walk through all rectangles of mask - const Region aWorkRgn(aMask.CreateRegion(COL_BLACK, Rectangle(Point(), aMask.GetSizePixel()))); + const vcl::Region aWorkRgn(aMask.CreateRegion(COL_BLACK, Rectangle(Point(), aMask.GetSizePixel()))); RectangleVector aRectangles; aWorkRgn.GetRegionRectangles(aRectangles); diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx index b87425f2934c..90969a3f1669 100644 --- a/vcl/source/gdi/print3.cxx +++ b/vcl/source/gdi/print3.cxx @@ -1013,7 +1013,7 @@ static void appendSubPage( GDIMetaFile& o_rMtf, const Rectangle& i_rClipRect, GD o_rMtf.AddAction( new MetaPushAction( PUSH_ALL ) ); // clip to page rect - o_rMtf.AddAction( new MetaClipRegionAction( Region( i_rClipRect ), true ) ); + o_rMtf.AddAction( new MetaClipRegionAction( vcl::Region( i_rClipRect ), true ) ); // append the subpage io_rSubPage.WindStart(); diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx index 6e9d528ba5ef..cf011f1c37f6 100644 --- a/vcl/source/gdi/region.cxx +++ b/vcl/source/gdi/region.cxx @@ -221,7 +221,9 @@ namespace } } // end of anonymous namespace -bool Region::IsEmpty() const +namespace vcl { + +bool vcl::Region::IsEmpty() const { return !mbIsNull && !mpB2DPolyPolygon.get() && !mpPolyPolygon.get() && !mpRegionBand.get(); } @@ -275,7 +277,7 @@ RegionBand* ImplCreateRegionBandFromPolyPolygon(const PolyPolygon& rPolyPolygon) return pRetval; } -PolyPolygon Region::ImplCreatePolyPolygonFromRegionBand() const +PolyPolygon vcl::Region::ImplCreatePolyPolygonFromRegionBand() const { PolyPolygon aRetval; @@ -297,7 +299,7 @@ PolyPolygon Region::ImplCreatePolyPolygonFromRegionBand() const return aRetval; } -basegfx::B2DPolyPolygon Region::ImplCreateB2DPolyPolygonFromRegionBand() const +basegfx::B2DPolyPolygon vcl::Region::ImplCreateB2DPolyPolygonFromRegionBand() const { PolyPolygon aPoly(ImplCreatePolyPolygonFromRegionBand()); @@ -360,7 +362,7 @@ Region::Region(const basegfx::B2DPolyPolygon& rPolyPoly) } } -Region::Region(const Region& rRegion) +Region::Region(const vcl::Region& rRegion) : mpB2DPolyPolygon(rRegion.mpB2DPolyPolygon), mpPolyPolygon(rRegion.mpPolyPolygon), mpRegionBand(rRegion.mpRegionBand), @@ -372,7 +374,7 @@ Region::~Region() { } -void Region::ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly ) +void vcl::Region::ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly ) { const sal_uInt16 nPolyCount = rPolyPoly.Count(); @@ -398,7 +400,7 @@ void Region::ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly ) } } -void Region::ImplCreatePolyPolyRegion( const basegfx::B2DPolyPolygon& rPolyPoly ) +void vcl::Region::ImplCreatePolyPolyRegion( const basegfx::B2DPolyPolygon& rPolyPoly ) { if(rPolyPoly.count() && !rPolyPoly.getB2DRange().isEmpty()) { @@ -407,7 +409,7 @@ void Region::ImplCreatePolyPolyRegion( const basegfx::B2DPolyPolygon& rPolyPoly } } -void Region::Move( long nHorzMove, long nVertMove ) +void vcl::Region::Move( long nHorzMove, long nVertMove ) { if(IsNull() || IsEmpty()) { @@ -454,7 +456,7 @@ void Region::Move( long nHorzMove, long nVertMove ) } } -void Region::Scale( double fScaleX, double fScaleY ) +void vcl::Region::Scale( double fScaleX, double fScaleY ) { if(IsNull() || IsEmpty()) { @@ -501,7 +503,7 @@ void Region::Scale( double fScaleX, double fScaleY ) } } -bool Region::Union( const Rectangle& rRect ) +bool vcl::Region::Union( const Rectangle& rRect ) { if(rRect.IsEmpty()) { @@ -542,7 +544,7 @@ bool Region::Union( const Rectangle& rRect ) basegfx::tools::solvePolygonOperationOr( aThisPolyPoly, basegfx::B2DPolyPolygon(aRectPoly))); - *this = Region(aClip); + *this = vcl::Region(aClip); } return true; @@ -583,7 +585,7 @@ bool Region::Union( const Rectangle& rRect ) return true; } -bool Region::Intersect( const Rectangle& rRect ) +bool vcl::Region::Intersect( const Rectangle& rRect ) { if ( rRect.IsEmpty() ) { @@ -676,7 +678,7 @@ bool Region::Intersect( const Rectangle& rRect ) return true; } -bool Region::Exclude( const Rectangle& rRect ) +bool vcl::Region::Exclude( const Rectangle& rRect ) { if ( rRect.IsEmpty() ) { @@ -718,7 +720,7 @@ bool Region::Exclude( const Rectangle& rRect ) const basegfx::B2DPolyPolygon aOtherPolyPoly(aRectPoly); const basegfx::B2DPolyPolygon aClip = basegfx::tools::solvePolygonOperationDiff(aThisPolyPoly, aOtherPolyPoly); - *this = Region(aClip); + *this = vcl::Region(aClip); return true; } @@ -757,7 +759,7 @@ bool Region::Exclude( const Rectangle& rRect ) return true; } -bool Region::XOr( const Rectangle& rRect ) +bool vcl::Region::XOr( const Rectangle& rRect ) { if ( rRect.IsEmpty() ) { @@ -801,7 +803,7 @@ bool Region::XOr( const Rectangle& rRect ) const basegfx::B2DPolyPolygon aOtherPolyPoly(aRectPoly); const basegfx::B2DPolyPolygon aClip = basegfx::tools::solvePolygonOperationXor(aThisPolyPoly, aOtherPolyPoly); - *this = Region(aClip); + *this = vcl::Region(aClip); return true; } @@ -842,7 +844,7 @@ bool Region::XOr( const Rectangle& rRect ) return true; } -bool Region::Union( const Region& rRegion ) +bool vcl::Region::Union( const vcl::Region& rRegion ) { if(rRegion.IsEmpty()) { @@ -853,7 +855,7 @@ bool Region::Union( const Region& rRegion ) if(rRegion.IsNull()) { // extending with null region -> null region - *this = Region(true); + *this = vcl::Region(true); return true; } @@ -891,7 +893,7 @@ bool Region::Union( const Region& rRegion ) // use logical OR operation basegfx::B2DPolyPolygon aClip(basegfx::tools::solvePolygonOperationOr(aThisPolyPoly, aOtherPolyPoly)); - *this = Region( aClip ); + *this = vcl::Region( aClip ); return true; } @@ -930,7 +932,7 @@ bool Region::Union( const Region& rRegion ) return true; } -bool Region::Intersect( const Region& rRegion ) +bool vcl::Region::Intersect( const vcl::Region& rRegion ) { // same instance data? -> nothing to do! if(getB2DPolyPolygon() && getB2DPolyPolygon() == rRegion.getB2DPolyPolygon()) @@ -1001,7 +1003,7 @@ bool Region::Intersect( const Region& rRegion ) aThisPolyPoly, true, false)); - *this = Region( aClip ); + *this = vcl::Region( aClip ); return true; } @@ -1027,7 +1029,7 @@ bool Region::Intersect( const Region& rRegion ) if(pCurrent->getRectangleCount() + 2 < pSource->getRectangleCount()) { // when we have less rectangles, turn around the call - Region aTempRegion = rRegion; + vcl::Region aTempRegion = rRegion; aTempRegion.Intersect( *this ); *this = aTempRegion; } @@ -1052,7 +1054,7 @@ bool Region::Intersect( const Region& rRegion ) return true; } -bool Region::Exclude( const Region& rRegion ) +bool vcl::Region::Exclude( const vcl::Region& rRegion ) { if ( rRegion.IsEmpty() ) { @@ -1099,7 +1101,7 @@ bool Region::Exclude( const Region& rRegion ) aOtherPolyPoly = basegfx::tools::prepareForPolygonOperation( aOtherPolyPoly ); basegfx::B2DPolyPolygon aClip = basegfx::tools::solvePolygonOperationDiff( aThisPolyPoly, aOtherPolyPoly ); - *this = Region( aClip ); + *this = vcl::Region( aClip ); return true; } @@ -1137,7 +1139,7 @@ bool Region::Exclude( const Region& rRegion ) return true; } -bool Region::XOr( const Region& rRegion ) +bool vcl::Region::XOr( const vcl::Region& rRegion ) { if ( rRegion.IsEmpty() ) { @@ -1187,7 +1189,7 @@ bool Region::XOr( const Region& rRegion ) aOtherPolyPoly = basegfx::tools::prepareForPolygonOperation( aOtherPolyPoly ); basegfx::B2DPolyPolygon aClip = basegfx::tools::solvePolygonOperationXor( aThisPolyPoly, aOtherPolyPoly ); - *this = Region( aClip ); + *this = vcl::Region( aClip ); return true; } @@ -1227,7 +1229,7 @@ bool Region::XOr( const Region& rRegion ) return true; } -Rectangle Region::GetBoundRect() const +Rectangle vcl::Region::GetBoundRect() const { if(IsEmpty()) { @@ -1274,7 +1276,7 @@ Rectangle Region::GetBoundRect() const return Rectangle(); } -const PolyPolygon Region::GetAsPolyPolygon() const +const PolyPolygon vcl::Region::GetAsPolyPolygon() const { if(getPolyPolygon()) { @@ -1285,7 +1287,7 @@ const PolyPolygon Region::GetAsPolyPolygon() const { // the polygon needs to be converted, buffer the down converion const PolyPolygon aPolyPolgon(*getB2DPolyPolygon()); - const_cast< Region* >(this)->mpPolyPolygon.reset(new PolyPolygon(aPolyPolgon)); + const_cast< vcl::Region* >(this)->mpPolyPolygon.reset(new PolyPolygon(aPolyPolgon)); return *getPolyPolygon(); } @@ -1294,7 +1296,7 @@ const PolyPolygon Region::GetAsPolyPolygon() const { // the BandRegion needs to be converted, buffer the converion const PolyPolygon aPolyPolgon(ImplCreatePolyPolygonFromRegionBand()); - const_cast< Region* >(this)->mpPolyPolygon.reset(new PolyPolygon(aPolyPolgon)); + const_cast< vcl::Region* >(this)->mpPolyPolygon.reset(new PolyPolygon(aPolyPolgon)); return *getPolyPolygon(); } @@ -1302,7 +1304,7 @@ const PolyPolygon Region::GetAsPolyPolygon() const return PolyPolygon(); } -const basegfx::B2DPolyPolygon Region::GetAsB2DPolyPolygon() const +const basegfx::B2DPolyPolygon vcl::Region::GetAsB2DPolyPolygon() const { if(getB2DPolyPolygon()) { @@ -1313,7 +1315,7 @@ const basegfx::B2DPolyPolygon Region::GetAsB2DPolyPolygon() const { // the polygon needs to be converted, buffer the up conversion. This will be preferred from now. const basegfx::B2DPolyPolygon aB2DPolyPolygon(getPolyPolygon()->getB2DPolyPolygon()); - const_cast< Region* >(this)->mpB2DPolyPolygon.reset(new basegfx::B2DPolyPolygon(aB2DPolyPolygon)); + const_cast< vcl::Region* >(this)->mpB2DPolyPolygon.reset(new basegfx::B2DPolyPolygon(aB2DPolyPolygon)); return *getB2DPolyPolygon(); } @@ -1322,7 +1324,7 @@ const basegfx::B2DPolyPolygon Region::GetAsB2DPolyPolygon() const { // the BandRegion needs to be converted, buffer the converion const basegfx::B2DPolyPolygon aB2DPolyPolygon(ImplCreateB2DPolyPolygonFromRegionBand()); - const_cast< Region* >(this)->mpB2DPolyPolygon.reset(new basegfx::B2DPolyPolygon(aB2DPolyPolygon)); + const_cast< vcl::Region* >(this)->mpB2DPolyPolygon.reset(new basegfx::B2DPolyPolygon(aB2DPolyPolygon)); return *getB2DPolyPolygon(); } @@ -1330,26 +1332,26 @@ const basegfx::B2DPolyPolygon Region::GetAsB2DPolyPolygon() const return basegfx::B2DPolyPolygon(); } -const RegionBand* Region::GetAsRegionBand() const +const RegionBand* vcl::Region::GetAsRegionBand() const { if(!getRegionBand()) { if(getB2DPolyPolygon()) { // convert B2DPolyPolygon to RegionBand, buffer it and return it - const_cast< Region* >(this)->mpRegionBand.reset(ImplCreateRegionBandFromPolyPolygon(PolyPolygon(*getB2DPolyPolygon()))); + const_cast< vcl::Region* >(this)->mpRegionBand.reset(ImplCreateRegionBandFromPolyPolygon(PolyPolygon(*getB2DPolyPolygon()))); } else if(getPolyPolygon()) { // convert B2DPolyPolygon to RegionBand, buffer it and return it - const_cast< Region* >(this)->mpRegionBand.reset(ImplCreateRegionBandFromPolyPolygon(*getPolyPolygon())); + const_cast< vcl::Region* >(this)->mpRegionBand.reset(ImplCreateRegionBandFromPolyPolygon(*getPolyPolygon())); } } return getRegionBand(); } -bool Region::IsInside( const Point& rPoint ) const +bool vcl::Region::IsInside( const Point& rPoint ) const { if(IsEmpty()) { @@ -1380,7 +1382,7 @@ bool Region::IsInside( const Point& rPoint ) const return false; } -bool Region::IsInside( const Rectangle& rRect ) const +bool vcl::Region::IsInside( const Rectangle& rRect ) const { if(IsEmpty()) { @@ -1401,14 +1403,14 @@ bool Region::IsInside( const Rectangle& rRect ) const } // create region from rectangle and intersect own region - Region aRegion(rRect); + vcl::Region aRegion(rRect); aRegion.Exclude(*this); // rectangle is inside if exclusion is empty return aRegion.IsEmpty(); } -bool Region::IsOver( const Rectangle& rRect ) const +bool vcl::Region::IsOver( const Rectangle& rRect ) const { if(IsEmpty()) { @@ -1425,14 +1427,14 @@ bool Region::IsOver( const Rectangle& rRect ) const // Can we optimize this ??? - is used in StarDraw for brushes pointers // Why we have no IsOver for Regions ??? // create region from rectangle and intersect own region - Region aRegion(rRect); + vcl::Region aRegion(rRect); aRegion.Intersect( *this ); // rectangle is over if include is not empty return !aRegion.IsEmpty(); } -void Region::SetNull() +void vcl::Region::SetNull() { // reset all content mpB2DPolyPolygon.reset(); @@ -1441,7 +1443,7 @@ void Region::SetNull() mbIsNull = true; } -void Region::SetEmpty() +void vcl::Region::SetEmpty() { // reset all content mpB2DPolyPolygon.reset(); @@ -1450,7 +1452,7 @@ void Region::SetEmpty() mbIsNull = false; } -Region& Region::operator=( const Region& rRegion ) +Region& vcl::Region::operator=( const vcl::Region& rRegion ) { // reset all content mpB2DPolyPolygon = rRegion.mpB2DPolyPolygon; @@ -1461,7 +1463,7 @@ Region& Region::operator=( const Region& rRegion ) return *this; } -Region& Region::operator=( const Rectangle& rRect ) +Region& vcl::Region::operator=( const Rectangle& rRect ) { mpB2DPolyPolygon.reset(); mpPolyPolygon.reset(); @@ -1471,7 +1473,7 @@ Region& Region::operator=( const Rectangle& rRect ) return *this; } -bool Region::operator==( const Region& rRegion ) const +bool vcl::Region::operator==( const vcl::Region& rRegion ) const { if(IsNull() && rRegion.IsNull()) { @@ -1517,8 +1519,8 @@ bool Region::operator==( const Region& rRegion ) const { // one of both has a B2DPolyPolygon based region, ensure both have it // by evtl. conversion - const_cast< Region* >(this)->GetAsB2DPolyPolygon(); - const_cast< Region& >(rRegion).GetAsB2DPolyPolygon(); + const_cast< vcl::Region* >(this)->GetAsB2DPolyPolygon(); + const_cast< vcl::Region& >(rRegion).GetAsB2DPolyPolygon(); return *rRegion.getB2DPolyPolygon() == *getB2DPolyPolygon(); } @@ -1527,8 +1529,8 @@ bool Region::operator==( const Region& rRegion ) const { // one of both has a B2DPolyPolygon based region, ensure both have it // by evtl. conversion - const_cast< Region* >(this)->GetAsPolyPolygon(); - const_cast< Region& >(rRegion).GetAsPolyPolygon(); + const_cast< vcl::Region* >(this)->GetAsPolyPolygon(); + const_cast< vcl::Region& >(rRegion).GetAsPolyPolygon(); return *rRegion.getPolyPolygon() == *getPolyPolygon(); } @@ -1545,7 +1547,7 @@ bool Region::operator==( const Region& rRegion ) const return false; } -SvStream& ReadRegion(SvStream& rIStrm, Region& rRegion) +SvStream& ReadRegion(SvStream& rIStrm, vcl::Region& rRegion) { VersionCompat aCompat(rIStrm, STREAM_READ); sal_uInt16 nVersion(0); @@ -1604,7 +1606,7 @@ SvStream& ReadRegion(SvStream& rIStrm, Region& rRegion) return rIStrm; } -SvStream& WriteRegion( SvStream& rOStrm, const Region& rRegion ) +SvStream& WriteRegion( SvStream& rOStrm, const vcl::Region& rRegion ) { const sal_uInt16 nVersion(2); VersionCompat aCompat(rOStrm, STREAM_WRITE, nVersion); @@ -1676,7 +1678,7 @@ SvStream& WriteRegion( SvStream& rOStrm, const Region& rRegion ) return rOStrm; } -void Region::GetRegionRectangles(RectangleVector& rTarget) const +void vcl::Region::GetRegionRectangles(RectangleVector& rTarget) const { // clear returnvalues rTarget.clear(); @@ -1744,9 +1746,9 @@ static inline bool ImplPolygonRectTest( const Polygon& rPoly, Rectangle* pRectOu return bIsRect; } -Region Region::GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly ) +vcl::Region vcl::Region::GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly ) { - //return Region( rPolyPoly ); + //return vcl::Region( rPolyPoly ); // check if it's worth extracting the XOr'ing the Rectangles // empiricism shows that break even between XOr'ing rectangles separately @@ -1770,10 +1772,10 @@ Region Region::GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly ) if( nPolygonPolygons > nPolygonRects ) { - return Region( rPolyPoly ); + return vcl::Region( rPolyPoly ); } - Region aResult; + vcl::Region aResult; Rectangle aRect; for( sal_uInt16 i = 0; i < nPolygons; i++ ) @@ -1786,11 +1788,13 @@ Region Region::GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly ) } else { - aResult.XOr( Region(rPoly) ); + aResult.XOr( vcl::Region(rPoly) ); } } return aResult; } +} /* namespace vcl */ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx index 1d9430fc7c2b..a331f0b6fd7c 100644 --- a/vcl/source/gdi/salgdilayout.cxx +++ b/vcl/source/gdi/salgdilayout.cxx @@ -238,13 +238,13 @@ bool SalGraphics::mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint * return false; } -void SalGraphics::mirror( Region& rRgn, const OutputDevice *pOutDev, bool bBack ) const +void SalGraphics::mirror( vcl::Region& rRgn, const OutputDevice *pOutDev, bool bBack ) const { if( rRgn.HasPolyPolygonOrB2DPolyPolygon() ) { const basegfx::B2DPolyPolygon aPolyPoly(mirror(rRgn.GetAsB2DPolyPolygon(), pOutDev, bBack)); - rRgn = Region(aPolyPoly); + rRgn = vcl::Region(aPolyPoly); } else { @@ -368,11 +368,11 @@ basegfx::B2DPolyPolygon SalGraphics::mirror( const basegfx::B2DPolyPolygon& i_rP return aRet; } -bool SalGraphics::SetClipRegion( const Region& i_rClip, const OutputDevice *pOutDev ) +bool SalGraphics::SetClipRegion( const vcl::Region& i_rClip, const OutputDevice *pOutDev ) { if( (m_nLayout & SAL_LAYOUT_BIDI_RTL) || (pOutDev && pOutDev->IsRTLEnabled()) ) { - Region aMirror( i_rClip ); + vcl::Region aMirror( i_rClip ); mirror( aMirror, pOutDev ); return setClipRegion( aMirror ); } diff --git a/vcl/source/outdev/clipping.cxx b/vcl/source/outdev/clipping.cxx index f19a084fe483..fbd26785b4b2 100644 --- a/vcl/source/outdev/clipping.cxx +++ b/vcl/source/outdev/clipping.cxx @@ -31,7 +31,7 @@ #include <numeric> -Region OutputDevice::GetClipRegion() const +vcl::Region OutputDevice::GetClipRegion() const { return PixelToLogic( maRegion ); @@ -41,7 +41,7 @@ void OutputDevice::SetClipRegion() { if ( mpMetaFile ) - mpMetaFile->AddAction( new MetaClipRegionAction( Region(), false ) ); + mpMetaFile->AddAction( new MetaClipRegionAction( vcl::Region(), false ) ); SetDeviceClipRegion( NULL ); @@ -49,7 +49,7 @@ void OutputDevice::SetClipRegion() mpAlphaVDev->SetClipRegion(); } -void OutputDevice::SetClipRegion( const Region& rRegion ) +void OutputDevice::SetClipRegion( const vcl::Region& rRegion ) { if ( mpMetaFile ) @@ -61,7 +61,7 @@ void OutputDevice::SetClipRegion( const Region& rRegion ) } else { - Region aRegion = LogicToPixel( rRegion ); + vcl::Region aRegion = LogicToPixel( rRegion ); SetDeviceClipRegion( &aRegion ); } @@ -69,7 +69,7 @@ void OutputDevice::SetClipRegion( const Region& rRegion ) mpAlphaVDev->SetClipRegion( rRegion ); } -bool OutputDevice::SelectClipRegion( const Region& rRegion, SalGraphics* pGraphics ) +bool OutputDevice::SelectClipRegion( const vcl::Region& rRegion, SalGraphics* pGraphics ) { DBG_TESTSOLARMUTEX(); @@ -118,7 +118,7 @@ void OutputDevice::IntersectClipRegion( const Rectangle& rRect ) mpAlphaVDev->IntersectClipRegion( rRect ); } -void OutputDevice::IntersectClipRegion( const Region& rRegion ) +void OutputDevice::IntersectClipRegion( const vcl::Region& rRegion ) { if(!rRegion.IsNull()) @@ -126,7 +126,7 @@ void OutputDevice::IntersectClipRegion( const Region& rRegion ) if ( mpMetaFile ) mpMetaFile->AddAction( new MetaISectRegionClipRegionAction( rRegion ) ); - Region aRegion = LogicToPixel( rRegion ); + vcl::Region aRegion = LogicToPixel( rRegion ); maRegion.Intersect( aRegion ); mbClipRegion = true; mbInitClipRegion = true; @@ -149,7 +149,7 @@ void OutputDevice::InitClipRegion() mbOutputClipped = false; // #102532# Respect output offset also for clip region - Region aRegion( ImplPixelToDevicePixel( maRegion ) ); + vcl::Region aRegion( ImplPixelToDevicePixel( maRegion ) ); const bool bClipDeviceBounds( ! GetPDFWriter() && GetOutDevType() != OUTDEV_PRINTER ); if( bClipDeviceBounds ) @@ -190,7 +190,7 @@ void OutputDevice::InitClipRegion() mbInitClipRegion = false; } -Region OutputDevice::GetActiveClipRegion() const +vcl::Region OutputDevice::GetActiveClipRegion() const { return GetClipRegion(); } @@ -201,7 +201,7 @@ void OutputDevice::ClipToPaintRegion(Rectangle& /*rDstRect*/) // on in other clipping functions } -void OutputDevice::SetDeviceClipRegion( const Region* pRegion ) +void OutputDevice::SetDeviceClipRegion( const vcl::Region* pRegion ) { DBG_TESTSOLARMUTEX(); @@ -209,7 +209,7 @@ void OutputDevice::SetDeviceClipRegion( const Region* pRegion ) { if ( mbClipRegion ) { - maRegion = Region(true); + maRegion = vcl::Region(true); mbClipRegion = false; mbInitClipRegion = true; } diff --git a/vcl/source/outdev/gradient.cxx b/vcl/source/outdev/gradient.cxx index 1f2a26c74b36..50a679c56ce2 100644 --- a/vcl/source/outdev/gradient.cxx +++ b/vcl/source/outdev/gradient.cxx @@ -85,7 +85,7 @@ void OutputDevice::DrawGradient( const PolyPolygon& rPolyPoly, mpMetaFile->AddAction( new MetaGradientExAction( rPolyPoly, rGradient ) ); Push( PUSH_CLIPREGION ); - IntersectClipRegion(Region(rPolyPoly)); + IntersectClipRegion(vcl::Region(rPolyPoly)); DrawGradient( aBoundRect, rGradient ); Pop(); diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index 5c2f181abebf..2a6ceb7d51a4 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -648,12 +648,12 @@ Rectangle OutputDevice::ImplDevicePixelToLogic( const Rectangle& rPixelRect ) co maThresRes.mnThresPixToLogY )-maMapRes.mnMapOfsY ); } -Region OutputDevice::ImplPixelToDevicePixel( const Region& rRegion ) const +vcl::Region OutputDevice::ImplPixelToDevicePixel( const vcl::Region& rRegion ) const { if ( !mnOutOffX && !mnOutOffY ) return rRegion; - Region aRegion( rRegion ); + vcl::Region aRegion( rRegion ); aRegion.Move( mnOutOffX+mnOutOffOrigX, mnOutOffY+mnOutOffOrigY ); return aRegion; } @@ -1070,7 +1070,7 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo return aTransformedPoly; } -Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const +vcl::Region OutputDevice::LogicToPixel( const vcl::Region& rLogicRegion ) const { if(!mbMap || rLogicRegion.IsNull() || rLogicRegion.IsEmpty()) @@ -1078,15 +1078,15 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const return rLogicRegion; } - Region aRegion; + vcl::Region aRegion; if(rLogicRegion.getB2DPolyPolygon()) { - aRegion = Region(LogicToPixel(*rLogicRegion.getB2DPolyPolygon())); + aRegion = vcl::Region(LogicToPixel(*rLogicRegion.getB2DPolyPolygon())); } else if(rLogicRegion.getPolyPolygon()) { - aRegion = Region(LogicToPixel(*rLogicRegion.getPolyPolygon())); + aRegion = vcl::Region(LogicToPixel(*rLogicRegion.getPolyPolygon())); } else if(rLogicRegion.getRegionBand()) { @@ -1240,7 +1240,7 @@ basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogi return aTransformedPoly; } -Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rMapMode ) const +vcl::Region OutputDevice::LogicToPixel( const vcl::Region& rLogicRegion, const MapMode& rMapMode ) const { if(rMapMode.IsDefault() || rLogicRegion.IsNull() || rLogicRegion.IsEmpty()) @@ -1248,15 +1248,15 @@ Region OutputDevice::LogicToPixel( const Region& rLogicRegion, const MapMode& rM return rLogicRegion; } - Region aRegion; + vcl::Region aRegion; if(rLogicRegion.getB2DPolyPolygon()) { - aRegion = Region(LogicToPixel(*rLogicRegion.getB2DPolyPolygon(), rMapMode)); + aRegion = vcl::Region(LogicToPixel(*rLogicRegion.getB2DPolyPolygon(), rMapMode)); } else if(rLogicRegion.getPolyPolygon()) { - aRegion = Region(LogicToPixel(*rLogicRegion.getPolyPolygon(), rMapMode)); + aRegion = vcl::Region(LogicToPixel(*rLogicRegion.getPolyPolygon(), rMapMode)); } else if(rLogicRegion.getRegionBand()) { @@ -1375,7 +1375,7 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } -Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const +vcl::Region OutputDevice::PixelToLogic( const vcl::Region& rDeviceRegion ) const { if(!mbMap || rDeviceRegion.IsNull() || rDeviceRegion.IsEmpty()) @@ -1383,15 +1383,15 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const return rDeviceRegion; } - Region aRegion; + vcl::Region aRegion; if(rDeviceRegion.getB2DPolyPolygon()) { - aRegion = Region(PixelToLogic(*rDeviceRegion.getB2DPolyPolygon())); + aRegion = vcl::Region(PixelToLogic(*rDeviceRegion.getB2DPolyPolygon())); } else if(rDeviceRegion.getPolyPolygon()) { - aRegion = Region(PixelToLogic(*rDeviceRegion.getPolyPolygon())); + aRegion = vcl::Region(PixelToLogic(*rDeviceRegion.getPolyPolygon())); } else if(rDeviceRegion.getRegionBand()) { @@ -1549,7 +1549,7 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo return aTransformedPoly; } -Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& rMapMode ) const +vcl::Region OutputDevice::PixelToLogic( const vcl::Region& rDeviceRegion, const MapMode& rMapMode ) const { if(rMapMode.IsDefault() || rDeviceRegion.IsNull() || rDeviceRegion.IsEmpty()) @@ -1557,15 +1557,15 @@ Region OutputDevice::PixelToLogic( const Region& rDeviceRegion, const MapMode& r return rDeviceRegion; } - Region aRegion; + vcl::Region aRegion; if(rDeviceRegion.getB2DPolyPolygon()) { - aRegion = Region(PixelToLogic(*rDeviceRegion.getB2DPolyPolygon(), rMapMode)); + aRegion = vcl::Region(PixelToLogic(*rDeviceRegion.getB2DPolyPolygon(), rMapMode)); } else if(rDeviceRegion.getPolyPolygon()) { - aRegion = Region(PixelToLogic(*rDeviceRegion.getPolyPolygon(), rMapMode)); + aRegion = vcl::Region(PixelToLogic(*rDeviceRegion.getPolyPolygon(), rMapMode)); } else if(rDeviceRegion.getRegionBand()) { diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx index b7edeb11ab05..157769967a56 100644 --- a/vcl/source/outdev/nativecontrols.cxx +++ b/vcl/source/outdev/nativecontrols.cxx @@ -294,9 +294,9 @@ bool OutputDevice::DrawNativeControl( ControlType nType, boost::shared_ptr< ImplControlValue > aScreenCtrlValue( TransformControlValue( aValue, *this ) ); Rectangle screenRegion( ImplLogicToDevicePixel( rControlRegion ) ); - Region aTestRegion( GetActiveClipRegion() ); + vcl::Region aTestRegion( GetActiveClipRegion() ); aTestRegion.Intersect( rControlRegion ); - if (aTestRegion == Region(rControlRegion)) + if (aTestRegion == vcl::Region(rControlRegion)) nState |= CTRL_CACHING_ALLOWED; // control is not clipped, caching allowed bool bRet = mpGraphics->DrawNativeControl(nType, nPart, screenRegion, nState, *aScreenCtrlValue, aCaption, this ); diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx index a5a19798a1da..cd43b519e595 100644 --- a/vcl/source/outdev/outdev.cxx +++ b/vcl/source/outdev/outdev.cxx @@ -467,7 +467,7 @@ void OutputDevice::ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const } void OutputDevice::ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, - const OutputDevice& rOutDev, const Region& rRegion ) + const OutputDevice& rOutDev, const vcl::Region& rRegion ) { GDIMetaFile* pOldMetaFile = mpMetaFile; @@ -813,11 +813,11 @@ void OutputDevice::ReMirror( Rectangle &rRect ) const rRect.Right() = rRect.Left() + nWidth; } -void OutputDevice::ReMirror( Region &rRegion ) const +void OutputDevice::ReMirror( vcl::Region &rRegion ) const { RectangleVector aRectangles; rRegion.GetRegionRectangles(aRectangles); - Region aMirroredRegion; + vcl::Region aMirroredRegion; for(RectangleVector::iterator aRectIter(aRectangles.begin()); aRectIter != aRectangles.end(); ++aRectIter) { diff --git a/vcl/source/outdev/outdevstate.cxx b/vcl/source/outdev/outdevstate.cxx index 809408a1411d..d53bbf8664e7 100644 --- a/vcl/source/outdev/outdevstate.cxx +++ b/vcl/source/outdev/outdevstate.cxx @@ -130,7 +130,7 @@ void OutputDevice::Push( PushFlags nFlags ) if ( nFlags & PUSH_CLIPREGION ) { if ( mbClipRegion ) - pState->mpClipRegion = new Region( maRegion ); + pState->mpClipRegion = new vcl::Region( maRegion ); else pState->mpClipRegion = NULL; } diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index 93de76c4ef84..2c0c028ea5ee 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -862,7 +862,7 @@ void OutputDevice::DrawText( const Point& rStartPt, const OUString& rStr, mpMetaFile->AddAction( new MetaTextAction( rStartPt, rStr, nIndex, nLen ) ); if( pVector ) { - Region aClip( GetClipRegion() ); + vcl::Region aClip( GetClipRegion() ); if( meOutDevType == OUTDEV_WINDOW ) aClip.Intersect( Rectangle( Point(), GetOutputSize() ) ); if( mpOutDevData && mpOutDevData->mpRecordLayout ) diff --git a/vcl/source/outdev/transparent.cxx b/vcl/source/outdev/transparent.cxx index 2b94fb6dc5e3..512ca332a972 100644 --- a/vcl/source/outdev/transparent.cxx +++ b/vcl/source/outdev/transparent.cxx @@ -192,7 +192,7 @@ void OutputDevice::ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask pMapY[ nY ] = aDestPt.Y() + FRound( (double) aDestSz.Height() * nY / nSrcHeight ); // walk through all rectangles of mask - const Region aWorkRgn(aMask.CreateRegion(COL_BLACK, Rectangle(Point(), aMask.GetSizePixel()))); + const vcl::Region aWorkRgn(aMask.CreateRegion(COL_BLACK, Rectangle(Point(), aMask.GetSizePixel()))); RectangleVector aRectangles; aWorkRgn.GetRegionRectangles(aRectangles); diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx index ce43ffe03f05..a9640614c887 100644 --- a/vcl/source/window/brdwin.cxx +++ b/vcl/source/window/brdwin.cxx @@ -1565,7 +1565,7 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p // Draw Frame if ( nDrawFlags & BORDERWINDOW_DRAW_FRAME ) { - Region oldClipRgn( pDev->GetClipRegion( ) ); + vcl::Region oldClipRgn( pDev->GetClipRegion( ) ); // for popups, don't draw part of the frame if ( pData->mnTitleType == BORDERWINDOW_TITLE_POPUP ) @@ -1573,7 +1573,7 @@ void ImplStdBorderWindowView::DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* p FloatingWindow *pWin = dynamic_cast< FloatingWindow* >( pData->mpBorderWindow->GetWindow( WINDOW_CLIENT ) ); if ( pWin ) { - Region aClipRgn( aInRect ); + vcl::Region aClipRgn( aInRect ); Rectangle aItemClipRect( pWin->ImplGetItemEdgeClipRect() ); if( !aItemClipRect.IsEmpty() ) { @@ -2070,7 +2070,7 @@ void ImplBorderWindow::InvalidateBorder() if ( nLeftBorder || nTopBorder || nRightBorder || nBottomBorder ) { Rectangle aWinRect( Point( 0, 0 ), GetOutputSizePixel() ); - Region aRegion( aWinRect ); + vcl::Region aRegion( aWinRect ); aWinRect.Left() += nLeftBorder; aWinRect.Top() += nTopBorder; aWinRect.Right() -= nRightBorder; diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx index b31e4ead8dcb..42b2c922c826 100644 --- a/vcl/source/window/clipping.cxx +++ b/vcl/source/window/clipping.cxx @@ -34,7 +34,7 @@ void Window::InitClipRegion() { DBG_TESTSOLARMUTEX(); - Region aRegion; + vcl::Region aRegion; // Put back backed up background if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) @@ -88,14 +88,14 @@ sal_uInt16 Window::GetParentClipMode() const return mpWindowImpl->mnParentClipMode; } -void Window::ExpandPaintClipRegion( const Region& rRegion ) +void Window::ExpandPaintClipRegion( const vcl::Region& rRegion ) { if( mpWindowImpl->mpPaintRegion ) { - Region aPixRegion = LogicToPixel( rRegion ); - Region aDevPixRegion = ImplPixelToDevicePixel( aPixRegion ); + vcl::Region aPixRegion = LogicToPixel( rRegion ); + vcl::Region aDevPixRegion = ImplPixelToDevicePixel( aPixRegion ); - Region aWinChildRegion = *ImplGetWinChildClipRegion(); + vcl::Region aWinChildRegion = *ImplGetWinChildClipRegion(); // --- RTL -- only this region is in frame coordinates, so re-mirror it if( ImplIsAntiparallel() ) { @@ -112,10 +112,10 @@ void Window::ExpandPaintClipRegion( const Region& rRegion ) } } -Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const +vcl::Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const { - Region aWinClipRegion; + vcl::Region aWinClipRegion; if ( nFlags & WINDOW_GETCLIPREGION_NOCHILDREN ) { @@ -125,7 +125,7 @@ Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const } else { - Region* pWinChildClipRegion = ((vcl::Window*)this)->ImplGetWinChildClipRegion(); + vcl::Region* pWinChildClipRegion = ((vcl::Window*)this)->ImplGetWinChildClipRegion(); aWinClipRegion = *pWinChildClipRegion; // --- RTL --- remirror clip region before passing it to somebody if( ImplIsAntiparallel() ) @@ -138,7 +138,7 @@ Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const if ( nFlags & WINDOW_GETCLIPREGION_NULL ) { Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); - Region aWinRegion( aWinRect ); + vcl::Region aWinRegion( aWinRect ); if ( aWinRegion == aWinClipRegion ) aWinClipRegion.SetNull(); @@ -150,9 +150,9 @@ Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const } -Region Window::GetActiveClipRegion() const +vcl::Region Window::GetActiveClipRegion() const { - Region aRegion(true); + vcl::Region aRegion(true); if ( mpWindowImpl->mbInPaint ) { @@ -168,7 +168,7 @@ Region Window::GetActiveClipRegion() const void Window::ClipToPaintRegion(Rectangle& rDstRect) { - const Region aPaintRgn(GetPaintRegion()); + const vcl::Region aPaintRgn(GetPaintRegion()); if (!aPaintRgn.IsNull()) rDstRect.Intersection(LogicToPixel(aPaintRgn.GetBoundRect())); @@ -183,7 +183,7 @@ void Window::EnableClipSiblings( bool bClipSiblings ) mpWindowImpl->mbClipSiblings = bClipSiblings; } -void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) +void Window::ImplClipBoundaries( vcl::Region& rRegion, bool bThis, bool bOverlaps ) { if ( bThis ) ImplIntersectWindowClipRegion( rRegion ); @@ -216,7 +216,7 @@ void Window::ImplClipBoundaries( Region& rRegion, bool bThis, bool bOverlaps ) ImplGetParent()->ImplIntersectWindowClipRegion( rRegion ); } -bool Window::ImplClipChildren( Region& rRegion ) +bool Window::ImplClipChildren( vcl::Region& rRegion ) { bool bOtherClip = false; vcl::Window* pWindow = mpWindowImpl->mpFirstChild; @@ -239,7 +239,7 @@ bool Window::ImplClipChildren( Region& rRegion ) return bOtherClip; } -void Window::ImplClipAllChildren( Region& rRegion ) +void Window::ImplClipAllChildren( vcl::Region& rRegion ) { vcl::Window* pWindow = mpWindowImpl->mpFirstChild; while ( pWindow ) @@ -250,7 +250,7 @@ void Window::ImplClipAllChildren( Region& rRegion ) } } -void Window::ImplClipSiblings( Region& rRegion ) +void Window::ImplClipSiblings( vcl::Region& rRegion ) { vcl::Window* pWindow = ImplGetParent()->mpWindowImpl->mpFirstChild; while ( pWindow ) @@ -300,7 +300,7 @@ void Window::ImplInitWinChildClipRegion() else { if ( !mpWindowImpl->mpChildClipRegion ) - mpWindowImpl->mpChildClipRegion = new Region( mpWindowImpl->maWinClipRegion ); + mpWindowImpl->mpChildClipRegion = new vcl::Region( mpWindowImpl->maWinClipRegion ); else *mpWindowImpl->mpChildClipRegion = mpWindowImpl->maWinClipRegion; @@ -323,7 +323,7 @@ Region* Window::ImplGetWinChildClipRegion() } -bool Window::ImplSysObjClip( const Region* pOldRegion ) +bool Window::ImplSysObjClip( const vcl::Region* pOldRegion ) { bool bUpdate = true; @@ -333,13 +333,13 @@ bool Window::ImplSysObjClip( const Region* pOldRegion ) if ( bVisibleState ) { - Region* pWinChildClipRegion = ImplGetWinChildClipRegion(); + vcl::Region* pWinChildClipRegion = ImplGetWinChildClipRegion(); if ( !pWinChildClipRegion->IsEmpty() ) { if ( pOldRegion ) { - Region aNewRegion = *pWinChildClipRegion; + vcl::Region aNewRegion = *pWinChildClipRegion; pWinChildClipRegion->Intersect( *pOldRegion ); bUpdate = aNewRegion == *pWinChildClipRegion; } @@ -347,9 +347,9 @@ bool Window::ImplSysObjClip( const Region* pOldRegion ) if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) ImplInvalidateAllOverlapBackgrounds(); - Region aRegion = *pWinChildClipRegion; + vcl::Region aRegion = *pWinChildClipRegion; Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); - Region aWinRectRegion( aWinRect ); + vcl::Region aWinRectRegion( aWinRect ); sal_uInt16 nClipFlags = mpWindowImpl->mpSysObj->GetClipRegionType(); if ( aRegion == aWinRectRegion ) @@ -443,9 +443,9 @@ bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller ) bool bUpdate = true; if ( mpWindowImpl->mpSysObj ) { - Region* pOldRegion = NULL; + vcl::Region* pOldRegion = NULL; if ( bSysObjOnlySmaller && !mpWindowImpl->mbInitWinClipRegion ) - pOldRegion = new Region( mpWindowImpl->maWinClipRegion ); + pOldRegion = new vcl::Region( mpWindowImpl->maWinClipRegion ); mbInitClipRegion = true; mpWindowImpl->mbInitWinClipRegion = true; @@ -530,7 +530,7 @@ bool Window::ImplSetClipFlag( bool bSysObjOnlySmaller ) return mpWindowImpl->mpFrameWindow->ImplSetClipFlagOverlapWindows( bSysObjOnlySmaller ); } -void Window::ImplIntersectWindowClipRegion( Region& rRegion ) +void Window::ImplIntersectWindowClipRegion( vcl::Region& rRegion ) { if ( mpWindowImpl->mbInitWinClipRegion ) ImplInitWinClipRegion(); @@ -538,7 +538,7 @@ void Window::ImplIntersectWindowClipRegion( Region& rRegion ) rRegion.Intersect( mpWindowImpl->maWinClipRegion ); } -void Window::ImplIntersectWindowRegion( Region& rRegion ) +void Window::ImplIntersectWindowRegion( vcl::Region& rRegion ) { rRegion.Intersect( Rectangle( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ) ); @@ -546,12 +546,12 @@ void Window::ImplIntersectWindowRegion( Region& rRegion ) rRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); } -void Window::ImplExcludeWindowRegion( Region& rRegion ) +void Window::ImplExcludeWindowRegion( vcl::Region& rRegion ) { if ( mpWindowImpl->mbWinRegion ) { Point aPoint( mnOutOffX, mnOutOffY ); - Region aRegion( Rectangle( aPoint, + vcl::Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); aRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); rRegion.Exclude( aRegion ); @@ -564,7 +564,7 @@ void Window::ImplExcludeWindowRegion( Region& rRegion ) } } -void Window::ImplExcludeOverlapWindows( Region& rRegion ) +void Window::ImplExcludeOverlapWindows( vcl::Region& rRegion ) { vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) @@ -579,7 +579,7 @@ void Window::ImplExcludeOverlapWindows( Region& rRegion ) } } -void Window::ImplExcludeOverlapWindows2( Region& rRegion ) +void Window::ImplExcludeOverlapWindows2( vcl::Region& rRegion ) { if ( mpWindowImpl->mbReallyVisible ) ImplExcludeWindowRegion( rRegion ); @@ -587,14 +587,14 @@ void Window::ImplExcludeOverlapWindows2( Region& rRegion ) ImplExcludeOverlapWindows( rRegion ); } -void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion ) +void Window::ImplIntersectAndUnionOverlapWindows( const vcl::Region& rInterRegion, vcl::Region& rRegion ) { vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; while ( pWindow ) { if ( pWindow->mpWindowImpl->mbReallyVisible ) { - Region aTempRegion( rInterRegion ); + vcl::Region aTempRegion( rInterRegion ); pWindow->ImplIntersectWindowRegion( aTempRegion ); rRegion.Union( aTempRegion ); pWindow->ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion ); @@ -604,11 +604,11 @@ void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Re } } -void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion ) +void Window::ImplIntersectAndUnionOverlapWindows2( const vcl::Region& rInterRegion, vcl::Region& rRegion ) { if ( mpWindowImpl->mbReallyVisible ) { - Region aTempRegion( rInterRegion ); + vcl::Region aTempRegion( rInterRegion ); ImplIntersectWindowRegion( aTempRegion ); rRegion.Union( aTempRegion ); } @@ -616,7 +616,7 @@ void Window::ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, R ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion ); } -void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion ) +void Window::ImplCalcOverlapRegionOverlaps( const vcl::Region& rInterRegion, vcl::Region& rRegion ) { // Clip Overlap Siblings vcl::Window* pStartOverlapWindow; @@ -642,13 +642,13 @@ void Window::ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& ImplIntersectAndUnionOverlapWindows( rInterRegion, rRegion ); } -void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion, +void Window::ImplCalcOverlapRegion( const Rectangle& rSourceRect, vcl::Region& rRegion, bool bChildren, bool bParent, bool bSiblings ) { - Region aRegion( rSourceRect ); + vcl::Region aRegion( rSourceRect ); if ( mpWindowImpl->mbWinRegion ) rRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); - Region aTempRegion; + vcl::Region aTempRegion; vcl::Window* pWindow; ImplCalcOverlapRegionOverlaps( aRegion, rRegion ); @@ -803,7 +803,7 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize, { if ( mpWindowImpl->mpPaintRegion ) { - Region aClip( *mpWindowImpl->mpPaintRegion ); + vcl::Region aClip( *mpWindowImpl->mpPaintRegion ); const Point aPixPos( LogicToPixel( rPos ) ); aClip.Move( -mnOutOffX, -mnOutOffY ); @@ -811,7 +811,7 @@ void Window::SaveBackground( const Point& rPos, const Size& rSize, if ( !aClip.IsEmpty() ) { - const Region aOldClip( rSaveDevice.GetClipRegion() ); + const vcl::Region aOldClip( rSaveDevice.GetClipRegion() ); const Point aPixOffset( rSaveDevice.LogicToPixel( rDestOff ) ); const bool bMap = rSaveDevice.IsMapModeEnabled(); @@ -871,7 +871,7 @@ void Window::ImplSaveOverlapBackground() } } -bool Window::ImplRestoreOverlapBackground( Region& rInvRegion ) +bool Window::ImplRestoreOverlapBackground( vcl::Region& rInvRegion ) { if ( mpWindowImpl->mpOverlapData->mpSaveBackDev ) { @@ -956,7 +956,7 @@ void Window::ImplInvalidateAllOverlapBackgrounds() if ( !aRect1.IsEmpty() ) { if ( !pWindow->mpWindowImpl->mpOverlapData->mpSaveBackRgn ) - pWindow->mpWindowImpl->mpOverlapData->mpSaveBackRgn = new Region( aRect2 ); + pWindow->mpWindowImpl->mpOverlapData->mpSaveBackRgn = new vcl::Region( aRect2 ); pWindow->mpWindowImpl->mpOverlapData->mpSaveBackRgn->Exclude( aRect1 ); if ( pWindow->mpWindowImpl->mpOverlapData->mpSaveBackRgn->IsEmpty() ) pWindow->ImplDeleteOverlapBackground(); diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index de43ab797673..41bcaa7ce72f 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -604,15 +604,15 @@ void ImplPopupFloatWin::DrawBorder() Point aPt; Rectangle aRect( aPt, GetOutputSizePixel() ); - Region oldClipRgn( GetClipRegion( ) ); - Region aClipRgn( aRect ); + vcl::Region oldClipRgn( GetClipRegion( ) ); + vcl::Region aClipRgn( aRect ); Rectangle aItemClipRect( ImplGetItemEdgeClipRect() ); if( !aItemClipRect.IsEmpty() ) { aItemClipRect.SetPos( AbsoluteScreenToOutputPixel( aItemClipRect.TopLeft() ) ); // draw the excluded border part with the background color of a toolbox - SetClipRegion( Region( aItemClipRect ) ); + SetClipRegion( vcl::Region( aItemClipRect ) ); SetLineColor( GetSettings().GetStyleSettings().GetFaceColor() ); DrawRect( aRect ); diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index dab3dec3ff54..7e93fe1c799e 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -124,7 +124,7 @@ long MenuFloatingWindow::ImplGetStartY() const return -nY; } -Region MenuFloatingWindow::ImplCalcClipRegion( bool bIncludeLogo ) const +vcl::Region MenuFloatingWindow::ImplCalcClipRegion( bool bIncludeLogo ) const { Size aOutSz = GetOutputSizePixel(); Point aPos; @@ -135,7 +135,7 @@ Region MenuFloatingWindow::ImplCalcClipRegion( bool bIncludeLogo ) const if ( pMenu && pMenu->pLogo && !bIncludeLogo ) aRect.Left() += pMenu->pLogo->aBitmap.GetSizePixel().Width(); - Region aRegion(aRect); + vcl::Region aRegion(aRect); if ( pMenu && pMenu->pLogo && bIncludeLogo && nScrollerHeight ) aRegion.Union( Rectangle( Point(), Size( pMenu->pLogo->aBitmap.GetSizePixel().Width(), aOutSz.Height() ) ) ); diff --git a/vcl/source/window/menufloatingwindow.hxx b/vcl/source/window/menufloatingwindow.hxx index 62731efd2ae1..5e1b3437584d 100644 --- a/vcl/source/window/menufloatingwindow.hxx +++ b/vcl/source/window/menufloatingwindow.hxx @@ -68,7 +68,7 @@ private: void InitMenuClipRegion(); protected: - Region ImplCalcClipRegion( bool bIncludeLogo = true ) const; + vcl::Region ImplCalcClipRegion( bool bIncludeLogo = true ) const; void ImplDrawScroller( bool bUp ); using Window::ImplScroll; void ImplScroll( const Point& rMousePos ); diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 07f04e996093..ce10abae4ae3 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -44,10 +44,10 @@ class PaintHelper { private: vcl::Window* m_pWindow; - Region* m_pChildRegion; + vcl::Region* m_pChildRegion; Rectangle m_aSelectionRect; Rectangle m_aPaintRect; - Region m_aPaintRegion; + vcl::Region m_aPaintRegion; sal_uInt16 m_nPaintFlags; bool m_bPop; bool m_bRestoreCursor; @@ -77,11 +77,11 @@ public: { return m_nPaintFlags; } - Region& GetPaintRegion() + vcl::Region& GetPaintRegion() { return m_aPaintRegion; } - void DoPaint(const Region* pRegion); + void DoPaint(const vcl::Region* pRegion); ~PaintHelper(); }; @@ -94,10 +94,10 @@ PaintHelper::PaintHelper(vcl::Window *pWindow, sal_uInt16 nPaintFlags) { } -void PaintHelper::DoPaint(const Region* pRegion) +void PaintHelper::DoPaint(const vcl::Region* pRegion) { WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl(); - Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion(); + vcl::Region* pWinChildClipRegion = m_pWindow->ImplGetWinChildClipRegion(); if ( pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL ) pWindowImpl->maInvalidateRegion = *pWinChildClipRegion; else @@ -114,7 +114,7 @@ void PaintHelper::DoPaint(const Region* pRegion) pWindowImpl->maInvalidateRegion.Union( *pWindowImpl->mpWinData->mpTrackRect ); if ( pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALLCHILDREN ) - m_pChildRegion = new Region( pWindowImpl->maInvalidateRegion ); + m_pChildRegion = new vcl::Region( pWindowImpl->maInvalidateRegion ); pWindowImpl->maInvalidateRegion.Intersect( *pWinChildClipRegion ); } pWindowImpl->mnPaintFlags = 0; @@ -138,7 +138,7 @@ void Window::PushPaintHelper(PaintHelper *pHelper) mpWindowImpl->mbInPaint = true; // restore Paint-Region - Region &rPaintRegion = pHelper->GetPaintRegion(); + vcl::Region &rPaintRegion = pHelper->GetPaintRegion(); rPaintRegion = mpWindowImpl->maInvalidateRegion; Rectangle aPaintRect = rPaintRegion.GetBoundRect(); @@ -157,7 +157,7 @@ void Window::PushPaintHelper(PaintHelper *pHelper) { if ( IsClipRegion() ) { - Region aOldRegion = GetClipRegion(); + vcl::Region aOldRegion = GetClipRegion(); SetClipRegion(); Erase(); SetClipRegion( aOldRegion ); @@ -223,7 +223,7 @@ PaintHelper::~PaintHelper() namespace vcl { -void Window::ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ) +void Window::ImplCallPaint( const vcl::Region* pRegion, sal_uInt16 nPaintFlags ) { // call PrePaint. PrePaint may add to the invalidate region as well as // other parameters used below. @@ -324,7 +324,7 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) return 0; } -void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) +void Window::ImplInvalidateFrameRegion( const vcl::Region* pRegion, sal_uInt16 nFlags ) { // set PAINTCHILDREN for all parent windows till the first OverlapWindow if ( !ImplIsOverlapWindow() ) @@ -365,7 +365,7 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags pParent = pParent->ImplGetParent(); if( pParent ) { - Region *pChildRegion; + vcl::Region *pChildRegion; if ( mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL ) // invalidate the whole child window region in the parent pChildRegion = ImplGetWinChildClipRegion(); @@ -381,9 +381,9 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ImplPostPaint(); } -void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) +void Window::ImplInvalidateOverlapFrameRegion( const vcl::Region& rRegion ) { - Region aRegion = rRegion; + vcl::Region aRegion = rRegion; ImplClipBoundaries( aRegion, true, true ); if ( !aRegion.IsEmpty() ) @@ -400,7 +400,7 @@ void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) } } -void Window::ImplInvalidateParentFrameRegion( Region& rRegion ) +void Window::ImplInvalidateParentFrameRegion( vcl::Region& rRegion ) { if ( mpWindowImpl->mbOverlapWin ) mpWindowImpl->mpFrameWindow->ImplInvalidateOverlapFrameRegion( rRegion ); @@ -411,7 +411,7 @@ void Window::ImplInvalidateParentFrameRegion( Region& rRegion ) } } -void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) +void Window::ImplInvalidate( const vcl::Region* pRegion, sal_uInt16 nFlags ) { // reset background storage @@ -459,7 +459,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) else { Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); - Region aRegion( aRect ); + vcl::Region aRegion( aRect ); if ( pRegion ) { // --- RTL --- remirror region before intersecting it @@ -467,7 +467,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) { const OutputDevice *pOutDev = GetOutDev(); - Region aRgn( *pRegion ); + vcl::Region aRgn( *pRegion ); pOutDev->ReMirror( aRgn ); aRegion.Intersect( aRgn ); } @@ -503,7 +503,7 @@ void Window::ImplMoveInvalidateRegion( const Rectangle& rRect, { if ( (mpWindowImpl->mnPaintFlags & (IMPL_PAINT_PAINT | IMPL_PAINT_PAINTALL)) == IMPL_PAINT_PAINT ) { - Region aTempRegion = mpWindowImpl->maInvalidateRegion; + vcl::Region aTempRegion = mpWindowImpl->maInvalidateRegion; aTempRegion.Intersect( rRect ); aTempRegion.Move( nHorzScroll, nVertScroll ); mpWindowImpl->maInvalidateRegion.Union( aTempRegion ); @@ -529,7 +529,7 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, // Paint-Region should be shifted, as drawn by the parents if ( !ImplIsOverlapWindow() ) { - Region aPaintAllRegion; + vcl::Region aPaintAllRegion; vcl::Window* pPaintAllWindow = this; do { @@ -557,7 +557,7 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, } } -void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) +void Window::ImplValidateFrameRegion( const vcl::Region* pRegion, sal_uInt16 nFlags ) { if ( !pRegion ) mpWindowImpl->maInvalidateRegion.SetEmpty(); @@ -566,7 +566,7 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) // when all child windows have to be drawn we need to invalidate them before doing so if ( (mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALLCHILDREN) && mpWindowImpl->mpFirstChild ) { - Region aChildRegion = mpWindowImpl->maInvalidateRegion; + vcl::Region aChildRegion = mpWindowImpl->maInvalidateRegion; if ( mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL ) { Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); @@ -599,7 +599,7 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) } } -void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) +void Window::ImplValidate( const vcl::Region* pRegion, sal_uInt16 nFlags ) { // assemble region bool bValidateAll = !pRegion; @@ -618,7 +618,7 @@ void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) else { Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); - Region aRegion( aRect ); + vcl::Region aRegion( aRect ); if ( pRegion ) aRegion.Intersect( *pRegion ); ImplClipBoundaries( aRegion, true, true ); @@ -647,7 +647,7 @@ void Window::ImplUpdateAll( bool bOverlapWindows ) if ( mpWindowImpl->mpFrameWindow->mpWindowImpl->mbPaintFrame ) { Point aPoint( 0, 0 ); - Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); + vcl::Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); ImplInvalidateOverlapFrameRegion( aRegion ); if ( mpWindowImpl->mbFrame || (mpWindowImpl->mpBorderWindow && mpWindowImpl->mpBorderWindow->mpWindowImpl->mbFrame) ) bFlush = true; @@ -701,7 +701,7 @@ void Window::SetWindowRegionPixel() mpWindowImpl->mpBorderWindow->SetWindowRegionPixel(); else if( mpWindowImpl->mbFrame ) { - mpWindowImpl->maWinRegion = Region(true); + mpWindowImpl->maWinRegion = vcl::Region(true); mpWindowImpl->mbWinRegion = false; mpWindowImpl->mpFrame->ResetClipRegion(); } @@ -709,7 +709,7 @@ void Window::SetWindowRegionPixel() { if ( mpWindowImpl->mbWinRegion ) { - mpWindowImpl->maWinRegion = Region(true); + mpWindowImpl->maWinRegion = vcl::Region(true); mpWindowImpl->mbWinRegion = false; ImplSetClipFlag(); @@ -721,14 +721,14 @@ void Window::SetWindowRegionPixel() if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) ImplInvalidateAllOverlapBackgrounds(); Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); - Region aRegion( aRect ); + vcl::Region aRegion( aRect ); ImplInvalidateParentFrameRegion( aRegion ); } } } } -void Window::SetWindowRegionPixel( const Region& rRegion ) +void Window::SetWindowRegionPixel( const vcl::Region& rRegion ) { if ( mpWindowImpl->mpBorderWindow ) @@ -788,7 +788,7 @@ void Window::SetWindowRegionPixel( const Region& rRegion ) { if ( mpWindowImpl->mbWinRegion ) { - mpWindowImpl->maWinRegion = Region(true); + mpWindowImpl->maWinRegion = vcl::Region(true); mpWindowImpl->mbWinRegion = false; ImplSetClipFlag(); } @@ -808,13 +808,13 @@ void Window::SetWindowRegionPixel( const Region& rRegion ) if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) ImplInvalidateAllOverlapBackgrounds(); Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); - Region aRegion( aRect ); + vcl::Region aRegion( aRect ); ImplInvalidateParentFrameRegion( aRegion ); } } } -const Region& Window::GetWindowRegionPixel() const +const vcl::Region& Window::GetWindowRegionPixel() const { if ( mpWindowImpl->mpBorderWindow ) @@ -832,18 +832,18 @@ bool Window::IsWindowRegionPixel() const return mpWindowImpl->mbWinRegion; } -Region Window::GetPaintRegion() const +vcl::Region Window::GetPaintRegion() const { if ( mpWindowImpl->mpPaintRegion ) { - Region aRegion = *mpWindowImpl->mpPaintRegion; + vcl::Region aRegion = *mpWindowImpl->mpPaintRegion; aRegion.Move( -mnOutOffX, -mnOutOffY ); return PixelToLogic( aRegion ); } else { - Region aPaintRegion(true); + vcl::Region aPaintRegion(true); return aPaintRegion; } } @@ -867,12 +867,12 @@ void Window::Invalidate( const Rectangle& rRect, sal_uInt16 nFlags ) Rectangle aRect = pOutDev->ImplLogicToDevicePixel( rRect ); if ( !aRect.IsEmpty() ) { - Region aRegion( aRect ); + vcl::Region aRegion( aRect ); ImplInvalidate( &aRegion, nFlags ); } } -void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) +void Window::Invalidate( const vcl::Region& rRegion, sal_uInt16 nFlags ) { if ( !IsDeviceOutputNecessary() || !mnOutWidth || !mnOutHeight ) @@ -882,7 +882,7 @@ void Window::Invalidate( const Region& rRegion, sal_uInt16 nFlags ) ImplInvalidate( NULL, nFlags ); else { - Region aRegion = ImplPixelToDevicePixel( LogicToPixel( rRegion ) ); + vcl::Region aRegion = ImplPixelToDevicePixel( LogicToPixel( rRegion ) ); if ( !aRegion.IsEmpty() ) ImplInvalidate( &aRegion, nFlags ); } @@ -940,7 +940,7 @@ void Window::Update() if ( mpWindowImpl->mpFrameWindow->mpWindowImpl->mbPaintFrame ) { Point aPoint( 0, 0 ); - Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); + vcl::Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); ImplInvalidateOverlapFrameRegion( aRegion ); if ( mpWindowImpl->mbFrame || (mpWindowImpl->mpBorderWindow && mpWindowImpl->mpBorderWindow->mpWindowImpl->mbFrame) ) bFlush = true; @@ -1017,7 +1017,7 @@ void Window::ImplPaintToDevice( OutputDevice* i_pTargetOutDev, const Point& i_rP // preserve graphicsstate Push(); - Region aClipRegion( GetClipRegion() ); + vcl::Region aClipRegion( GetClipRegion() ); SetClipRegion(); GDIMetaFile* pOldMtf = GetConnectMetaFile(); @@ -1214,7 +1214,7 @@ void Window::ImplScroll( const Rectangle& rRect, nFlags |= SCROLL_CHILDREN; } - Region aInvalidateRegion; + vcl::Region aInvalidateRegion; bool bScrollChildren = (nFlags & SCROLL_CHILDREN) != 0; bool bErase = (nFlags & SCROLL_NOERASE) == 0; @@ -1255,7 +1255,7 @@ void Window::ImplScroll( const Rectangle& rRect, { Rectangle aDestRect( aRectMirror ); aDestRect.Move( bReMirror ? -nHorzScroll : nHorzScroll, nVertScroll ); - Region aWinInvalidateRegion( aRectMirror ); + vcl::Region aWinInvalidateRegion( aRectMirror ); aWinInvalidateRegion.Exclude( aDestRect ); aInvalidateRegion.Union( aWinInvalidateRegion ); @@ -1263,7 +1263,7 @@ void Window::ImplScroll( const Rectangle& rRect, } Point aPoint( mnOutOffX, mnOutOffY ); - Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); + vcl::Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); if ( nFlags & SCROLL_CLIP ) aRegion.Intersect( rRect ); if ( mpWindowImpl->mbWinRegion ) diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index d9fb863adfcc..ad533cf31601 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -48,7 +48,7 @@ struct ImplCalcToTopData { ImplCalcToTopData* mpNext; vcl::Window* mpWindow; - Region* mpInvalidateRegion; + vcl::Region* mpInvalidateRegion; }; namespace vcl { @@ -219,9 +219,9 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) { // calculate region, where the window overlaps with other windows Point aPoint( mnOutOffX, mnOutOffY ); - Region aRegion( Rectangle( aPoint, + vcl::Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); - Region aInvalidateRegion; + vcl::Region aInvalidateRegion; ImplCalcOverlapRegionOverlaps( aRegion, aInvalidateRegion ); if ( !aInvalidateRegion.IsEmpty() ) @@ -230,7 +230,7 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) pPrevData->mpNext = pData; pData->mpNext = NULL; pData->mpWindow = this; - pData->mpInvalidateRegion = new Region( aInvalidateRegion ); + pData->mpInvalidateRegion = new vcl::Region( aInvalidateRegion ); } } } diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 9f780e909b0e..545b0a6e0bb3 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -377,7 +377,7 @@ void StatusBar::ImplDrawItem( bool bOffScreen, sal_uInt16 nPos, bool bDrawText, mpImplData->mpVirDev->SetOutputSizePixel( aTextRectSize ); else { - Region aRegion( aTextRect ); + vcl::Region aRegion( aTextRect ); SetClipRegion( aRegion ); } diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index b8ac59a5bad7..d6245bf763f1 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -453,7 +453,7 @@ void ToolBox::ImplDrawGradientBackground( ToolBox* pThis, ImplDockingWindowWrapp } -bool ToolBox::ImplDrawNativeBackground( ToolBox* pThis, const Region & ) +bool ToolBox::ImplDrawNativeBackground( ToolBox* pThis, const vcl::Region & ) { // use NWF Point aPt; @@ -464,7 +464,7 @@ bool ToolBox::ImplDrawNativeBackground( ToolBox* pThis, const Region & ) aCtrlRegion, nState, ImplControlValue(), OUString() ); } -void ToolBox::ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegion ) +void ToolBox::ImplDrawTransparentBackground( ToolBox* pThis, const vcl::Region &rRegion ) { // just invalidate to trigger paint of the parent @@ -477,7 +477,7 @@ void ToolBox::ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegi pThis->mpData->mbIsPaintLocked = bOldPaintLock; } -void ToolBox::ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, bool bIsInPopupMode ) +void ToolBox::ImplDrawConstantBackground( ToolBox* pThis, const vcl::Region &rRegion, bool bIsInPopupMode ) { // draw a constant color if( !bIsInPopupMode ) @@ -499,7 +499,7 @@ void ToolBox::ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ) ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( pThis ); bool bIsInPopupMode = pThis->ImplIsInPopupMode(); - Region aPaintRegion( rRect ); + vcl::Region aPaintRegion( rRect ); // make sure we do not invalidate/erase too much if( pThis->IsInPaint() ) @@ -3031,7 +3031,7 @@ void ToolBox::ImplDrawItem( sal_uInt16 nPos, sal_uInt16 nHighlight, bool bPaint, bClip = true; Rectangle aTempRect( pItem->maRect.Left()+1, pItem->maRect.Top()+1, pItem->maRect.Right()-1, pItem->maRect.Bottom()-1 ); - Region aTempRegion( aTempRect ); + vcl::Region aTempRegion( aTempRect ); SetClipRegion( aTempRegion ); } else diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index e04def3b9e39..9fa514680d8f 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -573,8 +573,8 @@ Window::~Window() WindowImpl::WindowImpl( WindowType nType ) { maZoom = Fraction( 1, 1 ); - maWinRegion = Region(true); - maWinClipRegion = Region(true); + maWinRegion = vcl::Region(true); + maWinClipRegion = vcl::Region(true); mpWinData = NULL; // Extra Window Data, that we dont need for all windows mpOverlapData = NULL; // Overlap Data mpFrameData = NULL; // Frame Data @@ -1499,8 +1499,8 @@ void Window::ImplPosSizeWindow( long nX, long nY, long nOldOutOffY = mnOutOffY; long nOldOutWidth = mnOutWidth; long nOldOutHeight = mnOutHeight; - Region* pOverlapRegion = NULL; - Region* pOldRegion = NULL; + vcl::Region* pOverlapRegion = NULL; + vcl::Region* pOldRegion = NULL; if ( IsReallyVisible() ) { @@ -1509,7 +1509,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, Rectangle aOldWinRect( Point( nOldOutOffX, nOldOutOffY ), Size( nOldOutWidth, nOldOutHeight ) ); - pOldRegion = new Region( aOldWinRect ); + pOldRegion = new vcl::Region( aOldWinRect ); if ( mpWindowImpl->mbWinRegion ) pOldRegion->Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); @@ -1594,7 +1594,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, { if ( bCopyBits && !pOverlapRegion ) { - pOverlapRegion = new Region(); + pOverlapRegion = new vcl::Region(); ImplCalcOverlapRegion( Rectangle( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ), *pOverlapRegion, false, true, true ); @@ -1612,7 +1612,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, { if ( bCopyBits && !pOverlapRegion ) { - pOverlapRegion = new Region(); + pOverlapRegion = new vcl::Region(); ImplCalcOverlapRegion( Rectangle( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ), *pOverlapRegion, false, true, true ); @@ -1704,7 +1704,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, if ( bCopyBits && bParentPaint && !HasPaintEvent() ) { Point aPoint( mnOutOffX, mnOutOffY ); - Region aRegion( Rectangle( aPoint, + vcl::Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); if ( mpWindowImpl->mbWinRegion ) aRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); @@ -1756,7 +1756,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, else { Point aPoint( mnOutOffX, mnOutOffY ); - Region aRegion( Rectangle( aPoint, + vcl::Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); aRegion.Exclude( *pOldRegion ); if ( mpWindowImpl->mbWinRegion ) @@ -1771,7 +1771,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, if ( bNewPos || (mnOutWidth < nOldOutWidth) || (mnOutHeight < nOldOutHeight) ) { - Region aRegion( *pOldRegion ); + vcl::Region aRegion( *pOldRegion ); if ( !mpWindowImpl->mbPaintTransparent ) ImplExcludeWindowRegion( aRegion ); ImplClipBoundaries( aRegion, false, true ); @@ -2263,7 +2263,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) if ( mpWindowImpl->mbReallyVisible ) { - Region aInvRegion; + vcl::Region aInvRegion; bool bSaveBack = false; if ( ImplIsOverlapWindow() && !mpWindowImpl->mbFrame ) diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 0067e5694de7..48faf1f2f8f7 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -270,7 +270,7 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) if ( nFlags & SHOWTRACK_CLIP ) { Point aPoint( mnOutOffX, mnOutOffY ); - Region aRegion( Rectangle( aPoint, + vcl::Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); ImplClipBoundaries( aRegion, false, false ); pOutDev->SelectClipRegion( aRegion, pGraphics ); @@ -334,7 +334,7 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) if ( nFlags & SHOWTRACK_CLIP ) { Point aPoint( mnOutOffX, mnOutOffY ); - Region aRegion( Rectangle( aPoint, + vcl::Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); ImplClipBoundaries( aRegion, false, false ); pOutDev->SelectClipRegion( aRegion, pGraphics ); diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 50ca77c375e5..cb2bd92a250b 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1517,7 +1517,7 @@ static void ImplHandlePaint( vcl::Window* pWindow, const Rectangle& rBoundRect, pWindow->ImplGetWindowImpl()->mnPaintFlags |= IMPL_PAINT_CHECKRTL; // trigger paint for all windows that live in the new paint region - Region aRegion( rBoundRect ); + vcl::Region aRegion( rBoundRect ); pWindow->ImplInvalidateOverlapFrameRegion( aRegion ); if( bImmediateUpdate ) { diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 10d374652d4c..d4c934c0f29a 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -225,12 +225,12 @@ void X11SalGraphics::DeInit() SetDrawable( None, m_nXScreen ); } -void X11SalGraphics::SetClipRegion( GC pGC, XLIB_Region pXReg ) const +void X11SalGraphics::SetClipRegion( GC pGC, Region pXReg ) const { Display *pDisplay = GetXDisplay(); int n = 0; - XLIB_Region Regions[3]; + Region Regions[3]; if( mpClipRegion ) Regions[n++] = mpClipRegion; @@ -244,7 +244,7 @@ void X11SalGraphics::SetClipRegion( GC pGC, XLIB_Region pXReg ) const XSetRegion( pDisplay, pGC, Regions[0] ); else { - XLIB_Region pTmpRegion = XCreateRegion(); + Region pTmpRegion = XCreateRegion(); XIntersectRegion( Regions[0], Regions[1], pTmpRegion ); XSetRegion( pDisplay, pGC, pTmpRegion ); @@ -548,7 +548,7 @@ void X11SalGraphics::ResetClipRegion() } } -bool X11SalGraphics::setClipRegion( const Region& i_rClip ) +bool X11SalGraphics::setClipRegion( const vcl::Region& i_rClip ) { if( mpClipRegion ) XDestroyRegion( mpClipRegion ); @@ -884,14 +884,14 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, if( nBrushColor_ != SALCOLOR_NONE ) { sal_uInt32 i, n; - XLIB_Region pXRegA = NULL; + Region pXRegA = NULL; for( i = 0; i < nPoly; i++ ) { n = pPoints[i]; SalPolyLine Points( n, pPtAry[i] ); if( n > 2 ) { - XLIB_Region pXRegB = XPolygonRegion( &Points[0], n+1, WindingRule ); + Region pXRegB = XPolygonRegion( &Points[0], n+1, WindingRule ); if( !pXRegA ) pXRegA = pXRegB; else diff --git a/vcl/unx/generic/gdi/xrender_peer.hxx b/vcl/unx/generic/gdi/xrender_peer.hxx index cb71889bb7f9..84622e80c4ce 100644 --- a/vcl/unx/generic/gdi/xrender_peer.hxx +++ b/vcl/unx/generic/gdi/xrender_peer.hxx @@ -54,7 +54,7 @@ public: unsigned long nDrawable, const XRenderPictureAttributes* ) const; void ChangePicture( Picture, unsigned long nValueMask, const XRenderPictureAttributes* ) const; - void SetPictureClipRegion( Picture, XLIB_Region ) const; + void SetPictureClipRegion( Picture, Region ) const; void CompositePicture( int nOp, Picture aSrc, Picture aMask, Picture aDst, int nXSrc, int nYSrc, int nXMask, int nYMask, int nXDst, int nYDst, unsigned nWidth, unsigned nHeight ) const; @@ -112,7 +112,7 @@ inline void XRenderPeer::ChangePicture( Picture aPicture, } inline void XRenderPeer::SetPictureClipRegion( Picture aPicture, - XLIB_Region aXlibRegion ) const + Region aXlibRegion ) const { XRenderSetPictureClipRegion( mpDisplay, aPicture, aXlibRegion ); } diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index ffacb587dc90..ee623bcd817b 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -512,7 +512,7 @@ void GtkSalGraphics::ResetClipRegion() X11SalGraphics::ResetClipRegion(); } -bool GtkSalGraphics::setClipRegion( const Region& i_rClip ) +bool GtkSalGraphics::setClipRegion( const vcl::Region& i_rClip ) { m_aClipRegion = i_rClip; bool bRet = X11SalGraphics::setClipRegion( m_aClipRegion ); @@ -795,7 +795,7 @@ bool GtkSalGraphics::drawNativeControl( ControlType nType, } Rectangle aCtrlRect( rControlRegion ); - Region aClipRegion( m_aClipRegion ); + vcl::Region aClipRegion( m_aClipRegion ); if( aClipRegion.IsNull() ) aClipRegion = aCtrlRect; diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index c4e16c3c8a89..c3eac7281305 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -1704,7 +1704,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPar Size aBSize( qBoundingRect.width(), qBoundingRect.height() ); rNativeBoundingRegion = Rectangle( aBPoint, aBSize ); - // Region of the content + // vcl::Region of the content Point aPoint( qRect.x(), qRect.y() ); Size aSize( qRect.width(), qRect.height() ); rNativeContentRegion = Rectangle( aPoint, aSize ); diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx index 17ae41c76f09..04d6239656b5 100644 --- a/vcl/unx/kde4/KDE4FilePicker.cxx +++ b/vcl/unx/kde4/KDE4FilePicker.cxx @@ -41,7 +41,7 @@ #include "VCLKDEApplication.hxx" /* ********* Hack, but needed because of conflicting types... */ -#define Region QtXRegion +#define vcl::Region QtXRegion #include <kfiledialog.h> #include <kwindowsystem.h> diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx index fbf1d8e7d844..32c5b1f366f5 100644 --- a/vcl/unx/kde4/KDEData.cxx +++ b/vcl/unx/kde4/KDEData.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define Region QtXRegion +#define vcl::Region QtXRegion #include <QStyle> #include <kapplication.h> diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx index b67b3eda0850..ad4cb7ccaeb5 100644 --- a/vcl/unx/kde4/KDESalFrame.cxx +++ b/vcl/unx/kde4/KDESalFrame.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define Region QtXRegion +#define vcl::Region QtXRegion #include <QColor> #include <QStyle> diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index 05b08a1da386..98f5280609fc 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define Region QtXRegion +#define vcl::Region QtXRegion #include <QStyle> #include <QStyleOption> @@ -198,7 +198,7 @@ namespace #ifdef IMAGE_BASED_PAINTING // There is a small catch with this function, although hopefully only philosophical. -// Officially Xlib's Region is an opaque data type, with only functions for manipulating it. +// Officially Xlib's vcl::Region is an opaque data type, with only functions for manipulating it. // However, whoever designed it apparently didn't give it that much thought, as it's impossible // to find out what exactly a region actually is (except for really weird ways like XClipBox() // and repeated XPointInRegion(), which would be awfully slow). Fortunately, the header file @@ -209,7 +209,7 @@ namespace // without IMAGE_BASED_PAINTING (in which case QApplication::setGraphicsSystem( "native" ) may // be needed too). #include <X11/Xregion.h> -static QRegion XRegionToQRegion( XLIB_Region xr ) +static QRegion XRegionToQRegion( Region xr ) { QRegion qr; for( int i = 0; @@ -615,7 +615,7 @@ bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, GC gc = GetFontGC(); if( gc ) { - XLIB_Region pTempClipRegion = NULL; + Region pTempClipRegion = NULL; if( clipRegion ) { pTempClipRegion = XCreateRegion(); @@ -933,7 +933,7 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, Size aBSize( boundingRect.width(), boundingRect.height() ); nativeBoundingRegion = Rectangle( aBPoint, aBSize ); - // Region of the content + // vcl::Region of the content Point aPoint( contentRect.x(), contentRect.y() ); Size aSize( contentRect.width(), contentRect.height() ); nativeContentRegion = Rectangle( aPoint, aSize ); diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index 768b133dbc72..d6e9a763bbeb 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -23,7 +23,7 @@ #include <unx/saldisp.hxx> #include <unx/salgdi.h> -#define Region QtXRegion +#define vcl::Region QtXRegion #include <QImage> #undef Region diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx index 1ee9a67d618c..cf2bf2df4dab 100644 --- a/vcl/unx/kde4/KDEXLib.cxx +++ b/vcl/unx/kde4/KDEXLib.cxx @@ -420,7 +420,7 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDEXLib::createFilePicker( #endif } -#define Region QtXRegion +#define vcl::Region QtXRegion #include <qframe.h> #undef Region diff --git a/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx index f1fddfca00ea..6db63217b81b 100644 --- a/vcl/unx/kde4/VCLKDEApplication.hxx +++ b/vcl/unx/kde4/VCLKDEApplication.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> -#define Region QtXRegion +#define vcl::Region QtXRegion #include <kapplication.h> diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx index f4f9775dfdac..a20180013709 100644 --- a/vcl/unx/kde4/main.cxx +++ b/vcl/unx/kde4/main.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#define Region QtXRegion +#define vcl::Region QtXRegion #include <QApplication> #undef Region diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 50c0f8efe83e..c518305547a2 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -780,7 +780,7 @@ void WinSalGraphics::ResetClipRegion() SelectClipRgn( getHDC(), 0 ); } -bool WinSalGraphics::setClipRegion( const Region& i_rClip ) +bool WinSalGraphics::setClipRegion( const vcl::Region& i_rClip ) { if ( mhRegion ) { @@ -793,14 +793,14 @@ bool WinSalGraphics::setClipRegion( const Region& i_rClip ) // #i122149# try to avoid usage of PolyPolygon ClipRegions when PolyPolygon is no curve // and only contains horizontal/vertical edges. In that case, use the fallback - // in GetRegionRectangles which will use Region::GetAsRegionBand() which will do + // in GetRegionRectangles which will use vcl::Region::GetAsRegionBand() which will do // the correct polygon-to-RegionBand transformation. // Background is that when using the same Rectangle as rectangle or as Polygon // clip region will lead to different results; the polygon-based one will be // one pixel less to the right and down (see GDI docu for CreatePolygonRgn). This // again is because of the polygon-nature and it's classic handling when filling. // This also means that all cases which use a 'true' polygon-based incarnation of - // a Region should know what they do - it may lead to repaint errors. + // a vcl::Region should know what they do - it may lead to repaint errors. if(bUsePolygon && bTryToAvoidPolygon) { const basegfx::B2DPolyPolygon aPolyPolygon( i_rClip.GetAsB2DPolyPolygon() ); diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index 720a61c35bc7..16f262fa41c6 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -301,7 +301,7 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY, // invalidate regions that were not copied bool bInvalidate = true; - // Combine Invalidate Region with existing ClipRegion + // Combine Invalidate vcl::Region with existing ClipRegion HRGN hTempRgn = CreateRectRgn( 0, 0, 0, 0 ); if ( GetClipRgn( getHDC(), hTempRgn ) == 1 ) { diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index 2ab837c9d5d9..98862e69fb56 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -656,7 +656,7 @@ void WinSalObject::EndSetClipRegion() { HRGN hRegion; - // create a ClipRegion from the Region data + // create a ClipRegion from the vcl::Region data if ( mpClipRgnData->rdh.nCount == 1 ) { RECT* pRect = &(mpClipRgnData->rdh.rcBound); |