[Libreoffice-commits] core.git: include/svx sc/source svx/inc svx/source
Noel Grandin
noel.grandin at collabora.co.uk
Fri Dec 29 07:02:31 UTC 2017
include/svx/ClassificationField.hxx | 2 +-
include/svx/EnhancedCustomShapeFunctionParser.hxx | 2 +-
include/svx/colorbox.hxx | 6 +++---
include/svx/dataaccessdescriptor.hxx | 2 +-
include/svx/dlgctl3d.hxx | 2 +-
include/svx/sdr/attribute/sdrformtextattribute.hxx | 2 +-
include/svx/sdrpagewindow.hxx | 4 ++--
include/svx/svdmrkv.hxx | 6 +++---
include/svx/svdograf.hxx | 4 ++--
include/svx/svdomedia.hxx | 2 +-
include/svx/svdoole2.hxx | 4 ++--
include/svx/tbxcolorupdate.hxx | 2 +-
include/svx/unoshape.hxx | 2 +-
include/svx/xit.hxx | 2 +-
sc/source/ui/view/gridwin.cxx | 2 +-
svx/inc/galobj.hxx | 2 +-
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 2 +-
svx/source/dialog/dlgctl3d.cxx | 2 +-
svx/source/dialog/framelinkarray.cxx | 4 ++--
svx/source/form/dataaccessdescriptor.cxx | 2 +-
svx/source/gallery2/galobj.cxx | 2 +-
svx/source/sdr/attribute/sdrformtextattribute.cxx | 2 +-
svx/source/svdraw/sdrpagewindow.cxx | 4 ++--
svx/source/svdraw/svdograf.cxx | 2 +-
svx/source/svdraw/svdomedia.cxx | 2 +-
svx/source/svdraw/svdoole2.cxx | 4 ++--
svx/source/svdraw/svdotextdecomposition.cxx | 4 ++--
svx/source/tbxctrls/tbcontrl.cxx | 2 +-
svx/source/unodraw/unoshape.cxx | 2 +-
29 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit e0eb09405b2f4d95532d37bc37054a51e5a0177b
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Dec 28 19:48:26 2017 +0200
loplugin:passstuffbyref improved return in svx
Change-Id: I33bdbd416709ce46afb3c17aeab0d2e19a68ab30
Reviewed-on: https://gerrit.libreoffice.org/47150
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/include/svx/ClassificationField.hxx b/include/svx/ClassificationField.hxx
index 53989f868fc8..3eb4955dd1f1 100644
--- a/include/svx/ClassificationField.hxx
+++ b/include/svx/ClassificationField.hxx
@@ -44,7 +44,7 @@ public:
}
/// Returns the text to display, which is the Abbreviated Name, if provided, otherwise Name.
- OUString getDisplayText() const
+ OUString const & getDisplayText() const
{
return !msAbbreviatedName.isEmpty() ? msAbbreviatedName : msName;
}
diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx
index 828a4ef4251b..bc1d97bd5879 100644
--- a/include/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx
@@ -233,7 +233,7 @@ public:
@return the generated function object.
*/
- SVX_DLLPUBLIC static std::shared_ptr<ExpressionNode> parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape );
+ SVX_DLLPUBLIC static std::shared_ptr<ExpressionNode> const & parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape );
// this is a singleton
FunctionParser() = delete;
diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx
index f9655b28bc27..8ffbc12db77f 100644
--- a/include/svx/colorbox.hxx
+++ b/include/svx/colorbox.hxx
@@ -46,7 +46,7 @@ private:
void Selected(const NamedColor& rNamedColor);
void createColorWindow();
void LockWidthRequest();
- VclPtr<SvxColorWindow> getColorWindow() const;
+ VclPtr<SvxColorWindow> const & getColorWindow() const;
public:
SvxColorListBox(vcl::Window* pParent, WinBits nStyle = 0);
virtual ~SvxColorListBox() override;
@@ -59,8 +59,8 @@ public:
void SetSlotId(sal_uInt16 nSlotId, bool bShowNoneButton = false);
- Color GetSelectEntryColor() const { return m_aSelectedColor.first; }
- NamedColor GetSelectedEntry() const { return m_aSelectedColor; }
+ Color const & GetSelectEntryColor() const { return m_aSelectedColor.first; }
+ NamedColor const & GetSelectedEntry() const { return m_aSelectedColor; }
void SelectEntry(const NamedColor& rColor);
void SelectEntry(const Color& rColor);
diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx
index 4a810a5950f2..e66e96513356 100644
--- a/include/svx/dataaccessdescriptor.hxx
+++ b/include/svx/dataaccessdescriptor.hxx
@@ -79,7 +79,7 @@ namespace svx
<p>If you call this method more than once, without writing any values between both calls, the same object
is returned. If you wrote values, a new object is returned.</p>
*/
- css::uno::Sequence< css::beans::PropertyValue >
+ css::uno::Sequence< css::beans::PropertyValue > const &
createPropertyValueSequence();
/** initialized the descriptor from the property values given
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index 7e78d6e33d78..6bcece170214 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -59,7 +59,7 @@ public:
virtual void SetObjectType(SvxPreviewObjectType nType);
SvxPreviewObjectType GetObjectType() const { return mnObjectType; }
- SfxItemSet Get3DAttributes() const;
+ SfxItemSet const & Get3DAttributes() const;
virtual void Set3DAttributes(const SfxItemSet& rAttr);
};
diff --git a/include/svx/sdr/attribute/sdrformtextattribute.hxx b/include/svx/sdr/attribute/sdrformtextattribute.hxx
index b5e49bc02f7b..6fe6b31164e3 100644
--- a/include/svx/sdr/attribute/sdrformtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrformtextattribute.hxx
@@ -71,7 +71,7 @@ namespace drawinglayer
XFormTextStyle getFormTextStyle() const;
XFormTextAdjust getFormTextAdjust() const;
XFormTextShadow getFormTextShadow() const;
- Color getFormTextShdwColor() const;
+ Color const & getFormTextShdwColor() const;
const SdrFormTextOutlineAttribute& getOutline() const;
const SdrFormTextOutlineAttribute& getShadowOutline() const;
bool getFormTextMirror() const;
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index ca55b110c2d1..9407c7eed60f 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -61,10 +61,10 @@ public:
SdrPageView& GetPageView() const;
SdrPaintWindow& GetPaintWindow() const;
const SdrPaintWindow* GetOriginalPaintWindow() const;
- css::uno::Reference<css::awt::XControlContainer> GetControlContainer( bool _bCreateIfNecessary = true ) const;
+ css::uno::Reference<css::awt::XControlContainer> const & GetControlContainer( bool _bCreateIfNecessary = true ) const;
// OVERLAYMANAGER
- rtl::Reference< sdr::overlay::OverlayManager > GetOverlayManager() const;
+ rtl::Reference< sdr::overlay::OverlayManager > const & GetOverlayManager() const;
// #i72752# allow patcing SdrPaintWindow from SdrPageView::DrawLayer if needed
void patchPaintWindow(SdrPaintWindow& rPaintWindow);
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index b670782d3137..0f725547033c 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -239,9 +239,9 @@ public:
size_t GetMarkedObjectCount() const { return GetMarkedObjectList().GetMarkCount(); }
void SortMarkedObjects() const { GetMarkedObjectList().ForceSort(); }
bool AreObjectsMarked() const { return 0 != GetMarkedObjectList().GetMarkCount(); }
- OUString GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); }
- OUString GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); }
- OUString GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); }
+ OUString const & GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); }
+ OUString const & GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); }
+ OUString const & GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); }
// Get a list of all those links which are connected to marked nodes,
// but which are not marked themselves.
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 74cb44b022db..b4fd3baba256 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -157,7 +157,7 @@ public:
const Size& GetGrafPrefSize() const;
void SetGrafStreamURL( const OUString& rGraphicStreamURL );
- OUString GetGrafStreamURL() const;
+ OUString const & GetGrafStreamURL() const;
Size getOriginalSize() const;
private:
@@ -272,7 +272,7 @@ public:
mbIsSignatureLineCanAddComment = bIsSignatureCanAddComment;
};
bool isSignatureLineCanAddComment() const { return mbIsSignatureLineCanAddComment; };
- const css::uno::Reference<css::graphic::XGraphic> getSignatureLineUnsignedGraphic() const
+ css::uno::Reference<css::graphic::XGraphic> const & getSignatureLineUnsignedGraphic() const
{
return mpSignatureLineUnsignedGraphic;
};
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 27d113cf9ee9..f0bf09300aff 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -63,7 +63,7 @@ public:
void setMediaProperties( const ::avmedia::MediaItem& rState );
const ::avmedia::MediaItem& getMediaProperties() const;
- const css::uno::Reference< css::graphic::XGraphic >
+ css::uno::Reference< css::graphic::XGraphic > const &
getSnapshot() const;
css::uno::Reference< css::io::XInputStream>
GetInputStream();
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 34c31c4590ba..4da4d057efb8 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -105,9 +105,9 @@ public:
bool IsEmpty() const;
void SetObjRef(const css::uno::Reference < css::embed::XEmbeddedObject >& rNewObjRef);
- css::uno::Reference < css::embed::XEmbeddedObject > GetObjRef() const;
+ css::uno::Reference < css::embed::XEmbeddedObject > const & GetObjRef() const;
- SVX_DLLPRIVATE css::uno::Reference < css::embed::XEmbeddedObject > GetObjRef_NoInit() const;
+ SVX_DLLPRIVATE css::uno::Reference < css::embed::XEmbeddedObject > const & GetObjRef_NoInit() const;
void AbandonObject();
diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index 5fad1c3dc759..8d0d3abbed96 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -47,7 +47,7 @@ namespace svx
~ToolboxButtonColorUpdater();
void Update( const Color& rColor, bool bForceUpdate = false );
- Color GetCurrentColor() const { return maCurColor; }
+ Color const & GetCurrentColor() const { return maCurColor; }
private:
ToolboxButtonColorUpdater(ToolboxButtonColorUpdater &) = delete;
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 2e81df0ea8af..eec731fbe971 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -228,7 +228,7 @@ public:
// access methods for master objects
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::beans::XPropertySetInfo > _getPropertySetInfo( );
+ css::uno::Reference< css::beans::XPropertySetInfo > const & _getPropertySetInfo( );
/// @throws css::beans::UnknownPropertyException
/// @throws css::beans::PropertyVetoException
/// @throws css::lang::IllegalArgumentException
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index 540ffa403eff..4630fa7f221a 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -51,7 +51,7 @@ public:
virtual bool operator==(const SfxPoolItem& rItem) const override;
virtual SfxPoolItem* Clone(SfxItemPool* pPool = nullptr) const override;
- OUString GetName() const { return GetValue(); }
+ OUString const & GetName() const { return GetValue(); }
void SetName(const OUString& rName) { SetValue(rName); }
bool IsIndex() const { return (nPalIndex >= 0); }
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 0881f006a4f0..1d1cae4a5dc2 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -6362,7 +6362,7 @@ rtl::Reference<sdr::overlay::OverlayManager> ScGridWindow::getOverlayManager()
if ( pPageWin )
{
- return (pPageWin->GetOverlayManager());
+ return pPageWin->GetOverlayManager();
}
}
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index aa0af5922553..5089d7439356 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -74,7 +74,7 @@ public:
bool IsValid() const { return bIsValid; }
bool IsThumbBitmap() const { return bIsThumbBmp; }
- const OUString GetTitle() const;
+ OUString const & GetTitle() const;
void SetTitle( const OUString& rTitle );
friend SvStream& WriteSgaObject( SvStream& rOut, const SgaObject& rObj );
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 4d2e3ffbbcfd..43de790937e3 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -1118,7 +1118,7 @@ const ParserContextSharedPtr& getParserContext()
namespace EnhancedCustomShape {
-std::shared_ptr<ExpressionNode> FunctionParser::parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape )
+std::shared_ptr<ExpressionNode> const & FunctionParser::parseFunction( const OUString& rFunction, const EnhancedCustomShape2d& rCustoShape )
{
// TODO(Q1): Check if a combination of the RTL_UNICODETOTEXT_FLAGS_*
// gives better conversion robustness here (we might want to map space
diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index 8deb3bbc8e6c..ce75eacf7991 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -230,7 +230,7 @@ void Svx3DPreviewControl::SetObjectType(SvxPreviewObjectType nType)
}
}
-SfxItemSet Svx3DPreviewControl::Get3DAttributes() const
+SfxItemSet const & Svx3DPreviewControl::Get3DAttributes() const
{
return mp3DObj->GetMergedItemSet();
}
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index c9273c41344f..560eefd775ce 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -76,7 +76,7 @@ public:
void MirrorSelfX();
- basegfx::B2DHomMatrix CreateCoordinateSystem(const Array& rArray) const;
+ basegfx::B2DHomMatrix const & CreateCoordinateSystem(const Array& rArray) const;
size_t GetCellIndex(const Array& rArray) const;
};
@@ -93,7 +93,7 @@ size_t Cell::GetCellIndex(const Array& rArray) const
return maCellIndex;
}
-basegfx::B2DHomMatrix Cell::CreateCoordinateSystem(const Array& rArray) const
+basegfx::B2DHomMatrix const & Cell::CreateCoordinateSystem(const Array& rArray) const
{
if(!maCoordinateSystem.isIdentity())
{
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index e2c675c5b3ab..974c40334b9a 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -353,7 +353,7 @@ namespace svx
m_pImpl->buildFrom(_rValues);
}
- Sequence< PropertyValue > ODataAccessDescriptor::createPropertyValueSequence()
+ Sequence< PropertyValue > const & ODataAccessDescriptor::createPropertyValueSequence()
{
m_pImpl->updateSequence();
return m_pImpl->m_aAsSequence;
diff --git a/svx/source/gallery2/galobj.cxx b/svx/source/gallery2/galobj.cxx
index a6ff2402b531..4bf26f7a13de 100644
--- a/svx/source/gallery2/galobj.cxx
+++ b/svx/source/gallery2/galobj.cxx
@@ -217,7 +217,7 @@ void SgaObject::ReadData(SvStream& rIn, sal_uInt16& rReadVersion )
aURL = INetURLObject(aTmpStr);
}
-const OUString SgaObject::GetTitle() const
+OUString const & SgaObject::GetTitle() const
{
return aTitle;
}
diff --git a/svx/source/sdr/attribute/sdrformtextattribute.cxx b/svx/source/sdr/attribute/sdrformtextattribute.cxx
index 1a2ff5325698..e0801737d599 100644
--- a/svx/source/sdr/attribute/sdrformtextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrformtextattribute.cxx
@@ -347,7 +347,7 @@ namespace drawinglayer
return mpSdrFormTextAttribute->getFormTextShadow();
}
- Color SdrFormTextAttribute::getFormTextShdwColor() const
+ Color const & SdrFormTextAttribute::getFormTextShdwColor() const
{
return mpSdrFormTextAttribute->getFormTextShdwColor();
}
diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx
index 9998c2fa5770..7c4ae6dc8c7a 100644
--- a/svx/source/svdraw/sdrpagewindow.cxx
+++ b/svx/source/svdraw/sdrpagewindow.cxx
@@ -65,7 +65,7 @@ struct SdrPageWindow::Impl
};
-uno::Reference<awt::XControlContainer> SdrPageWindow::GetControlContainer( bool _bCreateIfNecessary ) const
+uno::Reference<awt::XControlContainer> const & SdrPageWindow::GetControlContainer( bool _bCreateIfNecessary ) const
{
if (!mpImpl->mxControlContainer.is() && _bCreateIfNecessary)
{
@@ -162,7 +162,7 @@ const SdrPaintWindow* SdrPageWindow::GetOriginalPaintWindow() const
}
// OVERLAY MANAGER
-rtl::Reference< sdr::overlay::OverlayManager > SdrPageWindow::GetOverlayManager() const
+rtl::Reference< sdr::overlay::OverlayManager > const & SdrPageWindow::GetOverlayManager() const
{
return GetPaintWindow().GetOverlayManager();
}
diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx
index 510426088b3f..30bd0a2d8692 100644
--- a/svx/source/svdraw/svdograf.cxx
+++ b/svx/source/svdraw/svdograf.cxx
@@ -578,7 +578,7 @@ void SdrGrafObj::SetGrafStreamURL( const OUString& rGraphicStreamURL )
}
}
-OUString SdrGrafObj::GetGrafStreamURL() const
+OUString const & SdrGrafObj::GetGrafStreamURL() const
{
return pGraphic->GetUserData();
}
diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx
index 785a3a0f73fb..974cf3b56300 100644
--- a/svx/source/svdraw/svdomedia.cxx
+++ b/svx/source/svdraw/svdomedia.cxx
@@ -158,7 +158,7 @@ SdrMediaObj& SdrMediaObj::operator=(const SdrMediaObj& rObj)
return *this;
}
-const uno::Reference< graphic::XGraphic > SdrMediaObj::getSnapshot() const
+uno::Reference< graphic::XGraphic > const & SdrMediaObj::getSnapshot() const
{
#if HAVE_FEATURE_AVMEDIA
if( !m_xImpl->m_xCachedSnapshot.is() )
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index a43c341193db..6ccff1fae000 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -1820,13 +1820,13 @@ void SdrOle2Obj::GetObjRef_Impl()
GetSdrGlobalData().GetOLEObjCache().InsertObj(this);
}
-uno::Reference < embed::XEmbeddedObject > SdrOle2Obj::GetObjRef() const
+uno::Reference < embed::XEmbeddedObject > const & SdrOle2Obj::GetObjRef() const
{
const_cast<SdrOle2Obj*>(this)->GetObjRef_Impl();
return mpImpl->mxObjRef.GetObject();
}
-uno::Reference < embed::XEmbeddedObject > SdrOle2Obj::GetObjRef_NoInit() const
+uno::Reference < embed::XEmbeddedObject > const & SdrOle2Obj::GetObjRef_NoInit() const
{
return mpImpl->mxObjRef.GetObject();
}
diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx
index 940bdaad2205..7155bd15ab31 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -149,7 +149,7 @@ namespace
mrOutliner.SetDrawBulletHdl(Link<DrawBulletInfo*,void>());
}
- drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequence();
+ drawinglayer::primitive2d::Primitive2DContainer const & getPrimitive2DSequence();
};
bool impTextBreakupHandler::impIsUnderlineAbove(const vcl::Font& rFont)
@@ -643,7 +643,7 @@ namespace
}
}
- drawinglayer::primitive2d::Primitive2DContainer impTextBreakupHandler::getPrimitive2DSequence()
+ drawinglayer::primitive2d::Primitive2DContainer const & impTextBreakupHandler::getPrimitive2DSequence()
{
if(!maTextPortionPrimitives.empty())
{
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index d28befe5296a..8d6a3d9d1467 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3423,7 +3423,7 @@ void SvxColorListBox::dispose()
MenuButton::dispose();
}
-VclPtr<SvxColorWindow> SvxColorListBox::getColorWindow() const
+VclPtr<SvxColorWindow> const & SvxColorListBox::getColorWindow() const
{
if (!m_xColorWindow || m_xColorWindow->isDisposed())
const_cast<SvxColorListBox*>(this)->createColorWindow();
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index fd9851588e3d..f61d4e384976 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1367,7 +1367,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL
}
}
-Reference< beans::XPropertySetInfo >
+Reference< beans::XPropertySetInfo > const &
SvxShape::_getPropertySetInfo()
{
return mpPropSet->getPropertySetInfo();
More information about the Libreoffice-commits
mailing list