diff options
author | Noel Grandin <noel@peralex.com> | 2014-09-27 14:52:40 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-09-30 09:58:23 +0200 |
commit | 8dbde0845a3989528614addb9bd0333f60c522a5 (patch) | |
tree | c1f13bfc8e2841427eb6a07e2147445b309b1e9a /include/svx/sdrpaintwindow.hxx | |
parent | Use constants for ST_VerticalJc values (diff) | |
download | core-8dbde0845a3989528614addb9bd0333f60c522a5.tar.gz core-8dbde0845a3989528614addb9bd0333f60c522a5.zip |
fdo#82577: Handle Region
Put the VCL Region class in the vcl namespace. Avoids clash with the X11
Region typedef.
Change-Id: I6e008111df7cf37121fbc3eaabd44a8306338291
Diffstat (limited to 'include/svx/sdrpaintwindow.hxx')
-rw-r--r-- | include/svx/sdrpaintwindow.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index ca65289bf220..3a1f1ef7f986 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -60,7 +60,7 @@ public: ~SdrPreRenderDevice(); void PreparePreRenderDevice(); - void OutputPreRenderDevice(const Region& rExpandedRegion); + void OutputPreRenderDevice(const vcl::Region& rExpandedRegion); OutputDevice& GetOriginalOutputDevice() const { return mrOutputDevice; } OutputDevice& GetPreRenderDevice() { return maPreRenderDevice; } @@ -85,7 +85,7 @@ private: SdrPreRenderDevice* mpPreRenderDevice; // The RedrawRegion used for rendering - Region maRedrawRegion; + vcl::Region maRedrawRegion; // bitfield // #i72889# flag if this is only a temporary target for repaint, default is false @@ -112,7 +112,7 @@ public: rtl::Reference< ::sdr::overlay::OverlayManager > GetOverlayManager() const; // #i73602# add flag if buffer shall be used - void DrawOverlay(const Region& rRegion); + void DrawOverlay(const vcl::Region& rRegion); // calculate visible area and return Rectangle GetVisibleArea() const; @@ -132,12 +132,12 @@ public: // prepare PreRendering (evtl.) void PreparePreRenderDevice(); void DestroyPreRenderDevice(); - void OutputPreRenderDevice(const Region& rExpandedRegion); + void OutputPreRenderDevice(const vcl::Region& rExpandedRegion); SdrPreRenderDevice* GetPreRenderDevice() const { return mpPreRenderDevice; } // RedrawRegion - const Region& GetRedrawRegion() const { return maRedrawRegion;} - void SetRedrawRegion(const Region& rNew); + const vcl::Region& GetRedrawRegion() const { return maRedrawRegion;} + void SetRedrawRegion(const vcl::Region& rNew); // #i72889# read/write access to TempoparyTarget bool getTemporaryTarget() const { return (bool)mbTemporaryTarget; } |