summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-04-13 15:40:11 +0200
committerNoel Grandin <noel@peralex.com>2016-04-14 09:21:41 +0200
commit29a4b74caca601d10c15d58aa5df5166ec3e517c (patch)
treea1de2f734fa47a4d0560c01f6273f679240405e5
parentf6ea0b2eb44073baf1445dc8e62fc8a245e5d378 (diff)
loplugin:passstuffbyref in writerfilter
Change-Id: Ia85f5a7a9846802de7a1495e70d16c9e3418dc3e
-rw-r--r--writerfilter/source/dmapper/DomainMapper_Impl.hxx26
-rw-r--r--writerfilter/source/dmapper/GraphicImport.hxx2
-rw-r--r--writerfilter/source/dmapper/LatentStyleHandler.cxx2
-rw-r--r--writerfilter/source/dmapper/LatentStyleHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/NumberingManager.hxx14
-rw-r--r--writerfilter/source/dmapper/OLEHandler.hxx6
-rw-r--r--writerfilter/source/dmapper/PropertyMap.hxx6
-rw-r--r--writerfilter/source/dmapper/TableData.hxx6
-rw-r--r--writerfilter/source/dmapper/TableManager.hxx6
-rw-r--r--writerfilter/source/dmapper/TablePositionHandler.hxx8
-rw-r--r--writerfilter/source/dmapper/TblStylePrHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/TextEffectsHandler.hxx2
-rw-r--r--writerfilter/source/dmapper/WrapPolygonHandler.hxx2
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.hxx6
-rw-r--r--writerfilter/source/ooxml/OOXMLStreamImpl.hxx2
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.hxx2
16 files changed, 47 insertions, 47 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 08757c1ce4bb..82d1ce620219 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -159,7 +159,7 @@ public:
FieldContext(css::uno::Reference<css::text::XTextRange> const& xStart);
~FieldContext();
- css::uno::Reference<css::text::XTextRange> GetStartRange() const { return m_xStartRange; }
+ const css::uno::Reference<css::text::XTextRange>& GetStartRange() const { return m_xStartRange; }
void AppendCommand(const OUString& rPart);
const OUString& GetCommand() const {return m_sCommand; }
@@ -173,28 +173,28 @@ public:
void SetFieldLocked() { m_bFieldLocked = true; }
bool IsFieldLocked() { return m_bFieldLocked; }
- css::uno::Reference<css::beans::XPropertySet> GetCustomField() const { return m_xCustomField; }
+ const css::uno::Reference<css::beans::XPropertySet>& GetCustomField() const { return m_xCustomField; }
void SetCustomField(css::uno::Reference<css::beans::XPropertySet> const& xCustomField) { m_xCustomField = xCustomField; }
- css::uno::Reference<css::text::XTextField> GetTextField() const { return m_xTextField;}
+ const css::uno::Reference<css::text::XTextField>& GetTextField() const { return m_xTextField;}
void SetTextField(css::uno::Reference<css::text::XTextField> const& xTextField) { m_xTextField = xTextField;}
- css::uno::Reference<css::text::XFormField> GetFormField() const { return m_xFormField;}
+ const css::uno::Reference<css::text::XFormField>& GetFormField() const { return m_xFormField;}
void SetFormField(css::uno::Reference<css::text::XFormField> const& xFormField) { m_xFormField = xFormField;}
void SetTOC(css::uno::Reference<css::beans::XPropertySet> const& xTOC) { m_xTOC = xTOC; }
- css::uno::Reference<css::beans::XPropertySet> GetTOC() { return m_xTOC; }
+ const css::uno::Reference<css::beans::XPropertySet>& GetTOC() { return m_xTOC; }
void SetTC(css::uno::Reference<css::beans::XPropertySet> const& xTC) { m_xTC = xTC; }
- css::uno::Reference<css::beans::XPropertySet> GetTC() { return m_xTC; }
+ const css::uno::Reference<css::beans::XPropertySet>& GetTC() { return m_xTC; }
void SetHyperlinkURL( const OUString& rURL ) { m_sHyperlinkURL = rURL; }
const OUString& GetHyperlinkURL() { return m_sHyperlinkURL; }
void setFFDataHandler(FFDataHandler::Pointer_t pFFDataHandler) { m_pFFDataHandler = pFFDataHandler; }
- FFDataHandler::Pointer_t getFFDataHandler() const { return m_pFFDataHandler; }
+ const FFDataHandler::Pointer_t& getFFDataHandler() const { return m_pFFDataHandler; }
void setFormControlHelper(FormControlHelper::Pointer_t pFormControlHelper) { m_pFormControlHelper = pFormControlHelper; }
- FormControlHelper::Pointer_t getFormControlHelper() const { return m_pFormControlHelper; }
- PropertyMapPtr getProperties() { return m_pProperties; }
+ const FormControlHelper::Pointer_t& getFormControlHelper() const { return m_pFormControlHelper; }
+ const PropertyMapPtr& getProperties() { return m_pProperties; }
::std::vector<OUString> GetCommandParts() const;
};
@@ -483,11 +483,11 @@ public:
css::uno::Reference<css::container::XNameContainer> GetPageStyles();
css::uno::Reference<css::text::XText> GetBodyText();
- css::uno::Reference<css::lang::XMultiServiceFactory> GetTextFactory() const
+ const css::uno::Reference<css::lang::XMultiServiceFactory>& GetTextFactory() const
{
return m_xTextFactory;
}
- css::uno::Reference<css::text::XTextDocument> GetTextDocument() const
+ const css::uno::Reference<css::text::XTextDocument>& GetTextDocument() const
{
return m_xTextDocument;
}
@@ -561,7 +561,7 @@ public:
void PopProperties(ContextType eId);
ContextType GetTopContextType() const { return m_aContextStack.top(); }
- PropertyMapPtr GetTopContext()
+ const PropertyMapPtr& GetTopContext()
{
return m_pTopContext;
}
@@ -607,7 +607,7 @@ public:
css::uno::Sequence<css::style::TabStop> GetCurrentTabStopAndClear();
void SetCurrentParaStyleId(const OUString& sStringValue) {m_sCurrentParaStyleId = sStringValue;}
- OUString GetCurrentParaStyleId() const {return m_sCurrentParaStyleId;}
+ const OUString& GetCurrentParaStyleId() const {return m_sCurrentParaStyleId;}
css::uno::Any GetPropertyFromStyleSheet(PropertyIds eId);
void SetStyleSheetImport( bool bSet ) { m_bInStyleSheetImport = bSet;}
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index cdc55feafc38..deb738366a0d 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -91,7 +91,7 @@ public:
virtual void data(const sal_uInt8* buffer, size_t len, writerfilter::Reference<Properties>::Pointer_t ref) override;
css::uno::Reference<css::text::XTextContent> GetGraphicObject();
- css::uno::Reference<css::drawing::XShape> GetXShapeObject() { return m_xShape;}
+ const css::uno::Reference<css::drawing::XShape>& GetXShapeObject() { return m_xShape;}
bool IsGraphic() const;
private:
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.cxx b/writerfilter/source/dmapper/LatentStyleHandler.cxx
index 0e9eb585f31d..0b6cc64e6c16 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.cxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.cxx
@@ -68,7 +68,7 @@ void LatentStyleHandler::lcl_sprm(Sprm& /*rSprm*/)
{
}
-std::vector<beans::PropertyValue> LatentStyleHandler::getAttributes() const
+const std::vector<beans::PropertyValue>& LatentStyleHandler::getAttributes() const
{
return m_aAttributes;
}
diff --git a/writerfilter/source/dmapper/LatentStyleHandler.hxx b/writerfilter/source/dmapper/LatentStyleHandler.hxx
index 95dc2fbfd0eb..80891b124ec6 100644
--- a/writerfilter/source/dmapper/LatentStyleHandler.hxx
+++ b/writerfilter/source/dmapper/LatentStyleHandler.hxx
@@ -33,7 +33,7 @@ public:
LatentStyleHandler();
virtual ~LatentStyleHandler();
- std::vector<css::beans::PropertyValue> getAttributes() const;
+ const std::vector<css::beans::PropertyValue>& getAttributes() const;
};
} // namespace dmapper
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx b/writerfilter/source/dmapper/NumberingManager.hxx
index 8235c808949b..19d8e11a54d6 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -84,8 +84,8 @@ public:
void SetParaStyle( const std::shared_ptr< StyleSheetEntry >& pStyle );
// Getters
- OUString GetBulletChar( ) { return m_sBulletChar; };
- std::shared_ptr< StyleSheetEntry > GetParaStyle( ) { return m_pParaStyle; };
+ const OUString& GetBulletChar( ) { return m_sBulletChar; };
+ const std::shared_ptr< StyleSheetEntry >& GetParaStyle( ) { return m_pParaStyle; };
bool isOutlineNumbering() const { return m_outline; }
// UNO mapping functions
@@ -115,7 +115,7 @@ public:
void SetId(sal_Int32 nId);
sal_Int32 GetId() { return m_nId;}
void SetShape(css::uno::Reference<css::drawing::XShape> const& xShape);
- css::uno::Reference<css::drawing::XShape> GetShape() { return m_xShape; }
+ const css::uno::Reference<css::drawing::XShape>& GetShape() { return m_xShape; }
private:
sal_Int32 m_nId;
css::uno::Reference<css::drawing::XShape> m_xShape;
@@ -157,12 +157,12 @@ public:
ListLevel::Pointer GetLevel( sal_uInt16 nLvl );
void AddLevel( );
- ListLevel::Pointer GetCurrentLevel( ) { return m_pCurrentLevel; };
+ const ListLevel::Pointer& GetCurrentLevel( ) { return m_pCurrentLevel; };
virtual css::uno::Sequence< css::uno::Sequence<css::beans::PropertyValue> > GetPropertyValues();
void SetNumStyleLink(const OUString& sValue) { m_sNumStyleLink = sValue; };
- OUString GetNumStyleLink() { return m_sNumStyleLink; };
+ const OUString& GetNumStyleLink() { return m_sNumStyleLink; };
};
class ListDef : public AbstractListDef
@@ -182,7 +182,7 @@ public:
// Accessors
void SetAbstractDefinition( AbstractListDef::Pointer pAbstract ) { m_pAbstractDef = pAbstract; };
- AbstractListDef::Pointer GetAbstractDefinition( ) { return m_pAbstractDef; };
+ const AbstractListDef::Pointer& GetAbstractDefinition( ) { return m_pAbstractDef; };
// Mapping functions
static OUString GetStyleName( sal_Int32 nId );
@@ -191,7 +191,7 @@ public:
void CreateNumberingRules(DomainMapper& rDMapper, css::uno::Reference<css::lang::XMultiServiceFactory> const& xFactory);
- css::uno::Reference<css::container::XIndexReplace> GetNumberingRules() { return m_xNumRules; }
+ const css::uno::Reference<css::container::XIndexReplace>& GetNumberingRules() { return m_xNumRules; }
};
diff --git a/writerfilter/source/dmapper/OLEHandler.hxx b/writerfilter/source/dmapper/OLEHandler.hxx
index b8ffb179efe4..503c164e24f0 100644
--- a/writerfilter/source/dmapper/OLEHandler.hxx
+++ b/writerfilter/source/dmapper/OLEHandler.hxx
@@ -80,7 +80,7 @@ public:
OLEHandler(DomainMapper& rDomainMapper);
virtual ~OLEHandler();
- css::uno::Reference<css::drawing::XShape> getShape() { return m_xShape; };
+ const css::uno::Reference<css::drawing::XShape>& getShape() { return m_xShape; };
bool isOLEObject() { return m_xInputStream.is(); }
@@ -94,8 +94,8 @@ public:
OUString copyOLEOStream(css::uno::Reference<css::text::XTextDocument> const& xTextDocument);
- css::awt::Size getSize() const { return m_aShapeSize; }
- css::uno::Reference<css::graphic::XGraphic> getReplacement() const { return m_xReplacement; }
+ const css::awt::Size& getSize() const { return m_aShapeSize; }
+ const css::uno::Reference<css::graphic::XGraphic>& getReplacement() const { return m_xReplacement; }
};
typedef std::shared_ptr< OLEHandler > OLEHandlerPtr;
diff --git a/writerfilter/source/dmapper/PropertyMap.hxx b/writerfilter/source/dmapper/PropertyMap.hxx
index 1d82a1c589d5..603f4e8f9a13 100644
--- a/writerfilter/source/dmapper/PropertyMap.hxx
+++ b/writerfilter/source/dmapper/PropertyMap.hxx
@@ -287,7 +287,7 @@ public:
m_xStartingRange = xRange;
}
- css::uno::Reference<css::text::XTextRange> GetStartingRange() const { return m_xStartingRange; }
+ const css::uno::Reference<css::text::XTextRange>& GetStartingRange() const { return m_xStartingRange; }
css::uno::Reference<css::beans::XPropertySet> GetPageStyle(const css::uno::Reference<css::container::XNameContainer>& xStyles,
const css::uno::Reference<css::lang::XMultiServiceFactory>& xTextFactory,
@@ -428,10 +428,10 @@ public:
sal_Int8 GetDropCapLength() const { return m_nDropCapLength;}
void SetDropCapLength(sal_Int8 nSet) { m_nDropCapLength = nSet;}
- css::uno::Reference<css::text::XTextRange> GetStartingRange() const { return m_xStartingRange; }
+ const css::uno::Reference<css::text::XTextRange>& GetStartingRange() const { return m_xStartingRange; }
void SetStartingRange(css::uno::Reference<css::text::XTextRange> const& xSet) { m_xStartingRange = xSet; }
- css::uno::Reference<css::text::XTextRange> GetEndingRange() const { return m_xEndingRange; }
+ const css::uno::Reference<css::text::XTextRange>& GetEndingRange() const { return m_xEndingRange; }
void SetEndingRange(css::uno::Reference<css::text::XTextRange> const& xSet) { m_xEndingRange = xSet; }
void SetParaStyleName( const OUString& rSet ) { m_sParaStyleName = rSet;}
diff --git a/writerfilter/source/dmapper/TableData.hxx b/writerfilter/source/dmapper/TableData.hxx
index ff5f6aa7da11..84100cbb95f1 100644
--- a/writerfilter/source/dmapper/TableData.hxx
+++ b/writerfilter/source/dmapper/TableData.hxx
@@ -95,7 +95,7 @@ public:
/**
Return properties of the cell.
*/
- TablePropertyMapPtr getProperties() { return mpProps; }
+ const TablePropertyMapPtr& getProperties() { return mpProps; }
bool isOpen() const { return mbOpen; }
};
@@ -230,7 +230,7 @@ public:
/**
Return properties of the row.
*/
- TablePropertyMapPtr getProperties()
+ const TablePropertyMapPtr& getProperties()
{
return mpProperties;
}
@@ -362,7 +362,7 @@ public:
return mRows[i];
}
- const RowPointer_t getCurrentRow() const
+ const RowPointer_t& getCurrentRow() const
{
return mpRow;
}
diff --git a/writerfilter/source/dmapper/TableManager.hxx b/writerfilter/source/dmapper/TableManager.hxx
index e32012047566..334634d8d335 100644
--- a/writerfilter/source/dmapper/TableManager.hxx
+++ b/writerfilter/source/dmapper/TableManager.hxx
@@ -125,7 +125,7 @@ class TableManager
mpCellProps = pProps;
}
- TablePropertyMapPtr getCellProps()
+ const TablePropertyMapPtr& getCellProps()
{
return mpCellProps;
}
@@ -140,7 +140,7 @@ class TableManager
mpRowProps = pProps;
}
- TablePropertyMapPtr getRowProps()
+ const TablePropertyMapPtr& getRowProps()
{
return mpRowProps;
}
@@ -283,7 +283,7 @@ protected:
mState.resetTableProps();
}
- css::uno::Reference<css::text::XTextRange> getHandle()
+ const css::uno::Reference<css::text::XTextRange>& getHandle()
{
return mCurHandle;
}
diff --git a/writerfilter/source/dmapper/TablePositionHandler.hxx b/writerfilter/source/dmapper/TablePositionHandler.hxx
index c513221c5799..1a1daece76a3 100644
--- a/writerfilter/source/dmapper/TablePositionHandler.hxx
+++ b/writerfilter/source/dmapper/TablePositionHandler.hxx
@@ -63,19 +63,19 @@ public:
return m_nBottomFromText;
}
- OUString getVertAnchor()
+ const OUString& getVertAnchor()
{
return m_aVertAnchor;
}
- OUString getYSpec()
+ const OUString& getYSpec()
{
return m_aYSpec;
}
- OUString getHorzAnchor()
+ const OUString& getHorzAnchor()
{
return m_aHorzAnchor;
}
- OUString getXSpec()
+ const OUString& getXSpec()
{
return m_aXSpec;
}
diff --git a/writerfilter/source/dmapper/TblStylePrHandler.hxx b/writerfilter/source/dmapper/TblStylePrHandler.hxx
index e895604416ed..393242554fd9 100644
--- a/writerfilter/source/dmapper/TblStylePrHandler.hxx
+++ b/writerfilter/source/dmapper/TblStylePrHandler.hxx
@@ -68,7 +68,7 @@ public:
explicit TblStylePrHandler( DomainMapper & rDMapper );
virtual ~TblStylePrHandler( );
- inline PropertyMapPtr getProperties() { return m_pProperties; };
+ const PropertyMapPtr& getProperties() { return m_pProperties; };
inline TblStyleType getType() { return m_nType; };
OUString getTypeString();
void appendInteropGrabBag(const OUString& aKey, const OUString& aValue);
diff --git a/writerfilter/source/dmapper/TextEffectsHandler.hxx b/writerfilter/source/dmapper/TextEffectsHandler.hxx
index d3c63182c6a4..1ee928d76475 100644
--- a/writerfilter/source/dmapper/TextEffectsHandler.hxx
+++ b/writerfilter/source/dmapper/TextEffectsHandler.hxx
@@ -46,7 +46,7 @@ public:
TextEffectsHandler(sal_uInt32 aElementId);
virtual ~TextEffectsHandler();
- boost::optional<PropertyIds> getGrabBagPropertyId() { return maPropertyId;}
+ const boost::optional<PropertyIds>& getGrabBagPropertyId() { return maPropertyId;}
css::beans::PropertyValue getInteropGrabBag();
diff --git a/writerfilter/source/dmapper/WrapPolygonHandler.hxx b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
index d5122c51a442..c44cf0ced996 100644
--- a/writerfilter/source/dmapper/WrapPolygonHandler.hxx
+++ b/writerfilter/source/dmapper/WrapPolygonHandler.hxx
@@ -60,7 +60,7 @@ public:
WrapPolygonHandler();
virtual ~WrapPolygonHandler();
- WrapPolygon::Pointer_t getPolygon() { return mpPolygon;}
+ const WrapPolygon::Pointer_t& getPolygon() { return mpPolygon;}
private:
WrapPolygon::Pointer_t mpPolygon;
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 70726a76731c..d50d46e1e513 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -132,7 +132,7 @@ public:
void setDefine(Id nDefine);
Id getDefine() const { return mnDefine;}
- OOXMLParserState::Pointer_t getParserState() const { return mpParserState;}
+ const OOXMLParserState::Pointer_t& getParserState() const { return mpParserState;}
void sendTableDepth() const;
void setHandle();
@@ -220,7 +220,7 @@ protected:
void startAction(Token_t Element);
void endAction(Token_t Element);
- css::uno::Reference< css::uno::XComponentContext > getComponentContext() { return m_xContext;}
+ const css::uno::Reference< css::uno::XComponentContext >& getComponentContext() { return m_xContext;}
bool inPositionV;
@@ -245,7 +245,7 @@ public:
virtual ResourceEnum_t getResource() const override { return STREAM; }
- OOXMLPropertySet::Pointer_t getPropertySetAttrs() const { return mpPropertySetAttrs;}
+ const OOXMLPropertySet::Pointer_t& getPropertySetAttrs() const { return mpPropertySetAttrs;}
virtual void newProperty(const Id & rId, const OOXMLValue::Pointer_t& pVal) override;
void sendProperty(Id nId);
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index 70d12fc9a091..0edb52eafd2b 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -80,7 +80,7 @@ public:
virtual css::uno::Reference<css::xml::sax::XFastTokenHandler> getFastTokenHandler() override;
// Giving access to mxDocumentStream. It is needed by resolving custom xml to get list of customxml's used in document.
- css::uno::Reference<css::io::XStream> accessDocumentStream() { return mxDocumentStream;}
+ const css::uno::Reference<css::io::XStream>& accessDocumentStream() { return mxDocumentStream;}
};
}}
#endif // INCLUDED_WRITERFILTER_SOURCE_OOXML_OOXMLSTREAMIMPL_HXX
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index fe239a4341b2..f3c18ede656d 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -369,7 +369,7 @@ public:
void setAuthorInitials(OUString& rAuthorInitials);
void setIgnoreFirst(OUString& rIgnoreFirst);
void seek(sal_Size nPos);
- css::uno::Reference<css::lang::XMultiServiceFactory> getModelFactory()
+ const css::uno::Reference<css::lang::XMultiServiceFactory>& getModelFactory()
{
return m_xModelFactory;
}