diff options
Diffstat (limited to 'sd/source/ui/slidesorter')
8 files changed, 20 insertions, 20 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 20d627eaedad..9ebfd1e56fa8 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -275,7 +275,7 @@ void SlideSorterController::Paint ( try { - mrView.CompleteRedraw(pWindow, Region(rBBox), 0); + mrView.CompleteRedraw(pWindow, ::vcl::Region(rBBox), 0); } catch (const Exception&) { diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 120315122258..bdf3a05b75f3 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -199,7 +199,7 @@ public: The returned region has to be repainted to reflect the updated selection states. */ - Region RestoreSelection (void); + ::vcl::Region RestoreSelection (void); /** Typically called from controller::Listener this method handles the insertion and deletion of single pages. diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 292405f42725..048c05bca25d 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -88,7 +88,7 @@ public: void RequestRepaint (void); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); void RequestRepaint (const Rectangle& rRepaintBox); - void RequestRepaint (const Region& rRepaintRegion); + void RequestRepaint (const ::vcl::Region& rRepaintRegion); Rectangle GetModelArea (void); @@ -129,7 +129,7 @@ public: virtual void Resize (void); virtual void CompleteRedraw ( OutputDevice* pDevice, - const Region& rPaintArea, + const ::vcl::Region& rPaintArea, sdr::contact::ViewObjectContactRedirector* pRedirector = NULL) SAL_OVERRIDE; void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea); @@ -255,7 +255,7 @@ private: sal_Int32 mnButtonUnderMouse; ::boost::shared_ptr<PageObjectPainter> mpPageObjectPainter; ::boost::shared_ptr<SelectionPainter> mpSelectionPainter; - Region maRedrawRegion; + ::vcl::Region maRedrawRegion; SharedILayerPainter mpBackgroundPainter; ::boost::scoped_ptr<ToolTip> mpToolTip; bool mbIsRearrangePending; diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 6ce44a2c90ba..d90d701371b9 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -505,9 +505,9 @@ void SlideSorterModel::SaveCurrentSelection (void) } } -Region SlideSorterModel::RestoreSelection (void) +vcl::Region SlideSorterModel::RestoreSelection (void) { - Region aRepaintRegion; + vcl::Region aRepaintRegion; PageEnumeration aPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); while (aPages.HasMoreElements()) { diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 8f89c56397cd..51d1a6694ca4 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -575,7 +575,7 @@ void SlideSorterView::RequestRepaint (const Rectangle& rRepaintBox) } } -void SlideSorterView::RequestRepaint (const Region& rRepaintRegion) +void SlideSorterView::RequestRepaint (const vcl::Region& rRepaintRegion) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow) @@ -602,7 +602,7 @@ static double gnLastFrameStart = 0; void SlideSorterView::CompleteRedraw ( OutputDevice* pDevice, - const Region& rPaintArea, + const vcl::Region& rPaintArea, sdr::contact::ViewObjectContactRedirector* pRedirector) { (void)pRedirector; diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 078b7b0c543d..a916b40580c0 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -194,7 +194,7 @@ Point InsertionIndicatorOverlay::PaintRepresentatives ( // paint an overlay that visualizes this. if (rRepresentatives[nIndex].mbIsExcluded) { - const Region aSavedClipRegion (rContent.GetClipRegion()); + const vcl::Region aSavedClipRegion (rContent.GetClipRegion()); rContent.IntersectClipRegion(Rectangle(aPageOffset, aPreviewSize)); // Paint bitmap tiled over the preview to mark it as excluded. const sal_Int32 nIconWidth (aExclusionOverlay.GetSizePixel().Width()); diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index b7ae8cd0eae5..7e0e20b828ba 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -74,7 +74,7 @@ void DeviceCopy ( rSourceDevice); } -void ForAllRectangles (const Region& rRegion, ::boost::function<void(const Rectangle&)> aFunction) +void ForAllRectangles (const vcl::Region& rRegion, ::boost::function<void(const Rectangle&)> aFunction) { OSL_ASSERT(aFunction); RectangleVector aRectangles; @@ -108,7 +108,7 @@ public: void Initialize (const SharedSdWindow& rpTargetWindow); void InvalidateRectangle (const Rectangle& rInvalidationBox); - void InvalidateRegion (const Region& rInvalidationRegion); + void InvalidateRegion (const vcl::Region& rInvalidationRegion); void Validate (const MapMode& rMapMode); void Repaint ( OutputDevice& rTargetDevice, @@ -122,7 +122,7 @@ public: private: ::boost::shared_ptr<VirtualDevice> mpLayerDevice; ::std::vector<SharedILayerPainter> maPainters; - Region maInvalidationRegion; + vcl::Region maInvalidationRegion; void ValidateRectangle (const Rectangle& rBox); }; @@ -190,7 +190,7 @@ void LayeredDevice::InvalidateAllLayers (const Rectangle& rInvalidationArea) (*mpLayers)[nLayer]->InvalidateRectangle(rInvalidationArea); } -void LayeredDevice::InvalidateAllLayers (const Region& rInvalidationRegion) +void LayeredDevice::InvalidateAllLayers (const vcl::Region& rInvalidationRegion) { for (sal_uInt32 nLayer=0; nLayer<mpLayers->size(); ++nLayer) (*mpLayers)[nLayer]->InvalidateRegion(rInvalidationRegion); @@ -254,7 +254,7 @@ void LayeredDevice::RemovePainter ( mpLayers->pop_back(); } -void LayeredDevice::Repaint (const Region& rRepaintRegion) +void LayeredDevice::Repaint (const vcl::Region& rRepaintRegion) { // Validate the contents of all layers (that have their own devices.) ::std::for_each( @@ -396,7 +396,7 @@ void Layer::InvalidateRectangle (const Rectangle& rInvalidationBox) maInvalidationRegion.Union(rInvalidationBox); } -void Layer::InvalidateRegion (const Region& rInvalidationRegion) +void Layer::InvalidateRegion (const vcl::Region& rInvalidationRegion) { maInvalidationRegion.Union(rInvalidationRegion); } @@ -405,7 +405,7 @@ void Layer::Validate (const MapMode& rMapMode) { if (mpLayerDevice && ! maInvalidationRegion.IsEmpty()) { - Region aRegion (maInvalidationRegion); + vcl::Region aRegion (maInvalidationRegion); maInvalidationRegion.SetEmpty(); mpLayerDevice->SetMapMode(rMapMode); @@ -419,7 +419,7 @@ void Layer::ValidateRectangle (const Rectangle& rBox) { if ( ! mpLayerDevice) return; - const Region aSavedClipRegion (mpLayerDevice->GetClipRegion()); + const vcl::Region aSavedClipRegion (mpLayerDevice->GetClipRegion()); mpLayerDevice->IntersectClipRegion(rBox); for (::std::vector<SharedILayerPainter>::const_iterator diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx index 1cf5ea439bd6..454074376fce 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx @@ -54,7 +54,7 @@ public: void InvalidateAllLayers ( const Rectangle& rInvalidationBox); void InvalidateAllLayers ( - const Region& rInvalidationRegion); + const vcl::Region& rInvalidationRegion); void RegisterPainter ( const SharedILayerPainter& rPainter, @@ -65,7 +65,7 @@ public: const sal_Int32 nLayer); bool HandleMapModeChange (void); - void Repaint (const Region& rRepaintRegion); + void Repaint (const vcl::Region& rRepaintRegion); void Resize (void); |