summaryrefslogtreecommitdiff
path: root/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-27 14:52:40 +0200
committerNoel Grandin <noel@peralex.com>2014-09-30 09:58:23 +0200
commit8dbde0845a3989528614addb9bd0333f60c522a5 (patch)
treec1f13bfc8e2841427eb6a07e2147445b309b1e9a /sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
parentb69478acff4f5b7a9d334a765a1a528d44d7b3a4 (diff)
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 'sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx')
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index b7ae8cd0eae5..7e0e20b828ba 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -74,7 +74,7 @@ void DeviceCopy (
rSourceDevice);
}
-void ForAllRectangles (const Region& rRegion, ::boost::function<void(const Rectangle&)> aFunction)
+void ForAllRectangles (const vcl::Region& rRegion, ::boost::function<void(const Rectangle&)> aFunction)
{
OSL_ASSERT(aFunction);
RectangleVector aRectangles;
@@ -108,7 +108,7 @@ public:
void Initialize (const SharedSdWindow& rpTargetWindow);
void InvalidateRectangle (const Rectangle& rInvalidationBox);
- void InvalidateRegion (const Region& rInvalidationRegion);
+ void InvalidateRegion (const vcl::Region& rInvalidationRegion);
void Validate (const MapMode& rMapMode);
void Repaint (
OutputDevice& rTargetDevice,
@@ -122,7 +122,7 @@ public:
private:
::boost::shared_ptr<VirtualDevice> mpLayerDevice;
::std::vector<SharedILayerPainter> maPainters;
- Region maInvalidationRegion;
+ vcl::Region maInvalidationRegion;
void ValidateRectangle (const Rectangle& rBox);
};
@@ -190,7 +190,7 @@ void LayeredDevice::InvalidateAllLayers (const Rectangle& rInvalidationArea)
(*mpLayers)[nLayer]->InvalidateRectangle(rInvalidationArea);
}
-void LayeredDevice::InvalidateAllLayers (const Region& rInvalidationRegion)
+void LayeredDevice::InvalidateAllLayers (const vcl::Region& rInvalidationRegion)
{
for (sal_uInt32 nLayer=0; nLayer<mpLayers->size(); ++nLayer)
(*mpLayers)[nLayer]->InvalidateRegion(rInvalidationRegion);
@@ -254,7 +254,7 @@ void LayeredDevice::RemovePainter (
mpLayers->pop_back();
}
-void LayeredDevice::Repaint (const Region& rRepaintRegion)
+void LayeredDevice::Repaint (const vcl::Region& rRepaintRegion)
{
// Validate the contents of all layers (that have their own devices.)
::std::for_each(
@@ -396,7 +396,7 @@ void Layer::InvalidateRectangle (const Rectangle& rInvalidationBox)
maInvalidationRegion.Union(rInvalidationBox);
}
-void Layer::InvalidateRegion (const Region& rInvalidationRegion)
+void Layer::InvalidateRegion (const vcl::Region& rInvalidationRegion)
{
maInvalidationRegion.Union(rInvalidationRegion);
}
@@ -405,7 +405,7 @@ void Layer::Validate (const MapMode& rMapMode)
{
if (mpLayerDevice && ! maInvalidationRegion.IsEmpty())
{
- Region aRegion (maInvalidationRegion);
+ vcl::Region aRegion (maInvalidationRegion);
maInvalidationRegion.SetEmpty();
mpLayerDevice->SetMapMode(rMapMode);
@@ -419,7 +419,7 @@ void Layer::ValidateRectangle (const Rectangle& rBox)
{
if ( ! mpLayerDevice)
return;
- const Region aSavedClipRegion (mpLayerDevice->GetClipRegion());
+ const vcl::Region aSavedClipRegion (mpLayerDevice->GetClipRegion());
mpLayerDevice->IntersectClipRegion(rBox);
for (::std::vector<SharedILayerPainter>::const_iterator