diff options
366 files changed, 693 insertions, 620 deletions
diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index 658974f3df31..091a86dec91d 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -491,7 +491,7 @@ void FrameControl::impl_deleteFrame() // private method -const Sequence< Property > FrameControl::impl_getStaticPropertyDescriptor() +const Sequence< Property >& FrameControl::impl_getStaticPropertyDescriptor() { // All Properties of this implementation. The array must be sorted! static const Property pPropertys[PROPERTY_COUNT] = diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index fa17ebfa6446..e98fdecc8fa9 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -205,7 +205,7 @@ private: void impl_deleteFrame(); - static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(); + static const css::uno::Sequence< css::beans::Property >& impl_getStaticPropertyDescriptor(); // private variables diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index dcbbb3f817de..1a4ad3e4670f 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -190,7 +190,7 @@ ModulWindow::ModulWindow (ModulWindowLayout* pParent, ScriptDocument const& rDoc SetBackground(); } -SbModuleRef ModulWindow::XModule() +SbModuleRef const & ModulWindow::XModule() { // ModuleWindows can now be created as a result of the // modules getting created via the api. This is a result of an diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx index ba5caba27223..23d84770aac3 100644 --- a/basctl/source/basicide/baside2.hxx +++ b/basctl/source/basicide/baside2.hxx @@ -314,7 +314,7 @@ private: static void GoOnTop(); sal_Int32 FormatAndPrint( Printer* pPrinter, sal_Int32 nPage = -1 ); - SbModuleRef XModule(); + SbModuleRef const & XModule(); protected: virtual void Resize() override; virtual void GetFocus() override; diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 5cd875304e4d..157a2eb8ed0f 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -251,7 +251,7 @@ DlgEditor::~DlgEditor() } -Reference< awt::XControlContainer > DlgEditor::GetWindowControlContainer() +Reference< awt::XControlContainer > const & DlgEditor::GetWindowControlContainer() { if (!m_xControlContainer.is()) m_xControlContainer = VCLUnoHelper::CreateControlContainer(&rWindow); diff --git a/basctl/source/inc/dlged.hxx b/basctl/source/inc/dlged.hxx index 5963f0710f11..1fba5834641d 100644 --- a/basctl/source/inc/dlged.hxx +++ b/basctl/source/inc/dlged.hxx @@ -147,7 +147,7 @@ public: @see GetWindow @see SetWindow */ - css::uno::Reference< css::awt::XControlContainer > + css::uno::Reference< css::awt::XControlContainer > const & GetWindowControlContainer(); void SetScrollBars( ScrollBar* pHScroll, ScrollBar* pVScroll ); diff --git a/basegfx/source/tools/b2dclipstate.cxx b/basegfx/source/tools/b2dclipstate.cxx index 251a0e130116..d4bc4fa867ed 100644 --- a/basegfx/source/tools/b2dclipstate.cxx +++ b/basegfx/source/tools/b2dclipstate.cxx @@ -173,7 +173,7 @@ namespace tools addPolyPolygon(rPolyPoly,XOR); } - B2DPolyPolygon getClipPoly() const + B2DPolyPolygon const & getClipPoly() const { commitPendingRanges(); commitPendingPolygons(); diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx index 7bf209563d91..45421d50600c 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -189,7 +189,7 @@ SbxErrObject::~SbxErrObject() OSL_TRACE("SbxErrObject::~SbxErrObject dtor"); } -uno::Reference< vba::XErrObject > +uno::Reference< vba::XErrObject > const & SbxErrObject::getUnoErrObject() { SbxVariable* pVar = getErrObject(); @@ -197,7 +197,7 @@ SbxErrObject::getUnoErrObject() return pGlobErr->m_xErr; } -SbxVariableRef +SbxVariableRef const & SbxErrObject::getErrObject() { static SbxVariableRef pGlobErr = new SbxErrObject( OUString("Err"), uno::makeAny( uno::Reference< vba::XErrObject >( new ErrObject() ) ) ); diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 6d2aaa6c84d5..a4de8a1ceb72 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1815,7 +1815,7 @@ void StarBASIC::SetGlobalBreakHdl( const Link<StarBASIC*,sal_uInt16>& rLink ) GetSbData()->aBreakHdl = rLink; } -SbxArrayRef StarBASIC::getUnoListeners() +SbxArrayRef const & StarBASIC::getUnoListeners() { if( !xUnoListeners.Is() ) { diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 21be5c9dee43..10e96e6de2e6 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -167,7 +167,7 @@ Reference< XIdlReflection > getCoreReflection_Impl() } // save CoreReflection statically -Reference< XHierarchicalNameAccess > getCoreReflection_HierarchicalNameAccess_Impl() +Reference< XHierarchicalNameAccess > const & getCoreReflection_HierarchicalNameAccess_Impl() { static Reference< XHierarchicalNameAccess > xCoreReflection_HierarchicalNameAccess; @@ -184,7 +184,7 @@ Reference< XHierarchicalNameAccess > getCoreReflection_HierarchicalNameAccess_Im } // Hold TypeProvider statically -Reference< XHierarchicalNameAccess > getTypeProvider_Impl() +Reference< XHierarchicalNameAccess > const & getTypeProvider_Impl() { static Reference< XHierarchicalNameAccess > xAccess; @@ -210,7 +210,7 @@ Reference< XHierarchicalNameAccess > getTypeProvider_Impl() } // Hold TypeConverter statically -Reference< XTypeConverter > getTypeConverter_Impl() +Reference< XTypeConverter > const & getTypeConverter_Impl() { static Reference< XTypeConverter > xTypeConverter; diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 1e59c1373474..76ab1aa44761 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -492,7 +492,7 @@ SbModule::~SbModule() mxWrapper = nullptr; } -uno::Reference< script::XInvocation > +uno::Reference< script::XInvocation > const & SbModule::GetUnoModule() { if ( !mxWrapper.is() ) diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx index 88cef685e8d2..796b83102269 100644 --- a/basic/source/inc/errobject.hxx +++ b/basic/source/inc/errobject.hxx @@ -32,8 +32,8 @@ class SbxErrObject : public SbUnoObject virtual ~SbxErrObject(); public: - static SbxVariableRef getErrObject(); - static css::uno::Reference< ooo::vba::XErrObject > getUnoErrObject(); + static SbxVariableRef const & getErrObject(); + static css::uno::Reference< ooo::vba::XErrObject > const & getUnoErrObject(); void setNumberAndDescription( ::sal_Int32 _number, const OUString& _description ) throw (css::uno::RuntimeException); diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 2abca341ca68..420298ab2940 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -160,7 +160,7 @@ OUString getFullPath( const OUString& aRelPath ) } // TODO: -> SbiGlobals -static uno::Reference< ucb::XSimpleFileAccess3 > getFileAccess() +static uno::Reference< ucb::XSimpleFileAccess3 > const & getFileAccess() { static uno::Reference< ucb::XSimpleFileAccess3 > xSFI; if( !xSFI.is() ) diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index 6bddfd5c8570..93183d289e17 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -67,7 +67,7 @@ using namespace com::sun::star::lang; using namespace com::sun::star::sheet; using namespace com::sun::star::uno; -static Reference< XCalendar4 > getLocaleCalendar() +static Reference< XCalendar4 > const & getLocaleCalendar() { static Reference< XCalendar4 > xCalendar; if( !xCalendar.is() ) diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx index 03fa5597e319..8ffa34e4da9c 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.cxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx @@ -481,7 +481,7 @@ namespace cairocanvas cairo_paint( pWindowCairo.get() ); } - ::cairo::SurfaceSharedPtr SpriteCanvasHelper::getCompositingSurface( const ::basegfx::B2ISize& rNeededSize ) + ::cairo::SurfaceSharedPtr const & SpriteCanvasHelper::getCompositingSurface( const ::basegfx::B2ISize& rNeededSize ) { if( rNeededSize.getX() > maCompositingSurfaceSize.getX() || rNeededSize.getY() > maCompositingSurfaceSize.getY() ) @@ -501,7 +501,7 @@ namespace cairocanvas return mpCompositingSurface; } - ::cairo::SurfaceSharedPtr SpriteCanvasHelper::getTemporarySurface() + ::cairo::SurfaceSharedPtr const & SpriteCanvasHelper::getTemporarySurface() { if ( !mpTemporarySurface ) mpTemporarySurface = createSurface( maCompositingSurfaceSize ); diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx index 2fc3222eaadd..35cf73629653 100644 --- a/canvas/source/cairo/cairo_spritecanvashelper.hxx +++ b/canvas/source/cairo/cairo_spritecanvashelper.hxx @@ -117,8 +117,8 @@ namespace cairocanvas const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites ); private: - ::cairo::SurfaceSharedPtr getCompositingSurface( const ::basegfx::B2ISize& rNeededSize ); - ::cairo::SurfaceSharedPtr getTemporarySurface(); + ::cairo::SurfaceSharedPtr const & getCompositingSurface( const ::basegfx::B2ISize& rNeededSize ); + ::cairo::SurfaceSharedPtr const & getTemporarySurface(); ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rNeededSize ) const; /// Set from the SpriteCanvas: instance coordinating sprite redraw diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index b3caaad412c4..92c6c05d5c5f 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -568,7 +568,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; // normal methods - css::uno::Reference< css::util::XNumberFormatsSupplier > + css::uno::Reference< css::util::XNumberFormatsSupplier > const & getNumberFormatsSupplier(); const css::uno::Reference< css::uno::XInterface >& getChartView() { return xChartView;} diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 846daa78b34d..6f8004dbfbc4 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -200,7 +200,7 @@ public: } }; -OUString findChartFile(const OUString& rDir, uno::Reference< container::XNameAccess > const & xNames ) +OUString const & findChartFile(const OUString& rDir, uno::Reference< container::XNameAccess > const & xNames ) { uno::Sequence<OUString> rNames = xNames->getElementNames(); OUString* pElement = std::find_if(rNames.begin(), rNames.end(), CheckForChartName(rDir)); diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx index 68c57a5aa11e..904ec57ce11c 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx @@ -98,7 +98,7 @@ Reference< chart2::XDiagram > Chart2ModelContact::getChart2Diagram() const return ChartModelHelper::findDiagram( this->getChartModel() ); } -uno::Reference< lang::XUnoTunnel > Chart2ModelContact::getChartView() const +uno::Reference< lang::XUnoTunnel > const & Chart2ModelContact::getChartView() const { if(!m_xChartView.is()) { diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx index 8b64b5f0fb96..a0e9305676b2 100644 --- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx +++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx @@ -126,7 +126,7 @@ public: private: //methods ExplicitValueProvider* getExplicitValueProvider() const; - css::uno::Reference< css::lang::XUnoTunnel > getChartView() const; + css::uno::Reference< css::lang::XUnoTunnel > const & getChartView() const; public: //member css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx index 2503d858315a..08f391de5035 100644 --- a/chart2/source/controller/dialogs/DialogModel.cxx +++ b/chart2/source/controller/dialogs/DialogModel.cxx @@ -396,7 +396,7 @@ void DialogModel::setTemplate( m_xTemplate = xTemplate; } -::std::shared_ptr< RangeSelectionHelper > +::std::shared_ptr< RangeSelectionHelper > const & DialogModel::getRangeSelectionHelper() const { if( ! m_spRangeSelectionHelper.get()) diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx index a863b614779d..73fe00a44efb 100644 --- a/chart2/source/controller/dialogs/DialogModel.hxx +++ b/chart2/source/controller/dialogs/DialogModel.hxx @@ -76,7 +76,7 @@ public: void setTemplate( const css::uno::Reference< css::chart2::XChartTypeTemplate > & xTemplate ); - std::shared_ptr< RangeSelectionHelper > + std::shared_ptr< RangeSelectionHelper > const & getRangeSelectionHelper() const; css::uno::Reference< css::frame::XModel > diff --git a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx index c092b32772d6..013c625fa028 100644 --- a/chart2/source/controller/dialogs/RangeSelectionHelper.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionHelper.cxx @@ -54,7 +54,7 @@ bool RangeSelectionHelper::hasRangeSelection() return getRangeSelection().is(); } -Reference< sheet::XRangeSelection > RangeSelectionHelper::getRangeSelection() +Reference< sheet::XRangeSelection > const & RangeSelectionHelper::getRangeSelection() { if( !m_xRangeSelection.is() && m_xChartDocument.is() ) diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx index 049c19eac9d3..0b2ab7153e52 100644 --- a/chart2/source/controller/inc/RangeSelectionHelper.hxx +++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx @@ -43,7 +43,7 @@ public: ~RangeSelectionHelper(); bool hasRangeSelection(); - css::uno::Reference< css::sheet::XRangeSelection > getRangeSelection(); + css::uno::Reference< css::sheet::XRangeSelection > const & getRangeSelection(); void raiseRangeSelectionDocument(); bool chooseRange( const OUString & aCurrentRange, diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx index 60de98f6a00a..54763be4e8a2 100644 --- a/chart2/source/inc/ExplicitCategoriesProvider.hxx +++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx @@ -59,7 +59,7 @@ public: css::uno::Reference< css::chart2::data::XDataSequence > getOriginalCategories(); - css::uno::Sequence< OUString > getSimpleCategories(); + css::uno::Sequence< OUString > const & getSimpleCategories(); const std::vector<ComplexCategory>* getCategoriesByLevel( sal_Int32 nLevel ); static OUString getCategoryByIndex( diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx index 20cbcae441c3..91ac42c19734 100644 --- a/chart2/source/inc/chartview/DrawModelWrapper.hxx +++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx @@ -51,11 +51,11 @@ public: css::uno::Reference< css::lang::XMultiServiceFactory > getShapeFactory(); // the main page will contain the normal view objects - css::uno::Reference< css::drawing::XDrawPage > getMainDrawPage(); + css::uno::Reference< css::drawing::XDrawPage > const & getMainDrawPage(); SAL_DLLPRIVATE void clearMainDrawPage(); // the extra page is not visible, but contains some extras like the symbols for data points - css::uno::Reference< css::drawing::XDrawPage > getHiddenDrawPage(); + css::uno::Reference< css::drawing::XDrawPage > const & getHiddenDrawPage(); static css::uno::Reference< css::drawing::XShapes > getChartRootShape( const css::uno::Reference< css::drawing::XDrawPage>& xPage ); diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 48ec54304805..b9647eb16b67 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -1301,7 +1301,7 @@ Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames() return aResult; } -Reference< util::XNumberFormatsSupplier > ChartModel::getNumberFormatsSupplier() +Reference< util::XNumberFormatsSupplier > const & ChartModel::getNumberFormatsSupplier() { if( !m_xNumberFormatsSupplier.is() ) { diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx index fc45f1f6d387..d2f24524873b 100644 --- a/chart2/source/tools/ExplicitCategoriesProvider.cxx +++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx @@ -504,7 +504,7 @@ void ExplicitCategoriesProvider::init() } } -Sequence< OUString > ExplicitCategoriesProvider::getSimpleCategories() +Sequence< OUString > const & ExplicitCategoriesProvider::getSimpleCategories() { if( !m_bIsExplicitCategoriesInited ) { diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx index 7231f0515338..f547cb4013ce 100644 --- a/chart2/source/view/inc/VDataSeries.hxx +++ b/chart2/source/view/inc/VDataSeries.hxx @@ -94,8 +94,8 @@ public: bool hasPropertyMapping( const OUString& rPropName ) const; - css::uno::Sequence< double > getAllX() const; - css::uno::Sequence< double > getAllY() const; + css::uno::Sequence< double > const & getAllX() const; + css::uno::Sequence< double > const & getAllY() const; double getXMeanValue() const; double getYMeanValue() const; diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index f787a4906084..d62886091cce 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -163,7 +163,7 @@ uno::Reference< lang::XMultiServiceFactory > DrawModelWrapper::getShapeFactory() return xShapeFactory; } -uno::Reference< drawing::XDrawPage > DrawModelWrapper::getMainDrawPage() +uno::Reference< drawing::XDrawPage > const & DrawModelWrapper::getMainDrawPage() { if (m_xMainDrawPage.is()) return m_xMainDrawPage; @@ -192,7 +192,7 @@ uno::Reference< drawing::XDrawPage > DrawModelWrapper::getMainDrawPage() // AbstractShapeFactory::getOrCreateShapeFactory(this->getShapeFactory())->getOrCreateChartRootShape( m_xMainDrawPage ); return m_xMainDrawPage; } -uno::Reference< drawing::XDrawPage > DrawModelWrapper::getHiddenDrawPage() +uno::Reference< drawing::XDrawPage > const & DrawModelWrapper::getHiddenDrawPage() { if( !m_xHiddenDrawPage.is() ) { diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 544b272ea267..579765ab18da 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -304,7 +304,7 @@ OUString SAL_CALL DummyXShape::getImplementationName() namespace { -uno::Sequence< OUString > listSupportedServices() +uno::Sequence< OUString > const & listSupportedServices() { static const uno::Sequence< OUString > aSupportedServices{ "com.sun.star.drawing.Shape", diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx index 6b98b7a6f1ab..81e7bd2a2ce1 100644 --- a/chart2/source/view/main/VDataSeries.cxx +++ b/chart2/source/view/main/VDataSeries.cxx @@ -725,7 +725,7 @@ double VDataSeries::getMaximumofAllDifferentYValues( sal_Int32 index ) const return fMax; } -uno::Sequence< double > VDataSeries::getAllX() const +uno::Sequence< double > const & VDataSeries::getAllX() const { if(!m_aValues_X.is() && !m_aValues_X.getLength() && m_nPointCount) { @@ -738,7 +738,7 @@ uno::Sequence< double > VDataSeries::getAllX() const return m_aValues_X.Doubles; } -uno::Sequence< double > VDataSeries::getAllY() const +uno::Sequence< double > const & VDataSeries::getAllY() const { if(!m_aValues_Y.is() && !m_aValues_Y.getLength() && m_nPointCount) { diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index f4f318576b5a..83d0b2fd5633 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -37,7 +37,7 @@ bool Options::isValid(const OString& option) const return m_options.find(option) != m_options.end(); } -const OString Options::getOption(const OString& option) const +const OString& Options::getOption(const OString& option) const throw( IllegalArgument ) { OptionMap::const_iterator i(m_options.find(option)); diff --git a/comphelper/source/container/container.cxx b/comphelper/source/container/container.cxx index 44f117b4562b..a383a534c102 100644 --- a/comphelper/source/container/container.cxx +++ b/comphelper/source/container/container.cxx @@ -39,7 +39,7 @@ IndexAccessIterator::IndexAccessIterator(css::uno::Reference< css::uno::XInterfa IndexAccessIterator::~IndexAccessIterator() {} -css::uno::Reference< css::uno::XInterface> IndexAccessIterator::Next() +css::uno::Reference< css::uno::XInterface> const & IndexAccessIterator::Next() { bool bCheckingStartingPoint = !m_xCurrentObject.is(); // Is the current node the starting point? diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index 3cec05e24a1f..29ca9c6f8e38 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -54,7 +54,7 @@ namespace comphelper } - Reference < i18n::XBreakIterator > OCommonAccessibleText::implGetBreakIterator() + Reference < i18n::XBreakIterator > const & OCommonAccessibleText::implGetBreakIterator() { if ( !m_xBreakIter.is() ) { @@ -66,7 +66,7 @@ namespace comphelper } - Reference < i18n::XCharacterClassification > OCommonAccessibleText::implGetCharacterClassification() + Reference < i18n::XCharacterClassification > const & OCommonAccessibleText::implGetCharacterClassification() { if ( !m_xCharClass.is() ) { diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index ca73b511eabc..9c1e8097f04e 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -40,7 +40,7 @@ public: void add(PropertyMapEntry const * pMap) throw(); void remove( const OUString& aName ) throw(); - std::vector< Property > getProperties() throw(); + std::vector< Property > const & getProperties() throw(); const PropertyMap& getPropertyMap() const throw() { return maPropertyMap;} @@ -83,7 +83,7 @@ void PropertyMapImpl::remove( const OUString& aName ) throw() maProperties.clear(); } -std::vector< Property > PropertyMapImpl::getProperties() throw() +std::vector< Property > const & PropertyMapImpl::getProperties() throw() { // maybe we have to generate the properties after // a change in the property map or at first call diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index c7bfcf8afea7..b50c30ec9daa 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -67,7 +67,7 @@ class OFOPXMLHelper_Impl public: - css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > GetParsingResult(); + css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > const & GetParsingResult(); explicit OFOPXMLHelper_Impl( sal_uInt16 nFormat ); // must not be created directly virtual ~OFOPXMLHelper_Impl(); @@ -284,7 +284,7 @@ OFOPXMLHelper_Impl::~OFOPXMLHelper_Impl() } -uno::Sequence< uno::Sequence< beans::StringPair > > OFOPXMLHelper_Impl::GetParsingResult() +uno::Sequence< uno::Sequence< beans::StringPair > > const & OFOPXMLHelper_Impl::GetParsingResult() { if ( m_aElementsSeq.size() ) throw uno::RuntimeException(); // the parsing has still not finished! diff --git a/compilerplugins/clang/passstuffbyref.cxx b/compilerplugins/clang/passstuffbyref.cxx index 3cf7a352e89f..b1b3169f94c9 100644 --- a/compilerplugins/clang/passstuffbyref.cxx +++ b/compilerplugins/clang/passstuffbyref.cxx @@ -36,7 +36,7 @@ public: virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } // When warning about function params of primitive type that could be passed - // by value instead of by reference, make sure not to warn if the paremeter + // by value instead of by reference, make sure not to warn if the parameter // is ever bound to a reference; on the one hand, this needs scaffolding in // all Traverse*Decl functions (indirectly) derived from FunctionDecl; and // on the other hand, use a hack of ignoring just the DeclRefExprs nested in @@ -51,9 +51,8 @@ public: bool TraverseImplicitCastExpr(ImplicitCastExpr * expr); bool VisitDeclRefExpr(const DeclRefExpr * expr); - bool VisitCallExpr(const CallExpr * ) { if (mbInsideFunctionDecl) mbFoundDisqualifier = true; return true; } - bool VisitMaterializeTemporaryExpr(const MaterializeTemporaryExpr * ) { if (mbInsideFunctionDecl) mbFoundDisqualifier = true; return true; } - bool VisitDeclStmt(const DeclStmt * ) { if (mbInsideFunctionDecl) mbFoundDisqualifier = true; return true; } + bool VisitReturnStmt(const ReturnStmt * ); + bool VisitVarDecl(const VarDecl * ); private: template<typename T> bool traverseAnyFunctionDecl( @@ -62,6 +61,8 @@ private: void checkReturnValue(const FunctionDecl * functionDecl, const CXXMethodDecl * methodDecl); bool isFat(QualType type); bool isPrimitiveConstRef(QualType type); + bool isReturnExprDisqualified(const Expr* expr); + bool mbInsideFunctionDecl; bool mbFoundDisqualifier; @@ -228,10 +229,10 @@ void PassStuffByRef::checkParams(const FunctionDecl * functionDecl) { void PassStuffByRef::checkReturnValue(const FunctionDecl * functionDecl, const CXXMethodDecl * methodDecl) { - if (methodDecl && methodDecl->isVirtual()) { + if (methodDecl && (methodDecl->isVirtual() || methodDecl->hasAttr<OverrideAttr>())) { return; } - if( !functionDecl->hasBody()) { + if( !functionDecl->doesThisDeclarationHaveABody()) { return; } @@ -258,7 +259,8 @@ void PassStuffByRef::checkReturnValue(const FunctionDecl * functionDecl, const C || (dc.MemberFunction().Class("Model").Namespace("xforms") .GlobalNamespace()) || (dc.MemberFunction().Class("Submission").Namespace("xforms") - .GlobalNamespace())) + .GlobalNamespace()) + || (dc.Function("TopLeft").Class("SwRect").GlobalNamespace())) { return; } @@ -274,8 +276,7 @@ void PassStuffByRef::checkReturnValue(const FunctionDecl * functionDecl, const C return; // depends on a define if (dc.Function("GetSharedFileURL").Class("SfxObjectShell") - .GlobalNamespace()) - { + .GlobalNamespace()) { return; } mbInsideFunctionDecl = true; @@ -297,12 +298,85 @@ void PassStuffByRef::checkReturnValue(const FunctionDecl * functionDecl, const C { report( DiagnosticsEngine::Note, - "rather return by const& than by value", + "decl here", functionDecl->getCanonicalDecl()->getSourceRange().getBegin()) << functionDecl->getCanonicalDecl()->getSourceRange(); } } +bool PassStuffByRef::VisitReturnStmt(const ReturnStmt * returnStmt) +{ + if (!mbInsideFunctionDecl) + return true; + const Expr* expr = dyn_cast<Expr>(*returnStmt->child_begin())->IgnoreParenCasts(); + + if (isReturnExprDisqualified(expr)) { + mbFoundDisqualifier = true; + return true; + } + return true; +} + +bool PassStuffByRef::isReturnExprDisqualified(const Expr* expr) +{ + if (isa<ExprWithCleanups>(expr)) { + return true; + } + if (const CXXConstructExpr* constructExpr = dyn_cast<CXXConstructExpr>(expr)) { + if (constructExpr->getNumArgs()==1) { + expr = constructExpr->getArg(0)->IgnoreParenCasts(); + } + } + if (isa<CXXConstructExpr>(expr)) { + return true; + } + if (const ArraySubscriptExpr* childExpr = dyn_cast<ArraySubscriptExpr>(expr)) { + expr = childExpr->getLHS(); + } + if (const MemberExpr* memberExpr = dyn_cast<MemberExpr>(expr)) { + expr = memberExpr->getBase(); + } + if (const DeclRefExpr* declRef = dyn_cast<DeclRefExpr>(expr)) { + const VarDecl* varDecl = dyn_cast<VarDecl>(declRef->getDecl()); + if (varDecl) { + if (varDecl->getStorageDuration() == SD_Automatic + || varDecl->getStorageDuration() == SD_FullExpression ) { + return true; + } + return false; + } + } + if (const ConditionalOperator* condOper = dyn_cast<ConditionalOperator>(expr)) { + return isReturnExprDisqualified(condOper->getTrueExpr()) + || isReturnExprDisqualified(condOper->getFalseExpr()); + } + if (const CallExpr* callExpr = dyn_cast<CallExpr>(expr)) { + return !loplugin::TypeCheck(callExpr->getType()).Const().LvalueReference(); + } + return true; +} + +bool PassStuffByRef::VisitVarDecl(const VarDecl * varDecl) +{ + if (!mbInsideFunctionDecl) + return true; + // things guarded by locking are probably best left alone + loplugin::TypeCheck dc(varDecl->getType()); + if (dc.Class("Guard").Namespace("osl").GlobalNamespace()) + mbFoundDisqualifier = true; + if (dc.Class("ClearableGuard").Namespace("osl").GlobalNamespace()) + mbFoundDisqualifier = true; + if (dc.Class("ResettableGuard").Namespace("osl").GlobalNamespace()) + mbFoundDisqualifier = true; + else if (dc.Class("SolarMutexGuard").GlobalNamespace()) + mbFoundDisqualifier = true; + else if (dc.Class("SfxModelGuard").GlobalNamespace()) + mbFoundDisqualifier = true; + else if (dc.Class("ReadWriteGuard").Namespace("utl").GlobalNamespace()) + mbFoundDisqualifier = true; + return true; +} + // Would produce a wrong recommendation for // // PresenterFrameworkObserver::RunOnUpdateEnd( diff --git a/configmgr/source/lock.cxx b/configmgr/source/lock.cxx index 66a2be9eeca6..9258b35bfeb7 100644 --- a/configmgr/source/lock.cxx +++ b/configmgr/source/lock.cxx @@ -25,7 +25,7 @@ namespace configmgr { -std::shared_ptr<osl::Mutex> lock() +std::shared_ptr<osl::Mutex> const & lock() { static std::shared_ptr<osl::Mutex> theLock; if (!theLock.get()) diff --git a/configmgr/source/lock.hxx b/configmgr/source/lock.hxx index d8c050e824e6..ee98efcc365f 100644 --- a/configmgr/source/lock.hxx +++ b/configmgr/source/lock.hxx @@ -26,7 +26,7 @@ namespace configmgr { -std::shared_ptr<osl::Mutex> lock(); +std::shared_ptr<osl::Mutex> const & lock(); } diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx index 97c32b21fe4f..041cd50f890d 100644 --- a/configmgr/source/propertynode.cxx +++ b/configmgr/source/propertynode.cxx @@ -48,7 +48,7 @@ rtl::Reference< Node > PropertyNode::clone(bool) const { } -css::uno::Any PropertyNode::getValue(Components & components) { +css::uno::Any const & PropertyNode::getValue(Components & components) { if (!externalDescriptor_.isEmpty()) { css::beans::Optional< css::uno::Any > val( components.getExternalValue(externalDescriptor_)); diff --git a/configmgr/source/propertynode.hxx b/configmgr/source/propertynode.hxx index 7716ae963e34..e1ddb4495d08 100644 --- a/configmgr/source/propertynode.hxx +++ b/configmgr/source/propertynode.hxx @@ -45,7 +45,7 @@ public: bool isNillable() const { return nillable_;} - css::uno::Any getValue(Components & components); + css::uno::Any const & getValue(Components & components); void setValue(int layer, css::uno::Any const & value); css::uno::Any *getValuePtr(int layer); diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx index a84898df0bbf..3d4bbd5b4345 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -101,7 +101,7 @@ void RootAccess::release() throw () { Access::release(); } -OUString RootAccess::getAbsolutePathRepresentation() { +OUString const & RootAccess::getAbsolutePathRepresentation() { getNode(); // turn pathRepresentation_ into canonic form return pathRepresentation_; } diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx index a308ef59b223..8ea6b2025e6d 100644 --- a/configmgr/source/rootaccess.hxx +++ b/configmgr/source/rootaccess.hxx @@ -70,7 +70,7 @@ public: virtual void SAL_CALL release() throw () override; - OUString getAbsolutePathRepresentation(); + OUString const & getAbsolutePathRepresentation(); const OUString& getLocale() const { return locale_;} diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 3337bd12ad79..3e68e4a1c8e8 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -666,82 +666,82 @@ const ORowSetValue& ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex) } /// return an empty ORowSetValueDecorator -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getEmptyValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getEmptyValue() { static ORowSetValueDecoratorRef aEmptyValueRef = new ORowSetValueDecorator(); return aEmptyValueRef; } /// return an ORowSetValueDecorator with 0 as value -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::get0Value() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::get0Value() { static ORowSetValueDecoratorRef a0ValueRef = new ORowSetValueDecorator((sal_Int32)0); return a0ValueRef; } /// return an ORowSetValueDecorator with 1 as value -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::get1Value() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::get1Value() { static ORowSetValueDecoratorRef a1ValueRef = new ORowSetValueDecorator((sal_Int32)1); return a1ValueRef; } /// return an ORowSetValueDecorator with ColumnSearch::BASIC as value -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getBasicValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getBasicValue() { static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(ColumnSearch::BASIC); return aValueRef; } -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getSelectValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getSelectValue() { static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("SELECT")); return aValueRef; } -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getInsertValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getInsertValue() { static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("INSERT")); return aValueRef; } -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDeleteValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getDeleteValue() { static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("DELETE")); return aValueRef; } -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getUpdateValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getUpdateValue() { static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("UPDATE")); return aValueRef; } -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getCreateValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getCreateValue() { static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("CREATE")); return aValueRef; } -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getReadValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getReadValue() { static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("READ")); return aValueRef; } -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getAlterValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getAlterValue() { static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("ALTER")); return aValueRef; } -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getDropValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getDropValue() { static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("DROP")); return aValueRef; } -ORowSetValueDecoratorRef ODatabaseMetaDataResultSet::getQuoteValue() +ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getQuoteValue() { static ORowSetValueDecoratorRef aValueRef = new ORowSetValueDecorator(OUString("'")); return aValueRef; diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index 1646b64ce255..63dc30858339 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -58,7 +58,7 @@ namespace dbtools using namespace ::com::sun::star::beans; - css::util::Date DBTypeConversion::getStandardDate() + css::util::Date const & DBTypeConversion::getStandardDate() { static css::util::Date STANDARD_DB_DATE(1,1,1900); return STANDARD_DB_DATE; diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index 9dd861d33854..ad462ea596b6 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -249,7 +249,7 @@ bool OPoolCollection::isPoolingEnabled() return bEnabled; } -Reference<XInterface> OPoolCollection::getConfigPoolRoot() +Reference<XInterface> const & OPoolCollection::getConfigPoolRoot() { if(!m_xConfigNode.is()) m_xConfigNode = createWithServiceFactory(getConnectionPoolNodeName()); diff --git a/connectivity/source/cpool/ZPoolCollection.hxx b/connectivity/source/cpool/ZPoolCollection.hxx index ff31c6c38435..25c3f5a934d1 100644 --- a/connectivity/source/cpool/ZPoolCollection.hxx +++ b/connectivity/source/cpool/ZPoolCollection.hxx @@ -86,7 +86,7 @@ namespace connectivity // some configuration helper methods css::uno::Reference< css::uno::XInterface > createWithServiceFactory(const OUString& _rPath) const; - css::uno::Reference< css::uno::XInterface > getConfigPoolRoot(); + css::uno::Reference< css::uno::XInterface > const & getConfigPoolRoot(); static css::uno::Reference< css::uno::XInterface > createWithProvider( const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxConfProvider, const OUString& _rPath); static css::uno::Reference< css::uno::XInterface > openNode( const OUString& _rPath, diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index f2cfdf2c41f7..0d32d31a7bb0 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -101,7 +101,7 @@ void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValu acquireDoc(); } -Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc() +Reference< XSpreadsheetDocument> const & OCalcConnection::acquireDoc() { if ( m_xDoc.is() ) { diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index f384a89b1da7..f5f4c4993906 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -130,7 +130,7 @@ sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (R : ODbaseIndex_BASE::getSomething(rId); } -ONDXPagePtr ODbaseIndex::getRoot() +ONDXPagePtr const & ODbaseIndex::getRoot() { openIndexFile(); if (!m_aRoot.Is()) diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 1a0ef32a0551..3da41939886d 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -124,7 +124,7 @@ namespace connectivity cppu::WeakComponentImplHelperBase::disposing(); } - Reference< XDriver > ODriverDelegator::loadDriver( ) + Reference< XDriver > const & ODriverDelegator::loadDriver( ) { if ( !m_xDriver.is() ) { diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index cad5fbde4beb..e79718a18f65 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -79,21 +79,21 @@ namespace connectivity } } - Reference< XInputStream> StreamHelper::getInputStream() + Reference< XInputStream> const & StreamHelper::getInputStream() { if ( !m_xInputStream.is() ) m_xInputStream = m_xStream->getInputStream(); return m_xInputStream; } - Reference< XOutputStream> StreamHelper::getOutputStream() + Reference< XOutputStream> const & StreamHelper::getOutputStream() { if ( !m_xOutputStream.is() ) m_xOutputStream = m_xStream->getOutputStream(); return m_xOutputStream; } - Reference< XSeekable> StreamHelper::getSeek() + Reference< XSeekable> const & StreamHelper::getSeek() { if ( !m_xSeek.is() ) m_xSeek.set(m_xStream,UNO_QUERY); diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index e7666cc39a31..068b1ed3991d 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM2(const ::rtl::Reference< jvmaccess::VirtualMachine >& _rVM = ::rtl::Reference< jvmaccess::VirtualMachine >(), +::rtl::Reference< jvmaccess::VirtualMachine > const & getJavaVM2(const ::rtl::Reference< jvmaccess::VirtualMachine >& _rVM = ::rtl::Reference< jvmaccess::VirtualMachine >(), bool _bSet = false) { static ::rtl::Reference< jvmaccess::VirtualMachine > s_VM; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index d3410ba6123d..c2c4c3906a49 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -90,7 +90,7 @@ namespace }; - OUString lcl_guessProfileRoot( MozillaProductType _product ) + OUString const & lcl_guessProfileRoot( MozillaProductType _product ) { size_t productIndex = _product - 1; diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx index 006266c78e5d..6d491ed34ee9 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx @@ -245,31 +245,31 @@ namespace connectivity // some methods to get already defined ORowSetValues // this increase the reuse of ORowSetValues /// return an empty ORowSetValueDecorator - static ORowSetValueDecoratorRef getEmptyValue(); + static ORowSetValueDecoratorRef const & getEmptyValue(); /// return an ORowSetValueDecorator with 0 as value - static ORowSetValueDecoratorRef get0Value(); + static ORowSetValueDecoratorRef const & get0Value(); /// return an ORowSetValueDecorator with 1 as value - static ORowSetValueDecoratorRef get1Value(); + static ORowSetValueDecoratorRef const & get1Value(); /// return an ORowSetValueDecorator with ColumnSearch::BASIC as value - static ORowSetValueDecoratorRef getBasicValue(); + static ORowSetValueDecoratorRef const & getBasicValue(); /// return an ORowSetValueDecorator with string SELECT as value - static ORowSetValueDecoratorRef getSelectValue(); + static ORowSetValueDecoratorRef const & getSelectValue(); /// return an ORowSetValueDecorator with string INSERT as value - static ORowSetValueDecoratorRef getInsertValue(); + static ORowSetValueDecoratorRef const & getInsertValue(); /// return an ORowSetValueDecorator with string DELETE as value - static ORowSetValueDecoratorRef getDeleteValue(); + static ORowSetValueDecoratorRef const & getDeleteValue(); /// return an ORowSetValueDecorator with string UPDATE as value - static ORowSetValueDecoratorRef getUpdateValue(); + static ORowSetValueDecoratorRef const & getUpdateValue(); /// return an ORowSetValueDecorator with string CREATE as value - static ORowSetValueDecoratorRef getCreateValue(); + static ORowSetValueDecoratorRef const & getCreateValue(); /// return an ORowSetValueDecorator with string READ as value - static ORowSetValueDecoratorRef getReadValue(); + static ORowSetValueDecoratorRef const & getReadValue(); /// return an ORowSetValueDecorator with string ALTER as value - static ORowSetValueDecoratorRef getAlterValue(); + static ORowSetValueDecoratorRef const & getAlterValue(); /// return an ORowSetValueDecorator with string DROP as value - static ORowSetValueDecoratorRef getDropValue(); + static ORowSetValueDecoratorRef const & getDropValue(); /// return an ORowSetValueDecorator with string ' as value - static ORowSetValueDecoratorRef getQuoteValue(); + static ORowSetValueDecoratorRef const & getQuoteValue(); }; } diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx index b8b734a13114..63b1d4ab084d 100644 --- a/connectivity/source/inc/calc/CConnection.hxx +++ b/connectivity/source/inc/calc/CConnection.hxx @@ -70,7 +70,7 @@ namespace connectivity virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; // no interface methods - css::uno::Reference< css::sheet::XSpreadsheetDocument> acquireDoc(); + css::uno::Reference< css::sheet::XSpreadsheetDocument> const & acquireDoc(); void releaseDoc(); class ODocHolder diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index 5396e6475d48..afe45a478708 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -125,7 +125,7 @@ namespace connectivity ONDXPage* CreatePage(sal_uInt32 nPagePos, ONDXPage* pParent = nullptr, bool bLoad = false); void Collect(ONDXPage*); - ONDXPagePtr getRoot(); + ONDXPagePtr const & getRoot(); bool isUnique() const { return m_IsUnique; } bool UseCollector() const {return m_bUseCollector;} diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 21bc04459b93..255c6609b5d3 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -72,7 +72,7 @@ namespace connectivity @return The driver which was currently selected. */ - css::uno::Reference< css::sdbc::XDriver > loadDriver( ); + css::uno::Reference< css::sdbc::XDriver > const & loadDriver( ); /** shut down the connection and revoke the storage from the map @param _aIter diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx index f0bbe98e24d2..62ae7ec3d233 100644 --- a/connectivity/source/inc/hsqldb/HStorageMap.hxx +++ b/connectivity/source/inc/hsqldb/HStorageMap.hxx @@ -48,9 +48,9 @@ namespace connectivity StreamHelper(const css::uno::Reference< css::io::XStream>& _xStream); ~StreamHelper(); - css::uno::Reference< css::io::XInputStream> getInputStream(); - css::uno::Reference< css::io::XOutputStream> getOutputStream(); - css::uno::Reference< css::io::XSeekable> getSeek(); + css::uno::Reference< css::io::XInputStream> const & getInputStream(); + css::uno::Reference< css::io::XOutputStream> const & getOutputStream(); + css::uno::Reference< css::io::XSeekable> const & getSeek(); }; diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx index bc1c9155eb52..9fbbc3209f41 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.cxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx @@ -22,6 +22,7 @@ #include "RowSetBase.hxx" using namespace dbaccess; + ORowSetCacheIterator::ORowSetCacheIterator(const ORowSetCacheIterator& _rRH) : m_aIter(_rRH.m_aIter) , m_pCache(_rRH.m_pCache) @@ -29,7 +30,7 @@ ORowSetCacheIterator::ORowSetCacheIterator(const ORowSetCacheIterator& _rRH) { } -ORowSetCacheIterator::operator ORowSetMatrix::iterator() +ORowSetCacheIterator::operator ORowSetMatrix::iterator const &() { return m_aIter->second.aIterator; } diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx index 4b4c97e35a39..6c4a63367961 100644 --- a/dbaccess/source/core/api/RowSetCacheIterator.hxx +++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx @@ -58,7 +58,7 @@ namespace dbaccess bool isNull() const; ORowSetCacheIterator& operator =(const ORowSetMatrix::iterator&); - operator ORowSetMatrix::iterator(); + operator ORowSetMatrix::iterator const &(); ORowSetRow& operator *(); diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 9b170bdf0627..10c63345db44 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -669,7 +669,7 @@ Sequence< OUString > SAL_CALL OConnection::getAvailableServiceNames( ) throw (R return aRet; } -Reference< XTablesSupplier > OConnection::getMasterTables() +Reference< XTablesSupplier > const & OConnection::getMasterTables() { // check if out "master connection" can supply tables if(!m_xMasterTables.is()) diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index e06186cd91e5..eef6cfc2aa75 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -203,7 +203,7 @@ protected: throw css::lang::DisposedException(); } - css::uno::Reference< css::sdbcx::XTablesSupplier > getMasterTables(); + css::uno::Reference< css::sdbcx::XTablesSupplier > const & getMasterTables(); private: /** checks whether or not there are naming conflicts between tables and queries diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 9e0ee5eceb92..4d28b3756ea7 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -1729,7 +1729,7 @@ Reference< XUIConfigurationManager > SAL_CALL ODatabaseDocument::getUIConfigurat return Reference< XUIConfigurationManager >( getUIConfigurationManager2(), UNO_QUERY_THROW ); } -Reference< XUIConfigurationManager2 > ODatabaseDocument::getUIConfigurationManager2( ) throw (RuntimeException) +Reference< XUIConfigurationManager2 > const & ODatabaseDocument::getUIConfigurationManager2( ) throw (RuntimeException) { DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod); @@ -2090,7 +2090,7 @@ Reference< XController2 > SAL_CALL ODatabaseDocument::createViewController( cons return xController; } -Reference< XTitle > ODatabaseDocument::impl_getTitleHelper_throw() +Reference< XTitle > const & ODatabaseDocument::impl_getTitleHelper_throw() { if ( ! m_xTitleHelper.is ()) { diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index 0b91ad84119b..dbee460941aa 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -267,7 +267,7 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe // ModelDependentComponent overridables virtual css::uno::Reference< css::uno::XInterface > getThis() const override; - css::uno::Reference< css::frame::XTitle > impl_getTitleHelper_throw(); + css::uno::Reference< css::frame::XTitle > const & impl_getTitleHelper_throw(); css::uno::Reference< css::frame::XUntitledNumbers > impl_getUntitledHelper_throw( const css::uno::Reference< css::uno::XInterface >& _xComponent = css::uno::Reference< css::uno::XInterface >()); @@ -466,7 +466,7 @@ public: } private: - css::uno::Reference< css::ui::XUIConfigurationManager2 > getUIConfigurationManager2() throw (css::uno::RuntimeException); + css::uno::Reference< css::ui::XUIConfigurationManager2 > const & getUIConfigurationManager2() throw (css::uno::RuntimeException); /** returns whether the model is currently being initialized */ diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index a17220c2f55a..735586ad6f94 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -1360,7 +1360,7 @@ OUString ODBExport::implConvertAny(const Any& _rValue) return aBuffer.makeStringAndClear(); } -rtl::Reference < XMLPropertySetMapper > ODBExport::GetTableStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > const & ODBExport::GetTableStylesPropertySetMapper() const { if ( !m_xTableStylesPropertySetMapper.is() ) { @@ -1369,7 +1369,7 @@ rtl::Reference < XMLPropertySetMapper > ODBExport::GetTableStylesPropertySetMapp return m_xTableStylesPropertySetMapper; } -rtl::Reference < XMLPropertySetMapper > ODBExport::GetCellStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > const & ODBExport::GetCellStylesPropertySetMapper() const { if ( !m_xCellStylesPropertySetMapper.is() ) { @@ -1378,7 +1378,7 @@ rtl::Reference < XMLPropertySetMapper > ODBExport::GetCellStylesPropertySetMappe return m_xCellStylesPropertySetMapper; } -rtl::Reference < XMLPropertySetMapper > ODBExport::GetColumnStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > const & ODBExport::GetColumnStylesPropertySetMapper() const { if ( !m_xColumnStylesPropertySetMapper.is() ) { diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 4a25fcf2da67..3a335e2b4817 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -154,7 +154,7 @@ class ODBExport : public SvXMLExport static OUString implConvertAny(const Any& _rValue); - rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > const & GetTableStylesPropertySetMapper() const; ODBExport() = delete; protected: @@ -183,8 +183,8 @@ public: static css::uno::Reference<css::uno::XInterface> SAL_CALL Create( css::uno::Reference<css::lang::XMultiServiceFactory> const & _rxORB); - rtl::Reference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const; - rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > const & GetColumnStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > const & GetCellStylesPropertySetMapper() const; // XExporter virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index dcc8f767116a..6608e91f3d83 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -734,7 +734,7 @@ SvXMLImportContext* ODBFilter::CreateScriptContext( const OUString& _rLocalName } -rtl::Reference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > const & ODBFilter::GetTableStylesPropertySetMapper() const { if ( !m_xTableStylesPropertySetMapper.is() ) { @@ -744,7 +744,7 @@ rtl::Reference < XMLPropertySetMapper > ODBFilter::GetTableStylesPropertySetMapp } -rtl::Reference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > const & ODBFilter::GetColumnStylesPropertySetMapper() const { if ( !m_xColumnStylesPropertySetMapper.is() ) { @@ -754,7 +754,7 @@ rtl::Reference < XMLPropertySetMapper > ODBFilter::GetColumnStylesPropertySetMap } -rtl::Reference < XMLPropertySetMapper > ODBFilter::GetCellStylesPropertySetMapper() const +rtl::Reference < XMLPropertySetMapper > const & ODBFilter::GetCellStylesPropertySetMapper() const { if ( !m_xCellStylesPropertySetMapper.is() ) { diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 5db692434af9..7e47f458cdd6 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -139,9 +139,9 @@ public: const SvXMLTokenMap& GetQueryElemTokenMap() const; const SvXMLTokenMap& GetColumnElemTokenMap() const; - rtl::Reference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const; - rtl::Reference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const; - rtl::Reference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > const & GetTableStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > const & GetColumnStylesPropertySetMapper() const; + rtl::Reference < XMLPropertySetMapper > const & GetCellStylesPropertySetMapper() const; /** add a Info to the sequence which will be appended to the data source @param _rInfo The property to append. diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 122cec748dcf..c3a1bb3af524 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -152,7 +152,7 @@ OUString OColumnControlWindow::getAutoIncrementValue() const return m_sAutoIncrementValue; } -TOTypeInfoSP OColumnControlWindow::getDefaultTyp() const +TOTypeInfoSP const & OColumnControlWindow::getDefaultTyp() const { if ( !m_pTypeInfo.get() ) { diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 6c80b1cccbe6..2490f0eaf31c 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -411,7 +411,7 @@ Reference< XDriver > ODbDataSourceAdministrationHelper::getDriver(const OUString return xDriver; } -Reference< XPropertySet > ODbDataSourceAdministrationHelper::getCurrentDataSource() +Reference< XPropertySet > const & ODbDataSourceAdministrationHelper::getCurrentDataSource() { if ( !m_xDatasource.is() ) { diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx index 64efba450f4e..7d6e90882e73 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx @@ -103,7 +103,7 @@ namespace dbaui /** returns the data source the dialog is currently working with */ - css::uno::Reference< css::beans::XPropertySet > getCurrentDataSource(); + css::uno::Reference< css::beans::XPropertySet > const & getCurrentDataSource(); // returns the Url of a database document static OUString getDocumentUrl(SfxItemSet& _rDest); diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 4de77cc3e180..2df16e90ea24 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -68,7 +68,7 @@ namespace { } - Image getImage() const + Image const & getImage() const { if ( !m_defaultImage ) m_defaultImage = Image( ModuleRes( m_defaultImageID ) ); @@ -107,7 +107,7 @@ namespace { } - std::shared_ptr< ImageProvider > getImageProvider( SQLExceptionInfo::TYPE _eType ) const + std::shared_ptr< ImageProvider > const & getImageProvider( SQLExceptionInfo::TYPE _eType ) const { std::shared_ptr< ImageProvider >* ppProvider( &m_pErrorImage ); sal_uInt16 nNormalImageID( BMP_EXCEPTION_ERROR ); @@ -133,7 +133,7 @@ namespace return *ppProvider; } - std::shared_ptr< LabelProvider > getLabelProvider( SQLExceptionInfo::TYPE _eType, bool _bSubLabel ) const + std::shared_ptr< LabelProvider > const & getLabelProvider( SQLExceptionInfo::TYPE _eType, bool _bSubLabel ) const { std::shared_ptr< LabelProvider >* ppProvider( &m_pErrorLabel ); sal_uInt16 nLabelID( STR_EXCEPTION_ERROR ); diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx index 7a1cf40b5f5e..7c7f63a12e4e 100644 --- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx +++ b/dbaccess/source/ui/inc/ColumnControlWindow.hxx @@ -61,7 +61,7 @@ namespace dbaui virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() override; virtual css::uno::Reference< css::sdbc::XConnection> getConnection() override; virtual const OTypeInfoMap* getTypeInfo() const override; - TOTypeInfoSP getDefaultTyp() const; + TOTypeInfoSP const & getDefaultTyp() const; }; } // namespace dbaui #endif // INCLUDED_DBACCESS_SOURCE_UI_INC_COLUMNCONTROLWINDOW_HXX diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx index 212d03445ffc..dd8c38c5ae9c 100644 --- a/dbaccess/source/ui/inc/WCopyTable.hxx +++ b/dbaccess/source/ui/inc/WCopyTable.hxx @@ -208,7 +208,7 @@ namespace dbaui private: void impl_ensureColumnInfo_throw(); - ::utl::SharedUNOComponent< css::sdbc::XPreparedStatement > + ::utl::SharedUNOComponent< css::sdbc::XPreparedStatement > const & impl_ensureStatement_throw(); }; diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx index 73281f417597..56142ceee651 100644 --- a/dbaccess/source/ui/misc/WCopyTable.cxx +++ b/dbaccess/source/ui/misc/WCopyTable.cxx @@ -330,7 +330,7 @@ void NamedTableCopySource::impl_ensureColumnInfo_throw() } } -::utl::SharedUNOComponent< XPreparedStatement > NamedTableCopySource::impl_ensureStatement_throw() +::utl::SharedUNOComponent< XPreparedStatement > const & NamedTableCopySource::impl_ensureStatement_throw() { if ( !m_xStatement.is() ) m_xStatement.set( m_xConnection->prepareStatement( getSelectStatement() ), UNO_SET_THROW ); diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index 535d9a4ba327..cf3f75b11541 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -63,7 +63,7 @@ void BackendDb::save() ucbDb.writeStream(xData, true /*replace existing*/); } -css::uno::Reference<css::xml::dom::XDocument> BackendDb::getDocument() +css::uno::Reference<css::xml::dom::XDocument> const & BackendDb::getDocument() { if (!m_doc.is()) { @@ -106,7 +106,7 @@ css::uno::Reference<css::xml::dom::XDocument> BackendDb::getDocument() return m_doc; } -Reference<css::xml::xpath::XXPathAPI> BackendDb::getXPathAPI() +Reference<css::xml::xpath::XXPathAPI> const & BackendDb::getXPathAPI() { if (!m_xpathApi.is()) { diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index 8bed8bb89de0..73e1b43e1dc7 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -106,7 +106,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend void revokeEntryFromDb(OUString const & url); bool activateEntry(OUString const & url); - Reference< ucb::XSimpleFileAccess3 > getFileAccess(); + Reference< ucb::XSimpleFileAccess3 > const & getFileAccess(); Reference< ucb::XSimpleFileAccess3 > m_xSFA; const Reference<deployment::XPackageTypeInfo> m_xHelpTypeInfo; @@ -601,7 +601,7 @@ void BackendImpl::implCollectXhpFiles( const OUString& aDir, } } -Reference< ucb::XSimpleFileAccess3 > BackendImpl::getFileAccess() +Reference< ucb::XSimpleFileAccess3 > const & BackendImpl::getFileAccess() { if( !m_xSFA.is() ) { diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 36b15f82887e..8731cdc3d51e 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -58,11 +58,11 @@ protected: /* caller must make sure that only one thread accesses the function */ - css::uno::Reference<css::xml::dom::XDocument> getDocument(); + css::uno::Reference<css::xml::dom::XDocument> const & getDocument(); /* the namespace prefix is "reg" (without quotes) */ - css::uno::Reference<css::xml::xpath::XXPathAPI> getXPathAPI(); + css::uno::Reference<css::xml::xpath::XXPathAPI> const & getXPathAPI(); void save(); void removeElement(OUString const & sXPathExpression); diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index 6813187b0f9d..a719dbf8d702 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -836,7 +836,7 @@ namespace accessibility } } - static uno::Sequence< OUString > getAttributeNames() + static uno::Sequence< OUString > const & getAttributeNames() { static uno::Sequence< OUString >* pNames = nullptr; diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index 1de90eb3567b..89d1b84e9f40 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -175,7 +175,7 @@ SfxPoolItem** GlobalEditData::GetDefItems() return ppDefItems; } -rtl::Reference<SvxForbiddenCharactersTable> GlobalEditData::GetForbiddenCharsTable() +rtl::Reference<SvxForbiddenCharactersTable> const & GlobalEditData::GetForbiddenCharsTable() { if ( !xForbiddenCharsTable.is() ) { @@ -184,7 +184,7 @@ rtl::Reference<SvxForbiddenCharactersTable> GlobalEditData::GetForbiddenCharsTab return xForbiddenCharsTable; } -uno::Reference< linguistic2::XLanguageGuessing > GlobalEditData::GetLanguageGuesser() +uno::Reference< linguistic2::XLanguageGuessing > const & GlobalEditData::GetLanguageGuesser() { if (!xLanguageGuesser.is()) { diff --git a/editeng/source/editeng/eerdll2.hxx b/editeng/source/editeng/eerdll2.hxx index c19347de5af9..ffb96fe0aa19 100644 --- a/editeng/source/editeng/eerdll2.hxx +++ b/editeng/source/editeng/eerdll2.hxx @@ -40,9 +40,9 @@ public: SfxPoolItem** GetDefItems(); - rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharsTable(); + rtl::Reference<SvxForbiddenCharactersTable> const & GetForbiddenCharsTable(); void SetForbiddenCharsTable( rtl::Reference<SvxForbiddenCharactersTable> const & xForbiddenChars ) { xForbiddenCharsTable = xForbiddenChars; } - css::uno::Reference< css::linguistic2::XLanguageGuessing > GetLanguageGuesser(); + css::uno::Reference< css::linguistic2::XLanguageGuessing > const & GetLanguageGuesser(); }; #endif // INCLUDED_EDITENG_SOURCE_EDITENG_EERDLL2_HXX diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 1798234f246d..9bd6c6673364 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -679,8 +679,8 @@ private: void SetValidPaperSize( const Size& rSz ); - css::uno::Reference < css::i18n::XBreakIterator > ImplGetBreakIterator() const; - css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker() const; + css::uno::Reference < css::i18n::XBreakIterator > const & ImplGetBreakIterator() const; + css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > const & ImplGetInputSequenceChecker() const; void ImplUpdateOverflowingParaNum( sal_uInt32 ); void ImplUpdateOverflowingLineNum( sal_uInt32, sal_uInt32, sal_uInt32 ); @@ -899,7 +899,7 @@ public: EditView* GetActiveView() const { return pActiveView; } void SetActiveView( EditView* pView ); - css::uno::Reference< css::linguistic2::XSpellChecker1 > + css::uno::Reference< css::linguistic2::XSpellChecker1 > const & GetSpeller(); void SetSpeller( css::uno::Reference< css::linguistic2::XSpellChecker1 > const &xSpl ) { xSpeller = xSpl; } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 9fdb38929927..d31ecbe95427 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -4226,7 +4226,7 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_Int32 nPara, ImplInitDigitMode( pOutDev, eLang ); } -Reference < i18n::XBreakIterator > ImpEditEngine::ImplGetBreakIterator() const +Reference < i18n::XBreakIterator > const & ImpEditEngine::ImplGetBreakIterator() const { if ( !xBI.is() ) { @@ -4236,7 +4236,7 @@ Reference < i18n::XBreakIterator > ImpEditEngine::ImplGetBreakIterator() const return xBI; } -Reference < i18n::XExtendedInputSequenceChecker > ImpEditEngine::ImplGetInputSequenceChecker() const +Reference < i18n::XExtendedInputSequenceChecker > const & ImpEditEngine::ImplGetInputSequenceChecker() const { if ( !xISC.is() ) { diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx index 4dfd2d650e91..1facdd5e232b 100644 --- a/editeng/source/editeng/impedit4.cxx +++ b/editeng/source/editeng/impedit4.cxx @@ -1449,7 +1449,7 @@ css::lang::Locale ImpEditEngine::GetLocale( const EditPaM& rPaM ) const return LanguageTag( GetLanguage( rPaM ) ).getLocale(); } -Reference< XSpellChecker1 > ImpEditEngine::GetSpeller() +Reference< XSpellChecker1 > const & ImpEditEngine::GetSpeller() { if ( !xSpeller.is() ) xSpeller = LinguMgr::GetSpellChecker(); diff --git a/editeng/source/uno/unoipset.cxx b/editeng/source/uno/unoipset.cxx index f325079d6eba..02c5d9d20618 100644 --- a/editeng/source/uno/unoipset.cxx +++ b/editeng/source/uno/unoipset.cxx @@ -261,7 +261,7 @@ const SfxItemPropertySimpleEntry* SvxItemPropertySet::getPropertyMapEntry(const } -uno::Reference< beans::XPropertySetInfo > SvxItemPropertySet::getPropertySetInfo() const +uno::Reference< beans::XPropertySetInfo > const & SvxItemPropertySet::getPropertySetInfo() const { if( !m_xInfo.is() ) m_xInfo = new SfxItemPropertySetInfo( m_aPropertyMap ); diff --git a/embeddedobj/source/commonembedding/embedobj.cxx b/embeddedobj/source/commonembedding/embedobj.cxx index cda0aade7fce..5142871421ff 100644 --- a/embeddedobj/source/commonembedding/embedobj.cxx +++ b/embeddedobj/source/commonembedding/embedobj.cxx @@ -389,7 +389,7 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 nNextState ) } -uno::Sequence< sal_Int32 > OCommonEmbeddedObject::GetIntermediateStatesSequence_Impl( sal_Int32 nNewState ) +uno::Sequence< sal_Int32 > const & OCommonEmbeddedObject::GetIntermediateStatesSequence_Impl( sal_Int32 nNewState ) { sal_Int32 nCurInd = 0; for ( nCurInd = 0; nCurInd < m_aAcceptedStates.getLength(); nCurInd++ ) diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index 7dab0063a1c2..dabebe88cef3 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -818,7 +818,7 @@ bool DocumentHolder::HideUI( const uno::Reference< css::frame::XLayoutManager >& } -uno::Reference< frame::XFrame > DocumentHolder::GetDocFrame() +uno::Reference< frame::XFrame > const & DocumentHolder::GetDocFrame() { // the frame for outplace activation if ( !m_xFrame.is() ) diff --git a/embeddedobj/source/inc/commonembobj.hxx b/embeddedobj/source/inc/commonembobj.hxx index b3f4524bbc30..72217defd907 100644 --- a/embeddedobj/source/inc/commonembobj.hxx +++ b/embeddedobj/source/inc/commonembobj.hxx @@ -186,7 +186,7 @@ private: void SwitchStateTo_Impl( sal_Int32 nNextState ); - css::uno::Sequence< sal_Int32 > GetIntermediateStatesSequence_Impl( sal_Int32 nNewState ); + css::uno::Sequence< sal_Int32 > const & GetIntermediateStatesSequence_Impl( sal_Int32 nNewState ); OUString GetFilterName( sal_Int32 nVersion ) const; css::uno::Reference< css::util::XCloseable > LoadDocumentFromStorage_Impl(); diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx index 10a9b57cac30..3e627257e31e 100644 --- a/embeddedobj/source/inc/docholder.hxx +++ b/embeddedobj/source/inc/docholder.hxx @@ -82,7 +82,7 @@ private: css::uno::Sequence< css::uno::Any > m_aOutplaceFrameProps; - css::uno::Reference< css::frame::XFrame > GetDocFrame(); + css::uno::Reference< css::frame::XFrame > const & GetDocFrame(); bool LoadDocToFrame( bool ); css::awt::Rectangle CalculateBorderedArea( const css::awt::Rectangle& aRect ); diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx index 9b59d388ac4d..34fd9a2b6bc9 100644 --- a/extensions/source/bibliography/bibconfig.cxx +++ b/extensions/source/bibliography/bibconfig.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::sdb; const char cDataSourceHistory[] = "DataSourceHistory"; -Sequence<OUString> BibConfig::GetPropertyNames() +Sequence<OUString> const & BibConfig::GetPropertyNames() { static Sequence<OUString> aNames; if(!aNames.getLength()) diff --git a/extensions/source/bibliography/bibconfig.hxx b/extensions/source/bibliography/bibconfig.hxx index c260f8efcbd0..f4dba759f2e0 100644 --- a/extensions/source/bibliography/bibconfig.hxx +++ b/extensions/source/bibliography/bibconfig.hxx @@ -101,7 +101,7 @@ class BibConfig : public utl::ConfigItem OUString aColumnDefaults[COLUMN_COUNT]; - static css::uno::Sequence<OUString> GetPropertyNames(); + static css::uno::Sequence<OUString> const & GetPropertyNames(); virtual void ImplCommit() override; diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 3bff83b5ea0a..3d9d4756afc2 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -88,9 +88,9 @@ private: const Reference< XLoadEventListener > & aListener); BibDataManager* GetDataManager()const; - Reference< XNameAccess > GetDataColumns() const; - Reference< XResultSet > GetDataCursor() const; - Reference< sdb::XColumn > GetIdentifierColumn() const; + Reference< XNameAccess > const & GetDataColumns() const; + Reference< XResultSet > const & GetDataCursor() const; + Reference< sdb::XColumn > GetIdentifierColumn() const; public: BibliographyLoader(); @@ -336,7 +336,7 @@ BibDataManager* BibliographyLoader::GetDataManager()const return m_pDatMan; } -Reference< XNameAccess > BibliographyLoader::GetDataColumns() const +Reference< XNameAccess > const & BibliographyLoader::GetDataColumns() const { if (!m_xColumns.is()) { @@ -406,7 +406,7 @@ Reference< sdb::XColumn > BibliographyLoader::GetIdentifierColumn() const return xReturn; } -Reference< XResultSet > BibliographyLoader::GetDataCursor() const +Reference< XResultSet > const & BibliographyLoader::GetDataCursor() const { if (!m_xCursor.is()) GetDataColumns(); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 930a11543e13..8ce8ba0f6f37 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -744,7 +744,7 @@ Reference< awt::XControlModel > BibDataManager::updateGridModel() return updateGridModel( m_xForm ); } -Reference< awt::XControlModel > BibDataManager::updateGridModel(const Reference< XForm > & xDbForm) +Reference< awt::XControlModel > const & BibDataManager::updateGridModel(const Reference< XForm > & xDbForm) { try { @@ -1595,7 +1595,7 @@ void BibDataManager::SetToolbar(BibToolBar* pSet) pToolbar->SetDatMan(*this); } -uno::Reference< form::runtime::XFormController > BibDataManager::GetFormController() +uno::Reference< form::runtime::XFormController > const & BibDataManager::GetFormController() { if(!m_xFormCtrl.is()) { diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx index 5bda57645fa2..19fd5506bec9 100644 --- a/extensions/source/bibliography/datman.hxx +++ b/extensions/source/bibliography/datman.hxx @@ -106,7 +106,7 @@ protected: void SetMeAsUidListener(); void RemoveMeAsUidListener(); - css::uno::Reference< css::awt::XControlModel > + css::uno::Reference< css::awt::XControlModel > const & updateGridModel(const css::uno::Reference< css::form::XForm > & xDbForm); static css::uno::Reference< css::awt::XControlModel > createGridModel( const OUString& rName ); @@ -172,7 +172,7 @@ public: const OUString& GetIdentifierMapping(); void ResetIdentifierMapping() {sIdentifierMapping.clear();} - css::uno::Reference< css::form::runtime::XFormController > GetFormController(); + css::uno::Reference< css::form::runtime::XFormController > const & GetFormController(); void RegisterInterceptor( ::bib::BibBeamer* pBibBeamer); bool HasActiveConnection(); diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx index 398dea7129d6..8295cdd3bd76 100644 --- a/extensions/source/propctrlr/composeduiupdate.cxx +++ b/extensions/source/propctrlr/composeduiupdate.cxx @@ -746,7 +746,7 @@ namespace pcr } - Reference< XObjectInspectorUI > ComposedPropertyUIUpdate::getDelegatorUI() const + Reference< XObjectInspectorUI > const & ComposedPropertyUIUpdate::getDelegatorUI() const { impl_checkDisposed(); return m_xDelegatorUI; diff --git a/extensions/source/propctrlr/composeduiupdate.hxx b/extensions/source/propctrlr/composeduiupdate.hxx index 30011afe0bcd..bd2539f56ada 100644 --- a/extensions/source/propctrlr/composeduiupdate.hxx +++ b/extensions/source/propctrlr/composeduiupdate.hxx @@ -89,7 +89,7 @@ namespace pcr /** returns the delegator UI @throw css::lang::DisposedException */ - css::uno::Reference< css::inspection::XObjectInspectorUI > getDelegatorUI() const; + css::uno::Reference< css::inspection::XObjectInspectorUI > const & getDelegatorUI() const; /** returns a ->XObjectInspectorUI instance belonging to a given property handler diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 0a2ea581ce5c..8d3c8b4a0801 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -368,7 +368,7 @@ private: const double P3x, const double P3y, const double P4x, const double P4y ); - css::uno::Reference < css::i18n::XBreakIterator > Impl_GetBreakIterator(); + css::uno::Reference < css::i18n::XBreakIterator > const & Impl_GetBreakIterator(); private: css::uno::Reference< css::i18n::XBreakIterator > mxBreakIterator; diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx index 5d1d057c762e..05058d00c6c4 100644 --- a/filter/source/flash/swfwriter1.cxx +++ b/filter/source/flash/swfwriter1.cxx @@ -1987,7 +1987,7 @@ void Writer::Impl_quadBezierApprox( BitStream& rBits, } } -Reference < XBreakIterator > Writer::Impl_GetBreakIterator() +Reference < XBreakIterator > const & Writer::Impl_GetBreakIterator() { if ( !mxBreakIterator.is() ) { diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index ae2f189948bf..6173a5ae8c31 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -122,7 +122,7 @@ public: RefEdit* GetCurrRefEdit(); const FormulaHelper& GetFormulaHelper() const { return m_aFormulaHelper;} - uno::Reference< sheet::XFormulaOpCodeMapper > GetFormulaOpCodeMapper() const; + uno::Reference< sheet::XFormulaOpCodeMapper > const & GetFormulaOpCodeMapper() const; DECL_LINK_TYPED( ModifyHdl, ParaWin&, void ); DECL_LINK_TYPED( FxHdl, ParaWin&, void ); @@ -404,7 +404,7 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) pData->SetFocusWindow(pWin); } -uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeMapper() const +uno::Reference< sheet::XFormulaOpCodeMapper > const & FormulaDlg_Impl::GetFormulaOpCodeMapper() const { if ( !m_xOpCodeMapper.is() ) { diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 84d3dc599795..99998563bde8 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -118,7 +118,7 @@ class FWI_DLLPUBLIC LanguageGuessingHelper public: LanguageGuessingHelper(const css::uno::Reference< css::uno::XComponentContext >& _xContext) : m_xContext(_xContext){} - css::uno::Reference< css::linguistic2::XLanguageGuessing > GetGuesser() const; + css::uno::Reference< css::linguistic2::XLanguageGuessing > const & GetGuesser() const; }; FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems, diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx index 1924eeb1c136..98897e39149a 100644 --- a/framework/source/fwe/classes/imagewrapper.cxx +++ b/framework/source/fwe/classes/imagewrapper.cxx @@ -32,7 +32,7 @@ using namespace com::sun::star::uno; namespace framework { -static Sequence< sal_Int8 > impl_getStaticIdentifier() +static Sequence< sal_Int8 > const & impl_getStaticIdentifier() { static const sal_uInt8 pGUID[16] = { 0x46, 0xAD, 0x69, 0xFB, 0xA7, 0xBE, 0x44, 0x83, 0xB2, 0xA7, 0xB3, 0xEC, 0x59, 0x4A, 0xB7, 0x00 }; static css::uno::Sequence< sal_Int8 > seqID(reinterpret_cast<const sal_Int8*>(pGUID), 16); diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index f58cdcc5c500..7c4312470c8b 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -37,7 +37,7 @@ using namespace com::sun::star::beans; namespace framework { -static Sequence< sal_Int8 > impl_getStaticIdentifier() +static Sequence< sal_Int8 > const & impl_getStaticIdentifier() { static const sal_uInt8 pGUID[16] = { 0x17, 0x0F, 0xA2, 0xC9, 0xCA, 0x50, 0x4A, 0xD3, 0xA6, 0x3B, 0x39, 0x99, 0xC5, 0x96, 0x43, 0x27 }; static css::uno::Sequence< sal_Int8 > seqID(reinterpret_cast<const sal_Int8*>(pGUID), 16); diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx index 7eb5a403373e..7ce88b29c5fc 100644 --- a/framework/source/fwi/helper/mischelper.cxx +++ b/framework/source/fwi/helper/mischelper.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star::lang; namespace framework { -uno::Reference< linguistic2::XLanguageGuessing > LanguageGuessingHelper::GetGuesser() const +uno::Reference< linguistic2::XLanguageGuessing > const & LanguageGuessingHelper::GetGuesser() const { if (!m_xLanguageGuesser.is()) { diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 0e611e607d6f..b46cb213821f 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -274,7 +274,7 @@ protected: throw (css::container::NoSuchElementException, css::uno::RuntimeException); OUString impl_reSubstituteVariables( const OUString& aText ) throw (css::uno::RuntimeException); - OUString impl_getSubstituteVariableValue( const OUString& variable ) + OUString const & impl_getSubstituteVariableValue( const OUString& variable ) throw (css::container::NoSuchElementException, css::uno::RuntimeException); private: @@ -1147,7 +1147,7 @@ throw ( RuntimeException ) } // This method support both request schemes "$("<varname>")" or "<varname>". -OUString SubstitutePathVariables::impl_getSubstituteVariableValue( const OUString& rVariable ) +OUString const & SubstitutePathVariables::impl_getSubstituteVariableValue( const OUString& rVariable ) throw ( NoSuchElementException, RuntimeException ) { OUString aVariable; diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index b34a5e93a8e4..f87fe583f64b 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -280,12 +280,12 @@ private: mutable bool mbCachedCountry : 1; mutable bool mbCachedVariants : 1; - const OUString & getBcp47() const; - OUString getLanguage() const; - OUString getScript() const; - OUString getCountry() const; + OUString const & getBcp47() const; + OUString const & getLanguage() const; + OUString const & getScript() const; + OUString const & getCountry() const; OUString getRegion() const; - OUString getVariants() const; + OUString const & getVariants() const; bool hasScript() const; bool isIsoLocale() const; @@ -996,7 +996,7 @@ LanguageTag::ImplPtr LanguageTag::registerImpl() const } -LanguageTag::ImplPtr LanguageTag::getImpl() const +LanguageTag::ImplPtr const & LanguageTag::getImpl() const { if (!mpImpl) { @@ -1802,7 +1802,7 @@ bool LanguageTag::isIsoScript( const OUString& rScript ) } -OUString LanguageTagImpl::getLanguage() const +OUString const & LanguageTagImpl::getLanguage() const { if (!mbCachedLanguage) { @@ -1824,7 +1824,7 @@ OUString LanguageTag::getLanguage() const } -OUString LanguageTagImpl::getScript() const +OUString const & LanguageTagImpl::getScript() const { if (!mbCachedScript) { @@ -1858,7 +1858,7 @@ OUString LanguageTag::getLanguageAndScript() const } -OUString LanguageTagImpl::getCountry() const +OUString const & LanguageTagImpl::getCountry() const { if (!mbCachedCountry) { @@ -1888,7 +1888,7 @@ OUString LanguageTagImpl::getRegion() const } -OUString LanguageTagImpl::getVariants() const +OUString const & LanguageTagImpl::getVariants() const { if (!mbCachedVariants) { diff --git a/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx index ef44b2655ef8..b775e10a7110 100644 --- a/i18npool/inc/characterclassificationImpl.hxx +++ b/i18npool/inc/characterclassificationImpl.hxx @@ -99,7 +99,7 @@ private: css::uno::Reference < css::uno::XComponentContext > m_xContext; css::uno::Reference < XCharacterClassification > xUCI; - css::uno::Reference < XCharacterClassification > SAL_CALL getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale) + css::uno::Reference < XCharacterClassification > const & SAL_CALL getLocaleSpecificCharacterClassification(const css::lang::Locale& rLocale) throw(css::uno::RuntimeException); bool SAL_CALL createLocaleSpecificCharacterClassification(const OUString& serviceName, const css::lang::Locale& rLocale); diff --git a/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx index 8b5921129a9e..594059e96b68 100644 --- a/i18npool/inc/indexentrysupplier.hxx +++ b/i18npool/inc/indexentrysupplier.hxx @@ -89,7 +89,7 @@ private: css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > xIES; css::uno::Reference < css::uno::XComponentContext > m_xContext; bool SAL_CALL createLocaleSpecificIndexEntrySupplier(const OUString& name) throw( css::uno::RuntimeException ); - css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > SAL_CALL getLocaleSpecificIndexEntrySupplier( + css::uno::Reference < css::i18n::XExtendedIndexEntrySupplier > const & SAL_CALL getLocaleSpecificIndexEntrySupplier( const css::lang::Locale& rLocale, const OUString& rSortAlgorithm) throw (css::uno::RuntimeException); protected: diff --git a/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx index ed6b269aa3c0..09707ff37e8b 100644 --- a/i18npool/inc/xdictionary.hxx +++ b/i18npool/inc/xdictionary.hxx @@ -71,7 +71,7 @@ public: ~xdictionary(); Boundary nextWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType); Boundary previousWord( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType); - Boundary getWordBoundary( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType, bool bDirection ); + Boundary const & getWordBoundary( const OUString& rText, sal_Int32 nPos, sal_Int16 wordType, bool bDirection ); void setJapaneseWordBreak(); private: diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx index 551ce859592b..69aba9c43ae4 100644 --- a/i18npool/source/breakiterator/xdictionary.cxx +++ b/i18npool/source/breakiterator/xdictionary.cxx @@ -428,7 +428,7 @@ Boundary xdictionary::nextWord(const OUString& rText, sal_Int32 anyPos, sal_Int1 return getWordBoundary(rText, anyPos, wordType, true); } -Boundary xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, sal_Int16 wordType, bool bDirection) +Boundary const & xdictionary::getWordBoundary(const OUString& rText, sal_Int32 anyPos, sal_Int16 wordType, bool bDirection) { const sal_Unicode *text=rText.getStr(); sal_Int32 len=rText.getLength(); diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index 41aa591bb148..424f5ca994a6 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -152,7 +152,7 @@ bool SAL_CALL CharacterClassificationImpl::createLocaleSpecificCharacterClassifi return false; } -Reference < XCharacterClassification > SAL_CALL +Reference < XCharacterClassification > const & SAL_CALL CharacterClassificationImpl::getLocaleSpecificCharacterClassification(const Locale& rLocale) throw(RuntimeException) { diff --git a/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx index ed3dbe70b4b9..2ade78f958a4 100644 --- a/i18npool/source/indexentry/indexentrysupplier.cxx +++ b/i18npool/source/indexentry/indexentrysupplier.cxx @@ -110,7 +110,7 @@ bool SAL_CALL IndexEntrySupplier::createLocaleSpecificIndexEntrySupplier(const O return false; } -Reference < css::i18n::XExtendedIndexEntrySupplier > SAL_CALL +Reference < css::i18n::XExtendedIndexEntrySupplier > const & SAL_CALL IndexEntrySupplier::getLocaleSpecificIndexEntrySupplier(const Locale& rLocale, const OUString& rSortAlgorithm) throw (RuntimeException) { if (xIES.is() && rSortAlgorithm == aSortAlgorithm && rLocale.Language == aLocale.Language && diff --git a/include/basic/sbmod.hxx b/include/basic/sbmod.hxx index 3727d1dcfbb6..03d6fb2151a9 100644 --- a/include/basic/sbmod.hxx +++ b/include/basic/sbmod.hxx @@ -128,7 +128,7 @@ public: bool isProxyModule() { return bIsProxyModule; } void AddVarName( const OUString& aName ); void RemoveVars(); - css::uno::Reference< css::script::XInvocation > GetUnoModule(); + css::uno::Reference< css::script::XInvocation > const & GetUnoModule(); bool createCOMWrapperForIface( css::uno::Any& o_rRetAny, SbClassModuleObject* pProxyClassModuleObject ); void GetCodeCompleteDataFromParse(CodeCompleteDataCache& aCache); const SbxArrayRef& GetMethods() { return pMethods;} diff --git a/include/basic/sbstar.hxx b/include/basic/sbstar.hxx index 1fda1b5310a3..47f21bc3aec0 100644 --- a/include/basic/sbstar.hxx +++ b/include/basic/sbstar.hxx @@ -144,7 +144,7 @@ public: static void SetGlobalBreakHdl( const Link<StarBASIC*,sal_uInt16>& rNewHdl ); - SbxArrayRef getUnoListeners(); + SbxArrayRef const & getUnoListeners(); static SbxBase* FindSBXInCurrentScope( const OUString& rName ); static SbMethod* GetActiveMethod( sal_uInt16 nLevel = 0 ); diff --git a/include/codemaker/options.hxx b/include/codemaker/options.hxx index 2d7ddbf1d07e..5a0f0dba3d70 100644 --- a/include/codemaker/options.hxx +++ b/include/codemaker/options.hxx @@ -52,7 +52,7 @@ public: const ::rtl::OString& getProgramName() const { return m_program;} bool isValid(const ::rtl::OString& option) const; - const ::rtl::OString getOption(const ::rtl::OString& option) const + const OString& getOption(const ::rtl::OString& option) const throw( IllegalArgument ); const StringVector& getInputFiles() { return m_inputFiles;} diff --git a/include/comphelper/accessibletexthelper.hxx b/include/comphelper/accessibletexthelper.hxx index 7dd0fc5155ef..368e468a5978 100644 --- a/include/comphelper/accessibletexthelper.hxx +++ b/include/comphelper/accessibletexthelper.hxx @@ -48,8 +48,8 @@ namespace comphelper OCommonAccessibleText(); virtual ~OCommonAccessibleText(); - css::uno::Reference < css::i18n::XBreakIterator > implGetBreakIterator(); - css::uno::Reference < css::i18n::XCharacterClassification > implGetCharacterClassification(); + css::uno::Reference < css::i18n::XBreakIterator > const & implGetBreakIterator(); + css::uno::Reference < css::i18n::XCharacterClassification > const & implGetCharacterClassification(); static bool implIsValidBoundary( css::i18n::Boundary& rBoundary, sal_Int32 nLength ); static bool implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ); static bool implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ); diff --git a/include/comphelper/container.hxx b/include/comphelper/container.hxx index 12b33ab92c93..03a7e96de77c 100644 --- a/include/comphelper/container.hxx +++ b/include/comphelper/container.hxx @@ -51,7 +51,7 @@ public: virtual ~IndexAccessIterator(); - css::uno::Reference< css::uno::XInterface> Next(); + css::uno::Reference< css::uno::XInterface> const & Next(); virtual void Invalidate() { m_xCurrentObject = nullptr; } diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx index a79436eb5685..0c604025a653 100644 --- a/include/connectivity/dbconversion.hxx +++ b/include/connectivity/dbconversion.hxx @@ -67,7 +67,7 @@ namespace dbtools { namespace DBTypeConversion { - OOO_DLLPUBLIC_DBTOOLS css::util::Date getStandardDate(); + OOO_DLLPUBLIC_DBTOOLS css::util::Date const & getStandardDate(); OOO_DLLPUBLIC_DBTOOLS void setValue(const css::uno::Reference< css::sdb::XColumnUpdate>& xVariant, const css::uno::Reference< css::util::XNumberFormatter>& xFormatter, const css::util::Date& rNullDate, diff --git a/include/editeng/unoipset.hxx b/include/editeng/unoipset.hxx index fc24cfbcf99e..9eeede104735 100644 --- a/include/editeng/unoipset.hxx +++ b/include/editeng/unoipset.hxx @@ -57,7 +57,7 @@ public: void AddUsrAnyForID(const css::uno::Any& rAny, sal_uInt16 nWID); void ClearAllUsrAny(); - css::uno::Reference< css::beans::XPropertySetInfo > getPropertySetInfo() const; + css::uno::Reference< css::beans::XPropertySetInfo > const & getPropertySetInfo() const; const SfxItemPropertyMap& getPropertyMap() const { return m_aPropertyMap;} const SfxItemPropertySimpleEntry* getPropertyMapEntry(const OUString &rName) const; }; diff --git a/include/i18nlangtag/languagetag.hxx b/include/i18nlangtag/languagetag.hxx index f494d78bfb25..a1b1bb9104f7 100644 --- a/include/i18nlangtag/languagetag.hxx +++ b/include/i18nlangtag/languagetag.hxx @@ -514,7 +514,7 @@ private: mutable bool mbInitializedLangID : 1; bool mbIsFallback : 1; - ImplPtr getImpl() const; + ImplPtr const & getImpl() const; ImplPtr registerImpl() const; void syncFromImpl(); void syncVarsFromRawImpl() const; diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx index 520bc51bc1f9..1367e2e22d1d 100644 --- a/include/oox/drawingml/shape.hxx +++ b/include/oox/drawingml/shape.hxx @@ -123,7 +123,7 @@ public: Shape3DProperties& get3DProperties() { return *mp3DPropertiesPtr; } const Shape3DProperties& get3DProperties() const { return *mp3DPropertiesPtr; } - table::TablePropertiesPtr getTableProperties(); + table::TablePropertiesPtr const & getTableProperties(); EffectProperties& getEffectProperties() { return *mpEffectPropertiesPtr; } @@ -216,7 +216,7 @@ public: protected: - css::uno::Reference< css::drawing::XShape > + css::uno::Reference< css::drawing::XShape > const & createAndInsert( ::oox::core::XmlFilterBase& rFilterBase, const OUString& rServiceName, diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx index 4d91f975fc1c..71c8118678c2 100644 --- a/include/oox/ole/axcontrol.hxx +++ b/include/oox/ole/axcontrol.hxx @@ -985,7 +985,7 @@ public: private: /** Creates the form that will hold the form controls. */ - css::uno::Reference< css::container::XIndexContainer > + css::uno::Reference< css::container::XIndexContainer > const & createXForm(); private: diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx index ea7ffcccd351..b7bbd4e1e9be 100644 --- a/include/oox/ole/vbaproject.hxx +++ b/include/oox/ole/vbaproject.hxx @@ -166,10 +166,10 @@ private: css::uno::Reference< css::container::XNameContainer > openLibrary( sal_Int32 nPropId, bool bCreateMissing ); /** Creates and returns the Basic library of the document used for import. */ - css::uno::Reference< css::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > const & createBasicLibrary(); /** Creates and returns the dialog library of the document used for import. */ - css::uno::Reference< css::container::XNameContainer > + css::uno::Reference< css::container::XNameContainer > const & createDialogLibrary(); /** Imports the VBA code modules and forms. */ diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx index 546f73a45674..40f51bc54964 100644 --- a/include/oox/ppt/timenode.hxx +++ b/include/oox/ppt/timenode.hxx @@ -77,7 +77,7 @@ namespace oox { namespace ppt { const css::uno::Reference< css::animations::XAnimationNode >& xNode, const SlidePersistPtr & pSlide ); - AnimTargetElementPtr getTarget() + AnimTargetElementPtr const & getTarget() { if( !mpTarget ) mpTarget.reset( new AnimTargetElement ); diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index ee92f8da0800..a08c22b7bdb7 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -118,7 +118,7 @@ public: */ void SetFilter(const std::shared_ptr<const SfxFilter>& pFilter); const std::shared_ptr<const SfxFilter>& GetFilter() const; - std::shared_ptr<const SfxFilter> GetOrigFilter() const; + std::shared_ptr<const SfxFilter> const & GetOrigFilter() const; const OUString& GetOrigURL() const; SfxItemSet * GetItemSet() const; diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 8e678caf59e0..e6c618bdf274 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -822,7 +822,7 @@ protected: /* returns a unique id for the model that is valid as long as the document is loaded. The id is not saved across document close/reload. */ - OUString getRuntimeUID() const; + OUString const & getRuntimeUID() const; /* returns true if the document signatures are valid, otherwise false */ bool hasValidSignatures() const; diff --git a/include/sfx2/thumbnailviewitem.hxx b/include/sfx2/thumbnailviewitem.hxx index c37d6aac7276..ed3c4231f5e5 100644 --- a/include/sfx2/thumbnailviewitem.hxx +++ b/include/sfx2/thumbnailviewitem.hxx @@ -109,7 +109,7 @@ public: void setTitle (const OUString& rTitle); - css::uno::Reference< css::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > const & GetAccessible( bool bIsTransientChildrenDisabled ); void setDrawArea (const Rectangle &area); diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index f9f332b816d5..720cfb423ed6 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -149,7 +149,7 @@ public: getPropertyState(const SfxItemPropertySimpleEntry& rEntry, const SfxItemSet& rSet) const throw(); - css::uno::Reference<css::beans::XPropertySetInfo> + css::uno::Reference<css::beans::XPropertySetInfo> const & getPropertySetInfo() const; const SfxItemPropertyMap& getPropertyMap() const {return m_aMap;} }; diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 197c93850ed9..b0acd32534ea 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -112,7 +112,7 @@ public: /** returns the display name of this style, it is used at the user interface. If the display name is empty, this method returns the internal name. */ - OUString GetDisplayName() const; + OUString const & GetDisplayName() const; virtual const OUString& GetParent() const; virtual bool SetParent( const OUString& ); diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index 5cc8bd3f4230..185581c26645 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -181,7 +181,7 @@ public: //If someone does not care about all the double handling and just wants to print the text formatted. //(((The text will be formatted, using the Formatter, and then set) void SetTextFormatted(const OUString& rText); - OUString GetTextValue() const; + OUString const & GetTextValue() const; void SetDefaultText(const OUString& rDefault) { m_sDefaultText = rDefault; } const OUString& GetDefaultText() const { return m_sDefaultText; } diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx index 6f16ff125600..8e1a882b8a7c 100644 --- a/include/svx/sdr/contact/viewcontact.hxx +++ b/include/svx/sdr/contact/viewcontact.hxx @@ -122,7 +122,7 @@ public: // access to the local primitive. This will ensure that the primitive is // current in comparing the local one with a fresh created incarnation - drawinglayer::primitive2d::Primitive2DContainer getViewIndependentPrimitive2DSequence() const; + drawinglayer::primitive2d::Primitive2DContainer const & getViewIndependentPrimitive2DSequence() const; // add Gluepoints (if available) virtual drawinglayer::primitive2d::Primitive2DContainer createGluePointPrimitive2DSequence() const; diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx index 9c31755a3e09..b475d511da50 100644 --- a/include/svx/sdr/contact/viewcontactofe3d.hxx +++ b/include/svx/sdr/contact/viewcontactofe3d.hxx @@ -81,7 +81,7 @@ protected: public: // access to the local primitive without the object's local 3D transform. This is e.g. needed // to get the not-yet transformed BoundVolume for e.g. interactions - drawinglayer::primitive3d::Primitive3DContainer getVIP3DSWithoutObjectTransform() const; + drawinglayer::primitive3d::Primitive3DContainer const & getVIP3DSWithoutObjectTransform() const; // access to the local primitive. This will ensure that the list is // current in comparing the local list content with a fresh created incarnation. It will diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx index 6936760b8feb..e4253c5185fa 100644 --- a/include/svx/sdr/contact/viewobjectcontact.hxx +++ b/include/svx/sdr/contact/viewobjectcontact.hxx @@ -110,7 +110,7 @@ public: // access to the local primitive. This will ensure that the local primitive is // current in comparing the local one with a fresh created incarnation // This method will not handle included hierarchies and not check visibility. - drawinglayer::primitive2d::Primitive2DContainer getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; + drawinglayer::primitive2d::Primitive2DContainer const & getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const; // test this VOC for visibility concerning model-view stuff like e.g. Layer virtual bool isPrimitiveVisible(const DisplayInfo& rDisplayInfo) const; diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx index 64199a2ec550..44cb21978173 100644 --- a/include/svx/sdr/overlay/overlaymanager.hxx +++ b/include/svx/sdr/overlay/overlaymanager.hxx @@ -95,7 +95,7 @@ namespace sdr static rtl::Reference<OverlayManager> create(OutputDevice& rOutputDevice); // access to current ViewInformation2D; this call checks and evtl. updates ViewInformation2D - const drawinglayer::geometry::ViewInformation2D getCurrentViewInformation2D() const; + drawinglayer::geometry::ViewInformation2D const & getCurrentViewInformation2D() const; // complete redraw virtual void completeRedraw(const vcl::Region& rRegion, OutputDevice* pPreRenderDevice = nullptr) const; diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx index 499bb6530d43..a6ad7a0f9789 100644 --- a/include/svx/sdrpaintwindow.hxx +++ b/include/svx/sdrpaintwindow.hxx @@ -100,7 +100,7 @@ public: vcl::Window* GetWindow() const { return mpWindow; } // OVERLAYMANAGER - rtl::Reference< sdr::overlay::OverlayManager > GetOverlayManager() const; + rtl::Reference< sdr::overlay::OverlayManager > const & GetOverlayManager() const; // #i73602# add flag if buffer shall be used void DrawOverlay(const vcl::Region& rRegion); diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index e86209aaf930..ade835e6bef7 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -524,7 +524,7 @@ public: bool GetDisableTextEditUsesCommonUndoManager() const { return mbDisableTextEditUsesCommonUndoManager; } void SetDisableTextEditUsesCommonUndoManager(bool bNew) { mbDisableTextEditUsesCommonUndoManager = bNew; } - css::uno::Reference< css::uno::XInterface > getUnoModel(); + css::uno::Reference< css::uno::XInterface > const & getUnoModel(); void setUnoModel( const css::uno::Reference< css::uno::XInterface >& xModel ); // these functions are used by the api to disable repaints during a diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx index 69cd93f7b1ec..8bf0037c3e87 100644 --- a/include/svx/svdoashp.hxx +++ b/include/svx/svdoashp.hxx @@ -107,7 +107,7 @@ public: // #i37011# render geometry shadow SdrObject* mpLastShadowGeometry; - css::uno::Reference< css::drawing::XCustomShapeEngine > GetCustomShapeEngine() const; + css::uno::Reference< css::drawing::XCustomShapeEngine > const & GetCustomShapeEngine() const; // SVX_DLLPRIVATE css::uno::Sequence< css::uno::Reference< css::drawing::XCustomShapeHandle > > // SdrObjCustomShape::GetInteraction( const SdrObjCustomShape* pCustomShape ) const; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index 700aa0fc5216..365817b4e865 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -508,7 +508,7 @@ public: /// otherwise the visible pages virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV, const Rectangle* pRect) const; - css::uno::Reference< css::uno::XInterface > getUnoPage(); + css::uno::Reference< css::uno::XInterface > const & getUnoPage(); virtual SfxStyleSheet* GetTextStyleSheetForObject( SdrObject* pObj ) const; diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx index 5416c90a3ecb..8c0c6a3b59e6 100644 --- a/include/svx/textchain.hxx +++ b/include/svx/textchain.hxx @@ -53,11 +53,11 @@ a##PropName = (PropDefault); #define DECL_CHAIN_PROP_INTERFACE(PropName, PropType) \ - PropType Get##PropName (const SdrTextObj *); \ + PropType const & Get##PropName (const SdrTextObj *); \ void Set##PropName (const SdrTextObj *, PropType); #define IMPL_CHAIN_PROP_INTERFACE(PropName, PropType) \ - PropType TextChain::Get##PropName (const SdrTextObj *pTarget) { \ + PropType const & TextChain::Get##PropName (const SdrTextObj *pTarget) { \ ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget); \ return pLinkProperties->a##PropName; \ } \ diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index 3b4226503d39..bd8cb9bd55d2 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -72,7 +72,7 @@ private: bool *pGraphicRepl=nullptr, bool *pOasisFormat=nullptr ) const; - SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage > ImplGetContainerStorage( + SVX_DLLPRIVATE css::uno::Reference < css::embed::XStorage > const & ImplGetContainerStorage( const OUString& rStorageName ); SVX_DLLPRIVATE void ImplReadObject( diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx index a692f39e36ba..c55827e97cb0 100644 --- a/include/svx/xtable.hxx +++ b/include/svx/xtable.hxx @@ -321,12 +321,12 @@ public: // Special call to get a bitmap for the solid line representation. It // creates a bitmap fitting in size and style to the ones you get by // using GetUiBitmap for existing entries. - Bitmap GetBitmapForUISolidLine() const; + Bitmap const & GetBitmapForUISolidLine() const; // Special calls to get the translated strings for the UI entry for no // line style (XLINE_NONE) and solid line style (XLINE_SOLID) for dialogs - OUString GetStringForUiSolidLine() const; - OUString GetStringForUiNoLine() const; + OUString const & GetStringForUiSolidLine() const; + OUString const & GetStringForUiNoLine() const; }; class SVX_DLLPUBLIC XHatchList : public XPropertyList diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx index e89613c0cd61..4fe541f15833 100644 --- a/include/toolkit/awt/vclxprinter.hxx +++ b/include/toolkit/awt/vclxprinter.hxx @@ -67,7 +67,7 @@ public: virtual ~VCLXPrinterPropertySet(); Printer* GetPrinter() const { return mxPrinter.get(); } - css::uno::Reference< css::awt::XDevice > GetDevice(); + css::uno::Reference< css::awt::XDevice > const & GetDevice(); // css::uno::XInterface DECLARE_XINTERFACE(); diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index ada7a1cf79dc..8d8f2c9191bf 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -122,7 +122,7 @@ public: * @return the continuation chosen by an interaction handler or an empty * reference, if the request was not (yet) handled. */ - rtl::Reference< InteractionContinuation > getSelection() const; + rtl::Reference< InteractionContinuation > const & getSelection() const; /** * This method sets a continuation for the request. It also can be used diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx index 0f9acb9af6b4..294777955007 100644 --- a/include/unotools/lingucfg.hxx +++ b/include/unotools/lingucfg.hxx @@ -147,7 +147,7 @@ class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options // configuration update access for the 'Linguistic' main node mutable css::uno::Reference< css::util::XChangesBatch > m_xMainUpdateAccess; - css::uno::Reference< css::util::XChangesBatch > GetMainUpdateAccess() const; + css::uno::Reference< css::util::XChangesBatch > const & GetMainUpdateAccess() const; OUString GetVendorImageUrl_Impl( const OUString &rServiceImplName, const OUString &rImageName ) const; diff --git a/include/unotools/localedatawrapper.hxx b/include/unotools/localedatawrapper.hxx index 419ac1517508..c63e8fc93553 100644 --- a/include/unotools/localedatawrapper.hxx +++ b/include/unotools/localedatawrapper.hxx @@ -175,7 +175,7 @@ public: MeasurementSystem mapMeasurementStringToEnum( const OUString& rMS ) const; /// Convenience method to obtain the default calendar. - const std::shared_ptr< css::i18n::Calendar2 > getDefaultCalendar() const; + const std::shared_ptr< css::i18n::Calendar2 >& getDefaultCalendar() const; /// Convenience method to obtain the day names of the default calendar. const css::uno::Sequence< css::i18n::CalendarItem2 > getDefaultCalendarDays() const; diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index d78932e1e583..d39ced5bbdbb 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -81,7 +81,7 @@ namespace ooo VBAHELPER_DLLPUBLIC css::uno::Reference< css::frame::XModel > getCurrentWordDoc( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); VBAHELPER_DLLPUBLIC css::uno::Reference< css::beans::XIntrospectionAccess > getIntrospectionAccess( const css::uno::Any& aObject ) throw (css::uno::RuntimeException); - VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); + VBAHELPER_DLLPUBLIC css::uno::Reference< css::script::XTypeConverter > const & getTypeConverter( const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw (css::uno::RuntimeException); VBAHELPER_DLLPUBLIC void dispatchRequests( const css::uno::Reference< css::frame::XModel>& xModel, const OUString& aUrl ); VBAHELPER_DLLPUBLIC void dispatchRequests (const css::uno::Reference< css::frame::XModel>& xModel, const OUString & aUrl, const css::uno::Sequence< css::beans::PropertyValue >& sProps ); diff --git a/include/vbahelper/vbashaperange.hxx b/include/vbahelper/vbashaperange.hxx index ee9ec7c646f0..2e6936020b05 100644 --- a/include/vbahelper/vbashaperange.hxx +++ b/include/vbahelper/vbashaperange.hxx @@ -60,7 +60,7 @@ protected: css::uno::Reference< css::frame::XModel > m_xModel; virtual OUString getServiceImplName() override; virtual css::uno::Sequence<OUString> getServiceNames() override; - css::uno::Reference< css::drawing::XShapes > getShapes() throw (css::uno::RuntimeException) ; + css::uno::Reference< css::drawing::XShapes > const & getShapes() throw (css::uno::RuntimeException) ; public: ScVbaShapeRange( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::drawing::XDrawPage>& xDrawShape, const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/include/vcl/commandinfoprovider.hxx b/include/vcl/commandinfoprovider.hxx index 2560745c9d58..4f76dbe1af7f 100644 --- a/include/vcl/commandinfoprovider.hxx +++ b/include/vcl/commandinfoprovider.hxx @@ -119,10 +119,10 @@ public: CommandInfoProvider(); ~CommandInfoProvider(); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetDocumentAcceleratorConfiguration(); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetModuleAcceleratorConfiguration(); - css::uno::Reference<css::ui::XAcceleratorConfiguration> GetGlobalAcceleratorConfiguration(); - OUString GetModuleIdentifier(); + css::uno::Reference<css::ui::XAcceleratorConfiguration> const & GetDocumentAcceleratorConfiguration(); + css::uno::Reference<css::ui::XAcceleratorConfiguration> const & GetModuleAcceleratorConfiguration(); + css::uno::Reference<css::ui::XAcceleratorConfiguration> const & GetGlobalAcceleratorConfiguration(); + OUString const & GetModuleIdentifier(); css::uno::Sequence<css::beans::PropertyValue> GetCommandProperties ( const OUString& rsCommandName); OUString GetCommandProperty(const OUString& rsProperty, const OUString& rsCommandName); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index c78ea3ad18c3..28c29af61c9e 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -123,7 +123,7 @@ private: SAL_DLLPRIVATE void ImplCopy(css::uno::Reference<css::datatransfer::clipboard::XClipboard>& rxClipboard); SAL_DLLPRIVATE void ImplPaste(css::uno::Reference<css::datatransfer::clipboard::XClipboard>& rxClipboard); SAL_DLLPRIVATE long ImplGetTextYPosition() const; - SAL_DLLPRIVATE css::uno::Reference<css::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker(); + SAL_DLLPRIVATE css::uno::Reference<css::i18n::XExtendedInputSequenceChecker > const & ImplGetInputSequenceChecker(); SAL_DLLPRIVATE css::uno::Reference<css::i18n::XBreakIterator > ImplGetBreakIterator() const; SAL_DLLPRIVATE void filterText(); diff --git a/include/vcl/helper.hxx b/include/vcl/helper.hxx index dcdcd923ba18..cbefea363676 100644 --- a/include/vcl/helper.hxx +++ b/include/vcl/helper.hxx @@ -40,7 +40,7 @@ void VCL_DLLPUBLIC getPrinterPathList( std::list< OUString >& rPathList, const c // note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here // seems to be a bug in gcc, now we return an object instead of a reference -OUString VCL_DLLPUBLIC getFontPath(); +VCL_DLLPUBLIC OUString const & getFontPath(); bool VCL_DLLPUBLIC convertPfbToPfa( osl::File& rInFile, osl::File& rOutFile ); @@ -54,7 +54,7 @@ void VCL_DLLPUBLIC splitPath( OString& rOrgPath, OString& rDir, OString& rBase ) enum class whichOfficePath { InstallationRootPath, UserPath, ConfigPath }; // note: gcc 3.4.1 warns about visibility if we retunr a const OUString& here // seems to be a bug in gcc, now we return an object instead of a reference -OUString VCL_DLLPUBLIC getOfficePath( whichOfficePath ePath ); +VCL_DLLPUBLIC OUString const & getOfficePath( whichOfficePath ePath ); } // namespace diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 59d7d6c6ae45..02fcaad564e9 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -665,8 +665,8 @@ public: virtual short Execute() override; ///Emitted when an action widget is clicked virtual void response(short nResponseId); - OUString get_primary_text() const; - OUString get_secondary_text() const; + OUString const & get_primary_text() const; + OUString const & get_secondary_text() const; void set_primary_text(const OUString &rPrimaryString); void set_secondary_text(const OUString &rSecondaryString); virtual ~MessageDialog(); diff --git a/include/vcl/longcurr.hxx b/include/vcl/longcurr.hxx index 7c03c0fd190a..011237c6d8ef 100644 --- a/include/vcl/longcurr.hxx +++ b/include/vcl/longcurr.hxx @@ -55,7 +55,7 @@ public: bool IsUseThousandSep() const { return mbThousandSep; } void SetCurrencySymbol( const OUString& rStr ); - OUString GetCurrencySymbol() const; + OUString const & GetCurrencySymbol() const; void SetMin(const BigInt& rNewMin); const BigInt& GetMin() const { return mnMin; } diff --git a/include/vcl/mnemonic.hxx b/include/vcl/mnemonic.hxx index 9822db32b458..9d5fa1944e27 100644 --- a/include/vcl/mnemonic.hxx +++ b/include/vcl/mnemonic.hxx @@ -65,7 +65,7 @@ public: void RegisterMnemonic( const OUString& rKey ); OUString CreateMnemonic( const OUString& rKey ); - css::uno::Reference< css::i18n::XCharacterClassification > GetCharClass(); + css::uno::Reference< css::i18n::XCharacterClassification > const & GetCharClass(); // returns a string where all '~'-characters and CJK mnemonics of the form (~A) are completely removed static OUString EraseAllMnemonicChars( const OUString& rStr ); diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx index 5b26c830ecac..e162b19f6681 100644 --- a/include/vcl/tabctrl.hxx +++ b/include/vcl/tabctrl.hxx @@ -141,7 +141,7 @@ public: TabPage* GetTabPage( sal_uInt16 nPageId ) const; void SetPageText( sal_uInt16 nPageId, const OUString& rText ); - OUString GetPageText( sal_uInt16 nPageId ) const; + OUString const & GetPageText( sal_uInt16 nPageId ) const; void SetHelpText( sal_uInt16 nPageId, const OUString& rText ); const OUString& GetHelpText( sal_uInt16 nPageId ) const; diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 5f2fda1a701f..400d08060264 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -159,7 +159,7 @@ protected: // gets not exported. First and second parameter swapped to have a different signatur. SAL_DLLPRIVATE TextPaM ImpInsertText( sal_Unicode c, const TextSelection& rSel, bool bOverwrite = false, bool bIsUserInput = false ); // some other new functions needed that must not be exported to remain compatible - SAL_DLLPRIVATE css::uno::Reference < css::i18n::XExtendedInputSequenceChecker > GetInputSequenceChecker(); + SAL_DLLPRIVATE css::uno::Reference< css::i18n::XExtendedInputSequenceChecker > const & GetInputSequenceChecker(); SAL_DLLPRIVATE bool IsInputSequenceCheckingRequired( sal_Unicode c, const TextSelection& rCurSel ) const; // broadcast or adjust selections @@ -306,8 +306,8 @@ public: void Draw( OutputDevice* pDev, const Point& rPos ); void SetLocale( const css::lang::Locale& rLocale ); - css::lang::Locale GetLocale(); - css::uno::Reference< css::i18n::XBreakIterator > GetBreakIterator(); + css::lang::Locale const & GetLocale(); + css::uno::Reference< css::i18n::XBreakIterator > const & GetBreakIterator(); static bool DoesKeyChangeText( const KeyEvent& rKeyEvent ); static bool IsSimpleCharInput( const KeyEvent& rKeyEvent ); diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 48aebd413bfc..6ba10d56828e 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -425,27 +425,27 @@ public: } // get export helper for text - inline rtl::Reference< XMLTextParagraphExport > GetTextParagraphExport(); + inline rtl::Reference< XMLTextParagraphExport > const & GetTextParagraphExport(); // get export helper for shapes - inline rtl::Reference< XMLShapeExport > GetShapeExport(); + inline rtl::Reference< XMLShapeExport > const & GetShapeExport(); // get auto style pool - inline rtl::Reference< SvXMLAutoStylePoolP > GetAutoStylePool(); + inline rtl::Reference< SvXMLAutoStylePoolP > const & GetAutoStylePool(); // get Page Export - inline rtl::Reference< XMLPageExport > GetPageExport(); + inline rtl::Reference< XMLPageExport > const & GetPageExport(); // get chart export helper - inline rtl::Reference< SchXMLExportHelper > GetChartExport(); + inline rtl::Reference< SchXMLExportHelper > const & GetChartExport(); // get font auto style pool - inline rtl::Reference< XMLFontAutoStylePool > GetFontAutoStylePool(); + inline rtl::Reference< XMLFontAutoStylePool > const & GetFontAutoStylePool(); ProgressBarHelper* GetProgressBarHelper(); // get Formlayer Export - inline rtl::Reference< xmloff::OFormLayerXMLExport > GetFormExport(); + inline rtl::Reference< xmloff::OFormLayerXMLExport > const & GetFormExport(); inline bool HasFormExport(); // get XPropertySet with export information @@ -564,7 +564,7 @@ public: bool SetNullDateOnUnitConverter(); }; -inline rtl::Reference< XMLTextParagraphExport > SvXMLExport::GetTextParagraphExport() +inline rtl::Reference< XMLTextParagraphExport > const & SvXMLExport::GetTextParagraphExport() { if( !mxTextParagraphExport.is() ) mxTextParagraphExport = CreateTextParagraphExport(); @@ -572,7 +572,7 @@ inline rtl::Reference< XMLTextParagraphExport > SvXMLExport::GetTextParagraphExp return mxTextParagraphExport; } -inline rtl::Reference< XMLShapeExport > SvXMLExport::GetShapeExport() +inline rtl::Reference< XMLShapeExport > const & SvXMLExport::GetShapeExport() { if( !mxShapeExport.is() ) mxShapeExport = CreateShapeExport(); @@ -580,7 +580,7 @@ inline rtl::Reference< XMLShapeExport > SvXMLExport::GetShapeExport() return mxShapeExport; } -inline rtl::Reference< SvXMLAutoStylePoolP > SvXMLExport::GetAutoStylePool() +inline rtl::Reference< SvXMLAutoStylePoolP > const & SvXMLExport::GetAutoStylePool() { if( !mxAutoStylePool.is() ) mxAutoStylePool = CreateAutoStylePool(); @@ -588,7 +588,7 @@ inline rtl::Reference< SvXMLAutoStylePoolP > SvXMLExport::GetAutoStylePool() return mxAutoStylePool; } -inline rtl::Reference< SchXMLExportHelper > SvXMLExport::GetChartExport() +inline rtl::Reference< SchXMLExportHelper > const & SvXMLExport::GetChartExport() { if( !mxChartExport.is() ) mxChartExport = CreateChartExport(); @@ -596,7 +596,7 @@ inline rtl::Reference< SchXMLExportHelper > SvXMLExport::GetChartExport() return mxChartExport; } -inline rtl::Reference< XMLPageExport > SvXMLExport::GetPageExport() +inline rtl::Reference< XMLPageExport > const & SvXMLExport::GetPageExport() { if( !mxPageExport.is() ) mxPageExport = CreatePageExport(); @@ -604,7 +604,7 @@ inline rtl::Reference< XMLPageExport > SvXMLExport::GetPageExport() return mxPageExport; } -inline rtl::Reference< XMLFontAutoStylePool > SvXMLExport::GetFontAutoStylePool() +inline rtl::Reference< XMLFontAutoStylePool > const & SvXMLExport::GetFontAutoStylePool() { if( !mxFontAutoStylePool.is() ) mxFontAutoStylePool = CreateFontAutoStylePool(); @@ -612,7 +612,7 @@ inline rtl::Reference< XMLFontAutoStylePool > SvXMLExport::GetFontAutoStylePool( return mxFontAutoStylePool; } -inline rtl::Reference< xmloff::OFormLayerXMLExport > SvXMLExport::GetFormExport() +inline rtl::Reference< xmloff::OFormLayerXMLExport > const & SvXMLExport::GetFormExport() { if( !mxFormExport.is() ) mxFormExport = CreateFormExport(); diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index 7827177518fc..97bbf6ce8eca 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -296,18 +296,18 @@ public: virtual void SetStatistics(const css::uno::Sequence< css::beans::NamedValue > & i_rStats); // get import helper for text - inline rtl::Reference< XMLTextImportHelper > GetTextImport(); + inline rtl::Reference< XMLTextImportHelper > const & GetTextImport(); bool HasTextImport() const { return mxTextImport.is(); } inline SvXMLNumFmtHelper* GetDataStylesImport(); // get import helper for shapes - inline rtl::Reference< XMLShapeImportHelper > GetShapeImport(); + inline rtl::Reference< XMLShapeImportHelper > const & GetShapeImport(); // get import helper for charts - inline rtl::Reference< SchXMLImportHelper > GetChartImport(); + inline rtl::Reference< SchXMLImportHelper > const & GetChartImport(); // get import helper for form layer - inline rtl::Reference< ::xmloff::OFormLayerXMLImport > GetFormImport(); + inline rtl::Reference< ::xmloff::OFormLayerXMLImport > const & GetFormImport(); // get XPropertySet with import information const css::uno::Reference< css::beans::XPropertySet >& getImportInfo() const { return mxImportInfo; } @@ -520,7 +520,7 @@ public: bool needFixPositionAfterZ() const; }; -inline rtl::Reference< XMLTextImportHelper > SvXMLImport::GetTextImport() +inline rtl::Reference< XMLTextImportHelper > const & SvXMLImport::GetTextImport() { if( !mxTextImport.is() ) mxTextImport = CreateTextImport(); @@ -528,7 +528,7 @@ inline rtl::Reference< XMLTextImportHelper > SvXMLImport::GetTextImport() return mxTextImport; } -inline rtl::Reference< XMLShapeImportHelper > SvXMLImport::GetShapeImport() +inline rtl::Reference< XMLShapeImportHelper > const & SvXMLImport::GetShapeImport() { if( !mxShapeImport.is() ) mxShapeImport = CreateShapeImport(); @@ -536,7 +536,7 @@ inline rtl::Reference< XMLShapeImportHelper > SvXMLImport::GetShapeImport() return mxShapeImport; } -inline rtl::Reference< SchXMLImportHelper > SvXMLImport::GetChartImport() +inline rtl::Reference< SchXMLImportHelper > const & SvXMLImport::GetChartImport() { if( !mxChartImport.is() ) mxChartImport = CreateChartImport(); @@ -544,7 +544,7 @@ inline rtl::Reference< SchXMLImportHelper > SvXMLImport::GetChartImport() return mxChartImport; } -inline rtl::Reference< ::xmloff::OFormLayerXMLImport > SvXMLImport::GetFormImport() +inline rtl::Reference< ::xmloff::OFormLayerXMLImport > const & SvXMLImport::GetFormImport() { if( !mxFormImport.is() ) mxFormImport = CreateFormImport(); diff --git a/l10ntools/inc/export.hxx b/l10ntools/inc/export.hxx index de210396b075..4984800b8a50 100644 --- a/l10ntools/inc/export.hxx +++ b/l10ntools/inc/export.hxx @@ -257,7 +257,7 @@ class MergeDataHashMap typedef HashMap_t::const_iterator const_iterator; std::pair<iterator,bool> insert(const OString& rKey, MergeData* pMergeData); - iterator find(const OString& rKey); + iterator const & find(const OString& rKey); iterator begin() {return m_aHashMap.begin();} iterator end() {return m_aHashMap.end();} diff --git a/l10ntools/inc/po.hxx b/l10ntools/inc/po.hxx index 3004a1817cf3..ff8567e8db19 100644 --- a/l10ntools/inc/po.hxx +++ b/l10ntools/inc/po.hxx @@ -52,13 +52,13 @@ public: PoEntry( const PoEntry& rPo ); PoEntry& operator=( const PoEntry& rPo ); - OString getSourceFile() const; ///< Get name of file from which entry is extracted + OString const & getSourceFile() const; ///< Get name of file from which entry is extracted OString getGroupId() const; OString getLocalId() const; OString getResourceType() const; ///< Get the type of component from which entry is extracted TYPE getType() const; ///< Get the type of entry - OString getMsgId() const; - OString getMsgStr() const; + OString const & getMsgId() const; + OString const & getMsgStr() const; bool isFuzzy() const; /// Check whether po-s belong to the same localization component diff --git a/l10ntools/source/merge.cxx b/l10ntools/source/merge.cxx index 133f8f3f8c57..f927420fb30d 100644 --- a/l10ntools/source/merge.cxx +++ b/l10ntools/source/merge.cxx @@ -160,7 +160,7 @@ std::pair<MergeDataHashMap::iterator,bool> MergeDataHashMap::insert(const OStrin return aTemp; } -MergeDataHashMap::iterator MergeDataHashMap::find(const OString& rKey) +MergeDataHashMap::iterator const & MergeDataHashMap::find(const OString& rKey) { iterator aHint = m_aHashMap.end(); diff --git a/l10ntools/source/po.cxx b/l10ntools/source/po.cxx index 4662d58e0567..f446a2f31672 100644 --- a/l10ntools/source/po.cxx +++ b/l10ntools/source/po.cxx @@ -289,7 +289,7 @@ PoEntry& PoEntry::operator=(const PoEntry& rPo) return *this; } -OString PoEntry::getSourceFile() const +OString const & PoEntry::getSourceFile() const { assert( m_bIsInitialized ); return m_pGenPo->getReference(); @@ -343,14 +343,14 @@ bool PoEntry::isFuzzy() const } // Get translation string in merge format -OString PoEntry::getMsgId() const +OString const & PoEntry::getMsgId() const { assert( m_bIsInitialized ); return m_pGenPo->getMsgId(); } // Get translated string in merge format -OString PoEntry::getMsgStr() const +const OString& PoEntry::getMsgStr() const { assert( m_bIsInitialized ); return m_pGenPo->getMsgStr(); diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index b15fa85258ff..e076fa6dc3e8 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -988,7 +988,7 @@ throw (uno::RuntimeException, std::exception) } -uno::Reference< util::XChangesBatch > GrammarCheckingIterator::GetUpdateAccess() const +uno::Reference< util::XChangesBatch > const & GrammarCheckingIterator::GetUpdateAccess() const { if (!m_xUpdateAccess.is()) { diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx index 36e5f098a2c8..aa6b85967750 100644 --- a/linguistic/source/gciterator.hxx +++ b/linguistic/source/gciterator.hxx @@ -136,7 +136,7 @@ class GrammarCheckingIterator: void GetConfiguredGCSvcs_Impl(); css::uno::Reference< css::linguistic2::XProofreader > GetGrammarChecker( const css::lang::Locale & rLocale ); - css::uno::Reference< css::util::XChangesBatch > GetUpdateAccess() const; + css::uno::Reference< css::util::XChangesBatch > const & GetUpdateAccess() const; GrammarCheckingIterator( const GrammarCheckingIterator & ) = delete; GrammarCheckingIterator & operator = ( const GrammarCheckingIterator & ) = delete; diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx index eb3d0cdc9f03..087566c698c4 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.cxx +++ b/lotuswordpro/source/filter/lwpcelllayout.cxx @@ -297,7 +297,7 @@ void LwpCellLayout::ApplyFmtStyle(XFCellStyle *pCellStyle) * @param nCol - default cell position col number * @return OUString - registered cell style name */ -OUString LwpCellLayout::GetCellStyleName(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout) +OUString const & LwpCellLayout::GetCellStyleName(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout) { // judge cell border type LwpCellBorderType eType = GetCellBorderType(nRow, nCol, pTableLayout); diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx index 18a1bb833e78..7e4b7cc29f55 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.hxx +++ b/lotuswordpro/source/filter/lwpcelllayout.hxx @@ -111,7 +111,7 @@ protected: void ApplyWatermark(XFCellStyle* pCellStyle); void ApplyProtect(XFCell * pCell, LwpObjectID aTableID); void ApplyFmtStyle(XFCellStyle *pCellStyle); - OUString GetCellStyleName(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); + OUString const & GetCellStyleName(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); void RegisterDefaultCell(); virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); static LwpCellLayout * GetCellByRowCol(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout); diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx index dfa479716852..59b479933094 100644 --- a/lotuswordpro/source/filter/lwppara.hxx +++ b/lotuswordpro/source/filter/lwppara.hxx @@ -176,7 +176,7 @@ public: void SetBulletFlag(bool bFlag); void SetIndent(LwpIndentOverride* pIndentOverride); void SetFirstFrib(const OUString& Content,sal_uInt32 FontID); - OUString GetContentText(bool bAllText = false); + OUString const & GetContentText(bool bAllText = false); void SetParaDropcap(bool bFlag); void SetDropcapLines(sal_uInt16 number); diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx index 8c015fc8b797..7499af4d3514 100644 --- a/lotuswordpro/source/filter/lwppara1.cxx +++ b/lotuswordpro/source/filter/lwppara1.cxx @@ -108,7 +108,7 @@ using boost::polymorphic_downcast; /** * @short get text of paragraph */ -OUString LwpPara::GetContentText(bool bAllText) +OUString const & LwpPara::GetContentText(bool bAllText) { // rFont = m_FontID; if (bAllText) diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index fe96550bb0f3..55e429178e1b 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -171,7 +171,7 @@ Shape::~Shape() { } -table::TablePropertiesPtr Shape::getTableProperties() +table::TablePropertiesPtr const & Shape::getTableProperties() { if ( !mpTablePropertiesPtr.get() ) mpTablePropertiesPtr.reset( new table::TableProperties() ); @@ -398,7 +398,7 @@ void Shape::addChildren( } } -Reference< XShape > Shape::createAndInsert( +Reference< XShape > const & Shape::createAndInsert( ::oox::core::XmlFilterBase& rFilterBase, const OUString& rServiceName, const Theme* pTheme, diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index 25f505b8dacf..1455d5d51ff9 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2711,7 +2711,7 @@ Reference< XControlModel > EmbeddedForm::convertAndInsert( const EmbeddedControl return xRet; } -Reference< XIndexContainer > EmbeddedForm::createXForm() +Reference< XIndexContainer > const & EmbeddedForm::createXForm() { if( mxFormsSupp.is() ) { diff --git a/oox/source/ole/vbaproject.cxx b/oox/source/ole/vbaproject.cxx index 7aa47ce8c4f7..0642a8a5324e 100644 --- a/oox/source/ole/vbaproject.cxx +++ b/oox/source/ole/vbaproject.cxx @@ -235,14 +235,14 @@ Reference< XNameContainer > VbaProject::openLibrary( sal_Int32 nPropId, bool bCr return xLibrary; } -Reference< XNameContainer > VbaProject::createBasicLibrary() +Reference< XNameContainer > const & VbaProject::createBasicLibrary() { if( !mxBasicLib.is() ) mxBasicLib = openLibrary( PROP_BasicLibraries, true ); return mxBasicLib; } -Reference< XNameContainer > VbaProject::createDialogLibrary() +Reference< XNameContainer > const & VbaProject::createDialogLibrary() { if( !mxDialogLib.is() ) mxDialogLib = openLibrary( PROP_DialogLibraries, true ); diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index cf7273768794..44262e93488a 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -78,7 +78,7 @@ ShapeContextHandler::~ShapeContextHandler() { } -uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getLockedCanvasContext(sal_Int32 nElement) +uno::Reference<xml::sax::XFastContextHandler> const & ShapeContextHandler::getLockedCanvasContext(sal_Int32 nElement) { if (!mxLockedCanvasContext.is()) { @@ -101,7 +101,7 @@ uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getLockedCanv /* * This method creates new ChartGraphicDataContext Object. */ -uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getChartShapeContext(sal_Int32 nElement) +uno::Reference<xml::sax::XFastContextHandler> const & ShapeContextHandler::getChartShapeContext(sal_Int32 nElement) { if (!mxChartShapeContext.is()) { @@ -123,7 +123,7 @@ uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getChartShape return mxChartShapeContext; } -uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getWpsContext(sal_Int32 nStartElement, sal_Int32 nElement) +uno::Reference<xml::sax::XFastContextHandler> const & ShapeContextHandler::getWpsContext(sal_Int32 nStartElement, sal_Int32 nElement) { if (!mxWpsContext.is()) { @@ -149,7 +149,7 @@ uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getWpsContext return mxWpsContext; } -uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getWpgContext(sal_Int32 nElement) +uno::Reference<xml::sax::XFastContextHandler> const & ShapeContextHandler::getWpgContext(sal_Int32 nElement) { if (!mxWpgContext.is()) { @@ -169,7 +169,7 @@ uno::Reference<xml::sax::XFastContextHandler> ShapeContextHandler::getWpgContext return mxWpgContext; } -uno::Reference<xml::sax::XFastContextHandler> +uno::Reference<xml::sax::XFastContextHandler> const & ShapeContextHandler::getGraphicShapeContext(::sal_Int32 Element ) { if (! mxGraphicShapeContext.is()) @@ -198,7 +198,7 @@ ShapeContextHandler::getGraphicShapeContext(::sal_Int32 Element ) return mxGraphicShapeContext; } -uno::Reference<xml::sax::XFastContextHandler> +uno::Reference<xml::sax::XFastContextHandler> const & ShapeContextHandler::getDrawingShapeContext() { if (!mxDrawingFragmentHandler.is()) @@ -225,7 +225,7 @@ ShapeContextHandler::getDrawingShapeContext() return mxDrawingFragmentHandler; } -uno::Reference<xml::sax::XFastContextHandler> +uno::Reference<xml::sax::XFastContextHandler> const & ShapeContextHandler::getDiagramShapeContext() { if (!mxDiagramShapeContext.is()) diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx index 353b7c538777..103a8106bd08 100644 --- a/oox/source/shape/ShapeContextHandler.hxx +++ b/oox/source/shape/ShapeContextHandler.hxx @@ -169,13 +169,13 @@ private: css::uno::Reference<css::drawing::XDrawPage> mxDrawPage; OUString msRelationFragmentPath; - css::uno::Reference<XFastContextHandler> getGraphicShapeContext(::sal_Int32 Element); - css::uno::Reference<XFastContextHandler> getChartShapeContext(::sal_Int32 Element); - css::uno::Reference<XFastContextHandler> getDrawingShapeContext(); - css::uno::Reference<XFastContextHandler> getDiagramShapeContext(); - css::uno::Reference<XFastContextHandler> getLockedCanvasContext(sal_Int32 nElement); - css::uno::Reference<XFastContextHandler> getWpsContext(sal_Int32 nStartElement, sal_Int32 nElement); - css::uno::Reference<XFastContextHandler> getWpgContext(sal_Int32 nElement); + css::uno::Reference<XFastContextHandler> const & getGraphicShapeContext(::sal_Int32 Element); + css::uno::Reference<XFastContextHandler> const & getChartShapeContext(::sal_Int32 Element); + css::uno::Reference<XFastContextHandler> const & getDrawingShapeContext(); + css::uno::Reference<XFastContextHandler> const & getDiagramShapeContext(); + css::uno::Reference<XFastContextHandler> const & getLockedCanvasContext(sal_Int32 nElement); + css::uno::Reference<XFastContextHandler> const & getWpsContext(sal_Int32 nStartElement, sal_Int32 nElement); + css::uno::Reference<XFastContextHandler> const & getWpgContext(sal_Int32 nElement); css::uno::Reference<XFastContextHandler> getContextHandler(sal_Int32 nElement = 0); }; diff --git a/opencl/inc/opencl_device.hxx b/opencl/inc/opencl_device.hxx index 216af72de849..a42b57541365 100644 --- a/opencl/inc/opencl_device.hxx +++ b/opencl/inc/opencl_device.hxx @@ -14,7 +14,7 @@ namespace opencl { -ds_device getDeviceSelection(OUString const & pFileName, bool bForceSelection = false); +ds_device const & getDeviceSelection(OUString const & pFileName, bool bForceSelection = false); struct GPUEnv; void releaseOpenCLEnv( GPUEnv *gpuInfo ); diff --git a/opencl/source/opencl_device.cxx b/opencl/source/opencl_device.cxx index cfeb290645ea..9dc0130d6bad 100644 --- a/opencl/source/opencl_device.cxx +++ b/opencl/source/opencl_device.cxx @@ -555,7 +555,7 @@ void writeDevicesLog(std::unique_ptr<ds_profile>& rProfile, OUString const & sPr } // end anonymous namespace -ds_device getDeviceSelection( +ds_device const & getDeviceSelection( OUString const & sProfilePath, bool bForceSelection) { /* Run only if device is not yet selected */ diff --git a/opencl/source/openclwrapper.cxx b/opencl/source/openclwrapper.cxx index 0dd76e74ba05..32f0e5f4effc 100644 --- a/opencl/source/openclwrapper.cxx +++ b/opencl/source/openclwrapper.cxx @@ -85,7 +85,7 @@ OString generateMD5(const void* pData, size_t length) return aBuffer.makeStringAndClear(); } -OString getCacheFolder() +OString const & getCacheFolder() { static OString aCacheFolder; diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index aa6b45f17048..67f536816a0a 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -72,7 +72,7 @@ private: bool m_bRawStream; /// Check that m_xStream implements io::XSeekable and return it - css::uno::Reference< css::io::XInputStream > GetOwnSeekStream(); + css::uno::Reference< css::io::XInputStream > const & GetOwnSeekStream(); css::uno::Reference< css::io::XInputStream > SAL_CALL getRawData() throw(css::uno::RuntimeException); diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 97342933d60f..7e600238c3bd 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -511,7 +511,7 @@ void OWriteStream_Impl::DisposeWrappers() } } -OUString OWriteStream_Impl::GetFilledTempFileIfNo( const uno::Reference< io::XInputStream >& xStream ) +OUString const & OWriteStream_Impl::GetFilledTempFileIfNo( const uno::Reference< io::XInputStream >& xStream ) { if ( !m_aTempURL.getLength() ) { @@ -560,7 +560,7 @@ OUString OWriteStream_Impl::GetFilledTempFileIfNo( const uno::Reference< io::XIn return m_aTempURL; } -OUString OWriteStream_Impl::FillTempGetFileName() +OUString const & OWriteStream_Impl::FillTempGetFileName() { // should try to create cache first, if the amount of contents is too big, the temp file should be taken if ( !m_xCacheStream.is() && m_aTempURL.isEmpty() ) @@ -955,7 +955,7 @@ void OWriteStream_Impl::Revert() } } -uno::Sequence< beans::PropertyValue > OWriteStream_Impl::GetStreamProperties() +uno::Sequence< beans::PropertyValue > const & OWriteStream_Impl::GetStreamProperties() { if ( !m_aProps.getLength() ) m_aProps = ReadPackageStreamProperties(); diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx index a1dcaf3f5587..63c7fccee258 100644 --- a/package/source/xstor/owriteablestream.hxx +++ b/package/source/xstor/owriteablestream.hxx @@ -124,8 +124,8 @@ struct OWriteStream_Impl : public MutexHolder sal_Int32 m_nRelId; private: - OUString GetFilledTempFileIfNo( const css::uno::Reference< css::io::XInputStream >& xStream ); - OUString FillTempGetFileName(); + OUString const & GetFilledTempFileIfNo( const css::uno::Reference< css::io::XInputStream >& xStream ); + OUString const & FillTempGetFileName(); css::uno::Reference< css::io::XStream > GetTempFileAsStream(); css::uno::Reference< css::io::XInputStream > GetTempFileAsInputStream(); @@ -187,7 +187,7 @@ public: void Commit(); void Revert(); - css::uno::Sequence< css::beans::PropertyValue > GetStreamProperties(); + css::uno::Sequence< css::beans::PropertyValue > const & GetStreamProperties(); css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > GetAllRelationshipsIfAny(); diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index e72c3999c9f5..a07fa0f956e0 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -149,7 +149,7 @@ void ZipPackageStream::CloseOwnStreamIfAny() } } -uno::Reference< io::XInputStream > ZipPackageStream::GetOwnSeekStream() +uno::Reference< io::XInputStream > const & ZipPackageStream::GetOwnSeekStream() { if ( !m_bHasSeekable && m_xStream.is() ) { diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 834333e61e7d..31b43ceb7366 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -318,7 +318,7 @@ struct RuntimeCargo FILE *logFile; sal_Int32 logLevel; - PyRef getUnoModule(); + PyRef const & getUnoModule(); }; struct stRuntimeImpl diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 1cc944780871..2a3a9e7d05f0 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -1025,7 +1025,7 @@ PyThreadDetach::~PyThreadDetach() } -PyRef RuntimeCargo::getUnoModule() +PyRef const & RuntimeCargo::getUnoModule() { if( ! dictUnoModule.is() ) { diff --git a/reportdesign/source/ui/inc/ReportController.hxx b/reportdesign/source/ui/inc/ReportController.hxx index 4082efb9766a..c26355ab6d29 100644 --- a/reportdesign/source/ui/inc/ReportController.hxx +++ b/reportdesign/source/ui/inc/ReportController.hxx @@ -431,7 +431,7 @@ namespace rptui The caller is allowed to hold a reference to the RowSet - it is kept alive as long as the controller lives, and it's settings will follow the report definition's settings. */ - css::uno::Reference< css::sdbc::XRowSet > getRowSet(); + css::uno::Reference< css::sdbc::XRowSet > const & getRowSet(); /** returns the number formatter */ @@ -460,7 +460,7 @@ namespace rptui OSectionWindow* getSectionWindow(const css::uno::Reference< css::report::XSection>& _xSection) const; - css::uno::Reference< css::container::XNameAccess > getColumns() const; + css::uno::Reference< css::container::XNameAccess > const & getColumns() const; OUString getColumnLabel_throw(const OUString& i_sColumnName) const; SfxUndoManager& getUndoManager() const; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 94c67dedfc34..0ca28052c41b 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2978,7 +2978,7 @@ uno::Reference< frame::XModel > SAL_CALL OReportController::getModel() throw( u return m_xReportDefinition.get(); } -uno::Reference< sdbc::XRowSet > OReportController::getRowSet() +uno::Reference< sdbc::XRowSet > const & OReportController::getRowSet() { OSL_PRECOND( m_xReportDefinition.is(), "OReportController::getRowSet: no report definition?!" ); @@ -4318,7 +4318,7 @@ embed::VisualRepresentation SAL_CALL OReportController::getPreferredVisualRepres return embed::EmbedMapUnits::ONE_100TH_MM; } -uno::Reference< container::XNameAccess > OReportController::getColumns() const +uno::Reference< container::XNameAccess > const & OReportController::getColumns() const { if ( !m_xColumns.is() && m_xReportDefinition.is() && !m_xReportDefinition->getCommand().isEmpty() ) { diff --git a/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx index 59e4e077f686..6d571145ced7 100644 --- a/rsc/inc/rsctop.hxx +++ b/rsc/inc/rsctop.hxx @@ -61,7 +61,7 @@ public: const OString& rParType ); RscTop* GetRefClass() const { return pRefClass; } virtual RSCCLASS_TYPE GetClassType() const = 0; - RSCINST GetDefault(); + RSCINST const & GetDefault(); // preparation fro the destructor call // given that classes can have mutual dependencies, diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index b0e48074aec5..c96b7f172cd9 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -403,13 +403,13 @@ public: aEnumObj.fOutput = fOutput; pRoot = pR; } - ERRTYPE WriteRc() + ERRTYPE const & WriteRc() { aEnumObj.aError.Clear(); pRoot->EnumNodes( LINK( this, RscEnumerateRef, CallBackWriteRc ) ); return aEnumObj.aError; } - ERRTYPE WriteSrc( sal_uLong lFileKey ) + ERRTYPE const & WriteSrc( sal_uLong lFileKey ) { aEnumObj.lFileKey = lFileKey; diff --git a/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx index 04cc8a6358cf..47fa95a7f1bd 100644 --- a/rsc/source/res/rsctop.cxx +++ b/rsc/source/res/rsctop.cxx @@ -41,7 +41,7 @@ void RscTop::SetCallPar(const OString& rPar1, const OString& rPar2, aCallParType = rParType; } -RSCINST RscTop::GetDefault() +RSCINST const & RscTop::GetDefault() { if( !aDfltInst.IsInst() ) aDfltInst = this->Create( nullptr, RSCINST() ); diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 155dfec0d82f..01a49540d23d 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -4812,7 +4812,7 @@ namespace osl_Directory #define TEST_PATH_POSTFIX "hello/world" - OUString get_test_path() + OUString const & get_test_path() { static OUString test_path; if (test_path.isEmpty()) diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx index 47d7997caef3..43b5de9a01a6 100644 --- a/sc/inc/docuno.hxx +++ b/sc/inc/docuno.hxx @@ -106,7 +106,7 @@ private: bool FillRenderMarkData( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& rOptions, ScMarkData& rMark, ScPrintSelectionStatus& rStatus, OUString& rPagesStr ) const; - css::uno::Reference<css::uno::XAggregation> GetFormatter(); + css::uno::Reference<css::uno::XAggregation> const & GetFormatter(); void HandleCalculateEvents(); css::uno::Reference<css::uno::XInterface> create( diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index ad56ed2c7291..92ceff14fa0a 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -151,7 +151,7 @@ public: const ScImportSourceDesc* GetImportSourceDesc() const { return pImpDesc; } const ScDPServiceDesc* GetDPServiceDesc() const { return pServDesc; } - css::uno::Reference<css::sheet::XDimensionsSupplier> GetSource(); + css::uno::Reference<css::sheet::XDimensionsSupplier> const & GetSource(); bool IsSheetData() const; bool IsImportData() const { return(pImpDesc != nullptr); } diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index ae3fdd5a9167..a2fa951e0703 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -92,7 +92,7 @@ struct ScDPLabelData * when the layout name is present, use it, or else use the original * name. */ - OUString SC_DLLPUBLIC getDisplayName() const; + SC_DLLPUBLIC OUString const & getDisplayName() const; }; std::vector<Member> maMembers; css::uno::Sequence<OUString> maHiers; ///< Hierarchies. @@ -106,7 +106,7 @@ struct ScDPLabelData * @return the name that should be displayed in the dp dialogs i.e. when * the layout name is present, use it, or else use the original name. */ - OUString SC_DLLPUBLIC getDisplayName() const; + SC_DLLPUBLIC OUString const & getDisplayName() const; }; typedef std::vector< std::unique_ptr<ScDPLabelData> > ScDPLabelDataVector; diff --git a/sc/inc/viewopti.hxx b/sc/inc/viewopti.hxx index 259653d1dc77..580a2b38bdea 100644 --- a/sc/inc/viewopti.hxx +++ b/sc/inc/viewopti.hxx @@ -92,7 +92,7 @@ public: ScVObjMode GetObjMode( ScVObjType eObj ) const { return aModeArr[eObj]; } void SetGridColor( const Color& rCol, const OUString& rName ) { aGridCol = rCol; aGridColName = rName;} - Color GetGridColor( OUString* pStrName = nullptr ) const; + Color const & GetGridColor( OUString* pStrName = nullptr ) const; const ScGridOptions& GetGridOptions() const { return aGridOpt; } void SetGridOptions( const ScGridOptions& rNew ) { aGridOpt = rNew; } diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 987572bf1460..733ff90a535b 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -525,7 +525,7 @@ bool ScDPObject::IsDataDescriptionCell(const ScAddress& rPos) return (rPos == aTabRange.aStart); } -uno::Reference<sheet::XDimensionsSupplier> ScDPObject::GetSource() +uno::Reference<sheet::XDimensionsSupplier> const & ScDPObject::GetSource() { CreateObjects(); return xSource; diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx index 62a2f3b508f0..cbb6f838b1ec 100644 --- a/sc/source/core/data/pivot2.cxx +++ b/sc/source/core/data/pivot2.cxx @@ -62,7 +62,7 @@ ScDPLabelData::Member::Member() : mbShowDetails(true) {} -OUString ScDPLabelData::Member::getDisplayName() const +OUString const & ScDPLabelData::Member::getDisplayName() const { if (!maLayoutName.isEmpty()) return maLayoutName; @@ -83,7 +83,7 @@ ScDPLabelData::ScDPLabelData() : mbRepeatItemLabels(false) {} -OUString ScDPLabelData::getDisplayName() const +OUString const & ScDPLabelData::getDisplayName() const { if (!maLayoutName.isEmpty()) return maLayoutName; diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index aa110460f97a..55fd807de498 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -3694,7 +3694,7 @@ public: void CodeGen(); /// Produce kernel hash - std::string GetMD5(); + std::string const & GetMD5(); /// Create program, build, and create kernel /// TODO cache results based on kernel body hash @@ -3792,7 +3792,7 @@ void DynamicKernel::CodeGen() << " program to be compiled:\n" << linenumberify(mFullProgramSrc)); } -std::string DynamicKernel::GetMD5() +std::string const & DynamicKernel::GetMD5() { if (mKernelHash.empty()) { diff --git a/sc/source/core/tool/calcconfig.cxx b/sc/source/core/tool/calcconfig.cxx index 96277ce01194..6f287307a912 100644 --- a/sc/source/core/tool/calcconfig.cxx +++ b/sc/source/core/tool/calcconfig.cxx @@ -24,7 +24,7 @@ using comphelper::ConfigurationListener; -static rtl::Reference<ConfigurationListener> getMiscListener() +static rtl::Reference<ConfigurationListener> const & getMiscListener() { static rtl::Reference<ConfigurationListener> xListener; if (!xListener.is()) diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index e7f49ba79ac8..863fbe0dfc25 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -136,7 +136,7 @@ void ScViewOptions::SetDefaults() aGridOpt.SetDefaults(); } -Color ScViewOptions::GetGridColor( OUString* pStrName ) const +Color const & ScViewOptions::GetGridColor( OUString* pStrName ) const { if ( pStrName ) *pStrName = aGridColName; diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index c2860104703b..5c24f293110b 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -304,7 +304,7 @@ XclExpChRoot::~XclExpChRoot() { } -Reference< XChartDocument > XclExpChRoot::GetChartDocument() const +Reference< XChartDocument > const & XclExpChRoot::GetChartDocument() const { return mxChData->mxChartDoc; } diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index e51fa8a6f1a8..dd548a959d64 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -364,7 +364,7 @@ uno::Sequence< beans::NamedValue > XclExpRoot::GenerateDefaultEncryptionData() c return aEncryptionData; } -XclExpRootData::XclExpLinkMgrRef XclExpRoot::GetLocalLinkMgrRef() const +XclExpRootData::XclExpLinkMgrRef const & XclExpRoot::GetLocalLinkMgrRef() const { return IsInGlobals() ? mrExpData.mxGlobLinkMgr : mrExpData.mxLocLinkMgr; } diff --git a/sc/source/filter/inc/commentsbuffer.hxx b/sc/source/filter/inc/commentsbuffer.hxx index a4d19a8617f6..255c5a98100a 100644 --- a/sc/source/filter/inc/commentsbuffer.hxx +++ b/sc/source/filter/inc/commentsbuffer.hxx @@ -58,7 +58,7 @@ public: void importComment( SequenceInputStream& rStrm ); /** Creates and returns a new rich-string object for the comment text. */ - RichStringRef createText(); + RichStringRef const & createText(); /** Finalizes the formatted string of the comment. */ void finalizeImport(); diff --git a/sc/source/filter/inc/richstring.hxx b/sc/source/filter/inc/richstring.hxx index bfd48f107f4c..e00aad4d4c4e 100644 --- a/sc/source/filter/inc/richstring.hxx +++ b/sc/source/filter/inc/richstring.hxx @@ -43,7 +43,7 @@ public: /** Sets text data for this portion. */ void setText( const OUString& rText ); /** Creates and returns a new font formatting object. */ - FontRef createFont(); + FontRef const & createFont(); /** Links this portion to a font object from the global font list. */ void setFontId( sal_Int32 nFontId ); diff --git a/sc/source/filter/inc/stylesbuffer.hxx b/sc/source/filter/inc/stylesbuffer.hxx index 020ddd9d0b07..ead10940eb45 100644 --- a/sc/source/filter/inc/stylesbuffer.hxx +++ b/sc/source/filter/inc/stylesbuffer.hxx @@ -676,11 +676,11 @@ public: explicit Dxf( const WorkbookHelper& rHelper ); /** Creates a new empty font object. */ - FontRef createFont( bool bAlwaysNew = true ); + FontRef const & createFont( bool bAlwaysNew = true ); /** Creates a new empty border object. */ - BorderRef createBorder( bool bAlwaysNew = true ); + BorderRef const & createBorder( bool bAlwaysNew = true ); /** Creates a new empty fill object. */ - FillRef createFill( bool bAlwaysNew = true ); + FillRef const & createFill( bool bAlwaysNew = true ); /** Inserts a new number format code. */ void importNumFmt( const AttributeList& rAttribs ); diff --git a/sc/source/filter/inc/workbooksettings.hxx b/sc/source/filter/inc/workbooksettings.hxx index e384dec70853..02c8fa204a7f 100644 --- a/sc/source/filter/inc/workbooksettings.hxx +++ b/sc/source/filter/inc/workbooksettings.hxx @@ -98,7 +98,7 @@ public: /** Returns the show objects mode (considered a view setting in Calc). */ sal_Int16 getApiShowObjectMode() const; /** Returns the nulldate of this workbook. */ - css::util::Date getNullDate() const; + css::util::Date const & getNullDate() const; private: /** Updates date mode and unit converter nulldate. */ diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index 94b98e7c1a9d..4fe5f5c3baa2 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -86,7 +86,7 @@ public: /** Returns this root instance - for code readability in derived classes. */ inline const XclExpChRoot& GetChRoot() const { return *this; } /** Returns the API Chart document model. */ - css::uno::Reference< css::chart2::XChartDocument > + css::uno::Reference< css::chart2::XChartDocument > const & GetChartDocument() const; /** Returns a reference to the parent chart data object. */ XclExpChChart& GetChartData() const; diff --git a/sc/source/filter/inc/xeroot.hxx b/sc/source/filter/inc/xeroot.hxx index d52a8edc6679..941e01ca61e5 100644 --- a/sc/source/filter/inc/xeroot.hxx +++ b/sc/source/filter/inc/xeroot.hxx @@ -182,7 +182,7 @@ public: private: /** Returns the local or global link manager, depending on current context. */ - XclExpRootData::XclExpLinkMgrRef GetLocalLinkMgrRef() const; + XclExpRootData::XclExpLinkMgrRef const & GetLocalLinkMgrRef() const; private: XclExpRootData& mrExpData; /// Reference to the global export data struct. diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index e29a278b6fb3..f6c146b62541 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -124,7 +124,7 @@ void Comment::importComment( SequenceInputStream& rStrm ) AddressConverter::convertToCellRangeUnchecked( maModel.maRange, aBinRange, getSheetIndex() ); } -RichStringRef Comment::createText() +RichStringRef const & Comment::createText() { maModel.mxText.reset( new RichString( *this ) ); return maModel.mxText; diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index b79f5e582b86..da88e98d7941 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -61,7 +61,7 @@ void RichStringPortion::setText( const OUString& rText ) maText = rText; } -FontRef RichStringPortion::createFont() +FontRef const & RichStringPortion::createFont() { mxFont.reset( new Font( *this, false ) ); return mxFont; diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index 2e03ef8801a1..6b8b9422c117 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -2238,21 +2238,21 @@ Dxf::Dxf( const WorkbookHelper& rHelper ) : { } -FontRef Dxf::createFont( bool bAlwaysNew ) +FontRef const & Dxf::createFont( bool bAlwaysNew ) { if( bAlwaysNew || !mxFont ) mxFont.reset( new Font( *this, true ) ); return mxFont; } -BorderRef Dxf::createBorder( bool bAlwaysNew ) +BorderRef const & Dxf::createBorder( bool bAlwaysNew ) { if( bAlwaysNew || !mxBorder ) mxBorder.reset( new Border( *this, true ) ); return mxBorder; } -FillRef Dxf::createFill( bool bAlwaysNew ) +FillRef const & Dxf::createFill( bool bAlwaysNew ) { if( bAlwaysNew || !mxFill ) mxFill.reset( new Fill( *this, true ) ); diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx index dbe5473a0f88..c8cc6bd42d05 100644 --- a/sc/source/filter/oox/workbooksettings.cxx +++ b/sc/source/filter/oox/workbooksettings.cxx @@ -239,7 +239,7 @@ sal_Int16 WorkbookSettings::getApiShowObjectMode() const return API_SHOWMODE_SHOW; } -css::util::Date WorkbookSettings::getNullDate() const +css::util::Date const & WorkbookSettings::getNullDate() const { static const css::util::Date saDate1900 ( 30, 12, 1899 ); static const css::util::Date saDate1904 ( 1, 1, 1904 ); diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index 88b3ede5fad7..a277b0da5ffc 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.cxx @@ -222,7 +222,7 @@ void ScMyTables::AddColStyle(const sal_Int32 nRepeat, const OUString& rCellStyle nCurrentColCount = std::min<sal_Int32>( nCurrentColCount, MAXCOLCOUNT ); } -uno::Reference< drawing::XDrawPage > ScMyTables::GetCurrentXDrawPage() +uno::Reference< drawing::XDrawPage > const & ScMyTables::GetCurrentXDrawPage() { if( (maCurrentCellPos.Tab() != nCurrentDrawPage) || !xDrawPage.is() ) { @@ -234,7 +234,7 @@ uno::Reference< drawing::XDrawPage > ScMyTables::GetCurrentXDrawPage() return xDrawPage; } -uno::Reference< drawing::XShapes > ScMyTables::GetCurrentXShapes() +uno::Reference< drawing::XShapes > const & ScMyTables::GetCurrentXShapes() { if( (maCurrentCellPos.Tab() != nCurrentXShapes) || !xShapes.is() ) { @@ -242,10 +242,8 @@ uno::Reference< drawing::XShapes > ScMyTables::GetCurrentXShapes() rImport.GetShapeImport()->startPage(xShapes); rImport.GetShapeImport()->pushGroupForSorting ( xShapes ); nCurrentXShapes = sal::static_int_cast<sal_Int16>(maCurrentCellPos.Tab()); - return xShapes; } - else - return xShapes; + return xShapes; } bool ScMyTables::HasDrawPage() diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index 00176300c561..83a93b7806d1 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -88,9 +88,9 @@ public: SCROW GetCurrentRow() const { return (maCurrentCellPos.Row() >= 0) ? maCurrentCellPos.Row() : 0; } const css::uno::Reference< css::sheet::XSpreadsheet >& GetCurrentXSheet() const { return xCurrentSheet; } - css::uno::Reference< css::drawing::XDrawPage > + css::uno::Reference< css::drawing::XDrawPage > const & GetCurrentXDrawPage(); - css::uno::Reference< css::drawing::XShapes > + css::uno::Reference< css::drawing::XShapes > const & GetCurrentXShapes(); bool HasDrawPage(); bool HasXShapes(); diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 509d22e9b346..4ce35d1c14c0 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -397,7 +397,7 @@ ScModelObj::~ScModelObj() delete pPrinterOptions; } -uno::Reference< uno::XAggregation> ScModelObj::GetFormatter() +uno::Reference< uno::XAggregation> const & ScModelObj::GetFormatter() { // pDocShell may be NULL if this is the base of a ScDocOptionsObj if ( !xNumberAgg.is() && pDocShell ) diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index e381c399dcc7..b6619f2409b7 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -109,7 +109,7 @@ class PasteCellsWarningReseter { private: bool bInitialWarningState; - static uno::Reference< sheet::XGlobalSheetSettings > getGlobalSheetSettings() throw ( uno::RuntimeException ) + static uno::Reference< sheet::XGlobalSheetSettings > const & getGlobalSheetSettings() throw ( uno::RuntimeException ) { static uno::Reference< sheet::XGlobalSheetSettings > xProps = sheet::GlobalSheetSettings::create( comphelper::getProcessComponentContext() ); return xProps; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 5f3d8529fd24..aaba52dfd372 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -850,7 +850,7 @@ ScVbaApplication::Calculate() throw( script::BasicErrorException , uno::Runtime xCalculatable->calculateAll(); } -static uno::Reference< util::XPathSettings > lcl_getPathSettingsService( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) +static uno::Reference< util::XPathSettings > const & lcl_getPathSettingsService( const uno::Reference< uno::XComponentContext >& xContext ) throw ( uno::RuntimeException ) { static uno::Reference< util::XPathSettings > xPathSettings; if ( !xPathSettings.is() ) diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 1c51d1e503a0..3d9778a4f1ad 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -41,7 +41,7 @@ ScVbaChartObject::ScVbaChartObject( const css::uno::Reference< ov::XHelperInterf oShapeHelper.reset(new ShapeHelper(xShape)); } -OUString ScVbaChartObject::getPersistName() +OUString const & ScVbaChartObject::getPersistName() { if ( sPersistName.isEmpty() ) sPersistName = xNamed->getName(); diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx index 097ccf94bce9..95f5df95bc4d 100644 --- a/sc/source/ui/vba/vbachartobject.hxx +++ b/sc/source/ui/vba/vbachartobject.hxx @@ -43,7 +43,7 @@ class ScVbaChartObject : public ChartObjectImpl_BASE OUString sPersistName; std::unique_ptr<ov::ShapeHelper> oShapeHelper; css::uno::Reference< css::container::XNamed > xNamedShape; - OUString getPersistName(); + OUString const & getPersistName(); css::uno::Reference< css::drawing::XShape > setShape() throw ( css::script::BasicErrorException ); public: ScVbaChartObject( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableChart >& _xTableChart, const css::uno::Reference< css::drawing::XDrawPageSupplier >& _xDrawPageSupplier ); diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index ba2db5021e95..2035ba7d1454 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -773,7 +773,7 @@ ScVbaFormat< Ifc... >::initializeNumberFormats() throw ( script::BasicErrorExcep } template< typename... Ifc > -uno::Reference< beans::XPropertyState > +uno::Reference< beans::XPropertyState > const & ScVbaFormat< Ifc... >::getXPropertyState() throw ( uno::RuntimeException ) { if ( !xPropertyState.is() ) diff --git a/sc/source/ui/vba/vbaformat.hxx b/sc/source/ui/vba/vbaformat.hxx index 1489ec6ee673..573f0664c892 100644 --- a/sc/source/ui/vba/vbaformat.hxx +++ b/sc/source/ui/vba/vbaformat.hxx @@ -49,7 +49,7 @@ protected: bool mbCheckAmbiguoity; bool mbAddIndent; bool isAmbiguous(const OUString& _sPropertyName) throw ( css::script::BasicErrorException ); - css::uno::Reference< css::beans::XPropertyState > getXPropertyState() throw ( css::uno::RuntimeException ); + css::uno::Reference< css::beans::XPropertyState > const & getXPropertyState() throw ( css::uno::RuntimeException ); void initializeNumberFormats() throw ( css::script::BasicErrorException, css::uno::RuntimeException ); SfxItemSet* getCurrentDataSet( ) throw (css::uno::RuntimeException, std::exception); protected: diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 930f5972073f..52a9e58d9fac 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -58,13 +58,13 @@ ScVbaGlobals::~ScVbaGlobals() // XGlobals -uno::Reference<excel::XApplication > +uno::Reference<excel::XApplication > const & ScVbaGlobals::getApplication() throw (uno::RuntimeException) { // OSL_TRACE("In ScVbaGlobals::getApplication"); - if ( !mxApplication.is() ) + if ( !mxApplication.is() ) mxApplication.set( new ScVbaApplication( mxContext) ); - return mxApplication; + return mxApplication; } uno::Reference<excel::XApplication > SAL_CALL diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index b2195d40e81f..fc3fe0536d54 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -37,7 +37,7 @@ typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::excel::XGlobals > ScV class ScVbaGlobals : public ScVbaGlobals_BASE { css::uno::Reference< ov::excel::XApplication > mxApplication; - css::uno::Reference< ov::excel::XApplication > SAL_CALL getApplication() + css::uno::Reference< ov::excel::XApplication > const & SAL_CALL getApplication() throw (css::uno::RuntimeException); public: diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index a677a0ea3fc9..5c52886efc0d 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -344,7 +344,7 @@ public: sal_Int16 nComponentType ) throw (uno::RuntimeException); protected: - uno::Reference< container::XIndexContainer > createForm() throw (uno::RuntimeException); + uno::Reference< container::XIndexContainer > const & createForm() throw (uno::RuntimeException); virtual bool implPickShape( const uno::Reference< drawing::XShape >& rxShape ) const override; virtual OUString implGetShapeServiceName() const override; @@ -372,7 +372,7 @@ ScVbaControlContainer::ScVbaControlContainer( { } -uno::Reference< container::XIndexContainer > ScVbaControlContainer::createForm() throw (uno::RuntimeException) +uno::Reference< container::XIndexContainer > const & ScVbaControlContainer::createForm() throw (uno::RuntimeException) { if( !mxFormIC.is() ) { diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx index d7da289b6392..ecc4b787421e 100644 --- a/sd/inc/sdpage.hxx +++ b/sd/inc/sdpage.hxx @@ -295,13 +295,13 @@ public: void getAlienAttributes( css::uno::Any& rAttributes ); /** @return the main animation node */ - css::uno::Reference< css::animations::XAnimationNode > getAnimationNode() throw (css::uno::RuntimeException); + css::uno::Reference< css::animations::XAnimationNode > const & getAnimationNode() throw (css::uno::RuntimeException); /** sets the main animation node */ void setAnimationNode( css::uno::Reference< css::animations::XAnimationNode >& xNode ) throw (css::uno::RuntimeException); /// @return a helper class to manipulate effects inside the main sequence - std::shared_ptr< sd::MainSequence > getMainSequence(); + std::shared_ptr< sd::MainSequence > const & getMainSequence(); /** quick check if this slide has an animation node. This can be used to have a cost free check if there are no animations ad this slide. diff --git a/sd/source/core/sdpage_animations.cxx b/sd/source/core/sdpage_animations.cxx index df3b68b3bc1c..f58c7047392d 100644 --- a/sd/source/core/sdpage_animations.cxx +++ b/sd/source/core/sdpage_animations.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star::presentation; using ::com::sun::star::drawing::XShape; /** returns a helper class to manipulate effects inside the main sequence */ -sd::MainSequencePtr SdPage::getMainSequence() +sd::MainSequencePtr const & SdPage::getMainSequence() { if( nullptr == mpMainSequence.get() ) mpMainSequence.reset( new sd::MainSequence( getAnimationNode() ) ); @@ -49,7 +49,7 @@ sd::MainSequencePtr SdPage::getMainSequence() } /** returns the main animation node */ -Reference< XAnimationNode > SdPage::getAnimationNode() throw (RuntimeException) +Reference< XAnimationNode > const & SdPage::getAnimationNode() throw (RuntimeException) { if( !mxAnimationNode.is() ) { diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index 7828f8d63633..1eed38115361 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -145,7 +145,7 @@ public: void scanForButtonSets( const OUString& rPath ); - Reference< XGraphicProvider > getGraphicProvider(); + Reference< XGraphicProvider > const & getGraphicProvider(); std::vector< std::shared_ptr< ButtonsImpl > > maButtons; Reference< XGraphicProvider > mxGraphicProvider; @@ -250,7 +250,7 @@ bool ButtonSetImpl::exportButton( int nSet, const OUString& rPath, const OUStrin return false; } -Reference< XGraphicProvider > ButtonSetImpl::getGraphicProvider() +Reference< XGraphicProvider > const & ButtonSetImpl::getGraphicProvider() { if( !mxGraphicProvider.is() ) { diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 383f53392577..c5f39da0be1e 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2198,7 +2198,7 @@ void HtmlExport::CreateFileNames() } } -OUString HtmlExport::getDocumentTitle() +OUString const & HtmlExport::getDocumentTitle() { // check for a title object in this page, if its the first // title it becomes this documents title for the content diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index ae681a249246..3344118ab624 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -167,7 +167,7 @@ class HtmlExport bool checkForExistingFiles(); bool checkFileExists( css::uno::Reference< css::ucb::XSimpleFileAccess3 >& xFileAccess, OUString const & aFileName ); - OUString getDocumentTitle(); + OUString const & getDocumentTitle(); bool SavePresentation(); static OUString CreateLink( const OUString& aLink, const OUString& aText, diff --git a/sd/source/filter/ppt/ppt97animations.cxx b/sd/source/filter/ppt/ppt97animations.cxx index 6d210bc4493b..d06f8bff7d2e 100644 --- a/sd/source/filter/ppt/ppt97animations.cxx +++ b/sd/source/filter/ppt/ppt97animations.cxx @@ -239,12 +239,12 @@ sal_Int16 Ppt97Animation::GetTextAnimationType() const } return nRet; } -OUString Ppt97Animation::GetPresetId() const +OUString const & Ppt97Animation::GetPresetId() const { UpdateCacheData(); return m_aPresetId; } -OUString Ppt97Animation::GetPresetSubType() const +OUString const & Ppt97Animation::GetPresetSubType() const { UpdateCacheData(); return m_aSubType; diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index bc9c1a1719e2..eb2079ec8c29 100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -117,8 +117,8 @@ public: //public methods private: //private methods //read methods - OUString GetPresetId() const; - OUString GetPresetSubType() const; + OUString const & GetPresetId() const; + OUString const & GetPresetSubType() const; bool HasAfterEffect() const; bool HasAfterEffect_ChangeColor() const; bool HasAfterEffect_DimAtNextEffect() const; diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 995e95de87fe..88f4abf8bc96 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -181,11 +181,11 @@ public: /** Return a collection of properties that are used throughout the slide sorter. */ - std::shared_ptr<controller::Properties> GetProperties() const; + std::shared_ptr<controller::Properties> const & GetProperties() const; /** Return the active theme which gives access to colors and fonts. */ - std::shared_ptr<view::Theme> GetTheme() const; + std::shared_ptr<view::Theme> const & GetTheme() const; protected: /** This virtual method makes it possible to create a specialization of diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 7ea35795835b..39fec898ad74 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -76,7 +76,7 @@ public: void SetTop (const sal_Int32 nTop); void SetText (const OUString& Text); sal_Int32 ParseDistance (const OUString& rsDistance) const; - Reference<rendering::XBitmap> GetBitmap(); + Reference<rendering::XBitmap> const & GetBitmap(); sal_Int32 GetTotalHeight(); private: @@ -445,7 +445,7 @@ sal_Int32 PresenterTextView::Implementation::ParseDistance (const OUString& rsDi return nDistance; } -Reference<rendering::XBitmap> PresenterTextView::Implementation::GetBitmap() +Reference<rendering::XBitmap> const & PresenterTextView::Implementation::GetBitmap() { DBG_ASSERT(mpEditEngine!=nullptr, "EditEngine missing"); diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 1f57412a9d8e..d6b3ce6b3bcb 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -239,25 +239,25 @@ ScrollBarManager& SlideSorterController::GetScrollBarManager() return *mpScrollBarManager.get(); } -std::shared_ptr<CurrentSlideManager> SlideSorterController::GetCurrentSlideManager() const +std::shared_ptr<CurrentSlideManager> const & SlideSorterController::GetCurrentSlideManager() const { OSL_ASSERT(mpCurrentSlideManager.get()!=nullptr); return mpCurrentSlideManager; } -std::shared_ptr<SlotManager> SlideSorterController::GetSlotManager() const +std::shared_ptr<SlotManager> const & SlideSorterController::GetSlotManager() const { OSL_ASSERT(mpSlotManager.get()!=nullptr); return mpSlotManager; } -std::shared_ptr<SelectionManager> SlideSorterController::GetSelectionManager() const +std::shared_ptr<SelectionManager> const & SlideSorterController::GetSelectionManager() const { OSL_ASSERT(mpSelectionManager.get()!=nullptr); return mpSelectionManager; } -std::shared_ptr<InsertionIndicatorHandler> +std::shared_ptr<InsertionIndicatorHandler> const & SlideSorterController::GetInsertionIndicatorHandler() const { OSL_ASSERT(mpInsertionIndicatorHandler.get()!=nullptr); diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index 3f433ac44992..6e940bf7e899 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -171,7 +171,7 @@ void InsertionIndicatorHandler::SetPosition ( } } -std::shared_ptr<view::InsertAnimator> InsertionIndicatorHandler::GetInsertAnimator() +std::shared_ptr<view::InsertAnimator> const & InsertionIndicatorHandler::GetInsertAnimator() { if ( ! mpInsertAnimator) mpInsertAnimator.reset(new view::InsertAnimator(mrSlideSorter)); diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index fd9ac65f4593..af1145d0752c 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -116,10 +116,10 @@ public: */ ScrollBarManager& GetScrollBarManager(); - std::shared_ptr<CurrentSlideManager> GetCurrentSlideManager() const; - std::shared_ptr<SlotManager> GetSlotManager() const; - std::shared_ptr<SelectionManager> GetSelectionManager() const; - std::shared_ptr<InsertionIndicatorHandler> GetInsertionIndicatorHandler() const; + std::shared_ptr<CurrentSlideManager> const & GetCurrentSlideManager() const; + std::shared_ptr<SlotManager> const & GetSlotManager() const; + std::shared_ptr<SelectionManager> const & GetSelectionManager() const; + std::shared_ptr<InsertionIndicatorHandler> const & GetInsertionIndicatorHandler() const; /** This method forwards the call to the SlideSorterView and executes pending operations like moving selected pages into the visible area. diff --git a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx index 80b1049ec61e..f1d287173f60 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsInsertionIndicatorHandler.hxx @@ -121,7 +121,7 @@ private: void SetPosition ( const Point& rPoint, const Mode eMode); - std::shared_ptr<view::InsertAnimator> GetInsertAnimator(); + std::shared_ptr<view::InsertAnimator> const & GetInsertAnimator(); /** Make the insertion indicator visible (that is the show part) and keep it visible, even when the mouse leaves the window (that is the diff --git a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx index 0907dbbb7edd..aa3898ba517d 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsTransferableData.hxx @@ -47,7 +47,7 @@ public: : maBitmap(rBitmap), mbIsExcluded(bIsExcluded) {} Representative (const Representative& rOther) : maBitmap(rOther.maBitmap), mbIsExcluded(rOther.mbIsExcluded) {} - Representative operator= (Representative const& rOther) + Representative& operator= (Representative const& rOther) { if (&rOther != this) {maBitmap = rOther.maBitmap; mbIsExcluded = rOther.mbIsExcluded; } return *this; } diff --git a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx index 816dc14740ce..48c3cf8a32a0 100644 --- a/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlideSorterView.hxx @@ -143,7 +143,7 @@ public: */ void InvalidatePageObjectVisibilities(); - std::shared_ptr<cache::PageCache> GetPreviewCache(); + std::shared_ptr<cache::PageCache> const & GetPreviewCache(); /** Return the range of currently visible page objects including the first and last one in that range. @@ -151,7 +151,7 @@ public: The returned pair of page object indices is empty when the second index is lower than the first. */ - Pair GetVisiblePageRange(); + Pair const & GetVisiblePageRange(); /** Add a shape to the page. Typically used from inside PostModelChange(). @@ -187,7 +187,7 @@ public: void UpdateOrientation(); - std::shared_ptr<PageObjectPainter> GetPageObjectPainter(); + std::shared_ptr<PageObjectPainter> const & GetPageObjectPainter(); const std::shared_ptr<LayeredDevice>& GetLayeredDevice() const { return mpLayeredDevice;} class DrawLock diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 50975690c27b..79171b327634 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -417,13 +417,13 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) } } -std::shared_ptr<controller::Properties> SlideSorter::GetProperties() const +std::shared_ptr<controller::Properties> const & SlideSorter::GetProperties() const { OSL_ASSERT(mpProperties); return mpProperties; } -std::shared_ptr<view::Theme> SlideSorter::GetTheme() const +std::shared_ptr<view::Theme> const & SlideSorter::GetTheme() const { OSL_ASSERT(mpTheme); return mpTheme; diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 2abafe28dcc1..c5b75a26ea4d 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -689,7 +689,7 @@ void SlideSorterView::ConfigurationChanged ( } -std::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache() +std::shared_ptr<cache::PageCache> const & SlideSorterView::GetPreviewCache() { sd::Window *pWindow (mrSlideSorter.GetContentWindow()); if (pWindow && mpPreviewCache.get() == nullptr) @@ -704,7 +704,7 @@ std::shared_ptr<cache::PageCache> SlideSorterView::GetPreviewCache() return mpPreviewCache; } -Pair SlideSorterView::GetVisiblePageRange() +Pair const & SlideSorterView::GetVisiblePageRange() { if ( ! mbPageObjectVisibilitiesValid) DeterminePageObjectVisibilities(); @@ -827,7 +827,7 @@ bool SlideSorterView::SetState ( return bModified; } -std::shared_ptr<PageObjectPainter> SlideSorterView::GetPageObjectPainter() +std::shared_ptr<PageObjectPainter> const & SlideSorterView::GetPageObjectPainter() { if ( ! mpPageObjectPainter) mpPageObjectPainter.reset(new PageObjectPainter(mrSlideSorter)); diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index 2473fecffc69..7493fcafa0d9 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -47,7 +47,7 @@ typedef std::unordered_map<OUString, FactoryId, OUStringHash> FactoryMap; namespace { static std::shared_ptr<FactoryMap> spFactoryMap; -std::shared_ptr<FactoryMap> GetFactoryMap() +std::shared_ptr<FactoryMap> const & GetFactoryMap() { if (spFactoryMap.get() == nullptr) { 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<AccessibleFocusManager> Instance(); + static std::shared_ptr<AccessibleFocusManager> const & Instance(); void AddFocusableObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject); void RemoveFocusableObject (const ::rtl::Reference<PresenterAccessible::AccessibleObject>& rpObject); @@ -1990,7 +1990,7 @@ void AccessibleNotes::HandleTextChange() std::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::mpInstance; -std::shared_ptr<AccessibleFocusManager> AccessibleFocusManager::Instance() +std::shared_ptr<AccessibleFocusManager> 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<css::rendering::XBitmap>& return mxNormalBitmap; } -css::uno::Reference<css::rendering::XBitmap> +css::uno::Reference<css::rendering::XBitmap> 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<css::rendering::XBitmap>& GetNormalBitmap() const; - css::uno::Reference<css::rendering::XBitmap> GetBitmap(const Mode eMode) const; + css::uno::Reference<css::rendering::XBitmap> const & GetBitmap(const Mode eMode) const; void SetBitmap ( const Mode eMode, const css::uno::Reference<css::rendering::XBitmap>& 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<css::rendering::XCanvas>& rxParentCanvas, const css::uno::Reference<css::awt::XWindow>& 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<AreaCount); diff --git a/sdext/source/presenter/PresenterScrollBar.hxx b/sdext/source/presenter/PresenterScrollBar.hxx index 73ccbfabc1c4..9e0f0183a98f 100644 --- a/sdext/source/presenter/PresenterScrollBar.hxx +++ b/sdext/source/presenter/PresenterScrollBar.hxx @@ -186,7 +186,7 @@ protected: SharedBitmapDescriptor mpThumbEndDescriptor; bool maEnabledState[AreaCount]; - css::geometry::RealRectangle2D GetRectangle (const Area eArea) const; + css::geometry::RealRectangle2D const & GetRectangle (const Area eArea) const; virtual double GetDragDistance (const sal_Int32 nX, const sal_Int32 nY) const = 0; virtual void UpdateDragAnchor (const double nDragDistance) = 0; virtual double GetMinor (const double nX, const double nY) const = 0; diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx index 2f298b28450a..0fe71c460d1e 100644 --- a/sdext/source/presenter/PresenterToolBar.cxx +++ b/sdext/source/presenter/PresenterToolBar.cxx @@ -150,7 +150,7 @@ namespace { virtual void Paint ( const Reference<rendering::XCanvas>& rxCanvas, const rendering::ViewState& rViewState) = 0; - awt::Size GetBoundingSize ( + awt::Size const & GetBoundingSize ( const Reference<rendering::XCanvas>& 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<rendering::XCanvas>& 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<PresenterController>& GetPresenterController() const; const css::uno::Reference<css::uno::XComponentContext>& GetComponentContext() const; diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx index 1e516c48d187..5ca7743397d2 100644 --- a/sfx2/inc/guisaveas.hxx +++ b/sfx2/inc/guisaveas.hxx @@ -50,9 +50,9 @@ private: css::uno::Reference< css::container::XContainerQuery > m_xFilterQuery; css::uno::Reference< css::frame::XModuleManager2 > m_xModuleManager; - css::uno::Reference< css::container::XNameAccess > GetFilterConfiguration(); - css::uno::Reference< css::container::XContainerQuery > GetFilterQuery(); - css::uno::Reference< css::frame::XModuleManager2 > GetModuleManager(); + css::uno::Reference< css::container::XNameAccess > const & GetFilterConfiguration(); + css::uno::Reference< css::container::XContainerQuery > const & GetFilterQuery(); + css::uno::Reference< css::frame::XModuleManager2 > const & GetModuleManager(); public: SfxStoringHelper(); diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 69d360bb369a..9ff07b002498 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2094,7 +2094,7 @@ void SfxHelpTextWindow_Impl::SetOnStartupBoxPosition() } -Reference< XBreakIterator > SfxHelpTextWindow_Impl::GetBreakIterator() +Reference< XBreakIterator > const & SfxHelpTextWindow_Impl::GetBreakIterator() { if ( !xBreakIterator.is() ) xBreakIterator = vcl::unohelper::CreateBreakIterator(); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index d340a8417e82..c23fcb7c58c2 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -447,7 +447,7 @@ private: void InitOnStartupBox(); void SetOnStartupBoxPosition(); - css::uno::Reference< css::i18n::XBreakIterator > + css::uno::Reference< css::i18n::XBreakIterator > const & GetBreakIterator(); css::uno::Reference< css::text::XTextRange > getCursor() const; diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 33121b8fb224..8e10bb7dd8c1 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -98,7 +98,7 @@ void NoHelpErrorBox::RequestHelp( const HelpEvent& ) static bool impl_hasHelpInstalled( const OUString &rLang ); /// Return the locale we prefer for displaying help -static OUString HelpLocaleString() +static OUString const & HelpLocaleString() { static OUString aLocaleStr; if (aLocaleStr.isEmpty()) diff --git a/sfx2/source/control/thumbnailviewitem.cxx b/sfx2/source/control/thumbnailviewitem.cxx index 3690ae020cab..33a5b2d922f1 100644 --- a/sfx2/source/control/thumbnailviewitem.cxx +++ b/sfx2/source/control/thumbnailviewitem.cxx @@ -106,7 +106,7 @@ void ThumbnailViewItem::setTitle (const OUString& rTitle) maTitle = rTitle; } -uno::Reference< accessibility::XAccessible > ThumbnailViewItem::GetAccessible( bool bIsTransientChildrenDisabled ) +uno::Reference< accessibility::XAccessible > const & ThumbnailViewItem::GetAccessible( bool bIsTransientChildrenDisabled ) { if( !mxAcc.is() ) mxAcc = new ThumbnailViewItemAcc( this, bIsTransientChildrenDisabled ); diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 6c1813f160ea..23fea7939cec 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -208,7 +208,7 @@ struct DocumentMetadataAccess_Impl // this is... a hack. template<sal_Int16 Constant> -/*static*/ uno::Reference<rdf::XURI> +/*static*/ uno::Reference<rdf::XURI> const & getURI(uno::Reference< uno::XComponentContext > const & i_xContext) { static uno::Reference< rdf::XURI > xURI( diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index c4ce8719238c..7e8283b08552 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2645,7 +2645,7 @@ const std::shared_ptr<const SfxFilter>& SfxMedium::GetFilter() const } -std::shared_ptr<const SfxFilter> SfxMedium::GetOrigFilter() const +std::shared_ptr<const SfxFilter> const & SfxMedium::GetOrigFilter() const { return pImpl->pOrigFilter ? pImpl->pOrigFilter : pImpl->m_pFilter; } diff --git a/sfx2/source/doc/doctemplateslocal.cxx b/sfx2/source/doc/doctemplateslocal.cxx index 1cffac39ee97..cb82f0d24e16 100644 --- a/sfx2/source/doc/doctemplateslocal.cxx +++ b/sfx2/source/doc/doctemplateslocal.cxx @@ -123,7 +123,7 @@ DocTemplLocaleHelper::~DocTemplLocaleHelper() } -std::vector< beans::StringPair > DocTemplLocaleHelper::GetParsingResult() +std::vector< beans::StringPair > const & DocTemplLocaleHelper::GetParsingResult() { if ( !m_aElementsSeq.empty() ) throw uno::RuntimeException(); // the parsing has still not finished! diff --git a/sfx2/source/doc/doctemplateslocal.hxx b/sfx2/source/doc/doctemplateslocal.hxx index a98ae0377d7c..3b41fc87a5b4 100644 --- a/sfx2/source/doc/doctemplateslocal.hxx +++ b/sfx2/source/doc/doctemplateslocal.hxx @@ -40,7 +40,7 @@ class DocTemplLocaleHelper : public cppu::WeakImplHelper < css::xml::sax::XDocum std::vector< OUString > m_aElementsSeq; // stack of elements being parsed DocTemplLocaleHelper(); - std::vector< css::beans::StringPair > GetParsingResult(); + std::vector< css::beans::StringPair > const & GetParsingResult(); static std::vector< css::beans::StringPair > SAL_CALL ReadLocalizationSequence_Impl( const css::uno::Reference< css::io::XInputStream >& xInStream, const OUString& aStringID, const css::uno::Reference< css::uno::XComponentContext >& xContext ) throw( css::uno::Exception ); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 440185028461..9f99eab33a98 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -275,9 +275,9 @@ public: void FreeDocumentProps(); - uno::Reference< frame::XModel > GetModel(); - uno::Reference< frame::XStorable > GetStorable(); - uno::Reference< frame::XStorable2 > GetStorable2(); + uno::Reference< frame::XModel > const & GetModel(); + uno::Reference< frame::XStorable > const & GetStorable(); + uno::Reference< frame::XStorable2 > const & GetStorable2(); ::comphelper::SequenceAsHashMap& GetMediaDescr() { return m_aMediaDescrHM; } @@ -285,7 +285,7 @@ public: const ::comphelper::SequenceAsHashMap& GetDocProps(); - OUString GetModuleName(); + OUString const & GetModuleName(); const ::comphelper::SequenceAsHashMap& GetModuleProps(); void CheckInteractionHandler(); @@ -382,7 +382,7 @@ void ModelData_Impl::FreeDocumentProps() } -uno::Reference< frame::XModel > ModelData_Impl::GetModel() +uno::Reference< frame::XModel > const & ModelData_Impl::GetModel() { if ( !m_xModel.is() ) throw uno::RuntimeException(); @@ -391,7 +391,7 @@ uno::Reference< frame::XModel > ModelData_Impl::GetModel() } -uno::Reference< frame::XStorable > ModelData_Impl::GetStorable() +uno::Reference< frame::XStorable > const & ModelData_Impl::GetStorable() { if ( !m_xStorable.is() ) { @@ -404,7 +404,7 @@ uno::Reference< frame::XStorable > ModelData_Impl::GetStorable() } -uno::Reference< frame::XStorable2 > ModelData_Impl::GetStorable2() +uno::Reference< frame::XStorable2 > const & ModelData_Impl::GetStorable2() { if ( !m_xStorable2.is() ) { @@ -426,7 +426,7 @@ const ::comphelper::SequenceAsHashMap& ModelData_Impl::GetDocProps() } -OUString ModelData_Impl::GetModuleName() +OUString const & ModelData_Impl::GetModuleName() { if ( m_aModuleName.isEmpty() ) { @@ -1265,7 +1265,7 @@ SfxStoringHelper::SfxStoringHelper() } -uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguration() +uno::Reference< container::XNameAccess > const & SfxStoringHelper::GetFilterConfiguration() { if ( !m_xFilterCFG.is() ) { @@ -1280,7 +1280,7 @@ uno::Reference< container::XNameAccess > SfxStoringHelper::GetFilterConfiguratio } -uno::Reference< container::XContainerQuery > SfxStoringHelper::GetFilterQuery() +uno::Reference< container::XContainerQuery > const & SfxStoringHelper::GetFilterQuery() { if ( !m_xFilterQuery.is() ) { @@ -1293,7 +1293,7 @@ uno::Reference< container::XContainerQuery > SfxStoringHelper::GetFilterQuery() } -uno::Reference< css::frame::XModuleManager2 > SfxStoringHelper::GetModuleManager() +uno::Reference< css::frame::XModuleManager2 > const & SfxStoringHelper::GetModuleManager() { if ( !m_xModuleManager.is() ) { diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index ab6d33354131..17c8411d462a 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3410,7 +3410,7 @@ Reference< script::provider::XScriptProvider > SAL_CALL SfxBaseModel::getScriptP // XUIConfigurationManagerSupplier -OUString SfxBaseModel::getRuntimeUID() const +OUString const & SfxBaseModel::getRuntimeUID() const { OSL_ENSURE( !m_pData->m_sRuntimeUID.isEmpty(), "SfxBaseModel::getRuntimeUID - ID is empty!" ); diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index ad9212e1d3e9..877049b0b5ae 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -77,7 +77,7 @@ namespace slideshow // Private methods - GDIMetaFileSharedPtr DrawShape::forceScrollTextMetaFile() + GDIMetaFileSharedPtr const & DrawShape::forceScrollTextMetaFile() { if ((mnCurrMtfLoadFlags & MTF_LOAD_SCROLL_TEXT_MTF) != MTF_LOAD_SCROLL_TEXT_MTF) { diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index a0d98b1c9001..328d0c3bd3a4 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -199,7 +199,7 @@ namespace slideshow crafted metafile, usable to display drawing layer text animations. */ - GDIMetaFileSharedPtr forceScrollTextMetaFile(); + GDIMetaFileSharedPtr const & forceScrollTextMetaFile(); private: /** Create a shape for the given XShape diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index 5a20d3e9d194..23fd8099e829 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -88,7 +88,7 @@ namespace slideshow } } - AttributableShapeSharedPtr ShapeSubset::getSubsetShape() const + AttributableShapeSharedPtr const & ShapeSubset::getSubsetShape() const { return mpSubsetShape ? mpSubsetShape : mpOriginalShape; } diff --git a/slideshow/source/inc/shapesubset.hxx b/slideshow/source/inc/shapesubset.hxx index 68514759de2a..7f0a8a747148 100644 --- a/slideshow/source/inc/shapesubset.hxx +++ b/slideshow/source/inc/shapesubset.hxx @@ -96,7 +96,7 @@ namespace slideshow If the subset is currently revoked, this method returns the original shape. */ - AttributableShapeSharedPtr getSubsetShape() const; + AttributableShapeSharedPtr const & getSubsetShape() const; /** Enable the subset shape. diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index fcf1c200f7af..fa370de600f2 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -182,7 +182,7 @@ public: const std::set< OUString > & GetUsedSymbols() const { return maUsedSymbols; } - OUString GetAccessibleText(); + OUString const & GetAccessibleText(); EditEngine & GetEditEngine(); SfxItemPool & GetEditEngineItemPool(); diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx index 3bbda764b41c..1a984526dbdc 100644 --- a/starmath/source/document.cxx +++ b/starmath/source/document.cxx @@ -213,7 +213,7 @@ void SmDocShell::SetFormat(SmFormat& rFormat) } } -OUString SmDocShell::GetAccessibleText() +OUString const & SmDocShell::GetAccessibleText() { ArrangeFormula(); if (maAccText.isEmpty()) diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 283facc5f3e3..8aa9fed302a4 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -496,7 +496,7 @@ class OServiceManagerWrapper : public OServiceManagerMutex, public t_OServiceMan { Reference< XComponentContext > m_xContext; Reference< XMultiComponentFactory > m_root; - inline Reference< XMultiComponentFactory > getRoot() + Reference< XMultiComponentFactory > const & getRoot() { if (! m_root.is()) { diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index d87d08acecf3..ef637b747d40 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -260,7 +260,7 @@ css::task::UrlRecord find( css::task::PasswordRequestMode aRMode, const css::uno::Reference< css::task::XInteractionHandler >& xHandler ); - OUString GetMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) + OUString const & GetMasterPassword( const css::uno::Reference< css::task::XInteractionHandler >& Handler ) throw(css::uno::RuntimeException, std::exception); void UpdateVector( const OUString& url, ::std::list< NamePassRecord >& toUpdate, NamePassRecord& rec, bool writeFile ) diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 69f78e5ac19f..5e2a7279e1e4 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -311,7 +311,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const OUString& rName, cons return eRet; } -Reference<XPropertySetInfo> SfxItemPropertySet::getPropertySetInfo() const +Reference<XPropertySetInfo> const & SfxItemPropertySet::getPropertySetInfo() const { if( !m_xInfo.is() ) m_xInfo = new SfxItemPropertySetInfo( m_aMap ); diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index aed9c530431d..1c04d7bf4bc8 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -192,7 +192,7 @@ bool SfxStyleSheetBase::SetName(const OUString& rName, bool bReIndexNow) return true; } -OUString SfxStyleSheetBase::GetDisplayName() const +OUString const & SfxStyleSheetBase::GetDisplayName() const { if( maDisplayName.isEmpty() ) { diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 93d627c16177..3971ed06d06d 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -818,7 +818,7 @@ OUString PasswordContainer::RequestPasswordFromUser( PasswordRequestMode aRMode, } -OUString PasswordContainer::GetMasterPassword( const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception) +OUString const & PasswordContainer::GetMasterPassword( const Reference< XInteractionHandler >& aHandler ) throw(RuntimeException, std::exception) { PasswordRequestMode aRMode = PasswordRequestMode_PASSWORD_ENTER; if( !m_pStorageFile || !m_pStorageFile->useStorage() ) diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx index c0fcaefb0491..d947d6ca6dd3 100644 --- a/svtools/source/config/menuoptions.cxx +++ b/svtools/source/config/menuoptions.cxx @@ -125,7 +125,7 @@ class SvtMenuOptions_Impl : public ConfigItem @return A list of needed configuration keys is returned. *//*-*****************************************************************************************************/ - static Sequence< OUString > impl_GetPropertyNames(); + static Sequence< OUString > const & impl_GetPropertyNames(); }; // constructor @@ -299,7 +299,7 @@ void SvtMenuOptions_Impl::ImplCommit() // private method -Sequence< OUString > SvtMenuOptions_Impl::impl_GetPropertyNames() +Sequence< OUString > const & SvtMenuOptions_Impl::impl_GetPropertyNames() { // Build static list of configuration key names. static const OUString pProperties[] = diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx index b92e52d171dc..deb22cda6b9b 100644 --- a/svtools/source/control/fmtfield.cxx +++ b/svtools/source/control/fmtfield.cxx @@ -405,7 +405,7 @@ void FormattedField::SetTextFormatted(const OUString& rStr) m_ValueState = valueString; } -OUString FormattedField::GetTextValue() const +OUString const & FormattedField::GetTextValue() const { if (m_ValueState != valueString ) { diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index 38628ea7e14f..28e849c0f490 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -52,7 +52,7 @@ ValueSetItem::~ValueSetItem() } -uno::Reference< accessibility::XAccessible > ValueSetItem::GetAccessible( bool bIsTransientChildrenDisabled ) +uno::Reference< accessibility::XAccessible > const & ValueSetItem::GetAccessible( bool bIsTransientChildrenDisabled ) { if( !mxAcc.is() ) mxAcc = new ValueItemAcc( this, bIsTransientChildrenDisabled ); diff --git a/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx index c3d2339181de..53b13a05b38e 100644 --- a/svtools/source/control/valueimp.hxx +++ b/svtools/source/control/valueimp.hxx @@ -64,7 +64,7 @@ struct ValueSetItem explicit ValueSetItem( ValueSet& rParent ); ~ValueSetItem(); - css::uno::Reference< css::accessibility::XAccessible > + css::uno::Reference< css::accessibility::XAccessible > const & GetAccessible( bool bIsTransientChildrenDisabled ); }; diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx index 59bee404c571..2cbb18345073 100644 --- a/svtools/source/misc/sampletext.cxx +++ b/svtools/source/misc/sampletext.cxx @@ -1107,28 +1107,28 @@ namespace } //false for all bits considered "Latin" by LibreOffice - std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> getLatinMask() + std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> const & getLatinMask() { static std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> s_Mask(getMaskByScriptType(css::i18n::ScriptType::LATIN)); return s_Mask; } //false for all bits considered "Asian" by LibreOffice - std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> getCJKMask() + std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> const & getCJKMask() { static std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> s_Mask(getMaskByScriptType(css::i18n::ScriptType::ASIAN)); return s_Mask; } //false for all bits considered "Complex" by LibreOffice - std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> getCTLMask() + std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> const & getCTLMask() { static std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> s_Mask(getMaskByScriptType(css::i18n::ScriptType::COMPLEX)); return s_Mask; } //false for all bits considered "WEAK" by LibreOffice - std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> getWeakMask() + std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> const & getWeakMask() { static std::bitset<vcl::UnicodeCoverage::MAX_UC_ENUM> s_Mask(getMaskByScriptType(css::i18n::ScriptType::WEAK)); return s_Mask; diff --git a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx index aa58d2f19d59..ac573bf2271f 100644 --- a/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx +++ b/svx/inc/sdr/contact/viewobjectcontactofe3d.hxx @@ -57,7 +57,7 @@ namespace sdr // access to the local primitive sequence. This will ensure that the list is // current in comparing the local list content with a fresh created incarnation // This method will not handle included hierarchies or visibility. - drawinglayer::primitive3d::Primitive3DContainer getPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const; + drawinglayer::primitive3d::Primitive3DContainer const & getPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const; }; } // end of namespace contact } // end of namespace sdr diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index e8d6e054f31f..076179960179 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -241,7 +241,7 @@ SvxShowCharSetItem::~SvxShowCharSetItem() } -uno::Reference< css::accessibility::XAccessible > SvxShowCharSetItem::GetAccessible() +uno::Reference< css::accessibility::XAccessible > const & SvxShowCharSetItem::GetAccessible() { if( !m_xAcc.is() ) { diff --git a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx index a8aab198cee6..4aa8168f91a2 100644 --- a/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx +++ b/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx @@ -830,7 +830,7 @@ Rectangle SvxPixelCtlAccessibleChild::GetBoundingBoxOnScreen() throw( RuntimeExc return Rectangle( mrParentWindow.OutputToAbsoluteScreenPixel( aRect.TopLeft() ), aRect.GetSize() ); } -Rectangle SvxPixelCtlAccessibleChild::GetBoundingBox() throw( RuntimeException ) +Rectangle const & SvxPixelCtlAccessibleChild::GetBoundingBox() throw( RuntimeException ) { // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx index de5775bf883c..ea1404d35bcc 100644 --- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx +++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx @@ -1073,7 +1073,7 @@ Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBoxOnScreen() throw( Runt return Rectangle( mrParentWindow.OutputToScreenPixel( aRect.TopLeft() ), aRect.GetSize() ); } -Rectangle SvxRectCtlChildAccessibleContext::GetBoundingBox() throw( RuntimeException ) +Rectangle const & SvxRectCtlChildAccessibleContext::GetBoundingBox() throw( RuntimeException ) { // no guard necessary, because no one changes mpBoundingBox after creating it ThrowExceptionIfNotAlive(); diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 6bc1e254a9b7..89f1d6f2413a 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -833,7 +833,7 @@ SdrObject* CreateSdrObjectFromParagraphOutlines( const FWData& rFWData, const Sd Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::mxBreakIterator = nullptr; -Reference < i18n::XBreakIterator > EnhancedCustomShapeFontWork::GetBreakIterator() +Reference < i18n::XBreakIterator > const & EnhancedCustomShapeFontWork::GetBreakIterator() { if ( !mxBreakIterator.is() ) { diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx index 5e0baeae7fc5..d86388cb75fc 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx @@ -29,7 +29,7 @@ class EnhancedCustomShapeFontWork public: - static css::uno::Reference < css::i18n::XBreakIterator > GetBreakIterator(); + static css::uno::Reference < css::i18n::XBreakIterator > const & GetBreakIterator(); static SdrObject* CreateFontWork( const SdrObject* pShape2d, const SdrObject* pCustomShape ); }; diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 3335316bfa21..c52cdfbbc5a2 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -99,7 +99,7 @@ public: virtual ~SvxRubyData_Impl(); void SetController(const Reference<XController>& xCtrl); - Reference<XModel> GetModel() + Reference<XModel> const & GetModel() { if (!xController.is()) xModel = nullptr; @@ -111,7 +111,7 @@ public: { return bHasSelectionChanged; } - Reference<XRubySelection> GetRubySelection() + Reference<XRubySelection> const & GetRubySelection() { xSelection.set(xController, UNO_QUERY); return xSelection; diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 1ace5b93fe11..e16e6008a4a7 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -688,7 +688,7 @@ void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( Runtime } -Sequence< OUString> FormController::getSupportedServiceNames_Static() +Sequence< OUString> const & FormController::getSupportedServiceNames_Static() { static Sequence< OUString> aServices; if (!aServices.getLength()) diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx index 2169e9688452..02260bd3c1a2 100644 --- a/svx/source/inc/charmapacc.hxx +++ b/svx/source/inc/charmapacc.hxx @@ -108,8 +108,8 @@ namespace svx SvxShowCharSetItem( SvxShowCharSet& rParent,SvxShowCharSetAcc* _pParent,sal_uInt16 _nPos ); ~SvxShowCharSetItem(); - css::uno::Reference< css::accessibility::XAccessible > GetAccessible(); - void ClearAccessible(); + css::uno::Reference< css::accessibility::XAccessible > const & GetAccessible(); + void ClearAccessible(); }; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 83d44467088b..eda7ac894981 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -161,7 +161,7 @@ namespace svxform /** convert submission replace string from API value to UI value. Use 'none' as default. */ - OUString toUI( const OUString& rStr ) const + OUString const & toUI( const OUString& rStr ) const { if( rStr == m_sDoc_API ) return m_sDoc_UI; @@ -173,7 +173,7 @@ namespace svxform /** convert submission replace string from UI to API. Use 'none' as default. */ - OUString toAPI( const OUString& rStr ) const + OUString const & toAPI( const OUString& rStr ) const { if( rStr == m_sDoc_UI ) return m_sDoc_API; @@ -209,7 +209,7 @@ namespace svxform } /** convert from API to UI; put is default. */ - OUString toUI( const OUString& rStr ) const + OUString const & toUI( const OUString& rStr ) const { if( rStr == m_sGet_API ) return m_sGet_UI; @@ -220,7 +220,7 @@ namespace svxform } /** convert from UI to API; put is default */ - OUString toAPI( const OUString& rStr ) const + OUString const & toAPI( const OUString& rStr ) const { if( rStr == m_sGet_UI ) return m_sGet_API; diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index 6db2813a6961..e93160e94172 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -406,7 +406,7 @@ namespace svxform virtual void SAL_CALL invalidateAllFeatures( ) throw (css::uno::RuntimeException, std::exception) override; // method for registration - static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); + static css::uno::Sequence< OUString > const & getSupportedServiceNames_Static(); // comphelper::OPropertyArrayUsageHelper virtual void fillProperties( diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx index b9a572065967..07d807364eb1 100644 --- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx +++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx @@ -135,7 +135,7 @@ public: Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException ); - Rectangle GetBoundingBox() throw( css::uno::RuntimeException ); + Rectangle const & GetBoundingBox() throw( css::uno::RuntimeException ); /// @returns true if it's disposed or in disposing inline bool IsAlive() const; diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx index 2f3d072b3e82..f9dcc099258d 100644 --- a/svx/source/inc/svxrectctaccessiblecontext.hxx +++ b/svx/source/inc/svxrectctaccessiblecontext.hxx @@ -427,7 +427,7 @@ public: protected: Rectangle GetBoundingBoxOnScreen() throw( css::uno::RuntimeException ); - Rectangle GetBoundingBox() throw( css::uno::RuntimeException ); + Rectangle const & GetBoundingBox() throw( css::uno::RuntimeException ); void CommitChange( const css::accessibility::AccessibleEventObject& rEvent ); diff --git a/svx/source/sdr/contact/viewcontact.cxx b/svx/source/sdr/contact/viewcontact.cxx index 244aead6fb37..c4e5f11b7e3d 100644 --- a/svx/source/sdr/contact/viewcontact.cxx +++ b/svx/source/sdr/contact/viewcontact.cxx @@ -233,7 +233,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContact::createViewIndepende return drawinglayer::primitive2d::Primitive2DContainer { xReference }; } -drawinglayer::primitive2d::Primitive2DContainer ViewContact::getViewIndependentPrimitive2DSequence() const +drawinglayer::primitive2d::Primitive2DContainer const & ViewContact::getViewIndependentPrimitive2DSequence() const { // local up-to-date checks. Create new list and compare. drawinglayer::primitive2d::Primitive2DContainer xNew(createViewIndependentPrimitive2DSequence()); diff --git a/svx/source/sdr/contact/viewcontactofe3d.cxx b/svx/source/sdr/contact/viewcontactofe3d.cxx index 9bbb61a6f1a2..253bdea07f30 100644 --- a/svx/source/sdr/contact/viewcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewcontactofe3d.cxx @@ -135,7 +135,7 @@ ViewContactOfE3d::~ViewContactOfE3d() { } -drawinglayer::primitive3d::Primitive3DContainer ViewContactOfE3d::getVIP3DSWithoutObjectTransform() const +drawinglayer::primitive3d::Primitive3DContainer const & ViewContactOfE3d::getVIP3DSWithoutObjectTransform() const { // local up-to-date checks. Create new list and compare. drawinglayer::primitive3d::Primitive3DContainer xNew(createViewIndependentPrimitive3DContainer()); diff --git a/svx/source/sdr/contact/viewobjectcontact.cxx b/svx/source/sdr/contact/viewobjectcontact.cxx index 03fbd573e82c..029abbcfae02 100644 --- a/svx/source/sdr/contact/viewobjectcontact.cxx +++ b/svx/source/sdr/contact/viewobjectcontact.cxx @@ -359,7 +359,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewObjectContact::createPrimiti return xRetval; } -drawinglayer::primitive2d::Primitive2DContainer ViewObjectContact::getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const +drawinglayer::primitive2d::Primitive2DContainer const & ViewObjectContact::getPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const { drawinglayer::primitive2d::Primitive2DContainer xNewPrimitiveSequence; diff --git a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx index 896a56a600a5..93cf40845dd3 100644 --- a/svx/source/sdr/contact/viewobjectcontactofe3d.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofe3d.cxx @@ -72,7 +72,7 @@ namespace sdr return rViewContact.impCreateWithGivenPrimitive3DContainer(getPrimitive3DContainer(rDisplayInfo)); } - drawinglayer::primitive3d::Primitive3DContainer ViewObjectContactOfE3d::getPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const + drawinglayer::primitive3d::Primitive3DContainer const & ViewObjectContactOfE3d::getPrimitive3DContainer(const DisplayInfo& rDisplayInfo) const { drawinglayer::primitive3d::Primitive3DContainer xNewPrimitive3DSeq(createPrimitive3DContainer(rDisplayInfo)); diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx index 747a727f9cbe..043d4cacc9d5 100644 --- a/svx/source/sdr/overlay/overlaymanager.cxx +++ b/svx/source/sdr/overlay/overlaymanager.cxx @@ -145,7 +145,7 @@ namespace sdr return rtl::Reference<OverlayManager>(new OverlayManager(rOutputDevice)); } - const drawinglayer::geometry::ViewInformation2D OverlayManager::getCurrentViewInformation2D() const + drawinglayer::geometry::ViewInformation2D const & OverlayManager::getCurrentViewInformation2D() const { if(getOutputDevice().GetViewTransformation() != maViewTransformation) { diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 473da51f4508..c014ea9fc687 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -253,7 +253,7 @@ SdrPaintWindow::~SdrPaintWindow() DestroyPreRenderDevice(); } -rtl::Reference< sdr::overlay::OverlayManager > SdrPaintWindow::GetOverlayManager() const +rtl::Reference< sdr::overlay::OverlayManager > const & SdrPaintWindow::GetOverlayManager() const { if(!mxOverlayManager.is()) { diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 8d970297d779..240abf8bd0b3 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1759,7 +1759,7 @@ void SdrModel::SetStarDrawPreviewMode(bool bPreview) } } -uno::Reference< uno::XInterface > SdrModel::getUnoModel() +uno::Reference< uno::XInterface > const & SdrModel::getUnoModel() { if( !mxUnoModel.is() ) mxUnoModel = createUnoModel(); diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 0f4acc0f137e..799e2344a9ab 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -405,7 +405,7 @@ SdrObject* ImpCreateShadowObjectClone(const SdrObject& rOriginal, const SfxItemS } -Reference< XCustomShapeEngine > SdrObjCustomShape::GetCustomShapeEngine() const +Reference< XCustomShapeEngine > const & SdrObjCustomShape::GetCustomShapeEngine() const { if (mxCustomShapeEngine.is()) return mxCustomShapeEngine; diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index e6d961b3a87e..5fdb308b1a74 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -1669,7 +1669,7 @@ void SdrPage::SetUnoPage(uno::Reference<drawing::XDrawPage> const& xNewPage) mxUnoPage = xNewPage; } -uno::Reference< uno::XInterface > SdrPage::getUnoPage() +uno::Reference< uno::XInterface > const & SdrPage::getUnoPage() { if( !mxUnoPage.is() ) { diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index 82e5ad505567..7067da149f2a 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -329,7 +329,7 @@ bool SvXMLEmbeddedObjectHelper::ImplGetStorageNames( return true; } -uno::Reference < embed::XStorage > SvXMLEmbeddedObjectHelper::ImplGetContainerStorage( +uno::Reference < embed::XStorage > const & SvXMLEmbeddedObjectHelper::ImplGetContainerStorage( const OUString& rStorageName ) { DBG_ASSERT( -1 == rStorageName.indexOf( '/' ) && diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 52c2209f0a3c..40021aef04d4 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -189,7 +189,7 @@ Bitmap XDashList::CreateBitmapForUI( long nIndex ) return ImpCreateBitmapForXDash(&rDash); } -Bitmap XDashList::GetBitmapForUISolidLine() const +Bitmap const & XDashList::GetBitmapForUISolidLine() const { if(maBitmapSolidLine.IsEmpty()) { @@ -199,7 +199,7 @@ Bitmap XDashList::GetBitmapForUISolidLine() const return maBitmapSolidLine; } -OUString XDashList::GetStringForUiSolidLine() const +OUString const & XDashList::GetStringForUiSolidLine() const { if(maStringSolidLine.isEmpty()) { @@ -209,7 +209,7 @@ OUString XDashList::GetStringForUiSolidLine() const return maStringSolidLine; } -OUString XDashList::GetStringForUiNoLine() const +OUString const & XDashList::GetStringForUiNoLine() const { if(maStringNoLine.isEmpty()) { diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 219335120d9b..6cf7a2093d3c 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -36,7 +36,7 @@ public: SwAuthEntry( const SwAuthEntry& rCopy ); bool operator==(const SwAuthEntry& rComp); - inline OUString GetAuthorField(ToxAuthorityField ePos) const; + inline OUString const & GetAuthorField(ToxAuthorityField ePos) const; inline void SetAuthorField(ToxAuthorityField ePos, const OUString& rField); @@ -175,7 +175,7 @@ public: virtual OUString GetDescription() const override; }; -inline OUString SwAuthEntry::GetAuthorField(ToxAuthorityField ePos) const +inline OUString const & SwAuthEntry::GetAuthorField(ToxAuthorityField ePos) const { SAL_WARN_IF(AUTH_FIELD_END <= ePos, "sw", "wrong index"); return aAuthFields[ePos]; diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index 47615f45bc0f..2978f4472ef0 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -63,7 +63,7 @@ public: public: static SwBreakIt * Get(); - css::uno::Reference< css::i18n::XBreakIterator > GetBreakIter() + css::uno::Reference< css::i18n::XBreakIterator > const & GetBreakIter() { createBreakIterator(); return xBreak; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 222e55c07df5..c14f20a2ed96 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -344,7 +344,7 @@ public: OUString& rResult, double* pNumber); /** create and store or find an already stored connection to a data source for use in SwFieldMgr and SwDBTreeList */ - css::uno::Reference< css::sdbc::XConnection> + css::uno::Reference< css::sdbc::XConnection> const & RegisterConnection(OUString const& rSource); void CreateDSData(const SwDBData& rData) diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index cfaefece1ed1..dc96eb0af54d 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -1606,7 +1606,7 @@ public: const css::uno::Reference<css::container::XNameContainer>& getXForms() const { return mxXForms;} - css::uno::Reference< css::linguistic2::XProofreadingIterator > GetGCIterator() const; + css::uno::Reference< css::linguistic2::XProofreadingIterator > const & GetGCIterator() const; // #i31958# is this an XForms document? bool isXForms() const; @@ -1621,7 +1621,7 @@ public: void SetDefaultPageMode(bool bSquaredPageMode); bool IsSquaredPageMode() const; - css::uno::Reference< css::script::vba::XVBAEventProcessor > GetVbaEventProcessor(); + css::uno::Reference< css::script::vba::XVBAEventProcessor > const & GetVbaEventProcessor(); void SetVBATemplateToProjectCache( css::uno::Reference< css::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; }; const css::uno::Reference< css::container::XNameContainer >& GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; }; ::sfx2::IXmlIdRegistry& GetXmlIdRegistry(); diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index 372b053e315e..6dc1b481ce9e 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -71,7 +71,7 @@ public: // try to get OLE visualization in form of a Primitive2DSequence // and the corresponding B2DRange. This data may be locally buffered - drawinglayer::primitive2d::Primitive2DContainer tryToGetChartContentAsPrimitive2DSequence( + drawinglayer::primitive2d::Primitive2DContainer const & tryToGetChartContentAsPrimitive2DSequence( basegfx::B2DRange& rRange, bool bSynchron); void resetBufferedData(); diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 2d088022fe1e..c749f9e3d9cc 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -232,10 +232,10 @@ public: GetLngSvcEvtListener(); void CreateLngSvcEvtListener(); - css::uno::Reference< css::scanner::XScannerManager2 > + css::uno::Reference< css::scanner::XScannerManager2 > const & GetScannerManager(); - css::uno::Reference< css::linguistic2::XLanguageGuessing > + css::uno::Reference< css::linguistic2::XLanguageGuessing > const & GetLanguageGuesser(); }; diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 91d19beb7b58..63cf28621892 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -120,11 +120,11 @@ public: inline void SetSecondaryKeyReading(const OUString& rStr); inline void SetCitationKeyReading(const OUString& rStr); - inline OUString GetPrimaryKey() const; - inline OUString GetSecondaryKey() const; - inline OUString GetTextReading() const; - inline OUString GetPrimaryKeyReading() const; - inline OUString GetSecondaryKeyReading() const; + inline OUString const & GetPrimaryKey() const; + inline OUString const & GetSecondaryKey() const; + inline OUString const & GetTextReading() const; + inline OUString const & GetPrimaryKeyReading() const; + inline OUString const & GetSecondaryKeyReading() const; bool IsAutoGenerated() const {return m_bAutoGenerated;} void SetAutoGenerated(bool bSet) {m_bAutoGenerated = bSet;} @@ -292,7 +292,7 @@ public: SwForm& operator=( const SwForm& rForm ); inline void SetTemplate(sal_uInt16 nLevel, const OUString& rName); - inline OUString GetTemplate(sal_uInt16 nLevel) const; + inline OUString const & GetTemplate(sal_uInt16 nLevel) const; // #i21237# void SetPattern(sal_uInt16 nLevel, const SwFormTokens& rName); @@ -472,7 +472,7 @@ public: // index of objects - OUString GetStyleNames(sal_uInt16 nLevel) const + OUString const & GetStyleNames(sal_uInt16 nLevel) const { SAL_WARN_IF( nLevel >= MAXLEVEL, "sw", "Which level?"); return m_aStyleNames[nLevel]; @@ -599,31 +599,31 @@ inline sal_uInt16 SwTOXMark::GetLevel() const return m_nLevel; } -inline OUString SwTOXMark::GetPrimaryKey() const +inline OUString const & SwTOXMark::GetPrimaryKey() const { SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type"); return m_aPrimaryKey; } -inline OUString SwTOXMark::GetSecondaryKey() const +inline OUString const & SwTOXMark::GetSecondaryKey() const { SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type"); return m_aSecondaryKey; } -inline OUString SwTOXMark::GetTextReading() const +inline OUString const & SwTOXMark::GetTextReading() const { SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type"); return m_aTextReading; } -inline OUString SwTOXMark::GetPrimaryKeyReading() const +inline OUString const & SwTOXMark::GetPrimaryKeyReading() const { SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type"); return m_aPrimaryKeyReading; } -inline OUString SwTOXMark::GetSecondaryKeyReading() const +inline OUString const & SwTOXMark::GetSecondaryKeyReading() const { SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type"); return m_aSecondaryKeyReading; @@ -637,7 +637,7 @@ inline void SwForm::SetTemplate(sal_uInt16 nLevel, const OUString& rTemplate) m_aTemplate[nLevel] = rTemplate; } -inline OUString SwForm::GetTemplate(sal_uInt16 nLevel) const +inline OUString const & SwForm::GetTemplate(sal_uInt16 nLevel) const { SAL_WARN_IF(nLevel >= GetFormMax(), "sw", "Index >= GetFormMax()"); return m_aTemplate[nLevel]; diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index d497cfeff90a..6a5ac3040f9d 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -1126,7 +1126,7 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleParagraph::getSupportedServiceNam return aRet; } -uno::Sequence< OUString > getAttributeNames() +uno::Sequence< OUString > const & getAttributeNames() { static uno::Sequence< OUString >* pNames = nullptr; @@ -1159,7 +1159,7 @@ uno::Sequence< OUString > getAttributeNames() return *pNames; } -uno::Sequence< OUString > getSupplementalAttributeNames() +uno::Sequence< OUString > const & getSupplementalAttributeNames() { static uno::Sequence< OUString >* pNames = nullptr; diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx index d4b951adc1a8..63075b8a771d 100644 --- a/sw/source/core/doc/doc.cxx +++ b/sw/source/core/doc/doc.cxx @@ -1744,7 +1744,7 @@ void SwDoc::ChkCondColls() } } -uno::Reference< script::vba::XVBAEventProcessor > +uno::Reference< script::vba::XVBAEventProcessor > const & SwDoc::GetVbaEventProcessor() { #if HAVE_FEATURE_SCRIPTING diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx index 80c148ba2539..0ada4b63e6f5 100644 --- a/sw/source/core/doc/docnew.cxx +++ b/sw/source/core/doc/docnew.cxx @@ -136,7 +136,7 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage"; /* * global functions... */ - uno::Reference< linguistic2::XProofreadingIterator > SwDoc::GetGCIterator() const + uno::Reference< linguistic2::XProofreadingIterator > const & SwDoc::GetGCIterator() const { if (!m_xGCIterator.is() && SvtLinguConfig().HasGrammarChecker()) { diff --git a/sw/source/core/inc/txmsrt.hxx b/sw/source/core/inc/txmsrt.hxx index 10e4d36405e9..210702d2ace9 100644 --- a/sw/source/core/inc/txmsrt.hxx +++ b/sw/source/core/inc/txmsrt.hxx @@ -145,7 +145,7 @@ struct SwTOXSortTabBase virtual OUString GetURL() const; - inline TextAndReading GetText() const; + inline TextAndReading const & GetText() const; inline const css::lang::Locale& GetLocale() const; private: @@ -155,7 +155,7 @@ private: virtual TextAndReading GetText_Impl() const = 0; }; -inline TextAndReading SwTOXSortTabBase::GetText() const +inline TextAndReading const & SwTOXSortTabBase::GetText() const { if( !bValidText ) { diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx index 416089205b48..46197375c712 100644 --- a/sw/source/core/ole/ndole.cxx +++ b/sw/source/core/ole/ndole.cxx @@ -1022,7 +1022,7 @@ OUString SwOLEObj::GetDescription() return SW_RESSTR(STR_OLE); } -drawinglayer::primitive2d::Primitive2DContainer SwOLEObj::tryToGetChartContentAsPrimitive2DSequence( +drawinglayer::primitive2d::Primitive2DContainer const & SwOLEObj::tryToGetChartContentAsPrimitive2DSequence( basegfx::B2DRange& rRange, bool bSynchron) { diff --git a/sw/source/ui/vba/vbaglobals.cxx b/sw/source/ui/vba/vbaglobals.cxx index c7d719e69adc..82d8fbaa286d 100644 --- a/sw/source/ui/vba/vbaglobals.cxx +++ b/sw/source/ui/vba/vbaglobals.cxx @@ -52,7 +52,7 @@ SwVbaGlobals::~SwVbaGlobals() // XGlobals -uno::Reference<word::XApplication > +uno::Reference<word::XApplication > const & SwVbaGlobals::getApplication() throw (uno::RuntimeException) { OSL_TRACE("In SwVbaGlobals::getApplication"); diff --git a/sw/source/ui/vba/vbaglobals.hxx b/sw/source/ui/vba/vbaglobals.hxx index 47a029e6c4b3..e473f83956f0 100644 --- a/sw/source/ui/vba/vbaglobals.hxx +++ b/sw/source/ui/vba/vbaglobals.hxx @@ -38,7 +38,7 @@ class SwVbaGlobals : public SwVbaGlobals_BASE private: css::uno::Reference< ooo::vba::word::XApplication > mxApplication; - css::uno::Reference< ooo::vba::word::XApplication > getApplication() throw (css::uno::RuntimeException); + css::uno::Reference< ooo::vba::word::XApplication > const & getApplication() throw (css::uno::RuntimeException); public: diff --git a/sw/source/uibase/app/swmodule.cxx b/sw/source/uibase/app/swmodule.cxx index f436e09070e3..e637b960dba0 100644 --- a/sw/source/uibase/app/swmodule.cxx +++ b/sw/source/uibase/app/swmodule.cxx @@ -192,7 +192,7 @@ SwModule::SwModule( SfxObjectFactory* pWebFact, GetColorConfig(); } } -uno::Reference< scanner::XScannerManager2 > +uno::Reference< scanner::XScannerManager2 > const & SwModule::GetScannerManager() { if (!m_xScannerManager.is()) @@ -202,7 +202,7 @@ SwModule::GetScannerManager() return m_xScannerManager; } -uno::Reference< linguistic2::XLanguageGuessing > SwModule::GetLanguageGuesser() +uno::Reference< linguistic2::XLanguageGuessing > const & SwModule::GetLanguageGuesser() { if (!m_xLanguageGuesser.is()) { diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 5721cd33971e..197cc08e5a76 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -2322,7 +2322,7 @@ bool SwDBManager::OpenDataSource(const OUString& rDataSource, const OUString& rT return pFound->xResultSet.is(); } -uno::Reference< sdbc::XConnection> SwDBManager::RegisterConnection(OUString const& rDataSource) +uno::Reference< sdbc::XConnection> const & SwDBManager::RegisterConnection(OUString const& rDataSource) { SwDSParam* pFound = SwDBManager::FindDSConnection(rDataSource, true); uno::Reference< sdbc::XDataSource> xSource; diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 9f02086a8aa4..29677576858d 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -1679,7 +1679,7 @@ sal_uLong SwFieldMgr::GetDefaultFormat(sal_uInt16 nTypeId, bool bIsText, SvNumbe return pFormatter->GetStandardFormat(nDefFormat, GetCurrLanguage()); } -Reference<XNumberingTypeInfo> SwFieldMgr::GetNumberingInfo() const +Reference<XNumberingTypeInfo> const & SwFieldMgr::GetNumberingInfo() const { if(!xNumberingInfo.is()) { diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 526f5254b0ed..e65f163d0957 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -110,7 +110,7 @@ private: SAL_DLLPRIVATE sal_uInt16 GetCurrLanguage() const; css::uno::Reference<css::text::XNumberingTypeInfo> xNumberingInfo; - SAL_DLLPRIVATE css::uno::Reference<css::text::XNumberingTypeInfo> GetNumberingInfo()const; + SAL_DLLPRIVATE css::uno::Reference<css::text::XNumberingTypeInfo> const & GetNumberingInfo()const; public: explicit SwFieldMgr(SwWrtShell* pSh = nullptr); diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 3a12b2367053..9adc64e1196e 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -85,7 +85,7 @@ VCLXPrinterPropertySet::~VCLXPrinterPropertySet() mxPrinter.reset(); } -css::uno::Reference< css::awt::XDevice > VCLXPrinterPropertySet::GetDevice() +css::uno::Reference< css::awt::XDevice > const & VCLXPrinterPropertySet::GetDevice() { if ( !mxPrnDevice.is() ) { diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx index b7a242aca0f2..ba793aad9e73 100644 --- a/ucb/source/core/providermap.hxx +++ b/ucb/source/core/providermap.hxx @@ -37,7 +37,7 @@ class ProviderListEntry_Impl css::ucb::XContentProvider > m_xResolvedProvider; private: - css::uno::Reference< css::ucb::XContentProvider > resolveProvider() const; + css::uno::Reference< css::ucb::XContentProvider > const & resolveProvider() const; public: explicit ProviderListEntry_Impl( diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 09437c20576d..5f9f16b346be 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -941,7 +941,7 @@ bool UniversalContentBroker::getContentProviderData( // ProviderListEntry_Impl implementation. -Reference< XContentProvider > ProviderListEntry_Impl::resolveProvider() const +Reference< XContentProvider > const & ProviderListEntry_Impl::resolveProvider() const { if ( !m_xResolvedProvider.is() ) { diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 6180c6d7d30e..5dd9951402f1 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -446,7 +446,7 @@ namespace cmis return m_pSession; } - libcmis::ObjectTypePtr Content::getObjectType( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) + libcmis::ObjectTypePtr const & Content::getObjectType( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) { if ( nullptr == m_pObjectType.get( ) && m_bTransient ) { @@ -496,7 +496,7 @@ namespace cmis } - libcmis::ObjectPtr Content::getObject( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception) + libcmis::ObjectPtr const & Content::getObject( const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception) { // can't get the session for some reason // the recent file opening at start up is an example. diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx index 0252ed59de29..9e6a0516995b 100644 --- a/ucb/source/ucp/cmis/cmis_content.hxx +++ b/ucb/source/ucp/cmis/cmis_content.hxx @@ -80,7 +80,7 @@ private: const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); libcmis::Session* getSession( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); - libcmis::ObjectTypePtr getObjectType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); + libcmis::ObjectTypePtr const & getObjectType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ); private: typedef rtl::Reference< Content > ContentRef; @@ -199,7 +199,7 @@ public: virtual std::list< css::uno::Reference< css::ucb::XContent > > getChildren( ) override; - libcmis::ObjectPtr getObject( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception); + libcmis::ObjectPtr const & getObject( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw (css::uno::RuntimeException, css::ucb::CommandFailedException, libcmis::Exception); }; } diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx index f2b0d89eab0c..24f78bb7cb93 100644 --- a/ucb/source/ucp/file/filtask.hxx +++ b/ucb/source/ucp/file/filtask.hxx @@ -110,7 +110,7 @@ namespace fileaccess return m_nMinorCode; } - css::uno::Reference< css::task::XInteractionHandler > SAL_CALL + css::uno::Reference< css::task::XInteractionHandler > const & SAL_CALL getInteractionHandler() { if( ! m_xInteractionHandler.is() && m_xCommandEnvironment.is() ) diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index 79fc8706220a..52bc3b496bec 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -88,7 +88,7 @@ void InteractionRequest::setContinuations( } -rtl::Reference< InteractionContinuation > +rtl::Reference< InteractionContinuation > const & InteractionRequest::getSelection() const { return m_pImpl->m_xSelection; diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx index 65fd554d1b5b..998bf16e40f8 100644 --- a/unotools/source/config/lingucfg.cxx +++ b/unotools/source/config/lingucfg.cxx @@ -1052,7 +1052,7 @@ std::vector< SvtLinguConfigDictionaryEntry > SvtLinguConfig::GetActiveDictionari return aRes; } -uno::Reference< util::XChangesBatch > SvtLinguConfig::GetMainUpdateAccess() const +uno::Reference< util::XChangesBatch > const & SvtLinguConfig::GetMainUpdateAccess() const { if (!m_xMainUpdateAccess.is()) { diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index a07e472f5a53..1e2c1d7dc279 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -211,7 +211,7 @@ struct FactoryInfo }; private: - css::uno::Reference< css::util::XStringSubstitution > getStringSubstitution() + css::uno::Reference< css::util::XStringSubstitution > const & getStringSubstitution() { if ( !xSubstVars.is() ) { diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx index 6dbd1388ba52..1a31ba56755e 100644 --- a/unotools/source/i18n/localedatawrapper.cxx +++ b/unotools/source/i18n/localedatawrapper.cxx @@ -498,7 +498,7 @@ void LocaleDataWrapper::getDefaultCalendarImpl() } } -const std::shared_ptr< css::i18n::Calendar2 > LocaleDataWrapper::getDefaultCalendar() const +const std::shared_ptr< css::i18n::Calendar2 >& LocaleDataWrapper::getDefaultCalendar() const { ::utl::ReadWriteGuard aGuard( aMutex ); if (!xDefaultCalendar) diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index b2d52fd84a3c..2c6249b0f28d 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -109,7 +109,7 @@ getIntrospectionAccess( const uno::Any& aObject ) throw (uno::RuntimeException) return xIntrospection->inspect( aObject ); } -uno::Reference< script::XTypeConverter > +uno::Reference< script::XTypeConverter > const & getTypeConverter( const uno::Reference< uno::XComponentContext >& xContext ) throw (uno::RuntimeException) { static uno::Reference< script::XTypeConverter > xTypeConv( script::Converter::create(xContext) ); diff --git a/vbahelper/source/vbahelper/vbashaperange.cxx b/vbahelper/source/vbahelper/vbashaperange.cxx index 39fa9cbc286a..11aab8c2768d 100644 --- a/vbahelper/source/vbahelper/vbashaperange.cxx +++ b/vbahelper/source/vbahelper/vbashaperange.cxx @@ -71,7 +71,7 @@ ScVbaShapeRange::Group() throw (uno::RuntimeException, std::exception) return uno::Reference< msforms::XShape >( new ScVbaShape( getParent(), mxContext, xShape, getShapes(), m_xModel, office::MsoShapeType::msoGroup ) ); } -uno::Reference< drawing::XShapes > +uno::Reference< drawing::XShapes > const & ScVbaShapeRange::getShapes() throw (uno::RuntimeException) { if ( !m_xShapes.is() ) diff --git a/vcl/inc/impfontcharmap.hxx b/vcl/inc/impfontcharmap.hxx index 80c05b9ae799..82f65a86360f 100644 --- a/vcl/inc/impfontcharmap.hxx +++ b/vcl/inc/impfontcharmap.hxx @@ -41,7 +41,7 @@ private: ImplFontCharMap( const ImplFontCharMap& ) = delete; void operator=( const ImplFontCharMap& ) = delete; - static ImplFontCharMapPtr getDefaultMap( bool bSymbols=false); + static ImplFontCharMapPtr const & getDefaultMap( bool bSymbols=false); bool isDefaultMap() const; private: diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index cf1dea21243b..71af53dfd7d7 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -212,7 +212,7 @@ namespace vcl bool mbShowLayoutPage; - Size getJobPageSize(); + Size const & getJobPageSize(); void updateNup(); void updateNupFromPages(); void preparePreview( bool i_bPrintChanged = true, bool i_bMayUseCache = false ); diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx index 3b8d315e5a5c..0a8cfbe14f31 100644 --- a/vcl/inc/unx/freetype_glyphcache.hxx +++ b/vcl/inc/unx/freetype_glyphcache.hxx @@ -82,7 +82,7 @@ public: void CacheGlyphIndex( sal_UCS4 cChar, int nGI ) const; bool GetFontCodeRanges( CmapResult& ) const; - const FontCharMapPtr GetFontCharMap(); + const FontCharMapPtr& GetFontCharMap(); private: FT_FaceRec_* maFaceFT; diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index e29d221129a8..02550fe0f3ce 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -242,7 +242,7 @@ public: void RemoveTimer (SalTimer *pTimer); - std::shared_ptr<vcl::unx::GtkPrintWrapper> getPrintWrapper() const; + std::shared_ptr<vcl::unx::GtkPrintWrapper> const & getPrintWrapper() const; private: std::vector<GtkSalTimer *> m_aTimers; diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 2152c28ceca0..0f64127df81b 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -785,7 +785,7 @@ uno::Reference < i18n::XBreakIterator > Edit::ImplGetBreakIterator() const return i18n::BreakIterator::create(xContext); } -uno::Reference < i18n::XExtendedInputSequenceChecker > Edit::ImplGetInputSequenceChecker() +uno::Reference < i18n::XExtendedInputSequenceChecker > const & Edit::ImplGetInputSequenceChecker() { if ( !mxISC.is() ) { diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx index 60760748d3ea..eb32e17bc0e6 100644 --- a/vcl/source/control/field2.cxx +++ b/vcl/source/control/field2.cxx @@ -57,7 +57,7 @@ using namespace ::comphelper; #define EDITMASK_ALLCHAR 'x' #define EDITMASK_UPPERALLCHAR 'X' -uno::Reference< i18n::XCharacterClassification > ImplGetCharClass() +uno::Reference< i18n::XCharacterClassification > const & ImplGetCharClass() { static uno::Reference< i18n::XCharacterClassification > xCharClass; if ( !xCharClass.is() ) diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx index b9283666c79d..75ddd72c9285 100644 --- a/vcl/source/control/longcurr.cxx +++ b/vcl/source/control/longcurr.cxx @@ -309,7 +309,7 @@ void LongCurrencyFormatter::SetCurrencySymbol( const OUString& rStr ) ReformatAll(); } -OUString LongCurrencyFormatter::GetCurrencySymbol() const +OUString const & LongCurrencyFormatter::GetCurrencySymbol() const { return !maCurrencySymbol.isEmpty() ? maCurrencySymbol : GetLocaleDataWrapper().getCurrSymbol(); } diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 9441dea04ef6..d165f21467f2 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1943,7 +1943,7 @@ void TabControl::SetPageText( sal_uInt16 nPageId, const OUString& rText ) } } -OUString TabControl::GetPageText( sal_uInt16 nPageId ) const +OUString const & TabControl::GetPageText( sal_uInt16 nPageId ) const { ImplTabItem* pItem = ImplGetItem( nPageId ); diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx index 8f7765410fa4..deaad286e0dc 100644 --- a/vcl/source/edit/texteng.cxx +++ b/vcl/source/edit/texteng.cxx @@ -615,7 +615,7 @@ void TextEngine::ImpRemoveParagraph( sal_uInt32 nPara ) ImpParagraphRemoved( nPara ); } -uno::Reference < i18n::XExtendedInputSequenceChecker > TextEngine::GetInputSequenceChecker() +uno::Reference < i18n::XExtendedInputSequenceChecker > const & TextEngine::GetInputSequenceChecker() { if ( !mxISC.is() ) { @@ -2793,7 +2793,7 @@ void TextEngine::SetLeftMargin( sal_uInt16 n ) mpDoc->SetLeftMargin( n ); } -uno::Reference< i18n::XBreakIterator > TextEngine::GetBreakIterator() +uno::Reference< i18n::XBreakIterator > const & TextEngine::GetBreakIterator() { if ( !mxBreakIterator.is() ) mxBreakIterator = vcl::unohelper::CreateBreakIterator(); @@ -2808,7 +2808,7 @@ void TextEngine::SetLocale( const css::lang::Locale& rLocale ) mpLocaleDataWrapper = nullptr; } -css::lang::Locale TextEngine::GetLocale() +css::lang::Locale const & TextEngine::GetLocale() { if ( maLocale.Language.isEmpty() ) { diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx index 821427db93bf..3443cdb6f45f 100644 --- a/vcl/source/font/fontcharmap.cxx +++ b/vcl/source/font/fontcharmap.cxx @@ -63,7 +63,7 @@ ImplFontCharMap::ImplFontCharMap( const CmapResult& rCR ) } } -ImplFontCharMapPtr ImplFontCharMap::getDefaultMap( bool bSymbols ) +ImplFontCharMapPtr const & ImplFontCharMap::getDefaultMap( bool bSymbols ) { const sal_UCS4* pRangeCodes = aDefaultUnicodeRanges; int nCodesCount = sizeof(aDefaultUnicodeRanges) / sizeof(*pRangeCodes); diff --git a/vcl/source/helper/commandinfoprovider.cxx b/vcl/source/helper/commandinfoprovider.cxx index 00fa0c8cc093..956b4bafe55b 100644 --- a/vcl/source/helper/commandinfoprovider.cxx +++ b/vcl/source/helper/commandinfoprovider.cxx @@ -323,7 +323,7 @@ void CommandInfoProvider::SetFrame (const Reference<frame::XFrame>& rxFrame) } } -Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceleratorConfiguration() +Reference<ui::XAcceleratorConfiguration> const & CommandInfoProvider::GetDocumentAcceleratorConfiguration() { if ( ! mxCachedDocumentAcceleratorConfiguration.is()) { @@ -354,7 +354,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetDocumentAcceler return mxCachedDocumentAcceleratorConfiguration; } -Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAcceleratorConfiguration() +Reference<ui::XAcceleratorConfiguration> const & CommandInfoProvider::GetModuleAcceleratorConfiguration() { if ( ! mxCachedModuleAcceleratorConfiguration.is()) { @@ -375,7 +375,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetModuleAccelerat return mxCachedModuleAcceleratorConfiguration; } -Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAcceleratorConfiguration() +Reference<ui::XAcceleratorConfiguration> const & CommandInfoProvider::GetGlobalAcceleratorConfiguration() { // Get the global accelerator configuration. if ( ! mxCachedGlobalAcceleratorConfiguration.is()) @@ -386,7 +386,7 @@ Reference<ui::XAcceleratorConfiguration> CommandInfoProvider::GetGlobalAccelerat return mxCachedGlobalAcceleratorConfiguration; } -OUString CommandInfoProvider::GetModuleIdentifier() +OUString const & CommandInfoProvider::GetModuleIdentifier() { if (msCachedModuleIdentifier.getLength() == 0) { diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index f93aaaaa2af5..dd776a5b68dc 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -2271,14 +2271,14 @@ short MessageDialog::Execute() return Dialog::Execute(); } -OUString MessageDialog::get_primary_text() const +OUString const & MessageDialog::get_primary_text() const { const_cast<MessageDialog*>(this)->setDeferredProperties(); return m_sPrimaryString; } -OUString MessageDialog::get_secondary_text() const +OUString const & MessageDialog::get_secondary_text() const { const_cast<MessageDialog*>(this)->setDeferredProperties(); diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx index 530e5ff626fa..fe57879d6444 100644 --- a/vcl/source/window/mnemonic.cxx +++ b/vcl/source/window/mnemonic.cxx @@ -296,7 +296,7 @@ OUString MnemonicGenerator::CreateMnemonic( const OUString& _rKey ) return rKey; } -uno::Reference< i18n::XCharacterClassification > MnemonicGenerator::GetCharClass() +uno::Reference< i18n::XCharacterClassification > const & MnemonicGenerator::GetCharClass() { if ( !mxCharClass.is() ) mxCharClass = vcl::unohelper::CreateCharacterClassification(); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index f8d51a006293..258df1778a59 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1356,7 +1356,7 @@ void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache ) } } -Size PrintDialog::getJobPageSize() +Size const & PrintDialog::getJobPageSize() { if( maFirstPageSize.Width() == 0 && maFirstPageSize.Height() == 0) { diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx index 8b7c2ed722b4..2f83b96e5f0c 100644 --- a/vcl/unx/generic/fontmanager/helper.cxx +++ b/vcl/unx/generic/fontmanager/helper.cxx @@ -37,7 +37,7 @@ using ::rtl::Bootstrap; namespace psp { -OUString getOfficePath( whichOfficePath ePath ) +OUString const & getOfficePath( whichOfficePath ePath ) { static OUString aInstallationRootPath; static OUString aUserPath; @@ -185,7 +185,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub } } -OUString psp::getFontPath() +OUString const & psp::getFontPath() { static OUString aPath; diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 7023a5f1b9ea..2f26cceb13ea 100644 --- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -977,7 +977,7 @@ const FontCharMapPtr ServerFont::GetFontCharMap() const return xFCMap; } -const FontCharMapPtr FreetypeFontInfo::GetFontCharMap() +const FontCharMapPtr& FreetypeFontInfo::GetFontCharMap() { // check if the charmap is already cached if( mxFontCharMap ) diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx index 1b6529040798..e7f7773ac0a6 100644 --- a/vcl/unx/gtk/a11y/atkhypertext.cxx +++ b/vcl/unx/gtk/a11y/atkhypertext.cxx @@ -29,7 +29,7 @@ typedef struct { uno::Reference< accessibility::XAccessibleHyperlink > xLink; } HyperLink; -static uno::Reference< accessibility::XAccessibleHyperlink > +static uno::Reference< accessibility::XAccessibleHyperlink > const & getHyperlink( AtkHyperlink *pHyperlink ) { HyperLink *pLink = reinterpret_cast<HyperLink *>(pHyperlink); diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index 22cdca8f1938..c131721a00c6 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -469,7 +469,7 @@ GenPspGraphics *GtkInstance::CreatePrintGraphics() return new GenPspGraphics(); } -std::shared_ptr<vcl::unx::GtkPrintWrapper> +std::shared_ptr<vcl::unx::GtkPrintWrapper> const & GtkInstance::getPrintWrapper() const { if (!m_xPrintWrapper) diff --git a/writerfilter/inc/ooxml/QNameToString.hxx b/writerfilter/inc/ooxml/QNameToString.hxx index a525eb881d60..603204a1dbed 100644 --- a/writerfilter/inc/ooxml/QNameToString.hxx +++ b/writerfilter/inc/ooxml/QNameToString.hxx @@ -47,7 +47,7 @@ protected: QNameToString(); public: - static Pointer_t Instance(); + static Pointer_t const & Instance(); std::string operator()(Id qName); }; diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 018f39984298..b5dff72ac83b 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -274,7 +274,7 @@ DomainMapper_Impl::~DomainMapper_Impl() } } -uno::Reference< container::XNameContainer > DomainMapper_Impl::GetPageStyles() +uno::Reference< container::XNameContainer > const & DomainMapper_Impl::GetPageStyles() { if(!m_xPageStyles.is()) { @@ -286,7 +286,7 @@ uno::Reference< container::XNameContainer > DomainMapper_Impl::GetPageStyles( } -uno::Reference< text::XText > DomainMapper_Impl::GetBodyText() +uno::Reference< text::XText > const & DomainMapper_Impl::GetBodyText() { if(!m_xBodyText.is()) { @@ -299,7 +299,7 @@ uno::Reference< text::XText > DomainMapper_Impl::GetBodyText() } -uno::Reference< beans::XPropertySet > DomainMapper_Impl::GetDocumentSettings() +uno::Reference< beans::XPropertySet > const & DomainMapper_Impl::GetDocumentSettings() { if( !m_xDocumentSettings.is() && m_xTextFactory.is()) { @@ -662,7 +662,7 @@ uno::Any DomainMapper_Impl::GetPropertyFromStyleSheet(PropertyIds eId) } -ListsManager::Pointer DomainMapper_Impl::GetListTable() +ListsManager::Pointer const & DomainMapper_Impl::GetListTable() { if(!m_pListTable) m_pListTable.reset( @@ -4678,7 +4678,7 @@ void DomainMapper_Impl::AddAnnotationPosition( m_aAnnotationPositions[ nAnnotationId ] = aAnnotationPosition; } -GraphicImportPtr DomainMapper_Impl::GetGraphicImport(GraphicImportType eGraphicImportType) +GraphicImportPtr const & DomainMapper_Impl::GetGraphicImport(GraphicImportType eGraphicImportType) { if(!m_pGraphicImport) m_pGraphicImport.reset( new GraphicImport( m_xComponentContext, m_xTextFactory, m_rDMapper, eGraphicImportType, m_aPositionOffsets, m_aAligns, m_aPositivePercentages ) ); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index c0e13701c559..ec66b2015b97 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -457,7 +457,7 @@ private: void GetCurrentLocale(css::lang::Locale& rLocale); void SetNumberFormat(const OUString& rCommand, css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, bool bDetectFormat = false); css::uno::Reference<css::beans::XPropertySet> FindOrCreateFieldMaster(const sal_Char* pFieldMasterService, const OUString& rFieldMasterName) throw(css::uno::Exception); - css::uno::Reference<css::beans::XPropertySet> GetDocumentSettings(); + css::uno::Reference<css::beans::XPropertySet> const & GetDocumentSettings(); std::map<sal_Int32, css::uno::Any> deferredCharacterProperties; SmartTagHandler m_aSmartTagHandler; @@ -480,8 +480,8 @@ public: return dynamic_cast< SectionPropertyMap* >( m_pLastSectionContext.get( ) ); } - css::uno::Reference<css::container::XNameContainer> GetPageStyles(); - css::uno::Reference<css::text::XText> GetBodyText(); + css::uno::Reference<css::container::XNameContainer> const & GetPageStyles(); + css::uno::Reference<css::text::XText> const & GetBodyText(); const css::uno::Reference<css::lang::XMultiServiceFactory>& GetTextFactory() const { return m_xTextFactory; @@ -569,34 +569,34 @@ public: css::uno::Reference<css::text::XTextAppend> GetTopTextAppend(); FieldContextPtr GetTopFieldContext(); - FontTablePtr GetFontTable() + FontTablePtr const & GetFontTable() { if(!m_pFontTable) m_pFontTable.reset(new FontTable()); return m_pFontTable; } - StyleSheetTablePtr GetStyleSheetTable() + StyleSheetTablePtr const & GetStyleSheetTable() { if(!m_pStyleSheetTable) m_pStyleSheetTable.reset(new StyleSheetTable( m_rDMapper, m_xTextDocument, m_bIsNewDoc )); return m_pStyleSheetTable; } - ListsManager::Pointer GetListTable(); - ThemeTablePtr GetThemeTable() + ListsManager::Pointer const & GetListTable(); + ThemeTablePtr const & GetThemeTable() { if(!m_pThemeTable) m_pThemeTable.reset( new ThemeTable ); return m_pThemeTable; } - SettingsTablePtr GetSettingsTable() + SettingsTablePtr const & GetSettingsTable() { if( !m_pSettingsTable ) m_pSettingsTable.reset( new SettingsTable ); return m_pSettingsTable; } - GraphicImportPtr GetGraphicImport( GraphicImportType eGraphicImportType ); + GraphicImportPtr const & GetGraphicImport( GraphicImportType eGraphicImportType ); void ResetGraphicImport(); // this method deletes the current m_pGraphicImport after import void ImportGraphic(const writerfilter::Reference< Properties>::Pointer_t&, GraphicImportType eGraphicImportType ); diff --git a/writerfilter/source/dmapper/FormControlHelper.cxx b/writerfilter/source/dmapper/FormControlHelper.cxx index 9eabcea5ed0c..38899b0175aa 100644 --- a/writerfilter/source/dmapper/FormControlHelper.cxx +++ b/writerfilter/source/dmapper/FormControlHelper.cxx @@ -53,13 +53,13 @@ struct FormControlHelper::FormControlHelper_Impl uno::Reference<lang::XMultiServiceFactory> rServiceFactory; uno::Reference<text::XTextDocument> rTextDocument; - uno::Reference<drawing::XDrawPage> getDrawPage(); - uno::Reference<lang::XMultiServiceFactory> getServiceFactory(); - uno::Reference<form::XForm> getForm(); + uno::Reference<drawing::XDrawPage> const & getDrawPage(); + uno::Reference<lang::XMultiServiceFactory> const & getServiceFactory(); + uno::Reference<form::XForm> const & getForm(); uno::Reference<container::XIndexContainer> getFormComps(); }; -uno::Reference<drawing::XDrawPage> FormControlHelper::FormControlHelper_Impl::getDrawPage() +uno::Reference<drawing::XDrawPage> const & FormControlHelper::FormControlHelper_Impl::getDrawPage() { if (! rDrawPage.is()) { @@ -72,7 +72,7 @@ uno::Reference<drawing::XDrawPage> FormControlHelper::FormControlHelper_Impl::ge return rDrawPage; } -uno::Reference<lang::XMultiServiceFactory> FormControlHelper::FormControlHelper_Impl::getServiceFactory() +uno::Reference<lang::XMultiServiceFactory> const & FormControlHelper::FormControlHelper_Impl::getServiceFactory() { if (! rServiceFactory.is()) rServiceFactory.set(rTextDocument, uno::UNO_QUERY); @@ -80,7 +80,7 @@ uno::Reference<lang::XMultiServiceFactory> FormControlHelper::FormControlHelper_ return rServiceFactory; } -uno::Reference<form::XForm> FormControlHelper::FormControlHelper_Impl::getForm() +uno::Reference<form::XForm> const & FormControlHelper::FormControlHelper_Impl::getForm() { if (! rForm.is()) { diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx index 0592d56ce506..c526c6de3b17 100644 --- a/writerfilter/source/dmapper/GraphicImport.cxx +++ b/writerfilter/source/dmapper/GraphicImport.cxx @@ -404,7 +404,7 @@ public: } /// Getter for m_aInteropGrabBag, but also merges in the values from other members if they are set. - comphelper::SequenceAsHashMap getInteropGrabBag() + comphelper::SequenceAsHashMap const & getInteropGrabBag() { comphelper::SequenceAsHashMap aEffectExtent; if (m_oEffectExtentLeft) diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx index 715b8a2fa122..89287f140412 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx @@ -117,7 +117,7 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception) #endif } -rtl::Reference< OOXMLFastContextHandler > +rtl::Reference< OOXMLFastContextHandler > const & OOXMLFastDocumentHandler::getContextHandler() const { if (!mxContextHandler.is()) diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx index c104db71df63..5cfdc3679724 100644 --- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx +++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx @@ -95,7 +95,7 @@ private: OOXMLDocumentImpl* mpDocument; sal_Int32 mnXNoteId; mutable rtl::Reference<OOXMLFastContextHandler> mxContextHandler; - rtl::Reference<OOXMLFastContextHandler> getContextHandler() const; + rtl::Reference<OOXMLFastContextHandler> const & getContextHandler() const; }; }} diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.cxx b/writerfilter/source/ooxml/OOXMLPropertySet.cxx index 5c0c3ccfeb08..535421da31e0 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySet.cxx +++ b/writerfilter/source/ooxml/OOXMLPropertySet.cxx @@ -221,7 +221,7 @@ static bool GetBooleanValue(const char *pValue) || !strcmp(pValue, "On"); } -OOXMLValue::Pointer_t OOXMLBooleanValue::Create(bool bValue) +OOXMLValue::Pointer_t const & OOXMLBooleanValue::Create(bool bValue) { static OOXMLValue::Pointer_t False(new OOXMLBooleanValue (false)); static OOXMLValue::Pointer_t True(new OOXMLBooleanValue (true)); diff --git a/writerfilter/source/ooxml/OOXMLPropertySet.hxx b/writerfilter/source/ooxml/OOXMLPropertySet.hxx index 812ca9cee38f..f37d22966e2b 100644 --- a/writerfilter/source/ooxml/OOXMLPropertySet.hxx +++ b/writerfilter/source/ooxml/OOXMLPropertySet.hxx @@ -93,7 +93,7 @@ protected: bool mbValue; explicit OOXMLBooleanValue(bool bValue); public: - static OOXMLValue::Pointer_t Create (bool bValue); + static OOXMLValue::Pointer_t const & Create (bool bValue); static OOXMLValue::Pointer_t Create (const char *pValue); virtual ~OOXMLBooleanValue(); diff --git a/writerfilter/source/ooxml/qnametostrcore.cxx b/writerfilter/source/ooxml/qnametostrcore.cxx index 2cf13703d99a..c4509b9a76f7 100644 --- a/writerfilter/source/ooxml/qnametostrcore.cxx +++ b/writerfilter/source/ooxml/qnametostrcore.cxx @@ -24,7 +24,7 @@ namespace writerfilter QNameToString::Pointer_t QNameToString::pInstance; -QNameToString::Pointer_t QNameToString::Instance() +QNameToString::Pointer_t const & QNameToString::Instance() { if (pInstance.get() == nullptr) pInstance = QNameToString::Pointer_t(new QNameToString()); diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index fd0bd791ca66..d52c696e0f23 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -143,7 +143,7 @@ struct OLEStorageImpl void initialize(SvStream *pStream); tools::SvRef<SotStorageStream> getStream(const rtl::OUString &rPath); - tools::SvRef<SotStorageStream> getStream(std::size_t nId); + tools::SvRef<SotStorageStream> const & getStream(std::size_t nId); private: void traverse(const tools::SvRef<SotStorage> &rStorage, const rtl::OUString &rPath); @@ -202,7 +202,7 @@ tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const rtl::OUString &rP return maStreams[aIt->second].stream.ref; } -tools::SvRef<SotStorageStream> OLEStorageImpl::getStream(const std::size_t nId) +tools::SvRef<SotStorageStream> const & OLEStorageImpl::getStream(const std::size_t nId) { if (!maStreams[nId].stream.ref.Is()) maStreams[nId].stream.ref = createStream(rtl::OStringToOUString(maStreams[nId].name, RTL_TEXTENCODING_UTF8)); diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 471ffc6a5008..7792e65e4dcb 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -127,7 +127,7 @@ OString URLParameter::getByName( const char* par ) } -OUString URLParameter::get_id() +OUString const & URLParameter::get_id() { if( m_aId == "start" ) { // module is set @@ -171,7 +171,7 @@ OUString URLParameter::get_title() } -OUString URLParameter::get_language() +OUString const & URLParameter::get_language() { if( m_aLanguage.isEmpty() ) return m_aDefaultLanguage; @@ -180,7 +180,7 @@ OUString URLParameter::get_language() } -OUString URLParameter::get_program() +OUString const & URLParameter::get_program() { if( m_aProgram.isEmpty() ) { diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx index 3d48807b0fc7..294a47396641 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.hxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.hxx @@ -121,7 +121,7 @@ namespace chelp { bool isRoot() const { return m_aModule.isEmpty(); } bool isErrorDocument(); - OUString get_id(); + OUString const & get_id(); OUString get_tag(); @@ -139,7 +139,7 @@ namespace chelp { const OUString& get_module() const { return m_aModule; } - OUString get_dbpar() const + OUString const & get_dbpar() const { if( !m_aDbPar.isEmpty() ) return m_aDbPar; @@ -149,9 +149,9 @@ namespace chelp { const OUString& get_prefix() const { return m_aPrefix; } - OUString get_language(); + OUString const & get_language(); - OUString get_program(); + OUString const & get_program(); const OUString& get_query() const { return m_aQuery; } diff --git a/xmlhelp/source/treeview/tvread.cxx b/xmlhelp/source/treeview/tvread.cxx index c93e5b90b94a..b3b0f1569f12 100644 --- a/xmlhelp/source/treeview/tvread.cxx +++ b/xmlhelp/source/treeview/tvread.cxx @@ -126,7 +126,7 @@ namespace treeview { RTL_TEXTENCODING_UTF8 ); } - OUString getTargetURL() + OUString const & getTargetURL() { if( targetURL.isEmpty() ) { diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 04d1abe754d5..b6b2a6b8de81 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -160,7 +160,7 @@ protected: const OUString& GetServiceName() { return sServiceName; } inline void SetServiceName(const OUString& sStr) { sServiceName = sStr; } - OUString GetContent(); + OUString const & GetContent(); /// process attribute values virtual void ProcessAttribute( sal_uInt16 nAttrToken, diff --git a/xmloff/source/text/XMLRedlineExport.cxx b/xmloff/source/text/XMLRedlineExport.cxx index 8a5a062c5cfc..baf0d6de8760 100644 --- a/xmloff/source/text/XMLRedlineExport.cxx +++ b/xmloff/source/text/XMLRedlineExport.cxx @@ -421,7 +421,7 @@ void XMLRedlineExport::ExportChangedRegion( } -const OUString XMLRedlineExport::ConvertTypeName( +OUString const & XMLRedlineExport::ConvertTypeName( const OUString& sApiName) { if (sApiName == sDelete) diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx index 5ef3d2e9de24..3e43e5653a71 100644 --- a/xmloff/source/text/XMLRedlineExport.hxx +++ b/xmloff/source/text/XMLRedlineExport.hxx @@ -171,7 +171,7 @@ private: const css::uno::Sequence<css::beans::PropertyValue> & rValues); /// convert the change type from API to XML names - const OUString ConvertTypeName(const OUString& sApiName); + OUString const & ConvertTypeName(const OUString& sApiName); /// Get ID string! const OUString GetRedlineID( diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 438c9783fe90..0bc857a3db83 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -224,7 +224,7 @@ void XMLTextFieldImportContext::StartElement( XMLTextFieldImportContext::~XMLTextFieldImportContext() { } -OUString XMLTextFieldImportContext::GetContent() +OUString const & XMLTextFieldImportContext::GetContent() { if (sContent.isEmpty()) { diff --git a/xmlsecurity/source/helper/xsecctl.hxx b/xmlsecurity/source/helper/xsecctl.hxx index c496955c19b8..1b8222acd420 100644 --- a/xmlsecurity/source/helper/xsecctl.hxx +++ b/xmlsecurity/source/helper/xsecctl.hxx @@ -462,7 +462,7 @@ public: */ void collectToVerify( const OUString& referenceId ); void addSignature( sal_Int32 nSignatureId ); - css::uno::Reference< css::xml::sax::XDocumentHandler > createSignatureReader(sal_Int32 nType = 0); + css::uno::Reference< css::xml::sax::XDocumentHandler > const & createSignatureReader(sal_Int32 nType = 0); void releaseSignatureReader(); public: diff --git a/xmlsecurity/source/helper/xsecverify.cxx b/xmlsecurity/source/helper/xsecverify.cxx index f0801a09e23a..bded4f875ccb 100644 --- a/xmlsecurity/source/helper/xsecverify.cxx +++ b/xmlsecurity/source/helper/xsecverify.cxx @@ -398,7 +398,7 @@ void XSecController::addSignature( sal_Int32 nSignatureId ) m_bVerifyCurrentSignature = true; } -cssu::Reference< cssxs::XDocumentHandler > XSecController::createSignatureReader(sal_Int32 nType) +cssu::Reference< cssxs::XDocumentHandler > const & XSecController::createSignatureReader(sal_Int32 nType) { if (nType == embed::StorageFormats::OFOPXML) m_xSecParser = new OOXMLSecParser(this); |