summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-07-18 09:22:27 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-07-27 06:48:25 +0000
commit508c95f1b655d9cfa6be37a5a9de9aff6fd383bf (patch)
treed1c8626818cbf26a699875ae2d82f751a1657e92 /writerfilter
parent9f4af777a832d8a0b9a21d793d421fa6228131e0 (diff)
improve passstuffbyref return analysis
Change-Id: I4258bcc97273d8bb7a8c4879fac02a427f76e18c Reviewed-on: https://gerrit.libreoffice.org/27317 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/inc/ooxml/QNameToString.hxx2
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.cxx10
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx18
-rw-r--r--writerfilter/source/dmapper/FormControlHelper.cxx12
-rw-r--r--writerfilter/source/dmapper/GraphicImport.cxx2
-rw-r--r--writerfilter/source/ooxml/OOXMLFastDocumentHandler.cxx2
-rw-r--r--writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx2
-rw-r--r--writerfilter/source/ooxml/OOXMLPropertySet.cxx2
-rw-r--r--writerfilter/source/ooxml/OOXMLPropertySet.hxx2
-rw-r--r--writerfilter/source/ooxml/qnametostrcore.cxx2
10 files changed, 27 insertions, 27 deletions
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());