diff options
author | Michael Stahl <mstahl@redhat.com> | 2014-07-21 21:38:42 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2014-07-22 16:32:35 +0200 |
commit | d9c4aa3838044e86013ee6c0e49afa45274faf89 (patch) | |
tree | 68ae49eeca71740be72379475dd980a3490f507b | |
parent | 2354d22b7ce12738bb929fc9c513e70ebd9f34fb (diff) |
writerfilter: pass uno::Reference by reference in RTFSdrImport
Change-Id: I3a0821caccc37beb37f4ad8ecb4b0fdb5d2d5a58
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 11 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.hxx | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index d8aa4a34482c..3fb2f09fb9d6 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -114,7 +114,7 @@ std::vector<beans::PropertyValue> RTFSdrImport::getTextFrameDefaults(bool bNew) return aRet; } -void RTFSdrImport::pushParent(uno::Reference<drawing::XShapes> xParent) +void RTFSdrImport::pushParent(uno::Reference<drawing::XShapes> const& xParent) { m_aParents.push(xParent); } @@ -124,7 +124,8 @@ void RTFSdrImport::popParent() m_aParents.pop(); } -void RTFSdrImport::resolveDhgt(uno::Reference<beans::XPropertySet> xPropertySet, sal_Int32 nZOrder, bool bOldStyle) +void RTFSdrImport::resolveDhgt(uno::Reference<beans::XPropertySet> const& xPropertySet, + sal_Int32 const nZOrder, bool const bOldStyle) { writerfilter::dmapper::DomainMapper& rMapper = dynamic_cast<writerfilter::dmapper::DomainMapper&>(m_rImport.Mapper()); @@ -133,13 +134,15 @@ void RTFSdrImport::resolveDhgt(uno::Reference<beans::XPropertySet> xPropertySet, pHelper->addItem(xPropertySet, nZOrder); } -void RTFSdrImport::resolveFLine(uno::Reference<beans::XPropertySet> xPropertySet, sal_Int32 nFLine) +void RTFSdrImport::resolveFLine(uno::Reference<beans::XPropertySet> const& xPropertySet, + sal_Int32 const nFLine) { if (nFLine == 0) xPropertySet->setPropertyValue("LineStyle", uno::makeAny(drawing::LineStyle_NONE)); } -void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> xShape, const OUString& aKey, const OUString& aValue) +void RTFSdrImport::applyProperty(uno::Reference<drawing::XShape> const& xShape, + const OUString& aKey, const OUString& aValue) { uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY); sal_Int16 nHoriOrient = 0; diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx index 5b1ddd859f48..8135adaec3ec 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.hxx +++ b/writerfilter/source/rtftok/rtfsdrimport.hxx @@ -31,8 +31,8 @@ public: void append(const OUString& aKey, const OUString& aValue); /// Append property on the current parent. void appendGroupProperty(const OUString& aKey, const OUString& aValue); - void resolveDhgt(css::uno::Reference<css::beans::XPropertySet> xPropertySet, sal_Int32 nZOrder, bool bOldStyle); - void resolveFLine(css::uno::Reference<css::beans::XPropertySet> xPropertySet, sal_Int32 nFLine); + void resolveDhgt(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nZOrder, bool bOldStyle); + void resolveFLine(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nFLine); /** * These are the default in Word, but not in Writer. * @@ -40,7 +40,7 @@ public: */ std::vector<css::beans::PropertyValue> getTextFrameDefaults(bool bNew); /// Push a new group shape to the parent stack. - void pushParent(css::uno::Reference<css::drawing::XShapes> xParent); + void pushParent(css::uno::Reference<css::drawing::XShapes> const& xParent); /// Pop the current group shape from the parent stack. void popParent(); css::uno::Reference<css::drawing::XShape> const& getCurrentShape() @@ -53,7 +53,7 @@ public: } private: void createShape(const OUString& aService, css::uno::Reference<css::drawing::XShape>& xShape, css::uno::Reference<css::beans::XPropertySet>& xPropertySet); - void applyProperty(css::uno::Reference<css::drawing::XShape> xShape, const OUString& aKey, const OUString& aValue); + void applyProperty(css::uno::Reference<css::drawing::XShape> const& xShape, const OUString& aKey, const OUString& aValue); int initShape(css::uno::Reference<css::drawing::XShape>& o_xShape, css::uno::Reference<css::beans::XPropertySet>& o_xPropSet, bool& o_rIsCustomShape, @@ -70,6 +70,6 @@ private: } // namespace rtftok } // namespace writerfilter -#endif // _RTFSDRIPORT_HXX_ +#endif // INCLUDED_WRITERFILTER_SOURCE_RTFTOK_RTFSDRIMPORT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |