From 508c95f1b655d9cfa6be37a5a9de9aff6fd383bf Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 18 Jul 2016 09:22:27 +0200 Subject: improve passstuffbyref return analysis Change-Id: I4258bcc97273d8bb7a8c4879fac02a427f76e18c Reviewed-on: https://gerrit.libreoffice.org/27317 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sdext/source/presenter/PresenterAccessibility.cxx | 4 ++-- sdext/source/presenter/PresenterBitmapContainer.cxx | 2 +- sdext/source/presenter/PresenterBitmapContainer.hxx | 2 +- sdext/source/presenter/PresenterButton.cxx | 2 +- sdext/source/presenter/PresenterButton.hxx | 2 +- sdext/source/presenter/PresenterScrollBar.cxx | 2 +- sdext/source/presenter/PresenterScrollBar.hxx | 2 +- sdext/source/presenter/PresenterToolBar.cxx | 6 +++--- sdext/source/presenter/PresenterToolBar.hxx | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sdext/source') diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index a340509ce5fc..fd26f801ad64 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -509,7 +509,7 @@ private: class AccessibleFocusManager { public: - static std::shared_ptr Instance(); + static std::shared_ptr const & Instance(); void AddFocusableObject (const ::rtl::Reference& rpObject); void RemoveFocusableObject (const ::rtl::Reference& rpObject); @@ -1990,7 +1990,7 @@ void AccessibleNotes::HandleTextChange() std::shared_ptr AccessibleFocusManager::mpInstance; -std::shared_ptr AccessibleFocusManager::Instance() +std::shared_ptr const & AccessibleFocusManager::Instance() { if ( ! mpInstance) { diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx index 84ea7d47a0f4..ea39f17e2588 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.cxx +++ b/sdext/source/presenter/PresenterBitmapContainer.cxx @@ -342,7 +342,7 @@ const css::uno::Reference& return mxNormalBitmap; } -css::uno::Reference +css::uno::Reference const & PresenterBitmapContainer::BitmapDescriptor::GetBitmap(const Mode eMode) const { switch (eMode) diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx index f0877339dc44..e3acea1b4cdc 100644 --- a/sdext/source/presenter/PresenterBitmapContainer.hxx +++ b/sdext/source/presenter/PresenterBitmapContainer.hxx @@ -52,7 +52,7 @@ public: enum Mode {Normal, MouseOver, ButtonDown, Disabled, Mask}; const css::uno::Reference& GetNormalBitmap() const; - css::uno::Reference GetBitmap(const Mode eMode) const; + css::uno::Reference const & GetBitmap(const Mode eMode) const; void SetBitmap ( const Mode eMode, const css::uno::Reference& rxBitmap); diff --git a/sdext/source/presenter/PresenterButton.cxx b/sdext/source/presenter/PresenterButton.cxx index de2d758e700f..fc787724efef 100644 --- a/sdext/source/presenter/PresenterButton.cxx +++ b/sdext/source/presenter/PresenterButton.cxx @@ -221,7 +221,7 @@ void PresenterButton::SetCanvas ( } } -css::geometry::IntegerSize2D PresenterButton::GetSize() +css::geometry::IntegerSize2D const & PresenterButton::GetSize() { if (maButtonSize.Width < 0) CalculateButtonSize(); diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx index 4421c3739445..0f5bd77bf75b 100644 --- a/sdext/source/presenter/PresenterButton.hxx +++ b/sdext/source/presenter/PresenterButton.hxx @@ -72,7 +72,7 @@ public: void SetCanvas ( const css::uno::Reference& rxParentCanvas, const css::uno::Reference& rxParentWindow); - css::geometry::IntegerSize2D GetSize(); + css::geometry::IntegerSize2D const & GetSize(); // XWindowListener diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx index 3ea396653426..ead527a0a0ea 100644 --- a/sdext/source/presenter/PresenterScrollBar.cxx +++ b/sdext/source/presenter/PresenterScrollBar.cxx @@ -447,7 +447,7 @@ void SAL_CALL PresenterScrollBar::disposing (const css::lang::EventObject& rEven } -geometry::RealRectangle2D PresenterScrollBar::GetRectangle (const Area eArea) const +geometry::RealRectangle2D const & PresenterScrollBar::GetRectangle (const Area eArea) const { OSL_ASSERT(eArea>=0 && eArea& rxCanvas, const rendering::ViewState& rViewState) = 0; - awt::Size GetBoundingSize ( + awt::Size const & GetBoundingSize ( const Reference& rxCanvas); awt::Rectangle GetBoundingBox() const; virtual bool SetState (const bool bIsOver, const bool bIsPressed); @@ -474,7 +474,7 @@ void PresenterToolBar::RequestLayout() xManager->Invalidate(mxWindow); } -geometry::RealSize2D PresenterToolBar::GetMinimalSize() +geometry::RealSize2D const & PresenterToolBar::GetMinimalSize() { if (mbIsLayoutPending) Layout(mxCanvas); @@ -1244,7 +1244,7 @@ void Element::disposing() { } -awt::Size Element::GetBoundingSize ( +awt::Size const & Element::GetBoundingSize ( const Reference& rxCanvas) { maSize = CreateBoundingSize(rxCanvas); diff --git a/sdext/source/presenter/PresenterToolBar.hxx b/sdext/source/presenter/PresenterToolBar.hxx index f4201a1f6939..7bdcc6f0ed77 100644 --- a/sdext/source/presenter/PresenterToolBar.hxx +++ b/sdext/source/presenter/PresenterToolBar.hxx @@ -98,7 +98,7 @@ public: const bool bSynchronous); void RequestLayout(); - css::geometry::RealSize2D GetMinimalSize(); + css::geometry::RealSize2D const & GetMinimalSize(); const ::rtl::Reference& GetPresenterController() const; const css::uno::Reference& GetComponentContext() const; -- cgit