diff options
Diffstat (limited to 'sd/source')
22 files changed, 40 insertions, 40 deletions
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index 591e6322f8b9..e6501b00e7b7 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -269,7 +269,7 @@ void SdDocPreviewWin::updateViewSettings() // Use new StandardCheckVisisbilityRedirector StandardCheckVisisbilityRedirector aRedirector; const Rectangle aRedrawRectangle = Rectangle( Point(), aNewSize ); - Region aRedrawRegion(aRedrawRectangle); + vcl::Region aRedrawRegion(aRedrawRectangle); pView->SdrPaintView::CompleteRedraw(&aVDev,aRedrawRegion,&aRedirector); aVDev.Pop(); diff --git a/sd/source/ui/docshell/docshel2.cxx b/sd/source/ui/docshell/docshel2.cxx index d4882e594b0f..c0bf1fcf8b34 100644 --- a/sd/source/ui/docshell/docshel2.cxx +++ b/sd/source/ui/docshell/docshel2.cxx @@ -109,7 +109,7 @@ void DrawDocShell::Draw(OutputDevice* pOut, const JobSetup&, sal_uInt16 nAspect) pOut->SetMapMode(aMapMode); } - Region aRegion(aVisArea); + vcl::Region aRegion(aVisArea); pView->CompleteRedraw(pOut, aRegion); if (pOut->GetOutDevType() == OUTDEV_PRINTER) @@ -263,7 +263,7 @@ Bitmap DrawDocShell::GetPagePreviewBitmap(SdPage* pPage, sal_uInt16 nMaxEdgePixe pView->SetActiveLayer( pFrameView->GetActiveLayer() ); } - pView->CompleteRedraw( &aVDev, Region(Rectangle(aNullPt, aSize)) ); + pView->CompleteRedraw( &aVDev, vcl::Region(Rectangle(aNullPt, aSize)) ); // IsRedrawReady() always gives sal_True while ( !pView->IsRedrawReady() ) {} delete pView; diff --git a/sd/source/ui/inc/ClientView.hxx b/sd/source/ui/inc/ClientView.hxx index 4c3320fedc0f..48357380557b 100644 --- a/sd/source/ui/inc/ClientView.hxx +++ b/sd/source/ui/inc/ClientView.hxx @@ -39,7 +39,7 @@ public: DrawViewShell* pShell); virtual ~ClientView (void); - virtual void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; + virtual void CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; /* if the view should not do a Invalidate() on the windows, you have to overload the following two methods and do something different */ diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 63493f143865..936ae4786c1a 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -92,7 +92,7 @@ public: ViewShell* pViewSh=NULL); virtual ~View (void); - void CompleteRedraw( OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; + void CompleteRedraw( OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; virtual bool GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 7404aa653051..fc909a389388 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -188,7 +188,7 @@ public: virtual bool HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWin); - virtual void Draw(OutputDevice &rDev, const Region &rReg); + virtual void Draw(OutputDevice &rDev, const ::vcl::Region &rReg); virtual void SetUIUnit(FieldUnit eUnit); virtual void SetDefTabHRuler( sal_uInt16 nDefTab ); diff --git a/sd/source/ui/inc/drawview.hxx b/sd/source/ui/inc/drawview.hxx index d3865bee27a7..7d20d8bd4863 100644 --- a/sd/source/ui/inc/drawview.hxx +++ b/sd/source/ui/inc/drawview.hxx @@ -42,7 +42,7 @@ public: virtual ~DrawView (void); virtual void MarkListHasChanged() SAL_OVERRIDE; - void CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; + void CompleteRedraw(OutputDevice* pOutDev, const ::vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = 0L) SAL_OVERRIDE; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false) SAL_OVERRIDE; @@ -56,7 +56,7 @@ public: virtual void MakeVisible(const Rectangle& rRect, ::vcl::Window& rWin) SAL_OVERRIDE; virtual void HideSdrPage() SAL_OVERRIDE; // SdrPageView* pPV); - void PresPaint(const Region& rRegion); + void PresPaint(const ::vcl::Region& rRegion); virtual void DeleteMarked() SAL_OVERRIDE; // from SdrView protected: diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 20d627eaedad..9ebfd1e56fa8 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -275,7 +275,7 @@ void SlideSorterController::Paint ( try { - mrView.CompleteRedraw(pWindow, Region(rBBox), 0); + mrView.CompleteRedraw(pWindow, ::vcl::Region(rBBox), 0); } catch (const Exception&) { diff --git a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx index 120315122258..bdf3a05b75f3 100644 --- a/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlideSorterModel.hxx @@ -199,7 +199,7 @@ public: The returned region has to be repainted to reflect the updated selection states. */ - Region RestoreSelection (void); + ::vcl::Region RestoreSelection (void); /** Typically called from controller::Listener this method handles the insertion and deletion of single pages. diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 292405f42725..048c05bca25d 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -88,7 +88,7 @@ public: void RequestRepaint (void); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); void RequestRepaint (const Rectangle& rRepaintBox); - void RequestRepaint (const Region& rRepaintRegion); + void RequestRepaint (const ::vcl::Region& rRepaintRegion); Rectangle GetModelArea (void); @@ -129,7 +129,7 @@ public: virtual void Resize (void); virtual void CompleteRedraw ( OutputDevice* pDevice, - const Region& rPaintArea, + const ::vcl::Region& rPaintArea, sdr::contact::ViewObjectContactRedirector* pRedirector = NULL) SAL_OVERRIDE; void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea); @@ -255,7 +255,7 @@ private: sal_Int32 mnButtonUnderMouse; ::boost::shared_ptr<PageObjectPainter> mpPageObjectPainter; ::boost::shared_ptr<SelectionPainter> mpSelectionPainter; - Region maRedrawRegion; + ::vcl::Region maRedrawRegion; SharedILayerPainter mpBackgroundPainter; ::boost::scoped_ptr<ToolTip> mpToolTip; bool mbIsRearrangePending; diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 6ce44a2c90ba..d90d701371b9 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -505,9 +505,9 @@ void SlideSorterModel::SaveCurrentSelection (void) } } -Region SlideSorterModel::RestoreSelection (void) +vcl::Region SlideSorterModel::RestoreSelection (void) { - Region aRepaintRegion; + vcl::Region aRepaintRegion; PageEnumeration aPages (PageEnumerationProvider::CreateAllPagesEnumeration(*this)); while (aPages.HasMoreElements()) { diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 8f89c56397cd..51d1a6694ca4 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -575,7 +575,7 @@ void SlideSorterView::RequestRepaint (const Rectangle& rRepaintBox) } } -void SlideSorterView::RequestRepaint (const Region& rRepaintRegion) +void SlideSorterView::RequestRepaint (const vcl::Region& rRepaintRegion) { SharedSdWindow pWindow (mrSlideSorter.GetContentWindow()); if (pWindow) @@ -602,7 +602,7 @@ static double gnLastFrameStart = 0; void SlideSorterView::CompleteRedraw ( OutputDevice* pDevice, - const Region& rPaintArea, + const vcl::Region& rPaintArea, sdr::contact::ViewObjectContactRedirector* pRedirector) { (void)pRedirector; diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 078b7b0c543d..a916b40580c0 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -194,7 +194,7 @@ Point InsertionIndicatorOverlay::PaintRepresentatives ( // paint an overlay that visualizes this. if (rRepresentatives[nIndex].mbIsExcluded) { - const Region aSavedClipRegion (rContent.GetClipRegion()); + const vcl::Region aSavedClipRegion (rContent.GetClipRegion()); rContent.IntersectClipRegion(Rectangle(aPageOffset, aPreviewSize)); // Paint bitmap tiled over the preview to mark it as excluded. const sal_Int32 nIconWidth (aExclusionOverlay.GetSizePixel().Width()); diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index b7ae8cd0eae5..7e0e20b828ba 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -74,7 +74,7 @@ void DeviceCopy ( rSourceDevice); } -void ForAllRectangles (const Region& rRegion, ::boost::function<void(const Rectangle&)> aFunction) +void ForAllRectangles (const vcl::Region& rRegion, ::boost::function<void(const Rectangle&)> aFunction) { OSL_ASSERT(aFunction); RectangleVector aRectangles; @@ -108,7 +108,7 @@ public: void Initialize (const SharedSdWindow& rpTargetWindow); void InvalidateRectangle (const Rectangle& rInvalidationBox); - void InvalidateRegion (const Region& rInvalidationRegion); + void InvalidateRegion (const vcl::Region& rInvalidationRegion); void Validate (const MapMode& rMapMode); void Repaint ( OutputDevice& rTargetDevice, @@ -122,7 +122,7 @@ public: private: ::boost::shared_ptr<VirtualDevice> mpLayerDevice; ::std::vector<SharedILayerPainter> maPainters; - Region maInvalidationRegion; + vcl::Region maInvalidationRegion; void ValidateRectangle (const Rectangle& rBox); }; @@ -190,7 +190,7 @@ void LayeredDevice::InvalidateAllLayers (const Rectangle& rInvalidationArea) (*mpLayers)[nLayer]->InvalidateRectangle(rInvalidationArea); } -void LayeredDevice::InvalidateAllLayers (const Region& rInvalidationRegion) +void LayeredDevice::InvalidateAllLayers (const vcl::Region& rInvalidationRegion) { for (sal_uInt32 nLayer=0; nLayer<mpLayers->size(); ++nLayer) (*mpLayers)[nLayer]->InvalidateRegion(rInvalidationRegion); @@ -254,7 +254,7 @@ void LayeredDevice::RemovePainter ( mpLayers->pop_back(); } -void LayeredDevice::Repaint (const Region& rRepaintRegion) +void LayeredDevice::Repaint (const vcl::Region& rRepaintRegion) { // Validate the contents of all layers (that have their own devices.) ::std::for_each( @@ -396,7 +396,7 @@ void Layer::InvalidateRectangle (const Rectangle& rInvalidationBox) maInvalidationRegion.Union(rInvalidationBox); } -void Layer::InvalidateRegion (const Region& rInvalidationRegion) +void Layer::InvalidateRegion (const vcl::Region& rInvalidationRegion) { maInvalidationRegion.Union(rInvalidationRegion); } @@ -405,7 +405,7 @@ void Layer::Validate (const MapMode& rMapMode) { if (mpLayerDevice && ! maInvalidationRegion.IsEmpty()) { - Region aRegion (maInvalidationRegion); + vcl::Region aRegion (maInvalidationRegion); maInvalidationRegion.SetEmpty(); mpLayerDevice->SetMapMode(rMapMode); @@ -419,7 +419,7 @@ void Layer::ValidateRectangle (const Rectangle& rBox) { if ( ! mpLayerDevice) return; - const Region aSavedClipRegion (mpLayerDevice->GetClipRegion()); + const vcl::Region aSavedClipRegion (mpLayerDevice->GetClipRegion()); mpLayerDevice->IntersectClipRegion(rBox); for (::std::vector<SharedILayerPainter>::const_iterator diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx index 1cf5ea439bd6..454074376fce 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx @@ -54,7 +54,7 @@ public: void InvalidateAllLayers ( const Rectangle& rInvalidationBox); void InvalidateAllLayers ( - const Region& rInvalidationRegion); + const vcl::Region& rInvalidationRegion); void RegisterPainter ( const SharedILayerPainter& rPainter, @@ -65,7 +65,7 @@ public: const sal_Int32 nLayer); bool HandleMapModeChange (void); - void Repaint (const Region& rRepaintRegion); + void Repaint (const vcl::Region& rRepaintRegion); void Resize (void); diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx index 855e762029cf..e1da6f46da30 100644 --- a/sd/source/ui/tools/PreviewRenderer.cxx +++ b/sd/source/ui/tools/PreviewRenderer.cxx @@ -294,7 +294,7 @@ void PreviewRenderer::PaintPage ( { // Paint the page. Rectangle aPaintRectangle (Point(0,0), pPage->GetSize()); - Region aRegion (aPaintRectangle); + vcl::Region aRegion (aPaintRectangle); // Turn off online spelling and redlining. SdrOutliner* pOutliner = NULL; diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index ff86a44f1db2..85fd970c4d93 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -1885,7 +1885,7 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r { ::sd::ClientView* pView = new ::sd::ClientView( mpDocShell, pOut, NULL ); Rectangle aVisArea = Rectangle( Point(), mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1, ePageKind )->GetSize() ); - Region aRegion( aVisArea ); + vcl::Region aRegion( aVisArea ); ::sd::ViewShell* pOldViewSh = mpDocShell->GetViewShell(); ::sd::View* pOldSdView = pOldViewSh ? pOldViewSh->GetView() : NULL; @@ -2253,7 +2253,7 @@ void SdXImpressDocument::paintTile( VirtualDevice& rDevice, Size aSize(nTileWidth, nTileHeight); Rectangle aRect(aPoint, aSize); - pViewSh->GetView()->CompleteRedraw(&rDevice, Region(aRect)); + pViewSh->GetView()->CompleteRedraw(&rDevice, vcl::Region(aRect)); } void SdXImpressDocument::setPart( int nPart ) diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 1a903f74eadb..2a85683d56da 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -300,7 +300,7 @@ namespace { pView->DrawMarkedObj(rPrinter); else rPrintView.CompleteRedraw(&rPrinter, - Region(Rectangle(Point(0,0), rPage.GetSize()))); + vcl::Region(Rectangle(Point(0,0), rPage.GetSize()))); rPrinter.SetMapMode(aOriginalMapMode); diff --git a/sd/source/ui/view/clview.cxx b/sd/source/ui/view/clview.cxx index f8900caba5eb..312f1697764d 100644 --- a/sd/source/ui/view/clview.cxx +++ b/sd/source/ui/view/clview.cxx @@ -52,7 +52,7 @@ ClientView::~ClientView() void ClientView::InvalidateOneWin(vcl::Window& rWin) { - Region aRegion; + vcl::Region aRegion; CompleteRedraw(&rWin, aRegion); } @@ -63,10 +63,10 @@ void ClientView::InvalidateOneWin(vcl::Window& rWin) void ClientView::InvalidateOneWin(vcl::Window& rWin, const Rectangle& rRect) { - CompleteRedraw(&rWin, Region(rRect)); + CompleteRedraw(&rWin, vcl::Region(rRect)); } -void ClientView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector ) +void ClientView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector ) { DrawView::CompleteRedraw(pOutDev, rReg, pRedirector); } diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index 043abbbcddff..eb94dc6b1372 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/sd/source/ui/view/drawview.cxx @@ -455,7 +455,7 @@ bool DrawView::SetStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAtt * Paint-method: Redirect event to the view */ -void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) +void DrawView::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) { if( mpVDev ) { @@ -491,7 +491,7 @@ void DrawView::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::co * Paint-Event during running slide show */ -void DrawView::PresPaint(const Region& rRegion) +void DrawView::PresPaint(const vcl::Region& rRegion) { if(mpViewSh) { diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 8401254133e0..95b19f3f582c 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -425,7 +425,7 @@ void DrawViewShell::Paint(const Rectangle& rRect, ::sd::Window* pWin) character in a symbol font */ GetDoc()->GetDrawOutliner( NULL ).SetDefaultLanguage( Application::GetSettings().GetLanguageTag().getLanguageType() ); - mpDrawView->CompleteRedraw( pWin, Region( rRect ) ); + mpDrawView->CompleteRedraw( pWin, vcl::Region( rRect ) ); if( pWin ) { diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 2871b5baa1da..98d90a4168d8 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -467,7 +467,7 @@ drawinglayer::primitive2d::Primitive2DSequence ViewRedirector::createRedirectedP /** * The event will be forwarded to the View */ -void View::CompleteRedraw(OutputDevice* pOutDev, const Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) +void View::CompleteRedraw(OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector /*=0L*/) { // execute ?? if (mnLockRedrawSmph == 0) diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 258bc88f9415..1dcf322653a4 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -1370,7 +1370,7 @@ void ViewShell::Paint (const Rectangle&, ::sd::Window* ) { } -void ViewShell::Draw(OutputDevice &, const Region &) +void ViewShell::Draw(OutputDevice &, const vcl::Region &) { } |