diff options
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/accessibility/AccessibleControlShape.cxx | 2 | ||||
-rw-r--r-- | svx/source/accessibility/charmapacc.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmshimp.cxx | 4 | ||||
-rw-r--r-- | svx/source/inc/charmapacc.hxx | 2 | ||||
-rw-r--r-- | svx/source/inc/datanavi.hxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdmrkv.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdoole2.cxx | 2 | ||||
-rw-r--r-- | svx/source/table/svdotable.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/PaletteManager.cxx | 4 |
9 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 28d2cdf3a001..ed04609bbfbd 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -67,7 +67,7 @@ namespace constexpr OUString LABEL_CONTROL_PROPERTY_NAME = u"LabelControl"_ustr; // return the property which should be used as AccessibleName - OUString lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI ) + const OUString & lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI ) { if ( _rxPSI.is() && _rxPSI->hasPropertyByName( LABEL_PROPERTY_NAME ) ) return LABEL_PROPERTY_NAME; diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index 191f71efc4ad..0f1fbf2b7f42 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -55,7 +55,7 @@ SvxShowCharSetItem::~SvxShowCharSetItem() } } -rtl::Reference<SvxShowCharSetItemAcc> SvxShowCharSetItem::GetAccessible() +const rtl::Reference<SvxShowCharSetItemAcc> & SvxShowCharSetItem::GetAccessible() { if( !m_xItem.is() ) { diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 8fd0b05635d5..7f3e8f5a7956 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -431,7 +431,7 @@ namespace } - OUString getServiceNameByControlType(SdrObjKind nType) + const OUString & getServiceNameByControlType(SdrObjKind nType) { switch (nType) { @@ -459,7 +459,7 @@ namespace case SdrObjKind::FormNavigationBar : return FM_SUN_COMPONENT_NAVIGATIONBAR; default:; } - return OUString(); + return EMPTY_OUSTRING; } } diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 43ab846d5b6f..995aa97ae866 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -52,7 +52,7 @@ namespace svx SvxShowCharSetItem( SvxShowCharSet& rParent, SvxShowCharSetAcc* _pParent, sal_uInt16 _nPos ); ~SvxShowCharSetItem(); - rtl::Reference< SvxShowCharSetItemAcc > GetAccessible(); + const rtl::Reference< SvxShowCharSetItemAcc > & GetAccessible(); }; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index c3d0564a90f3..fe5a51508d1f 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -112,7 +112,7 @@ namespace svxform /** convert submission replace string from UI to API. Use 'none' as default. */ - OUString toAPI( std::u16string_view rStr ) const + const OUString & toAPI( std::u16string_view rStr ) const { if( rStr == m_sDoc_UI ) return m_sDoc_API; @@ -156,7 +156,7 @@ namespace svxform } /** convert from UI to API; put is default */ - OUString toAPI( std::u16string_view rStr ) const + const OUString & toAPI( std::u16string_view rStr ) const { if( rStr == m_sGet_UI ) return m_sGet_API; diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index d63556a50d3d..0c8e1c2f74bc 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -812,7 +812,7 @@ namespace { } - basegfx::B2DRange getTextBounds(const sdr::contact::ViewObjectContact &rVOC, sdr::contact::DisplayInfo &raDisplayInfo) + const basegfx::B2DRange & getTextBounds(const sdr::contact::ViewObjectContact &rVOC, sdr::contact::DisplayInfo &raDisplayInfo) { this->process(rVOC.getPrimitive2DSequence(raDisplayInfo)); return maTextRange; diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 3212314f4ade..e744fc613a27 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -1914,7 +1914,7 @@ bool SdrOle2Obj::IsCalc() const || SvGlobalName(SO3_SC_CLASSID) == aObjClsId; } -uno::Reference< frame::XModel > SdrOle2Obj::GetParentXModel() const +const uno::Reference< frame::XModel > & SdrOle2Obj::GetParentXModel() const { return getSdrModelFromSdrObject().getUnoModel(); } diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index b300c4284c38..455d561f283a 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -912,7 +912,7 @@ Reference< XTable > SdrTableObj::getTable() const return mpImpl->mxTable; } -rtl::Reference< TableModel > SdrTableObj::getUnoTable() const +const rtl::Reference< TableModel > & SdrTableObj::getUnoTable() const { return mpImpl->mxTable; } diff --git a/svx/source/tbxctrls/PaletteManager.cxx b/svx/source/tbxctrls/PaletteManager.cxx index 15799432eedf..894d38808f84 100644 --- a/svx/source/tbxctrls/PaletteManager.cxx +++ b/svx/source/tbxctrls/PaletteManager.cxx @@ -350,12 +350,12 @@ OUString PaletteManager::GetPaletteName() return aNames[mnCurrentPalette]; } -OUString PaletteManager::GetSelectedPalettePath() +const OUString & PaletteManager::GetSelectedPalettePath() { if (mnCurrentPalette < m_Palettes.size() && mnCurrentPalette != 0) return m_Palettes[mnCurrentPalette - 1]->GetPath(); else - return OUString(); + return EMPTY_OUSTRING; } tools::Long PaletteManager::GetColorCount() const |