summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-04-13 15:37:03 +0200
committerNoel Grandin <noel@peralex.com>2016-04-14 09:21:40 +0200
commitbaf34a9e44fbd39c3657cabd22d871bc804ab12d (patch)
treecd82a6b15c89f5ae510f2e241b3587f6a294dcb5 /sd
parent89fa923a28fb351bb4faad1f69ca94d17f8a5b06 (diff)
loplugin:passstuffbyref in sd
Change-Id: If5a68861451efe025b77f71a20e805b71240b827
Diffstat (limited to 'sd')
-rw-r--r--sd/inc/CustomAnimationEffect.hxx6
-rw-r--r--sd/inc/drawdoc.hxx2
-rw-r--r--sd/inc/sdpage.hxx6
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx2
-rw-r--r--sd/source/ui/annotations/annotationtag.hxx2
-rw-r--r--sd/source/ui/framework/configuration/ConfigurationUpdater.hxx4
-rw-r--r--sd/source/ui/func/fuconcs.cxx2
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx2
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx2
-rw-r--r--sd/source/ui/inc/FrameView.hxx2
-rw-r--r--sd/source/ui/inc/SlideSorter.hxx8
-rw-r--r--sd/source/ui/inc/ViewShell.hxx4
-rw-r--r--sd/source/ui/inc/ViewTabBar.hxx2
-rw-r--r--sd/source/ui/inc/Window.hxx6
-rw-r--r--sd/source/ui/inc/framework/FrameworkHelper.hxx2
-rw-r--r--sd/source/ui/inc/framework/ViewShellWrapper.hxx2
-rw-r--r--sd/source/ui/inc/fuconcs.hxx2
-rw-r--r--sd/source/ui/remotecontrol/ZeroconfService.hxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageContainer.cxx4
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.cxx2
-rw-r--r--sd/source/ui/sidebar/MasterPageDescriptor.hxx2
-rw-r--r--sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx4
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx8
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx4
-rw-r--r--sd/source/ui/view/DocumentRenderer.cxx2
33 files changed, 52 insertions, 52 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 507bd9fc8fde..a1b6b2a1bde4 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -100,13 +100,13 @@ public:
SAL_DLLPRIVATE double getIterateInterval() const { return mfIterateInterval; }
void setIterateInterval( double fIterateInterval );
- SAL_DLLPRIVATE css::uno::Any getTarget() const { return maTarget; }
+ SAL_DLLPRIVATE const css::uno::Any& getTarget() const { return maTarget; }
void setTarget( const css::uno::Any& rTarget );
SAL_DLLPRIVATE bool hasAfterEffect() const { return mbHasAfterEffect; }
SAL_DLLPRIVATE void setHasAfterEffect( bool bHasAfterEffect ) { mbHasAfterEffect = bHasAfterEffect; }
- SAL_DLLPRIVATE css::uno::Any getDimColor() const { return maDimColor; }
+ SAL_DLLPRIVATE const css::uno::Any& getDimColor() const { return maDimColor; }
SAL_DLLPRIVATE void setDimColor( const css::uno::Any& rDimColor ) { maDimColor = rDimColor; }
SAL_DLLPRIVATE bool IsAfterEffectOnNext() const { return mbAfterEffectOnNextEffect; }
@@ -317,7 +317,7 @@ public:
SAL_DLLPRIVATE sal_Int32 getSequenceType() const { return mnSequenceType; }
- SAL_DLLPRIVATE css::uno::Reference< css::drawing::XShape > getTriggerShape() const { return mxEventSource; }
+ SAL_DLLPRIVATE const css::uno::Reference< css::drawing::XShape >& getTriggerShape() const { return mxEventSource; }
SAL_DLLPRIVATE void setTriggerShape( const css::uno::Reference< css::drawing::XShape >& xTrigger ) { mxEventSource = xTrigger; }
SAL_DLLPRIVATE virtual sal_Int32 getOffsetFromEffect( const CustomAnimationEffectPtr& xEffect ) const;
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 5eeea8d78126..099f36b970ea 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -139,7 +139,7 @@ private:
OUString msDocAccTitle;
public:
SAL_DLLPRIVATE void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; }
- SAL_DLLPRIVATE const OUString getDocAccTitle() const { return msDocAccTitle; }
+ SAL_DLLPRIVATE const OUString& getDocAccTitle() const { return msDocAccTitle; }
private:
bool bReadOnly;
public:
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 46d47b907a11..b893e6a5dff8 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -231,7 +231,7 @@ public:
bool IsScaleObjects() const { return mbScaleObjects; }
void SetSoundFile(const OUString& rStr) { maSoundFile = rStr; }
- OUString GetSoundFile() const { return maSoundFile; }
+ const OUString& GetSoundFile() const { return maSoundFile; }
void SetLoopSound( bool bLoopSound ) { mbLoopSound = bLoopSound; }
bool IsLoopSound() const { return mbLoopSound; }
@@ -261,9 +261,9 @@ public:
virtual OUString GetLayoutName() const override { return maLayoutName; }
void SetFileName(const OUString& aName) { maFileName = aName; }
- OUString GetFileName() const { return maFileName; }
+ const OUString& GetFileName() const { return maFileName; }
void SetBookmarkName(const OUString& aName) { maBookmarkName = aName; }
- OUString GetBookmarkName() const { return maBookmarkName; }
+ const OUString& GetBookmarkName() const { return maBookmarkName; }
void ConnectLink();
void DisconnectLink();
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 328478a47584..3f5d50249341 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -355,7 +355,7 @@ public:
explicit CustomAnimationListEntry( CustomAnimationEffectPtr pEffect );
virtual ~CustomAnimationListEntry();
- CustomAnimationEffectPtr getEffect() const { return mpEffect; }
+ const CustomAnimationEffectPtr& getEffect() const { return mpEffect; }
private:
CustomAnimationEffectPtr mpEffect;
diff --git a/sd/source/ui/annotations/annotationtag.hxx b/sd/source/ui/annotations/annotationtag.hxx
index 4a7e0da6c0cb..622b4f1a40ff 100644
--- a/sd/source/ui/annotations/annotationtag.hxx
+++ b/sd/source/ui/annotations/annotationtag.hxx
@@ -61,7 +61,7 @@ public:
BitmapEx CreateAnnotationBitmap(bool);
- css::uno::Reference< css::office::XAnnotation > GetAnnotation() const { return mxAnnotation; }
+ const css::uno::Reference< css::office::XAnnotation >& GetAnnotation() const { return mxAnnotation; }
void OpenPopup( bool bEdit );
void ClosePopup();
diff --git a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
index 11658fc7ee03..7542cfbe6741 100644
--- a/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationUpdater.hxx
@@ -71,8 +71,8 @@ public:
void RequestUpdate (const css::uno::Reference<
css::drawing::framework::XConfiguration>& rxRequestedConfiguration);
- css::uno::Reference<
- css::drawing::framework::XConfiguration> GetCurrentConfiguration() const { return mxCurrentConfiguration;}
+ const css::uno::Reference<
+ css::drawing::framework::XConfiguration>& GetCurrentConfiguration() const { return mxCurrentConfiguration;}
friend class ConfigurationUpdaterLock;
/** Return a lock of the called ConfigurationUpdater. While the
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index a6e06d39d073..015ab43afb3c 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -246,7 +246,7 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj )
}
}
-OUString FuConstructCustomShape::GetShapeType() const
+const OUString& FuConstructCustomShape::GetShapeType() const
{
return aCustomShape;
}
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 2b7a2cc41713..7323d28fe4ed 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -108,7 +108,7 @@ public:
sd::ViewShell* GetViewShell() { return mpViewShell; }
::sd::FrameView* GetFrameView();
- rtl::Reference<FuPoor> GetDocShellFunction() const { return mxDocShellFunction; }
+ const rtl::Reference<FuPoor>& GetDocShellFunction() const { return mxDocShellFunction; }
void SetDocShellFunction( const rtl::Reference<FuPoor>& xFunction );
SdDrawDocument* GetDoc() { return mpDoc;}
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index b5d724b1e319..700a2ad35649 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -228,7 +228,7 @@ public:
PageKind GetPageKind() { return mePageKind; }
void SetPageKind( PageKind ePageKind ) { mePageKind = ePageKind; }
- Point GetMousePos() { return maMousePos; }
+ const Point& GetMousePos() { return maMousePos; }
void SetMousePosFreezed( bool bIn ) { mbMousePosFreezed = bIn; }
EditMode GetEditMode() const { return meEditMode; }
diff --git a/sd/source/ui/inc/FrameView.hxx b/sd/source/ui/inc/FrameView.hxx
index f59c6b6db898..11741ccd7280 100644
--- a/sd/source/ui/inc/FrameView.hxx
+++ b/sd/source/ui/inc/FrameView.hxx
@@ -81,7 +81,7 @@ public:
void SetVisArea(const Rectangle& rVisArea)
{ maVisArea = rVisArea; }
- const Rectangle GetVisArea() { return maVisArea; }
+ const Rectangle& GetVisArea() { return maVisArea; }
void SetPageKind(PageKind eKind) { mePageKind = eKind; }
PageKind GetPageKind() const { return mePageKind; }
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index cd44236eefed..995e95de87fe 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -120,21 +120,21 @@ public:
/** Return the control of the vertical scroll bar.
*/
- VclPtr<ScrollBar> GetVerticalScrollBar() const { return mpVerticalScrollBar;}
+ const VclPtr<ScrollBar>& GetVerticalScrollBar() const { return mpVerticalScrollBar;}
/** Return the control of the horizontal scroll bar.
*/
- VclPtr<ScrollBar> GetHorizontalScrollBar() const { return mpHorizontalScrollBar;}
+ const VclPtr<ScrollBar>& GetHorizontalScrollBar() const { return mpHorizontalScrollBar;}
/** Return the scroll bar filler that paints the little square that is
enclosed by the two scroll bars.
*/
- VclPtr<ScrollBarBox> GetScrollBarFiller (void) const { return mpScrollBarBox;}
+ const VclPtr<ScrollBarBox>& GetScrollBarFiller (void) const { return mpScrollBarBox;}
/** Return the content window. This is a sibling and is geometrically
enclosed by the scroll bars.
*/
- VclPtr<sd::Window> GetContentWindow() const { return mpContentWindow;}
+ const VclPtr<sd::Window>& GetContentWindow() const { return mpContentWindow;}
model::SlideSorterModel& GetModel() const;
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 9b50fcdf2cbe..462bfc56018d 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -242,9 +242,9 @@ public:
*/
virtual SdPage* getCurrentPage() const = 0;
- rtl::Reference<FuPoor> GetOldFunction() const { return mxOldFunction; }
+ const rtl::Reference<FuPoor>& GetOldFunction() const { return mxOldFunction; }
bool HasOldFunction() const { return mxOldFunction.is(); }
- rtl::Reference<FuPoor> GetCurrentFunction() const { return mxCurrentFunction; }
+ const rtl::Reference<FuPoor>& GetCurrentFunction() const { return mxCurrentFunction; }
bool HasCurrentFunction( sal_uInt16 nSID ) { return mxCurrentFunction.is() && (mxCurrentFunction->GetSlotID() == nSID ); }
bool HasCurrentFunction() { return mxCurrentFunction.is(); }
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index d6dba60a3235..b43b19f9acc1 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -64,7 +64,7 @@ public:
virtual void SAL_CALL disposing() override;
- VclPtr< ::TabControl> GetTabControl() const { return mpTabControl;}
+ const VclPtr< ::TabControl>& GetTabControl() const { return mpTabControl;}
bool ActivatePage();
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 74f8aa879a59..6d9d8697f36c 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -106,9 +106,9 @@ public:
long GetZoom() const;
- Point GetWinViewPos() const { return maWinPos;}
- Point GetViewOrigin() const { return maViewOrigin;}
- Size GetViewSize() const { return maViewSize;}
+ const Point& GetWinViewPos() const { return maWinPos;}
+ const Point& GetViewOrigin() const { return maViewOrigin;}
+ const Size& GetViewSize() const { return maViewSize;}
void SetWinViewPos(const Point& rPnt);
void SetViewOrigin(const Point& rPnt);
void SetViewSize(const Size& rSize);
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 19711d689d74..a6b15941d6cf 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -294,7 +294,7 @@ public:
const css::uno::Reference<
css::drawing::framework::XResourceId>& rxAnchor);
- css::uno::Reference<css::drawing::framework::XConfigurationController>
+ const css::uno::Reference<css::drawing::framework::XConfigurationController>&
GetConfigurationController() const { return mxConfigurationController;}
private:
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
index a79d49850d8c..3f7b12e82242 100644
--- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx
+++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx
@@ -82,7 +82,7 @@ public:
to obtain a pointer to the wrapped ViewShell object for a given
XView object.
*/
- ::std::shared_ptr<ViewShell> GetViewShell() { return mpViewShell;}
+ const ::std::shared_ptr<ViewShell>& GetViewShell() { return mpViewShell;}
// XUnoTunnel
diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx
index c8609faad49d..41faf9c79543 100644
--- a/sd/source/ui/inc/fuconcs.hxx
+++ b/sd/source/ui/inc/fuconcs.hxx
@@ -45,7 +45,7 @@ public:
virtual void Activate() override;
void SetAttributes( SdrObject* pObj );
- OUString GetShapeType() const;
+ const OUString& GetShapeType() const;
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) override;
diff --git a/sd/source/ui/remotecontrol/ZeroconfService.hxx b/sd/source/ui/remotecontrol/ZeroconfService.hxx
index 832fc9fe725e..a809ebe142a6 100644
--- a/sd/source/ui/remotecontrol/ZeroconfService.hxx
+++ b/sd/source/ui/remotecontrol/ZeroconfService.hxx
@@ -40,7 +40,7 @@ namespace sd{
:name(aname), port(aport){}
virtual ~ZeroconfService(){}
- std::string getName() const {return name;}
+ const std::string& getName() const {return name;}
void setName(const char * n) {name = n;}
// Clean up the service when closing
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 993562cc89ff..c4a451fb60c8 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -85,7 +85,7 @@ public:
void AddChangeListener (const Link<MasterPageContainerChangeEvent&,void>& rLink);
void RemoveChangeListener (const Link<MasterPageContainerChangeEvent&,void>& rLink);
void UpdatePreviewSizePixel();
- Size GetPreviewSizePixel (PreviewSize eSize) const;
+ const Size& GetPreviewSizePixel (PreviewSize eSize) const;
bool HasToken (Token aToken) const;
const SharedMasterPageDescriptor GetDescriptor (MasterPageContainer::Token aToken) const;
@@ -606,7 +606,7 @@ void MasterPageContainer::Implementation::UpdatePreviewSizePixel()
}
}
-Size MasterPageContainer::Implementation::GetPreviewSizePixel (PreviewSize eSize) const
+const Size& MasterPageContainer::Implementation::GetPreviewSizePixel (PreviewSize eSize) const
{
if (eSize == SMALL)
return maSmallPreviewSizePixel;
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.cxx b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
index 7a1d461b956d..3b5e5f83840a 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.cxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.cxx
@@ -82,7 +82,7 @@ void MasterPageDescriptor::SetToken (MasterPageContainer::Token aToken)
maToken = aToken;
}
-Image MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize) const
+const Image& MasterPageDescriptor::GetPreview (MasterPageContainer::PreviewSize eSize) const
{
if (eSize == MasterPageContainer::SMALL)
return maSmallPreview;
diff --git a/sd/source/ui/sidebar/MasterPageDescriptor.hxx b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
index 01920594d5f2..d4bb8cc40def 100644
--- a/sd/source/ui/sidebar/MasterPageDescriptor.hxx
+++ b/sd/source/ui/sidebar/MasterPageDescriptor.hxx
@@ -69,7 +69,7 @@ public:
@return
The returned preview may be empty.
*/
- Image GetPreview (MasterPageContainer::PreviewSize ePreviewSize) const;
+ const Image& GetPreview (MasterPageContainer::PreviewSize ePreviewSize) const;
/** Use the PreviewProvider to get access to a preview of the master
page.
diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
index 9ca737da0c5f..0925b0f92e17 100644
--- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
+++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx
@@ -51,11 +51,11 @@ public:
sal_Int32 GetAccessTime() const { return mnLastAccessTime; }
void SetAccessTime (sal_Int32 nAccessTime) { mnLastAccessTime = nAccessTime; }
- Bitmap GetPreview() const { return maPreview; }
+ const Bitmap& GetPreview() const { return maPreview; }
inline void SetPreview (const Bitmap& rPreview);
bool HasPreview() const;
- Bitmap GetMarkedPreview() const { return maMarkedPreview; }
+ const Bitmap& GetMarkedPreview() const { return maMarkedPreview; }
inline void SetMarkedPreview (const Bitmap& rMarkePreview);
bool HasReplacement() const { return (mpReplacement.get() != nullptr); }
diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
index 97b93478fbe8..fd9ac65f4593 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx
@@ -213,7 +213,7 @@ public:
/** Return an Animator object.
*/
- std::shared_ptr<Animator> GetAnimator() const { return mpAnimator;}
+ const std::shared_ptr<Animator>& GetAnimator() const { return mpAnimator;}
VisibleAreaManager& GetVisibleAreaManager() const;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
index c27da2dc9c74..803918705b88 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsCurrentSlideManager.hxx
@@ -73,7 +73,7 @@ public:
/** Return the page descriptor for the current slide. Note, that when
there is no current slide then the returned pointer is empty.
*/
- model::SharedPageDescriptor GetCurrentSlide() { return mpCurrentSlide;}
+ const model::SharedPageDescriptor& GetCurrentSlide() { return mpCurrentSlide;}
/** Release all references to model data.
*/
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
index 835e45b097b4..ab19184582fa 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsPageSelector.hxx
@@ -115,7 +115,7 @@ public:
@return
The returned anchor may be NULL.
*/
- model::SharedPageDescriptor GetSelectionAnchor() const { return mpSelectionAnchor;}
+ const model::SharedPageDescriptor& GetSelectionAnchor() const { return mpSelectionAnchor;}
typedef ::std::vector<SdPage*> PageSelection;
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
index 4d4d9919b90e..23b336c7af7e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx
@@ -81,22 +81,22 @@ public:
/** Return the background color.
*/
- Color GetBackgroundColor() const { return maBackgroundColor;}
+ const Color& GetBackgroundColor() const { return maBackgroundColor;}
void SetBackgroundColor (const Color& rColor);
/** Return the text color.
*/
- Color GetTextColor() const { return maTextColor;}
+ const Color& GetTextColor() const { return maTextColor;}
void SetTextColor (const Color& rColor);
/** Return the color in which selections are to be painted.
*/
- Color GetSelectionColor() const { return maSelectionColor;}
+ const Color& GetSelectionColor() const { return maSelectionColor;}
void SetSelectionColor (const Color& rColor);
/** Return the color used for highlighting e.g. the current slide.
*/
- Color GetHighlightColor() const { return maHighlightColor;}
+ const Color& GetHighlightColor() const { return maHighlightColor;}
void SetHighlightColor (const Color& rColor);
/** The UI can be set to be read only independently from the model status.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
index 9f90324f3ac9..25f2a99ffd8e 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionManager.hxx
@@ -103,7 +103,7 @@ public:
*/
void SetInsertionPosition (const sal_Int32 nInsertionPosition);
- std::shared_ptr<SelectionObserver> GetSelectionObserver() const { return mpSelectionObserver;}
+ const std::shared_ptr<SelectionObserver>& GetSelectionObserver() const { return mpSelectionObserver;}
private:
SlideSorter& mrSlideSorter;
diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
index d807070e8112..9707c64627b9 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx
@@ -72,7 +72,7 @@ public:
/** Return the page that is represented by the descriptor as XDrawPage reference.
*/
- css::uno::Reference<css::drawing::XDrawPage> GetXDrawPage() const { return mxPage;}
+ const css::uno::Reference<css::drawing::XDrawPage>& GetXDrawPage() const { return mxPage;}
/** Returns the index of the page as it is displayed in the view as page
number. The value may differ from the index returned by the
diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
index 131b1c97cb5c..d76113e2dd45 100644
--- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
+++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx
@@ -48,7 +48,7 @@ public:
void UpdateVisualState (const PageDescriptor& rDescriptor);
- Point GetLocationOffset() const { return maLocationOffset;}
+ const Point& GetLocationOffset() const { return maLocationOffset;}
void SetLocationOffset (const Point& rPoint);
sal_Int32 mnPageId; // For debugging
diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
index d8cbb7c147f9..2214c4c3c786 100644
--- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx
@@ -189,7 +189,7 @@ public:
void UpdateOrientation();
std::shared_ptr<PageObjectPainter> GetPageObjectPainter();
- std::shared_ptr<LayeredDevice> GetLayeredDevice() const { return mpLayeredDevice;}
+ const std::shared_ptr<LayeredDevice>& GetLayeredDevice() const { return mpLayeredDevice;}
class DrawLock
{
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index 2ebed558939f..9011e5fabf84 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -216,9 +216,9 @@ public:
sal_Int32 GetRow() const { return mnRow; }
sal_Int32 GetColumn() const { return mnColumn; }
sal_Int32 GetIndex() const { return mnIndex; }
- Point GetLocation() const { return maLocation; }
- Point GetLeadingOffset() const { return maLeadingOffset; }
- Point GetTrailingOffset() const { return maTrailingOffset; }
+ const Point& GetLocation() const { return maLocation; }
+ const Point& GetLeadingOffset() const { return maLeadingOffset; }
+ const Point& GetTrailingOffset() const { return maTrailingOffset; }
bool IsAtRunStart() const { return mbIsAtRunStart; }
bool IsAtRunEnd() const { return mbIsAtRunEnd; }
bool IsExtraSpaceNeeded() const { return mbIsExtraSpaceNeeded; }
diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
index 039d626b288d..0b2eb12266f7 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectLayouter.hxx
@@ -115,8 +115,8 @@ public:
/// the maximum size of each tile, also position independent, in window coordinate system
Size GetGridMaxSize();
- Image GetTransitionEffectIcon() const { return maTransitionEffectIcon;}
- Image GetCustomAnimationEffectIcon() const { return maCustomAnimationEffectIcon;}
+ const Image& GetTransitionEffectIcon() const { return maTransitionEffectIcon;}
+ const Image& GetCustomAnimationEffectIcon() const { return maCustomAnimationEffectIcon;}
private:
Rectangle GetBoundingBox (
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 10f538e45b87..6f5fb2416093 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -349,7 +349,7 @@ namespace {
return maProperties;
}
- std::vector<sal_Int32> GetSlidesPerPage() const
+ const std::vector<sal_Int32>& GetSlidesPerPage() const
{
return maSlidesPerPage;
}