diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-30 14:36:04 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-31 16:03:43 +0100 |
commit | 17ee20b161cf5825e25d120c84675d11f7282256 (patch) | |
tree | 8151eee99d8864a0cdff485a440f93e5607b09b0 /writerfilter | |
parent | d4d0b1a2b9f11fb7629559e08c345697ba129c04 (diff) |
loplugin:passstuffbyref improved return in emfio,writerfilter
Change-Id: I237936d62d0f1b17574dd88b5c9de932dc03238e
Reviewed-on: https://gerrit.libreoffice.org/47214
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper.hxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapperTableManager.hxx | 6 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 6 | ||||
-rw-r--r-- | writerfilter/source/dmapper/OLEHandler.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/OLEHandler.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SettingsTable.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/SettingsTable.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/StyleSheetTable.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TableData.hxx | 2 | ||||
-rw-r--r-- | writerfilter/source/dmapper/TableManager.hxx | 4 |
14 files changed, 24 insertions, 24 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 55ceef14df2e..a9c431a1d11b 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3764,7 +3764,7 @@ bool DomainMapper::IsRTFImport() const return m_pImpl->IsRTFImport(); } -uno::Reference < lang::XMultiServiceFactory > DomainMapper::GetTextFactory() const +uno::Reference < lang::XMultiServiceFactory > const & DomainMapper::GetTextFactory() const { return m_pImpl->GetTextFactory(); } @@ -3780,7 +3780,7 @@ OUString DomainMapper::getOrCreateCharStyle( PropertyValueVector_t& rCharPropert return pStyleSheets->getOrCreateCharStyle( rCharProperties, bAlwaysCreate ); } -StyleSheetTablePtr DomainMapper::GetStyleSheetTable( ) +StyleSheetTablePtr const & DomainMapper::GetStyleSheetTable( ) { return m_pImpl->GetStyleSheetTable( ); } diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx index b2b89f1776c1..18c61cfa9693 100644 --- a/writerfilter/source/dmapper/DomainMapper.hxx +++ b/writerfilter/source/dmapper/DomainMapper.hxx @@ -96,11 +96,11 @@ public: bool IsOOXMLImport() const; bool IsRTFImport() const; - css::uno::Reference<css::lang::XMultiServiceFactory> GetTextFactory() const; + css::uno::Reference<css::lang::XMultiServiceFactory> const & GetTextFactory() const; css::uno::Reference<css::text::XTextRange> GetCurrentTextRange(); OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties, bool bAlwaysCreate ); - std::shared_ptr< StyleSheetTable > GetStyleSheetTable( ); + std::shared_ptr< StyleSheetTable > const & GetStyleSheetTable( ); GraphicZOrderHelper* graphicZOrderHelper(); GraphicNamingHelper& GetGraphicNamingHelper(); diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx index 63aa3f505f0c..52151565c0d5 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx @@ -381,17 +381,17 @@ bool DomainMapperTableManager::sprm(Sprm & rSprm) return bRet; } -std::shared_ptr< vector<sal_Int32> > DomainMapperTableManager::getCurrentGrid( ) +std::shared_ptr< vector<sal_Int32> > const & DomainMapperTableManager::getCurrentGrid( ) { return m_aTableGrid.back( ); } -std::shared_ptr< vector< sal_Int32 > > DomainMapperTableManager::getCurrentSpans( ) +std::shared_ptr< vector< sal_Int32 > > const & DomainMapperTableManager::getCurrentSpans( ) { return m_aGridSpans.back( ); } -std::shared_ptr< vector< sal_Int32 > > DomainMapperTableManager::getCurrentCellWidths( ) +std::shared_ptr< vector< sal_Int32 > > const & DomainMapperTableManager::getCurrentCellWidths( ) { return m_aCellWidths.back( ); } diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx index 77db084634dc..4729c7c65b69 100644 --- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx +++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx @@ -94,9 +94,9 @@ public: virtual void endOfCellAction() override; virtual void endOfRowAction() override; - IntVectorPtr getCurrentGrid( ); - IntVectorPtr getCurrentSpans( ); - IntVectorPtr getCurrentCellWidths( ); + IntVectorPtr const & getCurrentGrid( ); + IntVectorPtr const & getCurrentSpans( ); + IntVectorPtr const & getCurrentCellWidths( ); /// Turn the attributes collected so far in m_aTableLook into a property and clear the container. void finishTableLook(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index b47066ffaa84..b16190b830df 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -581,13 +581,13 @@ PropertyMapPtr DomainMapper_Impl::GetTopContextOfType(ContextType eId) } -uno::Reference< text::XTextAppend > DomainMapper_Impl::GetTopTextAppend() +uno::Reference< text::XTextAppend > const & DomainMapper_Impl::GetTopTextAppend() { OSL_ENSURE(!m_aTextAppendStack.empty(), "text append stack is empty" ); return m_aTextAppendStack.top().xTextAppend; } -FieldContextPtr DomainMapper_Impl::GetTopFieldContext() +FieldContextPtr const & DomainMapper_Impl::GetTopFieldContext() { SAL_WARN_IF(m_aFieldStack.empty(), "writerfilter.dmapper", "Field stack is empty"); return m_aFieldStack.top(); diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 589a79953f13..db2ec50de9b5 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -167,7 +167,7 @@ public: const OUString& GetCommand() const {return m_sCommand; } void SetFieldId(FieldId eFieldId ) { m_eFieldId = eFieldId; } - boost::optional<FieldId> GetFieldId() const { return m_eFieldId; } + boost::optional<FieldId> const & GetFieldId() const { return m_eFieldId; } void AppendResult(OUString const& rResult) { m_sResult += rResult; } const OUString& GetResult() const { return m_sResult; } @@ -635,8 +635,8 @@ public: } PropertyMapPtr GetTopContextOfType(ContextType eId); - css::uno::Reference<css::text::XTextAppend> GetTopTextAppend(); - FieldContextPtr GetTopFieldContext(); + css::uno::Reference<css::text::XTextAppend> const & GetTopTextAppend(); + FieldContextPtr const & GetTopFieldContext(); FontTablePtr const & GetFontTable() { diff --git a/writerfilter/source/dmapper/OLEHandler.cxx b/writerfilter/source/dmapper/OLEHandler.cxx index 1b18578a4171..c4fe3337d847 100644 --- a/writerfilter/source/dmapper/OLEHandler.cxx +++ b/writerfilter/source/dmapper/OLEHandler.cxx @@ -253,7 +253,7 @@ OUString OLEHandler::getCLSID(const uno::Reference<uno::XComponentContext>& xCom return aRet; } -OUString OLEHandler::GetDrawAspect() const +OUString const & OLEHandler::GetDrawAspect() const { return m_sDrawAspect; } diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx index 6053851fb9b5..6757d3a3d2df 100644 --- a/writerfilter/source/dmapper/OLEHandler.hxx +++ b/writerfilter/source/dmapper/OLEHandler.hxx @@ -90,7 +90,7 @@ public: /// Get the CLSID of the OLE object, in case we can find one based on m_sProgId. OUString getCLSID(const css::uno::Reference<css::uno::XComponentContext>& xComponentContext) const; - OUString GetDrawAspect() const; + OUString const & GetDrawAspect() const; OUString copyOLEOStream(css::uno::Reference<css::text::XTextDocument> const& xTextDocument); diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx index b747eb37abdb..c1814ed1b65b 100644 --- a/writerfilter/source/dmapper/SettingsTable.cxx +++ b/writerfilter/source/dmapper/SettingsTable.cxx @@ -562,7 +562,7 @@ bool SettingsTable::GetProtectForm() const { return m_pImpl->m_bProtectForm; } -uno::Sequence<beans::PropertyValue> SettingsTable::GetThemeFontLangProperties() const +uno::Sequence<beans::PropertyValue> const & SettingsTable::GetThemeFontLangProperties() const { return m_pImpl->m_pThemeFontLangProps; } diff --git a/writerfilter/source/dmapper/SettingsTable.hxx b/writerfilter/source/dmapper/SettingsTable.hxx index 2a80bd186fc1..4dcfd2dcaf6a 100644 --- a/writerfilter/source/dmapper/SettingsTable.hxx +++ b/writerfilter/source/dmapper/SettingsTable.hxx @@ -75,7 +75,7 @@ class SettingsTable : public LoggedProperties, public LoggedTable bool GetNoColumnBalance() const; bool GetProtectForm() const; - css::uno::Sequence<css::beans::PropertyValue> GetThemeFontLangProperties() const; + css::uno::Sequence<css::beans::PropertyValue> const & GetThemeFontLangProperties() const; css::uno::Sequence<css::beans::PropertyValue> GetCompatSettings() const; diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx index 55996991a84a..d09ecfffb5e5 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.cxx +++ b/writerfilter/source/dmapper/StyleSheetTable.cxx @@ -395,7 +395,7 @@ StyleSheetTable::~StyleSheetTable() { } -PropertyMapPtr StyleSheetTable::GetDefaultCharProps() +PropertyMapPtr const & StyleSheetTable::GetDefaultCharProps() { return m_pImpl->m_pDefaultCharProps; } diff --git a/writerfilter/source/dmapper/StyleSheetTable.hxx b/writerfilter/source/dmapper/StyleSheetTable.hxx index b9131c02b53c..40b65fb95694 100644 --- a/writerfilter/source/dmapper/StyleSheetTable.hxx +++ b/writerfilter/source/dmapper/StyleSheetTable.hxx @@ -103,7 +103,7 @@ public: OUString getOrCreateCharStyle( PropertyValueVector_t& rCharProperties, bool bAlwaysCreate ); /// Returns the default character properties. - PropertyMapPtr GetDefaultCharProps(); + PropertyMapPtr const & GetDefaultCharProps(); private: // Properties diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx index cd17c007b3e3..de30d2247a63 100644 --- a/writerfilter/source/dmapper/TableData.hxx +++ b/writerfilter/source/dmapper/TableData.hxx @@ -218,7 +218,7 @@ public: @param i index of the cell */ - TablePropertyMapPtr getCellProperties(unsigned int i) const + TablePropertyMapPtr const & getCellProperties(unsigned int i) const { return mCells[i]->getProperties(); } diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx index e3ca33121179..cd5c9f981dfc 100644 --- a/writerfilter/source/dmapper/TableManager.hxx +++ b/writerfilter/source/dmapper/TableManager.hxx @@ -196,13 +196,13 @@ class TableManager TableManagerState mState; protected: - TablePropertyMapPtr getCellProps() + TablePropertyMapPtr const & getCellProps() { return mState.getCellProps(); } public: - TablePropertyMapPtr getRowProps() + TablePropertyMapPtr const & getRowProps() { return mState.getRowProps(); } |