[Libreoffice-commits] core.git: chart2/qa compilerplugins/clang reportdesign/inc reportdesign/source scripting/source sd/inc sd/source svgio/inc svgio/source
Noel Grandin
noel.grandin at collabora.co.uk
Tue Jan 2 12:15:58 UTC 2018
chart2/qa/extras/chart2dump/chart2dump.cxx | 2 +-
compilerplugins/clang/passstuffbyref.cxx | 4 ++++
compilerplugins/clang/test/passstuffbyref.cxx | 1 +
reportdesign/inc/reportformula.hxx | 8 ++++----
reportdesign/source/ui/inc/DesignView.hxx | 2 +-
reportdesign/source/ui/inc/ReportWindow.hxx | 2 +-
reportdesign/source/ui/inc/ScrollHelper.hxx | 2 +-
reportdesign/source/ui/report/DesignView.cxx | 2 +-
reportdesign/source/ui/report/ReportWindow.cxx | 2 +-
reportdesign/source/ui/report/ScrollHelper.cxx | 2 +-
scripting/source/dlgprov/dlgevtatt.cxx | 2 +-
scripting/source/dlgprov/dlgevtatt.hxx | 2 +-
sd/inc/sdpage.hxx | 2 +-
sd/inc/stlsheet.hxx | 2 +-
sd/source/core/stlsheet.cxx | 2 +-
sd/source/filter/grf/sdgrffilter.cxx | 2 +-
sd/source/ui/inc/ViewShell.hxx | 4 ++--
sd/source/ui/inc/ViewShellBase.hxx | 8 ++++----
sd/source/ui/sidebar/SlideBackground.cxx | 10 +++++-----
sd/source/ui/sidebar/SlideBackground.hxx | 10 +++++-----
sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx | 4 ++--
sd/source/ui/slidesorter/view/SlsLayouter.cxx | 4 ++--
sd/source/ui/view/ViewShellBase.cxx | 8 ++++----
sd/source/ui/view/drviews2.cxx | 2 +-
sd/source/ui/view/viewshe2.cxx | 4 ++--
svgio/inc/svgstyleattributes.hxx | 2 +-
svgio/source/svgreader/svgstyleattributes.cxx | 2 +-
27 files changed, 51 insertions(+), 46 deletions(-)
New commits:
commit a0e136d2cbb3784ddfcbddcfed5d784c8e4c9a64
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Jan 2 11:33:15 2018 +0200
loplugin:passstuffbyref improved return in sd,various
Change-Id: I4b6ea89ae2072f4389a696ea3c96d8f7a5731e7a
Reviewed-on: https://gerrit.libreoffice.org/47246
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx
index c852446efe7e..7e8cd9b2a2f6 100644
--- a/chart2/qa/extras/chart2dump/chart2dump.cxx
+++ b/chart2/qa/extras/chart2dump/chart2dump.cxx
@@ -108,7 +108,7 @@ protected:
bool isInDumpMode () const {return m_bDumpMode;}
virtual OUString getTestName() { return OUString(); }
- OUString getTestFileName() { return m_sTestFileName; }
+ OUString const & getTestFileName() { return m_sTestFileName; }
OUString getTestFileDirName() { return OUString("/chart2/qa/extras/chart2dump/data/"); }
OUString getReferenceDirName()
{
diff --git a/compilerplugins/clang/passstuffbyref.cxx b/compilerplugins/clang/passstuffbyref.cxx
index aca8b89da5a3..54982fdfc045 100644
--- a/compilerplugins/clang/passstuffbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -380,6 +380,10 @@ bool PassStuffByRef::isReturnExprDisqualified(const Expr* expr)
return isReturnExprDisqualified(condOper->getTrueExpr())
|| isReturnExprDisqualified(condOper->getFalseExpr());
}
+ if (auto unaryOp = dyn_cast<UnaryOperator>(expr)) {
+ expr = unaryOp->getSubExpr();
+ continue;
+ }
if (auto operatorCallExpr = dyn_cast<CXXOperatorCallExpr>(expr)) {
// TODO could improve this, but sometimes it means we're returning a copy of a temporary.
// Same logic as CXXOperatorCallExpr::isAssignmentOp(), which our supported clang
diff --git a/compilerplugins/clang/test/passstuffbyref.cxx b/compilerplugins/clang/test/passstuffbyref.cxx
index ed86d4d309d9..71c219c986ec 100644
--- a/compilerplugins/clang/test/passstuffbyref.cxx
+++ b/compilerplugins/clang/test/passstuffbyref.cxx
@@ -52,6 +52,7 @@ struct S2 {
OUString set5(OUString const & s) { return s; }
OUString set6() { std::vector<OUString> v1(1); return v1[0]; }
OUString set7(S1 const & s) { return s.get(); }
+ OUString set8() { OUString * p = nullptr; return *p; }
};
diff --git a/reportdesign/inc/reportformula.hxx b/reportdesign/inc/reportformula.hxx
index 7d10243aee86..5e5976a075b9 100644
--- a/reportdesign/inc/reportformula.hxx
+++ b/reportdesign/inc/reportformula.hxx
@@ -77,7 +77,7 @@ namespace rptui
const OUString& getUndecoratedContent() const { return m_sUndecoratedContent; }
/// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on an expression
- inline OUString getFieldName() const;
+ inline OUString const & getFieldName() const;
/**
@returns "=" + getFieldName()
@@ -85,7 +85,7 @@ namespace rptui
OUString getEqualUndecoratedContent() const;
/// convenience alias for <code>getUndecoratedContent</code>, which asserts (in a non-product build) when used on a field
- inline OUString getExpression() const;
+ inline OUString const & getExpression() const;
/** returns a bracketed field name of the formula denotes a field reference,
or the undecorated expression if the formula denotes an expression.
@@ -100,14 +100,14 @@ namespace rptui
};
- inline OUString ReportFormula::getFieldName() const
+ inline OUString const & ReportFormula::getFieldName() const
{
OSL_PRECOND( getType() == Field, "ReportFormula::getFieldName: not bound to a field!" );
return getUndecoratedContent();
}
- inline OUString ReportFormula::getExpression() const
+ inline OUString const & ReportFormula::getExpression() const
{
OSL_PRECOND( getType() == Expression, "ReportFormula::getExpression: not bound to an expression!" );
return getUndecoratedContent();
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 898821be753d..07e01d0d2b79 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -107,7 +107,7 @@ namespace rptui
void SetMode( DlgEdMode m_eMode );
void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType = OUString());
sal_uInt16 GetInsertObj() const { return m_eActObj;}
- OUString GetInsertObjString() const;
+ OUString const & GetInsertObjString() const;
DlgEdMode GetMode() const { return m_eMode; }
/** cuts the current selection in this section
diff --git a/reportdesign/source/ui/inc/ReportWindow.hxx b/reportdesign/source/ui/inc/ReportWindow.hxx
index dc00f4c3f91e..a474ca258e8d 100644
--- a/reportdesign/source/ui/inc/ReportWindow.hxx
+++ b/reportdesign/source/ui/inc/ReportWindow.hxx
@@ -77,7 +77,7 @@ namespace rptui
void SetMode( DlgEdMode m_eMode );
void SetInsertObj( sal_uInt16 eObj, const OUString& _sShapeType);
- OUString GetInsertObjString() const;
+ OUString const & GetInsertObjString() const;
void setGridSnap(bool bOn);
void setDragStripes(bool bOn);
diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 6ddcf52247ed..14dbb87130a2 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -88,7 +88,7 @@ namespace rptui
// forwards
void SetMode( DlgEdMode _eMode );
void SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType);
- OUString GetInsertObjString() const;
+ OUString const & GetInsertObjString() const;
void setGridSnap(bool bOn);
void setDragStripes(bool bOn);
/** copies the current selection in this section
diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx
index cf550e6de4ad..1170439603ee 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -294,7 +294,7 @@ void ODesignView::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
m_aScrollWindow->SetInsertObj( eObj,_sShapeType );
}
-OUString ODesignView::GetInsertObjString() const
+OUString const & ODesignView::GetInsertObjString() const
{
return m_aScrollWindow->GetInsertObjString();
}
diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx
index 97f88c0189d2..e6ddb124219d 100644
--- a/reportdesign/source/ui/report/ReportWindow.cxx
+++ b/reportdesign/source/ui/report/ReportWindow.cxx
@@ -102,7 +102,7 @@ void OReportWindow::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeType )
m_aViewsWindow->SetInsertObj( eObj,_sShapeType);
}
-OUString OReportWindow::GetInsertObjString() const
+OUString const & OReportWindow::GetInsertObjString() const
{
return m_aViewsWindow->GetInsertObjString();
}
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx b/reportdesign/source/ui/report/ScrollHelper.cxx
index 9d054ea15467..ce6b589f72c3 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -224,7 +224,7 @@ void OScrollWindowHelper::SetInsertObj( sal_uInt16 eObj,const OUString& _sShapeT
m_aReportWindow->SetInsertObj(eObj,_sShapeType);
}
-OUString OScrollWindowHelper::GetInsertObjString() const
+OUString const & OScrollWindowHelper::GetInsertObjString() const
{
return m_aReportWindow->GetInsertObjString();
}
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx
index d58c7ec0f4e3..563faeed79e8 100644
--- a/scripting/source/dlgprov/dlgevtatt.cxx
+++ b/scripting/source/dlgprov/dlgevtatt.cxx
@@ -186,7 +186,7 @@ namespace dlgprov
}
- Reference< script::XScriptListener >
+ Reference< script::XScriptListener > const &
DialogEventsAttacherImpl::getScriptListenerForKey( const OUString& sKey )
{
ListenerHash::iterator it = listenersForTypes.find( sKey );
diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx
index b4df1c516684..2c92d3220fef 100644
--- a/scripting/source/dlgprov/dlgevtatt.hxx
+++ b/scripting/source/dlgprov/dlgevtatt.hxx
@@ -52,7 +52,7 @@ namespace dlgprov
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::script::XEventAttacher > m_xEventAttacher;
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::script::XScriptListener > getScriptListenerForKey( const OUString& sScriptName );
+ css::uno::Reference< css::script::XScriptListener > const & getScriptListenerForKey( const OUString& sScriptName );
css::uno::Reference< css::script::XScriptEventsSupplier > getFakeVbaEventsSupplier( const css::uno::Reference< css::awt::XControl>& xControl, OUString const & sCodeName );
void nestedAttachEvents( const css::uno::Sequence< css::uno::Reference< css::uno::XInterface > >& Objects, const css::uno::Any& Helper, OUString& sDialogCodeName );
void attachEventsToControl( const css::uno::Reference< css::awt::XControl>& xControl, const css::uno::Reference< css::script::XScriptEventsSupplier >& events, const css::uno::Any& Helper );
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index f11aa7e640a2..dcef647fb59e 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -271,7 +271,7 @@ public:
bool bScaleAllObj);
const OUString& GetName() const;
- OUString GetRealName() const { return FmFormPage::GetName(); };
+ OUString const & GetRealName() const { return FmFormPage::GetName(); };
void SetPresentationLayout(const OUString& rLayoutName,
bool bReplaceStyleSheets = true,
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index d80da5e73578..314818a21b3e 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -69,7 +69,7 @@ public:
SdStyleSheet* GetPseudoStyleSheet() const;
void SetApiName( const OUString& rApiName );
- OUString GetApiName() const;
+ OUString const & GetApiName() const;
static OUString GetFamilyString( SfxStyleFamily eFamily );
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 47ee855153d2..e0aacc949efa 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -149,7 +149,7 @@ void SdStyleSheet::SetApiName( const OUString& rApiName )
msApiName = rApiName;
}
-OUString SdStyleSheet::GetApiName() const
+OUString const & SdStyleSheet::GetApiName() const
{
if( !msApiName.isEmpty() )
return msApiName;
diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx
index d34ca8d27471..60900a642ca8 100644
--- a/sd/source/filter/grf/sdgrffilter.cxx
+++ b/sd/source/filter/grf/sdgrffilter.cxx
@@ -96,7 +96,7 @@ class SdGRFFilter_ImplInteractionHdl : public ::cppu::WeakImplHelper< css::task:
nFilterError( ERRCODE_NONE )
{}
- ErrCode GetErrorCode() const { return nFilterError; };
+ ErrCode const & GetErrorCode() const { return nFilterError; };
virtual void SAL_CALL handle( const css::uno::Reference< css::task::XInteractionRequest >& ) override;
};
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index f65c5e31af60..ece5750c5c3b 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -300,8 +300,8 @@ public:
void NotifyAccUpdate();
void fireSwitchCurrentPage(sal_Int32 pageIndex);
void SetWinViewPos(const Point& rWinPos);
- Point GetWinViewPos() const;
- Point GetViewOrigin() const;
+ Point const & GetWinViewPos() const;
+ Point const & GetViewOrigin() const;
/** Return the window updater of this view shell.
@return
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 9d79c646ea63..5e760c422fef 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -81,7 +81,7 @@ public:
*/
void LateInit (const OUString& rsDefaultView);
- std::shared_ptr<ViewShellManager> GetViewShellManager() const;
+ std::shared_ptr<ViewShellManager> const & GetViewShellManager() const;
/** Return the main view shell stacked on the called ViewShellBase
object. This is usually the view shell displayed in the center
@@ -192,15 +192,15 @@ public:
events from various sources. This method must not be called before
LateInit() has terminated.
*/
- std::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer();
+ std::shared_ptr<tools::EventMultiplexer> const & GetEventMultiplexer();
/** returns the complete area of the current view relative to the frame
window
*/
const ::tools::Rectangle& getClientRectangle() const;
- std::shared_ptr<ToolBarManager> GetToolBarManager() const;
- std::shared_ptr<FormShellManager> GetFormShellManager() const;
+ std::shared_ptr<ToolBarManager> const & GetToolBarManager() const;
+ std::shared_ptr<FormShellManager> const & GetFormShellManager() const;
DrawController& GetDrawController() const;
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 76da35ddd0b0..190be7ff59dd 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -676,7 +676,7 @@ void SlideBackground::ExecuteMarginULChange(const long mnPageTopMargin, const lo
GetBindings()->GetDispatcher()->ExecuteList( SID_ATTR_PAGE_ULSPACE, SfxCallMode::RECORD, { mpPageULMarginItem.get() } );
}
-Color SlideBackground::GetColorSetOrDefault()
+Color const & SlideBackground::GetColorSetOrDefault()
{
// Tango Sky Blue 1, to be consistent w/ area fill panel (b/c COL_AUTO for slides is transparent)
if ( !mpColorItem )
@@ -685,7 +685,7 @@ Color SlideBackground::GetColorSetOrDefault()
return mpColorItem->GetColorValue();
}
-XGradient SlideBackground::GetGradientSetOrDefault()
+XGradient const & SlideBackground::GetGradientSetOrDefault()
{
if( !mpGradientItem )
{
@@ -700,7 +700,7 @@ XGradient SlideBackground::GetGradientSetOrDefault()
return mpGradientItem->GetGradientValue();
}
-const OUString SlideBackground::GetHatchingSetOrDefault()
+OUString const & SlideBackground::GetHatchingSetOrDefault()
{
if( !mpHatchItem )
{
@@ -715,7 +715,7 @@ const OUString SlideBackground::GetHatchingSetOrDefault()
return mpHatchItem->GetName();
}
-const OUString SlideBackground::GetBitmapSetOrDefault()
+OUString const & SlideBackground::GetBitmapSetOrDefault()
{
if( !mpBitmapItem || mpBitmapItem->isPattern())
{
@@ -730,7 +730,7 @@ const OUString SlideBackground::GetBitmapSetOrDefault()
return mpBitmapItem->GetName();
}
-const OUString SlideBackground::GetPatternSetOrDefault()
+OUString const & SlideBackground::GetPatternSetOrDefault()
{
if( !mpBitmapItem || !(mpBitmapItem->isPattern()))
{
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index 8b7ad034b585..9dfa890edc7c 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -159,11 +159,11 @@ private:
void UpdateMarginBox();
void SetPanelTitle(const OUString& rTitle);
- Color GetColorSetOrDefault();
- XGradient GetGradientSetOrDefault();
- const OUString GetHatchingSetOrDefault();
- const OUString GetBitmapSetOrDefault();
- const OUString GetPatternSetOrDefault();
+ Color const & GetColorSetOrDefault();
+ XGradient const & GetGradientSetOrDefault();
+ OUString const & GetHatchingSetOrDefault();
+ OUString const & GetBitmapSetOrDefault();
+ OUString const & GetPatternSetOrDefault();
bool IsDraw();
bool IsImpress();
void addListener();
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index eab9fec453f2..529c6a7662d3 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -69,7 +69,7 @@ public:
const std::shared_ptr<Theme>& rpTheme);
~Layouter();
- std::shared_ptr<PageObjectLayouter> GetPageObjectLayouter() const;
+ std::shared_ptr<PageObjectLayouter> const & GetPageObjectLayouter() const;
/** Set the interval of valid column counts. When nMinimalColumnCount
<= nMaximalColumnCount is not fulfilled then the call is ignored.
@param nMinimalColumnCount
@@ -112,7 +112,7 @@ public:
sal_Int32 GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) const;
- Size GetPageObjectSize() const;
+ Size const & GetPageObjectSize() const;
/** Return the bounding box in window coordinates of the nIndex-th page
object.
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index 81536d264d43..754bb4db51f3 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -298,7 +298,7 @@ Layouter::~Layouter()
{
}
-std::shared_ptr<PageObjectLayouter> Layouter::GetPageObjectLayouter() const
+std::shared_ptr<PageObjectLayouter> const & Layouter::GetPageObjectLayouter() const
{
return mpImplementation->mpPageObjectLayouter;
}
@@ -338,7 +338,7 @@ sal_Int32 Layouter::GetIndex (const sal_Int32 nRow, const sal_Int32 nColumn) con
return mpImplementation->GetIndex(nRow,nColumn,true);
}
-Size Layouter::GetPageObjectSize() const
+Size const & Layouter::GetPageObjectSize() const
{
return mpImplementation->maPageObjectSize;
}
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 99dca2efed88..ab6eca07ca5e 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -373,7 +373,7 @@ void ViewShellBase::LateInit (const OUString& rsDefaultView)
mpImpl->SetUserWantsTabBar( bIsTabBarVisible );
}
-std::shared_ptr<ViewShellManager> ViewShellBase::GetViewShellManager() const
+std::shared_ptr<ViewShellManager> const & ViewShellBase::GetViewShellManager() const
{
return mpImpl->mpViewShellManager;
}
@@ -920,7 +920,7 @@ OUString ViewShellBase::GetInitialViewShellType()
return sRequestedView;
}
-std::shared_ptr<tools::EventMultiplexer> ViewShellBase::GetEventMultiplexer()
+std::shared_ptr<tools::EventMultiplexer> const & ViewShellBase::GetEventMultiplexer()
{
OSL_ASSERT(mpImpl.get()!=nullptr);
OSL_ASSERT(mpImpl->mpEventMultiplexer.get()!=nullptr);
@@ -933,7 +933,7 @@ const ::tools::Rectangle& ViewShellBase::getClientRectangle() const
return mpImpl->maClientArea;
}
-std::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const
+std::shared_ptr<ToolBarManager> const & ViewShellBase::GetToolBarManager() const
{
OSL_ASSERT(mpImpl.get()!=nullptr);
OSL_ASSERT(mpImpl->mpToolBarManager.get()!=nullptr);
@@ -941,7 +941,7 @@ std::shared_ptr<ToolBarManager> ViewShellBase::GetToolBarManager() const
return mpImpl->mpToolBarManager;
}
-std::shared_ptr<FormShellManager> ViewShellBase::GetFormShellManager() const
+std::shared_ptr<FormShellManager> const & ViewShellBase::GetFormShellManager() const
{
OSL_ASSERT(mpImpl.get()!=nullptr);
OSL_ASSERT(mpImpl->mpFormShellManager.get()!=nullptr);
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 4fd1a539607f..42be1b63f8b0 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -306,7 +306,7 @@ public:
: ClassificationCommon(rDrawViewShell)
{}
- std::vector<svx::ClassificationResult> getResults()
+ std::vector<svx::ClassificationResult> const & getResults()
{
return m_aResults;
}
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index fd206cb0d1be..78d6cd13f4db 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -1019,12 +1019,12 @@ void ViewShell::SetWinViewPos(const Point& rWinPos)
}
}
-Point ViewShell::GetWinViewPos() const
+Point const & ViewShell::GetWinViewPos() const
{
return mpContentWindow->GetWinViewPos();
}
-Point ViewShell::GetViewOrigin() const
+Point const & ViewShell::GetViewOrigin() const
{
return mpContentWindow->GetViewOrigin();
}
diff --git a/svgio/inc/svgstyleattributes.hxx b/svgio/inc/svgstyleattributes.hxx
index 3b3035b6236e..c642f169f9c6 100644
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@@ -411,7 +411,7 @@ namespace svgio
const OUString& getDesc() const { return maDesc; }
// ClipPathXLink content
- OUString getClipPathXLink() const;
+ OUString const & getClipPathXLink() const;
const SvgClipPathNode* accessClipPathXLink() const;
// MaskXLink content
diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx
index 75945a0be2db..f1bc7c737aae 100644
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@@ -2662,7 +2662,7 @@ namespace svgio
return nullptr;
}
- OUString SvgStyleAttributes::getClipPathXLink() const
+ OUString const & SvgStyleAttributes::getClipPathXLink() const
{
return maClipPathXLink;
}
More information about the Libreoffice-commits
mailing list