diff options
Diffstat (limited to 'sd/source/ui/slidesorter')
8 files changed, 19 insertions, 19 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 1f57412a9d8e..d6b3ce6b3bcb 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -239,25 +239,25 @@ ScrollBarManager& SlideSorterController::GetScrollBarManager() return *mpScrollBarManager.get(); } -std::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager() const +std::shared_ptr<CurrentSlideManager> const & SlideSorterController::GetCurrentSlideManager() const { OSL_ASSERT(mpCurrentSlideManager.get()!=nullptr); return mpCurrentSlideManager; } -std::shared_ptr<SlotManager> SlideSorterController::GetSlotManager() const +std::shared_ptr<SlotManager> const & SlideSorterController::GetSlotManager() const { OSL_ASSERT(mpSlotManager.get()!=nullptr); return mpSlotManager; } -std::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager() const +std::shared_ptr<SelectionManager> const & SlideSorterController::GetSelectionManager() const { OSL_ASSERT(mpSelectionManager.get()!=nullptr); return mpSelectionManager; } -std::shared_ptr<InsertionIndicatorHandler> +std::shared_ptr<InsertionIndicatorHandler> const & SlideSorterController::GetInsertionIndicatorHandler() const { OSL_ASSERT(mpInsertionIndicatorHandler.get()!=nullptr); diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index 3f433ac44992..6e940bf7e899 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -171,7 +171,7 @@ void InsertionIndicatorHandler::SetPosition ( } } -std::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator() +std::shared_ptr<view::InsertAnimator> const & InsertionIndicatorHandler::GetInsertAnimator() { if ( ! mpInsertAnimator) mpInsertAnimator.reset(new view::InsertAnimator(mrSlideSorter)); diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index fd9ac65f4593..af1145d0752c 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -116,10 +116,10 @@ public: */ ScrollBarManager& GetScrollBarManager(); - std::shared_ptr<CurrentSlideManager> GetCurrentSlideManager() const; - std::shared_ptr<SlotManager> GetSlotManager() const; - std::shared_ptr<SelectionManager> GetSelectionManager() const; - std::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler() const; + std::shared_ptr<CurrentSlideManager> const & GetCurrentSlideManager() const; + std::shared_ptr<SlotManager> const & GetSlotManager() const; + std::shared_ptr<SelectionManager> const & GetSelectionManager() const; + std::shared_ptr<InsertionIndicatorHandler> const & GetInsertionIndicatorHandler() const; /** This method forwards the call to the SlideSorterView and executes pending operations like moving selected pages into the visible area. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index 80b1049ec61e..f1d287173f60 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx @@ -121,7 +121,7 @@ private: void SetPosition ( const Point& rPoint, const Mode eMode); - std::shared_ptr<view::InsertAnimator> GetInsertAnimator(); + std::shared_ptr<view::InsertAnimator> const & GetInsertAnimator(); /** Make the insertion indicator visible (that is the show part) and keep it visible, even when the mouse leaves the window (that is the diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 0907dbbb7edd..aa3898ba517d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -47,7 +47,7 @@ public: : maBitmap(rBitmap), mbIsExcluded(bIsExcluded) {} Representative (const Representative& rOther) : maBitmap(rOther.maBitmap), mbIsExcluded(rOther.mbIsExcluded) {} - Representative operator= (Representative const& rOther) + Representative& operator= (Representative const& rOther) { if (&rOther != this) {maBitmap = rOther.maBitmap; mbIsExcluded = rOther.mbIsExcluded; } return *this; } diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 816dc14740ce..48c3cf8a32a0 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -143,7 +143,7 @@ public: */ void InvalidatePageObjectVisibilities(); - std::shared_ptr<cache::PageCache> GetPreviewCache(); + std::shared_ptr<cache::PageCache> const & GetPreviewCache(); /** Return the range of currently visible page objects including the first and last one in that range. @@ -151,7 +151,7 @@ public: The returned pair of page object indices is empty when the second index is lower than the first. */ - Pair GetVisiblePageRange(); + Pair const & GetVisiblePageRange(); /** Add a shape to the page. Typically used from inside PostModelChange(). @@ -187,7 +187,7 @@ public: void UpdateOrientation(); - std::shared_ptr<PageObjectPainter> GetPageObjectPainter(); + std::shared_ptr<PageObjectPainter> const & GetPageObjectPainter(); const std::shared_ptr<LayeredDevice>& GetLayeredDevice() const { return mpLayeredDevice;} class DrawLock diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 50975690c27b..79171b327634 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -417,13 +417,13 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) } } -std::shared_ptr<controller::Properties> SlideSorter::GetProperties() const +std::shared_ptr<controller::Properties> const & SlideSorter::GetProperties() const { OSL_ASSERT(mpProperties); return mpProperties; } -std::shared_ptr<view::Theme> SlideSorter::GetTheme() const +std::shared_ptr<view::Theme> const & SlideSorter::GetTheme() const { OSL_ASSERT(mpTheme); return mpTheme; diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 2abafe28dcc1..c5b75a26ea4d 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -689,7 +689,7 @@ void SlideSorterView::ConfigurationChanged ( } -std::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache() +std::shared_ptr<cache::PageCache> const & SlideSorterView::GetPreviewCache() { sd::Window *pWindow (mrSlideSorter.GetContentWindow()); if (pWindow && mpPreviewCache.get() == nullptr) @@ -704,7 +704,7 @@ std::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache() return mpPreviewCache; } -Pair SlideSorterView::GetVisiblePageRange() +Pair const & SlideSorterView::GetVisiblePageRange() { if ( ! mbPageObjectVisibilitiesValid) DeterminePageObjectVisibilities(); @@ -827,7 +827,7 @@ bool SlideSorterView::SetState ( return bModified; } -std::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter() +std::shared_ptr<PageObjectPainter> const & SlideSorterView::GetPageObjectPainter() { if ( ! mpPageObjectPainter) mpPageObjectPainter.reset(new PageObjectPainter(mrSlideSorter)); |