basctl/source/dlged/dlged.cxx | 2 canvas/source/cairo/cairo_canvashelper_text.cxx | 6 canvas/source/directx/dx_textlayout_drawhelper.cxx | 4 canvas/source/vcl/canvashelper.cxx | 6 canvas/source/vcl/canvashelper_texturefill.cxx | 6 canvas/source/vcl/spritecanvashelper.cxx | 4 canvas/source/vcl/spritehelper.cxx | 2 chart2/source/controller/dialogs/DataBrowser.cxx | 2 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 2 chart2/source/controller/inc/DrawViewWrapper.hxx | 2 chart2/source/controller/main/ChartController_Window.cxx | 2 chart2/source/controller/main/ChartWindow.cxx | 2 chart2/source/controller/main/ChartWindow.hxx | 2 cui/source/dialogs/about.cxx | 2 cui/source/options/connpooloptions.cxx | 2 dbaccess/source/ui/control/RelationControl.cxx | 2 dbaccess/source/ui/control/TableGrantCtrl.cxx | 2 dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 2 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 dbaccess/source/ui/tabledesign/TEditControl.cxx | 2 drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 18 - drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 4 editeng/source/editeng/editeng.cxx | 2 editeng/source/editeng/impedit.cxx | 6 editeng/source/editeng/impedit.hxx | 2 editeng/source/editeng/impedit3.cxx | 6 extensions/source/scanner/grid.cxx | 2 extensions/source/update/ui/updatecheckui.cxx | 6 filter/source/graphicfilter/eps/eps.cxx | 14 - filter/source/graphicfilter/icgm/class0.cxx | 8 filter/source/graphicfilter/icgm/class3.cxx | 2 filter/source/graphicfilter/icgm/class5.cxx | 6 filter/source/graphicfilter/ios2met/ios2met.cxx | 2 filter/source/graphicfilter/ipict/ipict.cxx | 2 include/postwin.h | 1 include/postx.h | 1 include/prewin.h | 1 include/prex.h | 1 include/sfx2/sfxhtml.hxx | 2 include/shell/kde_headers.h | 2 include/shell/tde_headers.h | 2 include/svtools/tabbar.hxx | 4 include/svtools/valueset.hxx | 2 include/svx/galtheme.hxx | 2 include/svx/sdr/contact/displayinfo.hxx | 6 include/svx/sdr/contact/viewobjectcontact.hxx | 2 include/svx/sdr/overlay/overlaymanager.hxx | 6 include/svx/sdrpagewindow.hxx | 4 include/svx/sdrpaintwindow.hxx | 12 - include/svx/svdhdl.hxx | 2 include/svx/svdpagv.hxx | 4 include/svx/svdpntv.hxx | 10 include/toolkit/awt/vclxgraphics.hxx | 4 include/toolkit/awt/vclxregion.hxx | 6 include/toolkit/helper/vclunohelper.hxx | 2 include/vcl/alpha.hxx | 2 include/vcl/bitmap.hxx | 4 include/vcl/image.hxx | 2 include/vcl/metaact.hxx | 12 - include/vcl/metric.hxx | 4 include/vcl/outdev.hxx | 32 +- include/vcl/outdevstate.hxx | 2 include/vcl/print.hxx | 2 include/vcl/region.hxx | 41 +-- include/vcl/toolbox.hxx | 6 include/vcl/virdev.hxx | 2 include/vcl/window.hxx | 86 +++---- reportdesign/source/ui/dlg/GroupsSorting.cxx | 2 reportdesign/source/ui/report/ReportSection.cxx | 2 reportdesign/source/ui/report/StartMarker.cxx | 2 sc/source/ui/dbgui/csvgrid.cxx | 4 sc/source/ui/inc/output.hxx | 2 sc/source/ui/inc/tabcont.hxx | 2 sc/source/ui/view/drawvie4.cxx | 2 sc/source/ui/view/gridwin.cxx | 2 sc/source/ui/view/gridwin4.cxx | 8 sc/source/ui/view/olinewin.cxx | 2 sc/source/ui/view/output.cxx | 8 sc/source/ui/view/output2.cxx | 12 - sc/source/ui/view/output3.cxx | 2 sc/source/ui/view/printfun.cxx | 4 sc/source/ui/view/tabcont.cxx | 4 sd/source/ui/dlg/docprev.cxx | 2 sd/source/ui/docshell/docshel2.cxx | 4 sd/source/ui/inc/ClientView.hxx | 2 sd/source/ui/inc/View.hxx | 2 sd/source/ui/inc/ViewShell.hxx | 2 sd/source/ui/inc/drawview.hxx | 4 sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 2 sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx | 2 sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx | 6 sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 4 sd/source/ui/slidesorter/view/SlideSorterView.cxx | 4 sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx | 2 sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx | 16 - sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx | 4 sd/source/ui/tools/PreviewRenderer.cxx | 2 sd/source/ui/unoidl/unomodel.cxx | 4 sd/source/ui/view/DocumentRenderer.cxx | 2 sd/source/ui/view/clview.cxx | 6 sd/source/ui/view/drawview.cxx | 4 sd/source/ui/view/drviews5.cxx | 2 sd/source/ui/view/sdview.cxx | 2 sd/source/ui/view/viewshel.cxx | 2 sfx2/source/dialog/backingwindow.cxx | 2 sfx2/source/doc/doctempl.cxx | 40 +-- sfx2/source/doc/objembed.cxx | 2 starmath/source/view.cxx | 2 svtools/source/brwbox/brwbox2.cxx | 4 svtools/source/brwbox/datwin.hxx | 2 svtools/source/brwbox/editbrowsebox.cxx | 2 svtools/source/contnr/imivctl1.cxx | 8 svtools/source/contnr/svimpbox.cxx | 18 - svtools/source/contnr/treelistbox.cxx | 6 svtools/source/control/headbar.cxx | 4 svtools/source/control/tabbar.cxx | 10 svtools/source/control/valueset.cxx | 8 svtools/source/graphic/grfmgr.cxx | 4 svtools/source/graphic/grfmgr2.cxx | 2 svtools/source/toolpanel/paneltabbar.cxx | 4 svx/inc/sdr/overlay/overlaymanagerbuffered.hxx | 8 svx/source/dialog/contwnd.cxx | 2 svx/source/dialog/dlgctl3d.cxx | 2 svx/source/dialog/framelink.cxx | 6 svx/source/dialog/frmsel.cxx | 2 svx/source/dialog/graphctl.cxx | 2 svx/source/dialog/imapwnd.cxx | 2 svx/source/gallery2/galctrl.cxx | 2 svx/source/sdr/contact/displayinfo.cxx | 2 svx/source/sdr/contact/objectcontactofpageview.cxx | 2 svx/source/sdr/overlay/overlaymanager.cxx | 4 svx/source/sdr/overlay/overlaymanagerbuffered.cxx | 16 - svx/source/svdraw/sdrpagewindow.cxx | 6 svx/source/svdraw/sdrpaintwindow.cxx | 10 svx/source/svdraw/svdedxv.cxx | 2 svx/source/svdraw/svdibrow.cxx | 2 svx/source/svdraw/svdpagv.cxx | 10 svx/source/svdraw/svdpntv.cxx | 18 - svx/source/unodraw/UnoGraphicExporter.cxx | 4 sw/inc/viewsh.hxx | 6 sw/source/core/doc/notxtfrm.cxx | 2 sw/source/core/layout/layact.cxx | 2 sw/source/core/layout/paintfrm.cxx | 10 sw/source/core/text/txtpaint.cxx | 2 sw/source/core/text/txtpaint.hxx | 2 sw/source/core/view/pagepreviewlayout.cxx | 2 sw/source/core/view/viewsh.cxx | 22 - sw/source/ui/chrdlg/drpcps.cxx | 2 sw/source/ui/envelp/labfmt.cxx | 2 sw/source/uibase/dbui/mailmergehelper.cxx | 2 toolkit/source/awt/vclxgraphics.cxx | 8 toolkit/source/helper/vclunohelper.cxx | 4 vcl/generic/print/genpspgraphics.cxx | 2 vcl/headless/svpgdi.cxx | 2 vcl/inc/canvasbitmap.hxx | 4 vcl/inc/generic/genpspgraphics.h | 2 vcl/inc/headless/svpgdi.hxx | 4 vcl/inc/impfont.hxx | 2 vcl/inc/quartz/salgdi.h | 2 vcl/inc/salgdi.hxx | 6 vcl/inc/unx/gtk/gtkgdi.hxx | 4 vcl/inc/unx/salgdi.h | 8 vcl/inc/win/salgdi.h | 4 vcl/inc/window.h | 12 - vcl/quartz/salgdicommon.cxx | 2 vcl/source/control/edit.cxx | 12 - vcl/source/control/scrbar.cxx | 4 vcl/source/control/slider.cxx | 2 vcl/source/control/spinbtn.cxx | 6 vcl/source/control/spinfld.cxx | 12 - vcl/source/control/tabctrl.cxx | 8 vcl/source/edit/texteng.cxx | 6 vcl/source/filter/sgvmain.cxx | 16 - vcl/source/filter/wmf/wmfwr.cxx | 2 vcl/source/filter/wmf/wmfwr.hxx | 6 vcl/source/gdi/bitmap.cxx | 4 vcl/source/gdi/cvtsvm.cxx | 10 vcl/source/gdi/gdimetafiletools.cxx | 4 vcl/source/gdi/gdimtf.cxx | 14 - vcl/source/gdi/impanmvw.cxx | 4 vcl/source/gdi/impanmvw.hxx | 2 vcl/source/gdi/metaact.cxx | 4 vcl/source/gdi/pdfwriter_impl2.cxx | 4 vcl/source/gdi/print.cxx | 4 vcl/source/gdi/print3.cxx | 2 vcl/source/gdi/region.cxx | 118 +++++----- vcl/source/gdi/salgdilayout.cxx | 8 vcl/source/outdev/clipping.cxx | 22 - vcl/source/outdev/gradient.cxx | 2 vcl/source/outdev/map.cxx | 36 +-- vcl/source/outdev/nativecontrols.cxx | 4 vcl/source/outdev/outdev.cxx | 6 vcl/source/outdev/outdevstate.cxx | 2 vcl/source/outdev/text.cxx | 2 vcl/source/outdev/transparent.cxx | 2 vcl/source/window/brdwin.cxx | 6 vcl/source/window/clipping.cxx | 84 +++---- vcl/source/window/dockmgr.cxx | 6 vcl/source/window/menufloatingwindow.cxx | 4 vcl/source/window/menufloatingwindow.hxx | 2 vcl/source/window/paint.cxx | 86 +++---- vcl/source/window/stacking.cxx | 8 vcl/source/window/status.cxx | 2 vcl/source/window/toolbox.cxx | 10 vcl/source/window/window.cxx | 22 - vcl/source/window/window2.cxx | 4 vcl/source/window/winproc.cxx | 2 vcl/unx/generic/gdi/salgdi.cxx | 12 - vcl/unx/generic/gdi/xrender_peer.hxx | 4 vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 4 vcl/unx/kde/salnativewidgets-kde.cxx | 2 vcl/unx/kde4/KDE4FilePicker.cxx | 2 vcl/unx/kde4/KDEData.cxx | 2 vcl/unx/kde4/KDESalFrame.cxx | 2 vcl/unx/kde4/KDESalGraphics.cxx | 10 vcl/unx/kde4/KDESalGraphics.hxx | 2 vcl/unx/kde4/KDEXLib.cxx | 2 vcl/unx/kde4/VCLKDEApplication.hxx | 2 vcl/unx/kde4/main.cxx | 2 vcl/win/source/gdi/salgdi.cxx | 6 vcl/win/source/gdi/salgdi2.cxx | 2 vcl/win/source/window/salobj.cxx | 2 222 files changed, 755 insertions(+), 750 deletions(-)
New commits: commit 8dbde0845a3989528614addb9bd0333f60c522a5 Author: Noel Grandin <[email protected]> Date: Sat Sep 27 14:52:40 2014 +0200 fdo#82577: Handle Region Put the VCL Region class in the vcl namespace. Avoids clash with the X11 Region typedef. Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291 diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index b6c7f7f..9800c4c 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 4e489f4..41f2f85 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 19345b6..b565d8c 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 116b4ac..29e4dad 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 d6397c0..1033025 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 08c532c..dd4fd2b 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 0bda848..ebbd814 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 a58043d..c62285b 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 c32ee01..578a563 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 d7c36d7..3cc9e10 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 71a233a..c367f65 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 9371214..d54441b 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 9dee31b2..2afa38a 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 0ac795a..c26ae52 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 dd73fb4..f905137 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 8e2b99f..5d60e63 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 f334c2b..7a2582e 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 08901ac..4617c13 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 97ca36a..1f4c2ea 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 566906a..706f0a5 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 5cad9d6..8d70325 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 bc72bea..5e368fb 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 7d292e3..133d2e9 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 bdd5065..d9d5810 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 b0756c7..2e3a1cc 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 0b26a07..f807a4a 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 38c951c..4956c3f 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 38a7bd1..15209ce 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 9037313..7cf09e8 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 9b0abed..7669141 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 7af6971..3891490 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 962f355..5e6fdb2 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 d79aad3..89e1c9b 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 7b31336..2ce4b3d 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 64ac27e..37bf579c 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 1b02f2b..0952f7e 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 2ee8d9c..b60372f 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 97fc313..7b1a357 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 1343ac6..8291217 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 74053e4..8a1131f 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 c537ea3..8ffe6b0 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 bf53f75..f076d8f 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 8ade613..e82a4b4 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 e36d804..50f5d98 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 a842fc6..23190a4 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 bac055d..4e47270 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 fd7437a..5d84de2 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 36ea6b8..078edaf 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 ca65289..3a1f1ef 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 5d59a1c..334ad31 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 2450e40..9fb2d95 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 1c63d3f..16bdc9d 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 77c3179..068ed3b 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 0aafb86..1206a4f 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 08f5a89..e8a6c9b 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 fd84765..ec89be4 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 6f66f9c..516e407 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 82f53a2..7ca4985 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 e2eead0..d98d9ef 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 eb14450..6eb2da7 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 a0e18f2..6dc4f07 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 e53b7c1..9b2811a 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 8cb430d..6de196c 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 6f334f7..f4d2dd3 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 13a8ddc..7bde25e 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 8c36f52..624cb2f 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 ce75def..ae94819 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 eea629b..851ecc3 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 74c2375..b90145c 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 9d56541..d803450 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 5001e1e..63224f6 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 e7dd3d5..8a96498 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 b058d39..3b0d687 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 c2f7370..08a3565 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 e777df8..f36db76 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 cbdd99d..0991b7e 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 da59eda..89ee877 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 6b19602..5a622e2 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 5bca679..04d2a7b 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 4cdcd50..91c8da8 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 4869702..87c65ee 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 914ead8..ce52883 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 591e632..e6501b0 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 d4882e59..c0bf1fc 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 4c3320f..4835738 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 63493f1..936ae47 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 7404aa6..fc909a3 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -188,7 +188,7 @@ public: ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
