loplugin:constparams in writerfilter

Change-Id: Ic0455f0a61825ec649ecbb78244f78a20df2787a
Reviewed-on: https://gerrit.libreoffice.org/40595
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

24 files changed, 47 insertions, 48 deletions

diff --git a/writerfilter/inc/dmapper/DomainMapperFactory.hxx b/writerfilter/inc/dmapper/DomainMapperFactory.hxx
index 01c347edf903..331d871128ad 100644
--- a/writerfilter/inc/dmapper/DomainMapperFactory.hxx
+++ b/writerfilter/inc/dmapper/DomainMapperFactory.hxx
@@ -42,7 +42,7 @@ public:
                  css::uno::Reference<css::lang::XComponent> const& xModel,
                  bool bRepairStorage,
                  SourceDocumentType eDocumentType,
-                 utl::MediaDescriptor& rMediaDesc);
+                 utl::MediaDescriptor const & rMediaDesc);
 };
 
 // export just for test
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 7560a8ff9ef5..6af143a4706b 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -288,7 +288,7 @@ void lcl_SwapQuotesInField(OUString &rFmt)
     }
     rFmt = aBuffer.makeStringAndClear();
 }
-bool lcl_IsNotAM(OUString& rFmt, sal_Int32 nPos)
+bool lcl_IsNotAM(OUString const & rFmt, sal_Int32 nPos)
 {
     return (
             (nPos == rFmt.getLength() - 1) ||
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 6a79f2318055..05a3e0ed16bf 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -96,7 +96,7 @@ DomainMapper::DomainMapper( const uno::Reference< uno::XComponentContext >& xCon
                             uno::Reference<lang::XComponent> const& xModel,
                             bool bRepairStorage,
                             SourceDocumentType eDocumentType,
-                            utl::MediaDescriptor& rMediaDesc) :
+                            utl::MediaDescriptor const & rMediaDesc) :
     LoggedProperties("DomainMapper"),
     LoggedTable("DomainMapper"),
     LoggedStream("DomainMapper"),
diff --git a/writerfilter/source/dmapper/DomainMapper.hxx b/writerfilter/source/dmapper/DomainMapper.hxx
index f509efef8870..b2b89f1776c1 100644
--- a/writerfilter/source/dmapper/DomainMapper.hxx
+++ b/writerfilter/source/dmapper/DomainMapper.hxx
@@ -75,7 +75,7 @@ public:
                  css::uno::Reference<css::lang::XComponent> const& xModel,
                  bool bRepairStorage,
                  SourceDocumentType eDocumentType,
-                 utl::MediaDescriptor& rMediaDesc);
+                 utl::MediaDescriptor const & rMediaDesc);
     virtual ~DomainMapper() override;
 
     // Stream
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 07742f27563b..a00548c84b56 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -261,7 +261,7 @@ struct TableInfo
 namespace
 {
 
-bool lcl_extractTableBorderProperty(const PropertyMapPtr& pTableProperties, const PropertyIds nId, TableInfo& rInfo, table::BorderLine2& rLine)
+bool lcl_extractTableBorderProperty(const PropertyMapPtr& pTableProperties, const PropertyIds nId, TableInfo const & rInfo, table::BorderLine2& rLine)
 {
     if (!pTableProperties)
         return false;
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.cxx b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
index 82e7640471fe..fd94ebb8f873 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.cxx
@@ -66,7 +66,7 @@ DomainMapperTableManager::~DomainMapperTableManager()
 {
 }
 
-bool DomainMapperTableManager::attribute(Id nName, Value& rValue)
+bool DomainMapperTableManager::attribute(Id nName, Value const & rValue)
 {
     bool bRet = true;
 
diff --git a/writerfilter/source/dmapper/DomainMapperTableManager.hxx b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
index d783b8724bd9..5a68ad3893df 100644
--- a/writerfilter/source/dmapper/DomainMapperTableManager.hxx
+++ b/writerfilter/source/dmapper/DomainMapperTableManager.hxx
@@ -86,7 +86,7 @@ public:
     void SetStyleProperties( PropertyMapPtr pProperties ) { m_pStyleProps = pProperties; };
 
     virtual bool sprm(Sprm & rSprm) override;
-    bool attribute(Id nName, Value & val);
+    bool attribute(Id nName, Value const & val);
 
     virtual void startLevel( ) override;
     virtual void endLevel( ) override;
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index a2205d45f9ff..76f9be6b8391 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -181,7 +181,7 @@ DomainMapper_Impl::DomainMapper_Impl(
             uno::Reference<uno::XComponentContext> const& xContext,
             uno::Reference<lang::XComponent> const& xModel,
             SourceDocumentType eDocumentType,
-            utl::MediaDescriptor& rMediaDesc) :
+            utl::MediaDescriptor const & rMediaDesc) :
         m_eDocumentType( eDocumentType ),
         m_rDMapper( rDMapper ),
         m_xTextDocument( xModel, uno::UNO_QUERY ),
@@ -805,10 +805,10 @@ static void lcl_MoveBorderPropertiesToFrame(std::vector<beans::PropertyValue>& r
 
 
 static void lcl_AddRangeAndStyle(
-    ParagraphPropertiesPtr& pToBeSavedProperties,
+    ParagraphPropertiesPtr const & pToBeSavedProperties,
     uno::Reference< text::XTextAppend > const& xTextAppend,
     const PropertyMapPtr& pPropertyMap,
-    TextAppendContext& rAppendContext)
+    TextAppendContext const & rAppendContext)
 {
     uno::Reference<text::XParagraphCursor> xParaCursor(
         xTextAppend->createTextCursorByRange( rAppendContext.xInsertPosition.is() ? rAppendContext.xInsertPosition : xTextAppend->getEnd()), uno::UNO_QUERY_THROW );
@@ -1554,7 +1554,7 @@ void DomainMapper_Impl::appendStarMath( const Value& val )
 }
 
 uno::Reference< beans::XPropertySet > DomainMapper_Impl::appendTextSectionAfter(
-                                    uno::Reference< text::XTextRange >& xBefore )
+                                    uno::Reference< text::XTextRange > const & xBefore )
 {
     uno::Reference< beans::XPropertySet > xRet;
     if (m_aTextAppendStack.empty())
@@ -2897,7 +2897,7 @@ void FieldContext::AppendCommand(const OUString& rPart)
 /*-------------------------------------------------------------------------
 //collect the pieces of the command
   -----------------------------------------------------------------------*/
-void DomainMapper_Impl::AppendFieldCommand(OUString& rPartOfCommand)
+void DomainMapper_Impl::AppendFieldCommand(OUString const & rPartOfCommand)
 {
 #ifdef DEBUG_WRITERFILTER
     TagLogger::getInstance().startElement("appendFieldCommand");
@@ -3003,7 +3003,7 @@ static const FieldConversionMap_t & lcl_GetEnhancedFieldConversion()
 
 void DomainMapper_Impl::handleFieldSet
     (const FieldContextPtr& pContext,
-     uno::Reference< uno::XInterface > & xFieldInterface,
+     uno::Reference< uno::XInterface > const & xFieldInterface,
      uno::Reference< beans::XPropertySet > const& xFieldProperties)
 {
     OUString sVariable, sHint;
@@ -3171,7 +3171,7 @@ void  DomainMapper_Impl::handleRubyEQField( const FieldContextPtr& pContext)
 
 void DomainMapper_Impl::handleAutoNum
     (const FieldContextPtr& pContext,
-    uno::Reference< uno::XInterface > & xFieldInterface,
+    uno::Reference< uno::XInterface > const & xFieldInterface,
     uno::Reference< beans::XPropertySet > const& xFieldProperties)
 {
     //create a sequence field master "AutoNr"
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index c6d79bd7378d..f4fb77625097 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -471,7 +471,7 @@ public:
             css::uno::Reference < css::uno::XComponentContext > const& xContext,
             css::uno::Reference< css::lang::XComponent > const& xModel,
             SourceDocumentType eDocumentType,
-            utl::MediaDescriptor& rMediaDesc);
+            utl::MediaDescriptor const & rMediaDesc);
     ~DomainMapper_Impl();
 
     SectionPropertyMap* GetLastSectionContext( )
@@ -507,7 +507,7 @@ public:
     void SetIsLastParagraphInSection( bool bIsLast );
     bool GetIsLastParagraphInSection() { return m_bIsLastParaInSection;}
     void SetRubySprmId( sal_uInt32 nSprmId) { m_aRubyInfo.nSprmId = nSprmId ; }
-    void SetRubyText( OUString &sText,OUString &sStyle) {
+    void SetRubyText( OUString const &sText, OUString const &sStyle) {
         m_aRubyInfo.sRubyText = sText;
         m_aRubyInfo.sRubyStyle = sStyle;
     }
@@ -528,7 +528,7 @@ public:
     bool GetParaSectpr() { return m_bParaSectpr;}
 
     void SetSymbolChar( sal_Int32 nSymbol) { m_aSymbolData.cSymbol = sal_Unicode(nSymbol); }
-    void SetSymbolFont( OUString &rName ) { m_aSymbolData.sFont = rName; }
+    void SetSymbolFont( OUString const &rName ) { m_aSymbolData.sFont = rName; }
     const SymbolData & GetSymbolData() { return m_aSymbolData;}
 
     /// Setter method for m_bSdt.
@@ -552,12 +552,12 @@ public:
     void appendTextContent(const css::uno::Reference<css::text::XTextContent>&, const css::uno::Sequence<css::beans::PropertyValue>&);
     void appendOLE( const OUString& rStreamName, const OLEHandlerPtr& pOleHandler );
     void appendStarMath( const Value& v );
-    css::uno::Reference<css::beans::XPropertySet> appendTextSectionAfter(css::uno::Reference<css::text::XTextRange>& xBefore);
+    css::uno::Reference<css::beans::XPropertySet> appendTextSectionAfter(css::uno::Reference<css::text::XTextRange> const & xBefore);
 
     /// AutoText import: each entry is placed in the separate section
     void appendGlossaryEntry();
     /// Remember where entry was started
-    void setGlossaryEntryStart( css::uno::Reference<css::text::XTextRange>& xStart )
+    void setGlossaryEntryStart( css::uno::Reference<css::text::XTextRange> const & xStart )
     {
         m_xGlossaryEntryStart = xStart;
     }
@@ -655,11 +655,11 @@ public:
     //mark field in current context as locked (fixed)
     void SetFieldLocked();
     //collect the pieces of the command
-    void AppendFieldCommand(OUString& rPartOfCommand);
+    void AppendFieldCommand(OUString const & rPartOfCommand);
     void handleRubyEQField( const FieldContextPtr& pContext);
     void handleFieldSet
         (const FieldContextPtr& pContext,
-        css::uno::Reference< css::uno::XInterface > & xFieldInterface,
+        css::uno::Reference< css::uno::XInterface > const & xFieldInterface,
         css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties);
     void handleFieldAsk
         (const FieldContextPtr& pContext,
@@ -670,7 +670,7 @@ public:
         css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties);
     void handleAutoNum
         (const FieldContextPtr& pContext,
-        css::uno::Reference< css::uno::XInterface > & xFieldInterface,
+        css::uno::Reference< css::uno::XInterface > const & xFieldInterface,
         css::uno::Reference< css::beans::XPropertySet > const& xFieldProperties);
     static void handleAuthor
         (OUString const& rFirstParam,
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 2f3a0b4e3893..12f2e1130638 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -358,7 +358,7 @@ public:
                 uno::makeAny(nVertRelation));
     }
 
-    void applyZOrder(uno::Reference<beans::XPropertySet>& xGraphicObjectProperties) const
+    void applyZOrder(uno::Reference<beans::XPropertySet> const & xGraphicObjectProperties) const
     {
         if (zOrder >= 0)
         {
@@ -368,7 +368,7 @@ public:
         }
     }
 
-    void applyName(uno::Reference<beans::XPropertySet>& xGraphicObjectProperties) const
+    void applyName(uno::Reference<beans::XPropertySet> const & xGraphicObjectProperties) const
     {
         try
         {
@@ -940,7 +940,7 @@ uno::Reference<text::XTextContent> GraphicImport::GetGraphicObject()
 }
 
 
-void GraphicImport::ProcessShapeOptions(Value& rValue)
+void GraphicImport::ProcessShapeOptions(Value const & rValue)
 {
     sal_Int32 nIntValue = rValue.getInt();
     switch( m_pImpl->nShapeOptionType )
diff --git a/writerfilter/source/dmapper/GraphicImport.hxx b/writerfilter/source/dmapper/GraphicImport.hxx
index 9b0246e79581..f513632e966b 100644
--- a/writerfilter/source/dmapper/GraphicImport.hxx
+++ b/writerfilter/source/dmapper/GraphicImport.hxx
@@ -71,7 +71,7 @@ class GraphicImport : public LoggedProperties, public LoggedTable
     css::uno::Reference<css::text::XTextContent> m_xGraphicObject;
 
     css::uno::Reference<css::drawing::XShape> m_xShape;
-    void ProcessShapeOptions(Value & val);
+    void ProcessShapeOptions(Value const & val);
 
     css::uno::Reference<css::text::XTextContent > createGraphicObject(const css::beans::PropertyValues& aMediaProperties, const css::uno::Reference<css::beans::XPropertySet>& xShapeProps);
 
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx
index bd6ceb5b5c98..6ba8e6c20084 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -1447,7 +1447,7 @@ public:
     {
     }
 
-    bool operator() ( beans::PropertyValue& aVal )
+    bool operator() ( beans::PropertyValue const & aVal )
     {
         return aVal.Name == m_aName;
     }
diff --git a/writerfilter/source/dmapper/SdtHelper.cxx b/writerfilter/source/dmapper/SdtHelper.cxx
index b9c3b9f0ad02..2e96d623e1ba 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -25,7 +25,7 @@ namespace dmapper
 using namespace ::com::sun::star;
 
 /// w:sdt's w:dropDownList doesn't have width, so guess the size based on the longest string.
-awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr& pStyleSheet, OUString& rDefault, std::vector<OUString>& rItems)
+awt::Size lcl_getOptimalWidth(const StyleSheetTablePtr& pStyleSheet, OUString const & rDefault, std::vector<OUString>& rItems)
 {
     OUString aLongest = rDefault;
     sal_Int32 nHeight = 0;
@@ -85,7 +85,7 @@ void SdtHelper::createDropDownControl()
     m_aDropDownItems.clear();
 }
 
-void SdtHelper::createDateControl(OUString& rContentText, const beans::PropertyValue& rCharFormat)
+void SdtHelper::createDateControl(OUString const & rContentText, const beans::PropertyValue& rCharFormat)
 {
     uno::Reference<awt::XControlModel> xControlModel;
     try
diff --git a/writerfilter/source/dmapper/SdtHelper.hxx b/writerfilter/source/dmapper/SdtHelper.hxx
index a1fc08d50b55..65dbc145099d 100644
--- a/writerfilter/source/dmapper/SdtHelper.hxx
+++ b/writerfilter/source/dmapper/SdtHelper.hxx
@@ -111,7 +111,7 @@ public:
     /// Create drop-down control from w:sdt's w:dropDownList.
     void createDropDownControl();
     /// Create date control from w:sdt's w:date.
-    void createDateControl(OUString& rContentText, const css::beans::PropertyValue& rCharFormat);
+    void createDateControl(OUString const & rContentText, const css::beans::PropertyValue& rCharFormat);
 
     void appendToInteropGrabBag(const css::beans::PropertyValue& rValue);
     css::uno::Sequence<css::beans::PropertyValue> getInteropGrabBagAndClear();
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 522102630a70..d821191a1302 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -270,7 +270,7 @@ struct StyleSheetTable_Impl
     OUString HasListCharStyle( const PropertyValueVector_t& rCharProperties );
 
     /// Appends the given key-value pair to the list of latent style properties of the current entry.
-    void AppendLatentStyleProperty(const OUString& aName, Value& rValue);
+    void AppendLatentStyleProperty(const OUString& aName, Value const & rValue);
     /// Sets all properties of xStyle back to default.
     static void SetPropertiesToDefault(const uno::Reference<style::XStyle>& xStyle);
 };
@@ -343,7 +343,7 @@ OUString StyleSheetTable_Impl::HasListCharStyle( const PropertyValueVector_t& rP
     return OUString();
 }
 
-void StyleSheetTable_Impl::AppendLatentStyleProperty(const OUString& aName, Value& rValue)
+void StyleSheetTable_Impl::AppendLatentStyleProperty(const OUString& aName, Value const & rValue)
 {
     beans::PropertyValue aValue;
     aValue.Name = aName;
diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/writerfilter/source/dmapper/domainmapperfactory.cxx
index 52e568c42111..f2988a40838e 100644
--- a/writerfilter/source/dmapper/domainmapperfactory.cxx
+++ b/writerfilter/source/dmapper/domainmapperfactory.cxx
@@ -20,7 +20,7 @@ Stream::Pointer_t DomainMapperFactory::createMapper(css::uno::Reference<css::uno
         css::uno::Reference<css::lang::XComponent> const& xModel,
         bool bRepairStorage,
         SourceDocumentType eDocumentType,
-        utl::MediaDescriptor& rMediaDesc)
+        utl::MediaDescriptor const & rMediaDesc)
 {
 #ifdef DEBUG_WRITERFILTER
     OUString sURL = rMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString());
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index ddb89f17b528..3267e89ee6b2 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -46,7 +46,7 @@ OOXMLStreamImpl::OOXMLStreamImpl
 }
 
 OOXMLStreamImpl::OOXMLStreamImpl
-(OOXMLStreamImpl & rOOXMLStream, StreamType_t nStreamType)
+(OOXMLStreamImpl const & rOOXMLStream, StreamType_t nStreamType)
 : mxContext(rOOXMLStream.mxContext),
   mxStorageStream(rOOXMLStream.mxStorageStream),
   mxStorage(rOOXMLStream.mxStorage),
@@ -59,7 +59,7 @@ OOXMLStreamImpl::OOXMLStreamImpl
 }
 
 OOXMLStreamImpl::OOXMLStreamImpl
-(OOXMLStreamImpl & rOOXMLStream, const OUString & rId)
+(OOXMLStreamImpl const & rOOXMLStream, const OUString & rId)
 : mxContext(rOOXMLStream.mxContext),
   mxStorageStream(rOOXMLStream.mxStorageStream),
   mxStorage(rOOXMLStream.mxStorage),
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
index aff8189b7396..751068d95062 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.hxx
@@ -61,12 +61,12 @@ public:
     typedef std::shared_ptr<OOXMLStreamImpl> Pointer_t;
 
     OOXMLStreamImpl
-    (OOXMLStreamImpl & rStream, StreamType_t nType);
+    (OOXMLStreamImpl const & rStream, StreamType_t nType);
     OOXMLStreamImpl
     (css::uno::Reference<css::uno::XComponentContext> const & xContext,
      css::uno::Reference<css::io::XInputStream> const & xStorageStream,
      StreamType_t nType, bool bRepairStorage);
-    OOXMLStreamImpl(OOXMLStreamImpl & rStream, const OUString & rId);
+    OOXMLStreamImpl(OOXMLStreamImpl const & rStream, const OUString & rId);
 
     virtual ~OOXMLStreamImpl() override;
 
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index edfc2accb964..457fa1f6af68 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -208,7 +208,7 @@ const char* keywordToString(RTFKeyword nKeyword)
     return nullptr;
 }
 
-static util::DateTime lcl_getDateTime(RTFParserState& aState)
+static util::DateTime lcl_getDateTime(RTFParserState const & aState)
 {
     return {0 /*100sec*/, 0 /*sec*/, aState.nMinute, aState.nHour,
             aState.nDay, aState.nMonth, aState.nYear, false
@@ -333,10 +333,9 @@ void RTFDocumentImpl::finishSubstream()
 
 void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId)
 {
-    OUString aStr;
-    resolveSubstream(nPos, nId, aStr);
+    resolveSubstream(nPos, nId, OUString());
 }
-void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId, OUString& rIgnoreFirst)
+void RTFDocumentImpl::resolveSubstream(std::size_t nPos, Id nId, OUString const & rIgnoreFirst)
 {
     sal_uInt64 const nCurrent = Strm().Tell();
     // Seek to header position, parse, then seek back.
@@ -3187,7 +3186,7 @@ void RTFDocumentImpl::setDestination(Destination eDestination)
 
 // this is a questionably named method that is used only in a very special
 // situation where it looks like the "current" buffer is needed?
-void RTFDocumentImpl::setDestinationText(OUString& rString)
+void RTFDocumentImpl::setDestinationText(OUString const & rString)
 {
     m_aStates.top().aDestinationText.setLength(0);
     m_aStates.top().aDestinationText.append(rString);
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index 6c96a89d7f64..374f3ebe2b0c 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -426,7 +426,7 @@ public:
         return m_xModelFactory;
     }
     bool isInBackground();
-    void setDestinationText(OUString& rString);
+    void setDestinationText(OUString const & rString);
     /// Resolve a picture: If not inline, then anchored.
     void resolvePict(bool bInline, css::uno::Reference<css::drawing::XShape> const& xShape);
 
@@ -466,7 +466,7 @@ private:
     void resetSprms();
     void resetAttributes();
     void resolveSubstream(std::size_t nPos, Id nId);
-    void resolveSubstream(std::size_t nPos, Id nId, OUString& rIgnoreFirst);
+    void resolveSubstream(std::size_t nPos, Id nId, OUString const & rIgnoreFirst);
 
     void text(OUString& rString);
     // Sends a single character to dmapper, taking care of buffering.
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index cea03b801f9f..dc4ed8eb2780 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -146,7 +146,7 @@ void RTFSdrImport::resolveDhgt(uno::Reference<beans::XPropertySet> const& xPrope
     }
 }
 
-void RTFSdrImport::resolveLineColorAndWidth(bool bTextFrame, const uno::Reference<beans::XPropertySet>& xPropertySet, uno::Any& rLineColor, uno::Any& rLineWidth)
+void RTFSdrImport::resolveLineColorAndWidth(bool bTextFrame, const uno::Reference<beans::XPropertySet>& xPropertySet, uno::Any const & rLineColor, uno::Any const & rLineWidth)
 {
     if (!bTextFrame)
     {
diff --git a/writerfilter/source/rtftok/rtfsdrimport.hxx b/writerfilter/source/rtftok/rtfsdrimport.hxx
index 42260b3ad29b..ccb02c55d885 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.hxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.hxx
@@ -36,7 +36,7 @@ public:
     void appendGroupProperty(const OUString& aKey, const OUString& aValue);
     void resolveDhgt(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nZOrder, bool bOldStyle);
     /// Set line color and line width on the shape, using the relevant API depending on if the shape is a text frame or not.
-    static void resolveLineColorAndWidth(bool bTextFrame, const css::uno::Reference<css::beans::XPropertySet>& xPropertySet, css::uno::Any& rLineColor, css::uno::Any& rLineWidth);
+    static void resolveLineColorAndWidth(bool bTextFrame, const css::uno::Reference<css::beans::XPropertySet>& xPropertySet, css::uno::Any const & rLineColor, css::uno::Any const & rLineWidth);
     static void resolveFLine(css::uno::Reference<css::beans::XPropertySet> const& xPropertySet, sal_Int32 nFLine);
     /**
      * These are the default in Word, but not in Writer.
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 027217008ac8..f1d28a85e305 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -272,7 +272,7 @@ bool RTFTokenizer::lookupMathKeyword(RTFMathSymbol& rSymbol)
     return true;
 }
 
-RTFError RTFTokenizer::dispatchKeyword(OString& rKeyword, bool bParam, int nParam)
+RTFError RTFTokenizer::dispatchKeyword(OString const & rKeyword, bool bParam, int nParam)
 {
     if (m_rImport.getDestination() == Destination::SKIP)
     {
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx
index 8005fd6c1c17..c42b89dc4cd6 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -54,7 +54,7 @@ private:
         return *m_pInStream;
     }
     RTFError resolveKeyword();
-    RTFError dispatchKeyword(OString& rKeyword, bool bParam, int nParam);
+    RTFError dispatchKeyword(OString const & rKeyword, bool bParam, int nParam);
 
     RTFListener& m_rImport;
     SvStream* m_pInStream;