diff options
Diffstat (limited to 'sd/source/ui/slidesorter/inc')
10 files changed, 36 insertions, 36 deletions
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 44ae5995e9b9..cee9f9631bd8 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -83,7 +83,7 @@ public: /** Place and size the scroll bars and the browser window so that the given rectangle is filled. */ - void Resize (const Rectangle& rAvailableSpace); + void Resize (const ::tools::Rectangle& rAvailableSpace); /** Determine which of the UI elements--the scroll bars, the scroll bar filler, the actual slide sorter view--are visible and place them in @@ -124,7 +124,7 @@ public: /** This method forwards the call to the SlideSorterView and executes pending operations like moving selected pages into the visible area. */ - void Paint (const Rectangle& rRect, vcl::Window* pWin); + void Paint (const ::tools::Rectangle& rRect, vcl::Window* pWin); void FuTemporary (SfxRequest& rRequest); void FuPermanent (SfxRequest& rRequest); @@ -261,7 +261,7 @@ private: /** This rectangle in the parent window encloses scroll bars and slide sorter window. It is set when Resize() is called. */ - Rectangle maTotalWindowArea; + ::tools::Rectangle maTotalWindowArea; /** This counter is used to avoid processing of reentrant calls to Paint(). diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx index 698ab95702ba..a544f4585726 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx @@ -102,8 +102,8 @@ public: Returns the space that remains after the scroll bars are placed. */ - Rectangle PlaceScrollBars ( - const Rectangle& rAvailableArea, + ::tools::Rectangle PlaceScrollBars ( + const ::tools::Rectangle& rAvailableArea, const bool bIsHorizontalScrollBarAllowed, const bool bIsVerticalScrollBarAllowed); @@ -217,8 +217,8 @@ private: The area that is enclosed by the scroll bars is returned. It will be filled with the SlideSorterView. */ - Rectangle DetermineScrollBarVisibilities( - const Rectangle& rAvailableArea, + ::tools::Rectangle DetermineScrollBarVisibilities( + const ::tools::Rectangle& rAvailableArea, const bool bIsHorizontalScrollBarAllowed, const bool bIsVerticalScrollBarAllowed); @@ -233,7 +233,7 @@ private: bool TestScrollBarVisibilities ( bool bHorizontalScrollBarVisible, bool bVerticalScrollBarVisible, - const Rectangle& rAvailableArea); + const ::tools::Rectangle& rAvailableArea); void CalcAutoScrollOffset (const Point& rMouseWindowPosition); bool RepeatAutoScroll(); @@ -242,9 +242,9 @@ private: DECL_LINK(VerticalScrollBarHandler, ScrollBar*, void); DECL_LINK(AutoScrollTimeoutHandler, Timer *, void); - void PlaceHorizontalScrollBar (const Rectangle& aArea); - void PlaceVerticalScrollBar (const Rectangle& aArea); - void PlaceFiller (const Rectangle& aArea); + void PlaceHorizontalScrollBar (const ::tools::Rectangle& aArea); + void PlaceVerticalScrollBar (const ::tools::Rectangle& aArea); + void PlaceFiller (const ::tools::Rectangle& aArea); }; } } } // end of namespace ::sd::slidesorter::controller diff --git a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx index 7e227b578970..fec1640d6850 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsVisibleAreaManager.hxx @@ -71,7 +71,7 @@ private: area. Cleared on every call to ForgetVisibleRequests() and MakeVisible(). */ - ::std::vector<Rectangle> maVisibleRequests; + ::std::vector<::tools::Rectangle> maVisibleRequests; /** Animation id for a scroll animation that sets the top and left of the visible area to maRequestedVisibleTopLeft. diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 3b1d0df7c530..949f9f5b6034 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -110,9 +110,9 @@ public: VisualState& GetVisualState() { return maVisualState;} - Rectangle GetBoundingBox() const; + ::tools::Rectangle GetBoundingBox() const; Point GetLocation (const bool bIgnoreLocation) const; - void SetBoundingBox (const Rectangle& rBoundingBox); + void SetBoundingBox (const ::tools::Rectangle& rBoundingBox); private: SdPage* mpPage; @@ -124,7 +124,7 @@ private: */ sal_Int32 mnIndex; - Rectangle maBoundingBox; + ::tools::Rectangle maBoundingBox; VisualState maVisualState; bool mbIsSelected : 1; diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 1b541ca36374..5daf2d4efc89 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -85,10 +85,10 @@ public: void RequestRepaint(); void RequestRepaint (const model::SharedPageDescriptor& rDescriptor); - void RequestRepaint (const Rectangle& rRepaintBox); + void RequestRepaint (const ::tools::Rectangle& rRepaintBox); void RequestRepaint (const vcl::Region& rRepaintRegion); - Rectangle GetModelArea(); + ::tools::Rectangle GetModelArea(); /** Return the index of the page that is rendered at the given position. @param rPosition @@ -129,7 +129,7 @@ public: OutputDevice* pDevice, const vcl::Region& rPaintArea, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr) override; - void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea); + void Paint (OutputDevice& rDevice, const ::tools::Rectangle& rRepaintArea); virtual void ConfigurationChanged ( utl::ConfigurationBroadcaster* pBroadcaster, diff --git a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx index f317f70f900a..35c58de2b285 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsILayerPainter.hxx @@ -24,7 +24,7 @@ #include <memory> class OutputDevice; -class Rectangle; +namespace tools { class Rectangle; } namespace sd { namespace slidesorter { namespace view { @@ -33,7 +33,7 @@ class ILayerInvalidator public: virtual ~ILayerInvalidator() {} - virtual void Invalidate (const Rectangle& rInvalidationBox) = 0; + virtual void Invalidate (const ::tools::Rectangle& rInvalidationBox) = 0; }; typedef std::shared_ptr<ILayerInvalidator> SharedILayerInvalidator; @@ -46,7 +46,7 @@ public: const SharedILayerInvalidator& rpInvalidator) = 0; virtual void Paint ( OutputDevice& rDevice, - const Rectangle& rRepaintArea) = 0; + const ::tools::Rectangle& rRepaintArea) = 0; }; typedef std::shared_ptr<ILayerPainter> SharedILayerPainter; diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx index 8fe353ce73c2..05eb4b876df8 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx @@ -69,13 +69,13 @@ public: virtual void Paint ( OutputDevice& rDevice, - const Rectangle& rRepaintArea) override; + const ::tools::Rectangle& rRepaintArea) override; bool IsVisible() const { return mbIsVisible;} void Hide(); void Show(); - Rectangle GetBoundingBox() const; + ::tools::Rectangle GetBoundingBox() const; private: SlideSorter& mrSlideSorter; diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx index 8860817fc101..d312fe2700ae 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx @@ -116,14 +116,14 @@ public: /** Return the bounding box in window coordinates of the nIndex-th page object. */ - Rectangle GetPageObjectBox ( + ::tools::Rectangle GetPageObjectBox ( const sal_Int32 nIndex, const bool bIncludeBorderAndGap) const; /** Return the bounding box in model coordinates of the page that contains the given amount of page objects. */ - Rectangle GetTotalBoundingBox() const; + ::tools::Rectangle GetTotalBoundingBox() const; /** Return the index of the first fully or partially visible page object. This takes into account only the vertical dimension. @@ -131,7 +131,7 @@ public: The second index may be larger than the number of existing page objects. */ - Range GetRangeOfVisiblePageObjects (const Rectangle& rVisibleArea) const; + Range GetRangeOfVisiblePageObjects (const ::tools::Rectangle& rVisibleArea) const; /** Return the index of the page object that is rendered at the given point. diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx index 15ff687fcc04..d6df4b7aa381 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx @@ -99,7 +99,7 @@ public: Return a position ignoring the slides' location, ie. as if we were the first slide. */ - Rectangle GetBoundingBox ( + ::tools::Rectangle GetBoundingBox ( const model::SharedPageDescriptor& rpPageDescriptor, const Part ePart, const CoordinateSystem eCoordinateSystem, @@ -115,7 +115,7 @@ public: const Image& GetCustomAnimationEffectIcon() const { return maCustomAnimationEffectIcon;} private: - Rectangle GetBoundingBox ( + ::tools::Rectangle GetBoundingBox ( const Point& rPageObjectLocation, const Part ePart, const CoordinateSystem eCoordinateSystem); @@ -123,18 +123,18 @@ private: private: VclPtr<sd::Window> mpWindow; Size maPageObjectSize; - Rectangle maFocusIndicatorBoundingBox; - Rectangle maPageObjectBoundingBox; - Rectangle maPageNumberAreaBoundingBox; - Rectangle maPreviewBoundingBox; - Rectangle maTransitionEffectBoundingBox; - Rectangle maCustomAnimationEffectBoundingBox; + ::tools::Rectangle maFocusIndicatorBoundingBox; + ::tools::Rectangle maPageObjectBoundingBox; + ::tools::Rectangle maPageNumberAreaBoundingBox; + ::tools::Rectangle maPreviewBoundingBox; + ::tools::Rectangle maTransitionEffectBoundingBox; + ::tools::Rectangle maCustomAnimationEffectBoundingBox; const Image maTransitionEffectIcon; const Image maCustomAnimationEffectIcon; const std::shared_ptr<vcl::Font> mpPageNumberFont; Size GetPageNumberAreaSize (const int nPageCount); - Rectangle CalculatePreviewBoundingBox ( + ::tools::Rectangle CalculatePreviewBoundingBox ( Size& rPageObjectSize, const Size& rPreviewModelSize, const sal_Int32 nPageNumberAreaWidth, diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index 52c037468b12..8f151e6ff99f 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -99,7 +99,7 @@ private: void PaintBorder ( OutputDevice& rDevice, const Theme::GradientColorType eColorType, - const Rectangle& rBox) const; + const ::tools::Rectangle& rBox) const; void PaintBackgroundDetail( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, |