forms/source/component/ListBox.cxx | 4 ++-- framework/inc/dispatch/interceptionhelper.hxx | 2 +- framework/inc/jobs/jobdata.hxx | 6 +++--- framework/inc/jobs/jobresult.hxx | 4 ++-- framework/source/fwe/classes/addonsoptions.cxx | 12 ++++++------ framework/source/jobs/job.cxx | 2 +- framework/source/jobs/jobdata.cxx | 6 +++--- framework/source/jobs/jobresult.cxx | 7 +++++-- 8 files changed, 23 insertions(+), 20 deletions(-)
New commits: commit 1e496ce2cf63daf792393bdb2b4881c77c095319 Author: Noel Grandin <[email protected]> AuthorDate: Thu Nov 7 10:00:46 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Nov 7 11:56:21 2024 +0100 loplugin:passstuffbyref in forms..framework Change-Id: Ib5a013df49d532b139acd881127cfc82c7c5a6b7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176190 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index f828a768882a..d2371e4e5a18 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -1465,12 +1465,12 @@ namespace frm public: explicit ExtractStringFromSequence_Safe( const std::vector< OUString >& _rList ) : m_rList( _rList ) { } - OUString operator ()( sal_Int16 _nIndex ) + const OUString & operator ()( sal_Int16 _nIndex ) { OSL_ENSURE( _nIndex < static_cast<sal_Int32>(m_rList.size()), "ExtractStringFromSequence_Safe: inconsistence!" ); if ( _nIndex < static_cast<sal_Int32>(m_rList.size()) ) return m_rList[ _nIndex ]; - return OUString(); + return EMPTY_OUSTRING; } }; diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index 89339b1f8455..3f162e1e8868 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -247,7 +247,7 @@ class InterceptionHelper final : public ::cppu::WeakImplHelper< */ virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent) override; - rtl::Reference<DispatchProvider> GetSlave() const { return m_xSlave; } + const rtl::Reference<DispatchProvider> & GetSlave() const { return m_xSlave; } }; // class InterceptionHelper diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index 050bce6a84a9..4b876ddb6bd5 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -174,10 +174,10 @@ class JobData final EMode getMode () const; EEnvironment getEnvironment () const; OUString getEnvironmentDescriptor() const; - OUString getService () const; - OUString getEvent () const; + const OUString & getService () const; + const OUString & getEvent () const; css::uno::Sequence< css::beans::NamedValue > getConfig () const; - std::vector< css::beans::NamedValue > getJobConfig () const; + const std::vector< css::beans::NamedValue > & getJobConfig () const; bool hasConfig () const; bool hasCorrectContext ( std::u16string_view rModuleIdent ) const; diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index a9d3f189bac8..b1a62f59797e 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -94,8 +94,8 @@ class JobResult final JobResult& operator=( const JobResult& rCopy ); bool existPart ( sal_uInt32 eParts ) const; - std::vector< css::beans::NamedValue > getArguments ( ) const; - css::frame::DispatchResultEvent getDispatchResult( ) const; + const std::vector< css::beans::NamedValue > & getArguments ( ) const; + const css::frame::DispatchResultEvent & getDispatchResult( ) const; }; } // namespace framework diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index f3b038e99660..86210d87e046 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -224,8 +224,8 @@ class AddonsOptions_Impl : public ConfigItem const Sequence< Sequence< PropertyValue > >& GetAddonsMenuBarPart () const { return m_aCachedMenuBarPartProperties;} const Sequence< Sequence< PropertyValue > >& GetAddonsToolBarPart ( sal_uInt32 nIndex ) const; const Sequence< Sequence< PropertyValue > >& GetAddonsNotebookBarPart ( sal_uInt32 nIndex ) const; - OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; - OUString GetAddonsNotebookBarResourceName( sal_uInt32 nIndex ) const; + const OUString & GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const; + const OUString & GetAddonsNotebookBarResourceName( sal_uInt32 nIndex ) const; const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const { return m_aCachedHelpMenuProperties;} BitmapEx GetImageFromURL( const OUString& aURL, bool bBig, bool bNoScale ); const MergeMenuInstructionContainer& GetMergeMenuInstructions() const { return m_aCachedMergeMenuInsContainer;} @@ -531,22 +531,22 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsNotebo // public method -OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const +const OUString & AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const { if ( nIndex < m_aCachedToolBarPartResourceNames.size() ) return m_aCachedToolBarPartResourceNames[nIndex]; else - return OUString(); + return EMPTY_OUSTRING; } // public method -OUString AddonsOptions_Impl::GetAddonsNotebookBarResourceName( sal_uInt32 nIndex ) const +const OUString & AddonsOptions_Impl::GetAddonsNotebookBarResourceName( sal_uInt32 nIndex ) const { if ( nIndex < m_aCachedNotebookBarPartResourceNames.size() ) return m_aCachedNotebookBarPartResourceNames[nIndex]; else - return OUString(); + return EMPTY_OUSTRING; } // public method diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 9cb4f6237119..26f5fe6b8df8 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -462,7 +462,7 @@ void Job::impl_reactForJobResult( /*IN*/ const css::uno::Any& aResult ) (aAnalyzedResult.existPart(JobResult::E_ARGUMENTS)) ) { - m_aJobCfg.setJobConfig(aAnalyzedResult.getArguments()); + m_aJobCfg.setJobConfig(std::vector{aAnalyzedResult.getArguments()}); } // disable a job for further executions. diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index 7ef42137635d..3359738c2cfa 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -310,17 +310,17 @@ OUString JobData::getEnvironmentDescriptor() const return sDescriptor; } -OUString JobData::getService() const +const OUString & JobData::getService() const { return m_sService; } -OUString JobData::getEvent() const +const OUString & JobData::getEvent() const { return m_sEvent; } -std::vector< css::beans::NamedValue > JobData::getJobConfig() const +const std::vector< css::beans::NamedValue > & JobData::getJobConfig() const { return m_lArguments; } diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 183543606b59..de8712f116a1 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -170,9 +170,12 @@ bool JobResult::existPart(sal_uInt32 eParts) const { return ((m_eParts & eParts) @return It returns the state of the internal member without any checks! */ -std::vector<css::beans::NamedValue> JobResult::getArguments() const { return m_lArguments; } +const std::vector<css::beans::NamedValue>& JobResult::getArguments() const { return m_lArguments; } -css::frame::DispatchResultEvent JobResult::getDispatchResult() const { return m_aDispatchResult; } +const css::frame::DispatchResultEvent& JobResult::getDispatchResult() const +{ + return m_aDispatchResult; +} } // namespace framework
