[Libreoffice-commits] core.git: include/oox oox/inc oox/source

Noel Grandin noel.grandin at collabora.co.uk
Mon Jul 31 08:35:52 UTC 2017


 include/oox/core/contexthandler2.hxx                       |    2 
 include/oox/core/filterbase.hxx                            |    2 
 include/oox/crypto/DocumentDecryption.hxx                  |    2 
 include/oox/drawingml/connectorshapecontext.hxx            |    2 
 include/oox/drawingml/graphicshapecontext.hxx              |    8 -
 include/oox/drawingml/shape.hxx                            |    6 -
 include/oox/drawingml/shapecontext.hxx                     |    2 
 include/oox/drawingml/shapegroupcontext.hxx                |    2 
 include/oox/export/chartexport.hxx                         |    2 
 include/oox/helper/binaryoutputstream.hxx                  |    2 
 include/oox/ole/axcontrol.hxx                              |   12 +-
 include/oox/ole/axcontrolfragment.hxx                      |    2 
 include/oox/ole/olehelper.hxx                              |    6 -
 include/oox/ole/vbaproject.hxx                             |    2 
 include/oox/ppt/backgroundproperties.hxx                   |    2 
 include/oox/ppt/customshowlistcontext.hxx                  |    2 
 include/oox/ppt/pptgraphicshapecontext.hxx                 |    2 
 include/oox/ppt/pptshapecontext.hxx                        |    2 
 include/oox/ppt/pptshapegroupcontext.hxx                   |    2 
 include/oox/ppt/pptshapepropertiescontext.hxx              |    2 
 include/oox/ppt/slidemastertextstylescontext.hxx           |    2 
 include/oox/ppt/slidetimingcontext.hxx                     |    2 
 include/oox/ppt/slidetransitioncontext.hxx                 |    2 
 include/oox/ppt/soundactioncontext.hxx                     |    2 
 include/oox/ppt/timenodelistcontext.hxx                    |    6 -
 include/oox/vml/vmlshape.hxx                               |    2 
 include/oox/vml/vmlshapecontext.hxx                        |   16 +--
 include/oox/vml/vmltextboxcontext.hxx                      |    6 -
 oox/inc/drawingml/chart/plotareaconverter.hxx              |    2 
 oox/inc/drawingml/clrschemecontext.hxx                     |    6 -
 oox/inc/drawingml/colorchoicecontext.hxx                   |    4 
 oox/inc/drawingml/customshapegeometry.hxx                  |    6 -
 oox/inc/drawingml/diagram/diagram.hxx                      |    2 
 oox/inc/drawingml/guidcontext.hxx                          |    2 
 oox/inc/drawingml/linepropertiescontext.hxx                |    2 
 oox/inc/drawingml/misccontexts.hxx                         |   24 ++---
 oox/inc/drawingml/objectdefaultcontext.hxx                 |    2 
 oox/inc/drawingml/scene3dcontext.hxx                       |    6 -
 oox/inc/drawingml/shapepropertiescontext.hxx               |    2 
 oox/inc/drawingml/shapestylecontext.hxx                    |    2 
 oox/inc/drawingml/spdefcontext.hxx                         |    2 
 oox/inc/drawingml/table/tablebackgroundstylecontext.hxx    |    2 
 oox/inc/drawingml/table/tablecellcontext.hxx               |    2 
 oox/inc/drawingml/table/tablecontext.hxx                   |    2 
 oox/inc/drawingml/table/tablepartstylecontext.hxx          |    2 
 oox/inc/drawingml/table/tablerowcontext.hxx                |    2 
 oox/inc/drawingml/table/tablestylecellstylecontext.hxx     |    2 
 oox/inc/drawingml/table/tablestylecontext.hxx              |    2 
 oox/inc/drawingml/table/tablestyletextstylecontext.hxx     |    2 
 oox/inc/drawingml/textbodycontext.hxx                      |    4 
 oox/inc/drawingml/textbodypropertiescontext.hxx            |    2 
 oox/inc/drawingml/textcharacterpropertiescontext.hxx       |    2 
 oox/inc/drawingml/texteffectscontext.hxx                   |    2 
 oox/inc/drawingml/textfieldcontext.hxx                     |    2 
 oox/inc/drawingml/textliststylecontext.hxx                 |    2 
 oox/inc/drawingml/textparagraphproperties.hxx              |    2 
 oox/inc/drawingml/textparagraphpropertiescontext.hxx       |    2 
 oox/inc/drawingml/themeelementscontext.hxx                 |    2 
 oox/inc/drawingml/transform2dcontext.hxx                   |    2 
 oox/source/core/contexthandler2.cxx                        |    4 
 oox/source/core/filterbase.cxx                             |    2 
 oox/source/crypto/DocumentDecryption.cxx                   |    4 
 oox/source/drawingml/chart/converterbase.cxx               |    4 
 oox/source/drawingml/chart/plotareaconverter.cxx           |    2 
 oox/source/drawingml/chart/seriescontext.cxx               |    2 
 oox/source/drawingml/clrschemecontext.cxx                  |    6 -
 oox/source/drawingml/colorchoicecontext.cxx                |    4 
 oox/source/drawingml/connectorshapecontext.cxx             |    2 
 oox/source/drawingml/customshapegeometry.cxx               |   54 ++++++-------
 oox/source/drawingml/diagram/constraintlistcontext.cxx     |    2 
 oox/source/drawingml/diagram/constraintlistcontext.hxx     |    2 
 oox/source/drawingml/diagram/datamodelcontext.cxx          |   14 +--
 oox/source/drawingml/diagram/datamodelcontext.hxx          |    2 
 oox/source/drawingml/diagram/diagram.cxx                   |    2 
 oox/source/drawingml/diagram/diagramdefinitioncontext.cxx  |    2 
 oox/source/drawingml/diagram/diagramdefinitioncontext.hxx  |    2 
 oox/source/drawingml/diagram/layoutatomvisitors.cxx        |    8 -
 oox/source/drawingml/diagram/layoutatomvisitors.hxx        |    8 -
 oox/source/drawingml/diagram/layoutnodecontext.cxx         |   12 +-
 oox/source/drawingml/diagram/layoutnodecontext.hxx         |    2 
 oox/source/drawingml/effectpropertiescontext.cxx           |    2 
 oox/source/drawingml/effectpropertiescontext.hxx           |    2 
 oox/source/drawingml/graphicshapecontext.cxx               |    8 -
 oox/source/drawingml/guidcontext.cxx                       |    2 
 oox/source/drawingml/hyperlinkcontext.cxx                  |    2 
 oox/source/drawingml/hyperlinkcontext.hxx                  |    2 
 oox/source/drawingml/linepropertiescontext.cxx             |    2 
 oox/source/drawingml/misccontexts.cxx                      |   24 ++---
 oox/source/drawingml/objectdefaultcontext.cxx              |    2 
 oox/source/drawingml/scene3dcontext.cxx                    |    6 -
 oox/source/drawingml/shape.cxx                             |    6 -
 oox/source/drawingml/shapecontext.cxx                      |    2 
 oox/source/drawingml/shapegroupcontext.cxx                 |    2 
 oox/source/drawingml/shapepropertiescontext.cxx            |    2 
 oox/source/drawingml/shapestylecontext.cxx                 |    2 
 oox/source/drawingml/spdefcontext.cxx                      |    2 
 oox/source/drawingml/table/tablebackgroundstylecontext.cxx |    2 
 oox/source/drawingml/table/tablecell.cxx                   |    2 
 oox/source/drawingml/table/tablecellcontext.cxx            |    2 
 oox/source/drawingml/table/tablecontext.cxx                |    2 
 oox/source/drawingml/table/tablepartstylecontext.cxx       |    2 
 oox/source/drawingml/table/tablerowcontext.cxx             |    2 
 oox/source/drawingml/table/tablestylecellstylecontext.cxx  |    2 
 oox/source/drawingml/table/tablestylecontext.cxx           |    2 
 oox/source/drawingml/table/tablestyletextstylecontext.cxx  |    2 
 oox/source/drawingml/textbodycontext.cxx                   |    8 -
 oox/source/drawingml/textbodypropertiescontext.cxx         |    2 
 oox/source/drawingml/textcharacterpropertiescontext.cxx    |    2 
 oox/source/drawingml/texteffectscontext.cxx                |    2 
 oox/source/drawingml/textfieldcontext.cxx                  |    2 
 oox/source/drawingml/textliststylecontext.cxx              |    2 
 oox/source/drawingml/textparagraphproperties.cxx           |    2 
 oox/source/drawingml/textparagraphpropertiescontext.cxx    |    2 
 oox/source/drawingml/textspacingcontext.cxx                |    2 
 oox/source/drawingml/textspacingcontext.hxx                |    2 
 oox/source/drawingml/texttabstoplistcontext.cxx            |    2 
 oox/source/drawingml/texttabstoplistcontext.hxx            |    2 
 oox/source/drawingml/themeelementscontext.cxx              |   18 ++--
 oox/source/drawingml/transform2dcontext.cxx                |    2 
 oox/source/export/chartexport.cxx                          |    2 
 oox/source/export/shapes.cxx                               |    4 
 oox/source/helper/binaryoutputstream.cxx                   |    2 
 oox/source/ole/axbinarywriter.cxx                          |    2 
 oox/source/ole/axcontrol.cxx                               |   12 +-
 oox/source/ole/axcontrolfragment.cxx                       |    2 
 oox/source/ole/olehelper.cxx                               |    6 -
 oox/source/ole/vbaexport.cxx                               |    2 
 oox/source/ppt/animvariantcontext.cxx                      |    2 
 oox/source/ppt/animvariantcontext.hxx                      |    2 
 oox/source/ppt/backgroundproperties.cxx                    |    2 
 oox/source/ppt/buildlistcontext.cxx                        |    2 
 oox/source/ppt/buildlistcontext.hxx                        |    2 
 oox/source/ppt/commonbehaviorcontext.cxx                   |    2 
 oox/source/ppt/commonbehaviorcontext.hxx                   |    2 
 oox/source/ppt/commontimenodecontext.cxx                   |    2 
 oox/source/ppt/commontimenodecontext.hxx                   |    2 
 oox/source/ppt/conditioncontext.cxx                        |    4 
 oox/source/ppt/conditioncontext.hxx                        |    4 
 oox/source/ppt/customshowlistcontext.cxx                   |   10 +-
 oox/source/ppt/headerfootercontext.cxx                     |    2 
 oox/source/ppt/headerfootercontext.hxx                     |    2 
 oox/source/ppt/pptgraphicshapecontext.cxx                  |    2 
 oox/source/ppt/pptshapecontext.cxx                         |    2 
 oox/source/ppt/pptshapegroupcontext.cxx                    |    2 
 oox/source/ppt/pptshapepropertiescontext.cxx               |    2 
 oox/source/ppt/presentationfragmenthandler.cxx             |    2 
 oox/source/ppt/slidemastertextstylescontext.cxx            |    2 
 oox/source/ppt/slidepersist.cxx                            |    4 
 oox/source/ppt/slidetimingcontext.cxx                      |    2 
 oox/source/ppt/slidetransitioncontext.cxx                  |    2 
 oox/source/ppt/soundactioncontext.cxx                      |    2 
 oox/source/ppt/timeanimvaluecontext.cxx                    |    2 
 oox/source/ppt/timeanimvaluecontext.hxx                    |    2 
 oox/source/ppt/timenodelistcontext.cxx                     |   28 +++---
 oox/source/ppt/timetargetelementcontext.cxx                |    4 
 oox/source/ppt/timetargetelementcontext.hxx                |    2 
 oox/source/shape/LockedCanvasContext.cxx                   |    2 
 oox/source/shape/LockedCanvasContext.hxx                   |    2 
 oox/source/shape/WpgContext.cxx                            |    2 
 oox/source/shape/WpgContext.hxx                            |    2 
 oox/source/shape/WpsContext.cxx                            |    2 
 oox/source/shape/WpsContext.hxx                            |    2 
 oox/source/vml/vmlshape.cxx                                |    2 
 oox/source/vml/vmlshapecontext.cxx                         |   16 +--
 oox/source/vml/vmltextboxcontext.cxx                       |    6 -
 165 files changed, 323 insertions(+), 323 deletions(-)

New commits:
commit 8302f334b66f9d16e208a7cf4d4d1033664eb0e4
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Jul 31 09:28:51 2017 +0200

    loplugin:constparams in oox
    
    Change-Id: I43984b4ece82da39ca61a91fa14e4660298509dd
    Reviewed-on: https://gerrit.libreoffice.org/40581
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/oox/core/contexthandler2.hxx b/include/oox/core/contexthandler2.hxx
index b08dd937226f..c14ddcd62ada 100644
--- a/include/oox/core/contexthandler2.hxx
+++ b/include/oox/core/contexthandler2.hxx
@@ -226,7 +226,7 @@ protected:
 class OOX_DLLPUBLIC ContextHandler2 : public ContextHandler, public ContextHandler2Helper
 {
 public:
-    explicit            ContextHandler2( ContextHandler2Helper& rParent );
+    explicit            ContextHandler2( ContextHandler2Helper const & rParent );
     virtual             ~ContextHandler2() override;
 
     // resolve ambiguity from base classes
diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 6c2ffb04fd15..dcbebc122309 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -196,7 +196,7 @@ public:
 
     /** Imports the raw binary data from the specified stream.
         @return  True, if the data could be imported from the stream. */
-    bool                importBinaryData( StreamDataSequence& orDataSeq, const OUString& rStreamName );
+    bool                importBinaryData( StreamDataSequence const & orDataSeq, const OUString& rStreamName );
 
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index fbd5e36eb747..852dd9035c9f 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -49,7 +49,7 @@ private:
     std::unique_ptr<CryptoEngine>   mEngine;
     CryptoType                      mCryptoType;
 
-    bool readAgileEncryptionInfo( css::uno::Reference< css::io::XInputStream >& rStream );
+    bool readAgileEncryptionInfo( css::uno::Reference< css::io::XInputStream > const & rStream );
     bool readStandard2007EncryptionInfo( BinaryInputStream& rStream );
 
 public:
diff --git a/include/oox/drawingml/connectorshapecontext.hxx b/include/oox/drawingml/connectorshapecontext.hxx
index 57982230bc34..15d07e2366d2 100644
--- a/include/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
@@ -34,7 +34,7 @@ namespace oox { namespace drawingml {
 class OOX_DLLPUBLIC ConnectorShapeContext : public ShapeContext
 {
 public:
-    ConnectorShapeContext( ::oox::core::ContextHandler2Helper& rParent, const ShapePtr& pMasterShapePtr, const ShapePtr& pGroupShapePtr );
+    ConnectorShapeContext( ::oox::core::ContextHandler2Helper const & rParent, const ShapePtr& pMasterShapePtr, const ShapePtr& pGroupShapePtr );
     virtual ~ConnectorShapeContext() override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx
index 403fdea79018..5b520e468089 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -36,7 +36,7 @@ namespace oox { namespace drawingml {
 class OOX_DLLPUBLIC GraphicShapeContext : public ShapeContext
 {
 public:
-    GraphicShapeContext( ::oox::core::ContextHandler2Helper& rParent, const ShapePtr& pMasterShapePtr, const ShapePtr& pShapePtr );
+    GraphicShapeContext( ::oox::core::ContextHandler2Helper const & rParent, const ShapePtr& pMasterShapePtr, const ShapePtr& pShapePtr );
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
@@ -59,7 +59,7 @@ private:
 class OleObjectGraphicDataContext : public ShapeContext
 {
 public:
-    OleObjectGraphicDataContext( ::oox::core::ContextHandler2Helper& rParent, const ShapePtr& pShapePtr );
+    OleObjectGraphicDataContext( ::oox::core::ContextHandler2Helper const & rParent, const ShapePtr& pShapePtr );
     virtual ~OleObjectGraphicDataContext() override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
@@ -72,7 +72,7 @@ class DiagramGraphicDataContext
     : public ShapeContext
 {
 public:
-    DiagramGraphicDataContext( ::oox::core::ContextHandler2Helper& rParent, const ShapePtr& pShapePtr );
+    DiagramGraphicDataContext( ::oox::core::ContextHandler2Helper const & rParent, const ShapePtr& pShapePtr );
     virtual ~DiagramGraphicDataContext() override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
@@ -90,7 +90,7 @@ class ChartGraphicDataContext : public ShapeContext
 {
 public:
     explicit            ChartGraphicDataContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             const ShapePtr& rxShape, bool bEmbedShapes );
 
     virtual ::oox::core::ContextHandlerRef
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index c98bf4e3f254..9f16113b2ac5 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -182,7 +182,7 @@ public:
                             ::oox::core::XmlFilterBase& rFilterBase,
                             const Theme* pTheme,
                             const css::uno::Reference< css::drawing::XShapes >& rxShapes,
-                            basegfx::B2DHomMatrix& aTransformation );
+                            basegfx::B2DHomMatrix const & aTransformation );
 
     void                setXShape( const css::uno::Reference< css::drawing::XShape >& rXShape )
                             { mxShape = rXShape; };
@@ -233,10 +233,10 @@ protected:
                             ShapeIdMap* pShapeMap,
                             const basegfx::B2DHomMatrix& aTransformation );
 
-    void                keepDiagramCompatibilityInfo( ::oox::core::XmlFilterBase& rFilterBase );
+    void                keepDiagramCompatibilityInfo( ::oox::core::XmlFilterBase const & rFilterBase );
 
     css::uno::Reference< css::drawing::XShape >
-                        renderDiagramToGraphic( ::oox::core::XmlFilterBase& rFilterBase );
+                        renderDiagramToGraphic( ::oox::core::XmlFilterBase const & rFilterBase );
 
     OUString finalizeServiceName(
                             ::oox::core::XmlFilterBase& rFilter,
diff --git a/include/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx
index e745b9723469..b06ac38ed21d 100644
--- a/include/oox/drawingml/shapecontext.hxx
+++ b/include/oox/drawingml/shapecontext.hxx
@@ -33,7 +33,7 @@ namespace oox { namespace drawingml {
 class OOX_DLLPUBLIC ShapeContext : public ::oox::core::ContextHandler2
 {
 public:
-    ShapeContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr const & pMasterShapePtr, ShapePtr const & pShapePtr );
+    ShapeContext( ::oox::core::ContextHandler2Helper const & rParent, ShapePtr const & pMasterShapePtr, ShapePtr const & pShapePtr );
     virtual ~ShapeContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/include/oox/drawingml/shapegroupcontext.hxx b/include/oox/drawingml/shapegroupcontext.hxx
index d66457a566b9..c273d9c03263 100644
--- a/include/oox/drawingml/shapegroupcontext.hxx
+++ b/include/oox/drawingml/shapegroupcontext.hxx
@@ -33,7 +33,7 @@ namespace oox { namespace drawingml {
 class OOX_DLLPUBLIC ShapeGroupContext : public ::oox::core::ContextHandler2
 {
 public:
-    ShapeGroupContext( ::oox::core::ContextHandler2Helper& rParent, ShapePtr const & pMasterShapePtr, ShapePtr const & pGroupShapePtr );
+    ShapeGroupContext( ::oox::core::ContextHandler2Helper const & rParent, ShapePtr const & pMasterShapePtr, ShapePtr const & pGroupShapePtr );
     virtual ~ShapeGroupContext() override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/include/oox/export/chartexport.hxx b/include/oox/export/chartexport.hxx
index f0fe9cd80f6a..dadad8d6ca34 100644
--- a/include/oox/export/chartexport.hxx
+++ b/include/oox/export/chartexport.hxx
@@ -207,7 +207,7 @@ private:
 
 public:
 
-    ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, css::uno::Reference< css::frame::XModel >& xModel,
+    ChartExport( sal_Int32 nXmlNamespace, ::sax_fastparser::FSHelperPtr pFS, css::uno::Reference< css::frame::XModel > const & xModel,
                  ::oox::core::XmlFilterBase* pFB, DocumentType eDocumentType );
     virtual ~ChartExport() {}
 
diff --git a/include/oox/helper/binaryoutputstream.hxx b/include/oox/helper/binaryoutputstream.hxx
index 796777f60209..2b954a66f49a 100644
--- a/include/oox/helper/binaryoutputstream.hxx
+++ b/include/oox/helper/binaryoutputstream.hxx
@@ -185,7 +185,7 @@ public:
             wrapper. The data sequence MUST NOT be changed from outside as long
             as this stream wrapper is used to write to it.
      */
-    explicit            SequenceOutputStream( StreamDataSequence& rData );
+    explicit            SequenceOutputStream( StreamDataSequence const & rData );
 
     /** Writes the passed data sequence. */
     virtual void        writeData( const StreamDataSequence& rData, size_t nAtomSize = 1 ) override;
diff --git a/include/oox/ole/axcontrol.hxx b/include/oox/ole/axcontrol.hxx
index 25a91398a201..59e56dc3cedd 100644
--- a/include/oox/ole/axcontrol.hxx
+++ b/include/oox/ole/axcontrol.hxx
@@ -219,7 +219,7 @@ public:
                             sal_uInt32 nOleColor ) const;
 
     static void         convertToMSColor(
-                            PropertySet& rPropSet,
+                            PropertySet const & rPropSet,
                             sal_Int32 nPropId,
                             sal_uInt32& nOleColor,
                             sal_uInt32 nDefault = 0 );
@@ -236,7 +236,7 @@ public:
                             bool bHorizontal );
 
     static void         convertToMSOrientation(
-                            PropertySet& rPropMap,
+                            PropertySet const & rPropMap,
                             bool& bHorizontal );
 
     /** Converts the vertical alignment to UNO properties. */
@@ -281,7 +281,7 @@ public:
                             sal_Int32 nSpecialEffect ) const;
 
     static void        convertToAxBorder(
-                            PropertySet& rPropSet,
+                            PropertySet const & rPropSet,
                             sal_uInt32& nBorderColor,
                             sal_Int32& nBorderStyle,
                             sal_Int32& nSpecialEffect );
@@ -292,7 +292,7 @@ public:
                             sal_Int32 nSpecialEffect );
 
     static void         convertToAxVisualEffect(
-                            PropertySet& rPropSet,
+                            PropertySet const & rPropSet,
                             sal_Int32& nSpecialEffect );
 
     /** Converts the passed picture stream and Forms 2.0 position to UNO
@@ -319,7 +319,7 @@ public:
                             bool bAwtModel );
 
     static void        convertToAxState(
-                            PropertySet& rPropSet,
+                            PropertySet const & rPropSet,
                             OUString& rValue,
                             sal_Int32& nMultiSelect,
                             ApiDefaultStateMode eDefStateMode,
@@ -332,7 +332,7 @@ public:
                             sal_Int32 nOrientation );
 
     static void        convertToAxOrientation(
-                            PropertySet& rPropSet,
+                            PropertySet const & rPropSet,
                             const AxPairData& rSize,
                             sal_Int32& nOrientation );
 
diff --git a/include/oox/ole/axcontrolfragment.hxx b/include/oox/ole/axcontrolfragment.hxx
index a741aed06794..cc11252aa418 100644
--- a/include/oox/ole/axcontrolfragment.hxx
+++ b/include/oox/ole/axcontrolfragment.hxx
@@ -41,7 +41,7 @@ class AxControlPropertyContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            AxControlPropertyContext(
-                            ::oox::core::FragmentHandler2& rFragment,
+                            ::oox::core::FragmentHandler2 const & rFragment,
                             ControlModelBase& rModel );
 
     virtual ::oox::core::ContextHandlerRef
diff --git a/include/oox/ole/olehelper.hxx b/include/oox/ole/olehelper.hxx
index a0fe764e19c5..19b871ad27de 100644
--- a/include/oox/ole/olehelper.hxx
+++ b/include/oox/ole/olehelper.hxx
@@ -152,10 +152,10 @@ protected:
 public:
     MSConvertOCXControls( const css::uno::Reference< css::frame::XModel >& rxModel );
     virtual ~MSConvertOCXControls() override;
-    bool ReadOCXStorage( tools::SvRef<SotStorage>& rSrc1, css::uno::Reference< css::form::XFormComponent > & rxFormComp );
-    bool ReadOCXCtlsStream(tools::SvRef<SotStorageStream>& rSrc1, css::uno::Reference< css::form::XFormComponent > & rxFormComp,
+    bool ReadOCXStorage( tools::SvRef<SotStorage> const & rSrc1, css::uno::Reference< css::form::XFormComponent > & rxFormComp );
+    bool ReadOCXCtlsStream(tools::SvRef<SotStorageStream> const & rSrc1, css::uno::Reference< css::form::XFormComponent > & rxFormComp,
                                    sal_Int32 nPos, sal_Int32 nSize );
-    static bool WriteOCXStream( const css::uno::Reference< css::frame::XModel >& rxModel, tools::SvRef<SotStorage> &rSrc1, const css::uno::Reference< css::awt::XControlModel > &rControlModel, const css::awt::Size& rSize,OUString &rName);
+    static bool WriteOCXStream( const css::uno::Reference< css::frame::XModel >& rxModel, tools::SvRef<SotStorage> const &rSrc1, const css::uno::Reference< css::awt::XControlModel > &rControlModel, const css::awt::Size& rSize,OUString &rName);
     static bool WriteOCXExcelKludgeStream( const css::uno::Reference< css::frame::XModel >& rxModel, const css::uno::Reference< css::io::XOutputStream >& xOutStrm, const css::uno::Reference< css::awt::XControlModel > &rControlModel, const css::awt::Size& rSize,OUString &rName);
 };
 
diff --git a/include/oox/ole/vbaproject.hxx b/include/oox/ole/vbaproject.hxx
index 4e6aacf24ad6..8e170324e9f4 100644
--- a/include/oox/ole/vbaproject.hxx
+++ b/include/oox/ole/vbaproject.hxx
@@ -146,7 +146,7 @@ public:
     /** Attaches VBA macros to objects registered via registerMacroAttacher(). */
     void                attachMacros();
 
-    void                setOleOverridesSink( css::uno::Reference< css::container::XNameContainer >&  rxOleOverridesSink ){ mxOleOverridesSink = rxOleOverridesSink; }
+    void                setOleOverridesSink( css::uno::Reference< css::container::XNameContainer > const & rxOleOverridesSink ){ mxOleOverridesSink = rxOleOverridesSink; }
 
 protected:
     /** Registers a dummy module that will be created when the VBA project is
diff --git a/include/oox/ppt/backgroundproperties.hxx b/include/oox/ppt/backgroundproperties.hxx
index ce8925db93b8..c1cb3c13fc64 100644
--- a/include/oox/ppt/backgroundproperties.hxx
+++ b/include/oox/ppt/backgroundproperties.hxx
@@ -33,7 +33,7 @@ namespace oox { namespace ppt {
 class BackgroundPropertiesContext : public ::oox::core::FragmentHandler2
 {
 public:
-    BackgroundPropertiesContext( ::oox::core::FragmentHandler2& rParent, ::oox::drawingml::FillProperties& rFillProperties );
+    BackgroundPropertiesContext( ::oox::core::FragmentHandler2 const & rParent, ::oox::drawingml::FillProperties& rFillProperties );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 
 protected:
diff --git a/include/oox/ppt/customshowlistcontext.hxx b/include/oox/ppt/customshowlistcontext.hxx
index 34964697181e..216e43fe9d36 100644
--- a/include/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
@@ -45,7 +45,7 @@ namespace oox { namespace ppt {
         std::vector< CustomShow >& mrCustomShowList;
 
     public:
-        CustomShowListContext( ::oox::core::FragmentHandler2& rParent,
+        CustomShowListContext( ::oox::core::FragmentHandler2 const & rParent,
                 std::vector< CustomShow >& rCustomShowList );
 
         virtual ~CustomShowListContext( ) override;
diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx b/include/oox/ppt/pptgraphicshapecontext.hxx
index ba01f726c552..14e57633e0c1 100644
--- a/include/oox/ppt/pptgraphicshapecontext.hxx
+++ b/include/oox/ppt/pptgraphicshapecontext.hxx
@@ -36,7 +36,7 @@ class PPTGraphicShapeContext : public ::oox::drawingml::GraphicShapeContext
     SlidePersistPtr     mpSlidePersistPtr;
 
 public:
-    PPTGraphicShapeContext( ::oox::core::ContextHandler2Helper& rParent, const SlidePersistPtr& rSlidePersistPtr, const oox::drawingml::ShapePtr& pMasterShapePtr, const oox::drawingml::ShapePtr& pShapePtr );
+    PPTGraphicShapeContext( ::oox::core::ContextHandler2Helper const & rParent, const SlidePersistPtr& rSlidePersistPtr, const oox::drawingml::ShapePtr& pMasterShapePtr, const oox::drawingml::ShapePtr& pShapePtr );
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
 
diff --git a/include/oox/ppt/pptshapecontext.hxx b/include/oox/ppt/pptshapecontext.hxx
index c58296ff0ccd..6996fe730bd6 100644
--- a/include/oox/ppt/pptshapecontext.hxx
+++ b/include/oox/ppt/pptshapecontext.hxx
@@ -36,7 +36,7 @@ class PPTShapeContext : public ::oox::drawingml::ShapeContext
     SlidePersistPtr     mpSlidePersistPtr;
 
 public:
-    PPTShapeContext( ::oox::core::ContextHandler2Helper& rParent, const SlidePersistPtr& rSlidePersistPtr, const oox::drawingml::ShapePtr& pMasterShapePtr, const oox::drawingml::ShapePtr& pShapePtr );
+    PPTShapeContext( ::oox::core::ContextHandler2Helper const & rParent, const SlidePersistPtr& rSlidePersistPtr, const oox::drawingml::ShapePtr& pMasterShapePtr, const oox::drawingml::ShapePtr& pShapePtr );
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
 
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx b/include/oox/ppt/pptshapegroupcontext.hxx
index 011cdff62a86..de497635d34d 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -44,7 +44,7 @@ class PPTShapeGroupContext : public ::oox::drawingml::ShapeGroupContext
 
 public:
     PPTShapeGroupContext(
-        ::oox::core::ContextHandler2Helper& rParent,
+        ::oox::core::ContextHandler2Helper const & rParent,
         const oox::ppt::SlidePersistPtr& rSlidePersistPtr,
         const oox::ppt::ShapeLocation eShapeLocation,
         const oox::drawingml::ShapePtr& pMasterShapePtr,
diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx b/include/oox/ppt/pptshapepropertiescontext.hxx
index dffa4795ae28..7e2039a7c794 100644
--- a/include/oox/ppt/pptshapepropertiescontext.hxx
+++ b/include/oox/ppt/pptshapepropertiescontext.hxx
@@ -35,7 +35,7 @@ namespace oox { namespace ppt {
 class PPTShapePropertiesContext : public ::oox::drawingml::ShapePropertiesContext
 {
 public:
-    PPTShapePropertiesContext( ::oox::core::ContextHandler2Helper& rParent, ::oox::drawingml::Shape& rShape );
+    PPTShapePropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, ::oox::drawingml::Shape& rShape );
     virtual ::oox::core::ContextHandlerRef
         onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 };
diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx b/include/oox/ppt/slidemastertextstylescontext.hxx
index a5ca1c2372b2..109732f8302a 100644
--- a/include/oox/ppt/slidemastertextstylescontext.hxx
+++ b/include/oox/ppt/slidemastertextstylescontext.hxx
@@ -32,7 +32,7 @@ namespace oox { namespace ppt {
 class SlideMasterTextStylesContext : public oox::core::FragmentHandler2
 {
 public:
-    SlideMasterTextStylesContext( ::oox::core::FragmentHandler2& rParent, SlidePersistPtr const & pSlidePersistPtr );
+    SlideMasterTextStylesContext( ::oox::core::FragmentHandler2 const & rParent, SlidePersistPtr const & pSlidePersistPtr );
     virtual ~SlideMasterTextStylesContext() override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
 
diff --git a/include/oox/ppt/slidetimingcontext.hxx b/include/oox/ppt/slidetimingcontext.hxx
index de936ad2a205..f1c428682db2 100644
--- a/include/oox/ppt/slidetimingcontext.hxx
+++ b/include/oox/ppt/slidetimingcontext.hxx
@@ -32,7 +32,7 @@ namespace oox { namespace ppt {
 class SlideTimingContext : public ::oox::core::FragmentHandler2
 {
 public:
-    SlideTimingContext( ::oox::core::FragmentHandler2& rParent, TimeNodePtrList & aTimeNodeList ) throw();
+    SlideTimingContext( ::oox::core::FragmentHandler2 const & rParent, TimeNodePtrList & aTimeNodeList ) throw();
     virtual ~SlideTimingContext() throw() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
diff --git a/include/oox/ppt/slidetransitioncontext.hxx b/include/oox/ppt/slidetransitioncontext.hxx
index 4edaa3fcae9f..3361fd07a5a5 100644
--- a/include/oox/ppt/slidetransitioncontext.hxx
+++ b/include/oox/ppt/slidetransitioncontext.hxx
@@ -35,7 +35,7 @@ namespace oox { namespace ppt {
     class SlideTransitionContext : public ::oox::core::FragmentHandler2
     {
     public:
-        SlideTransitionContext( ::oox::core::FragmentHandler2& rParent,
+        SlideTransitionContext( ::oox::core::FragmentHandler2 const & rParent,
             const AttributeList& rAttributes,
             PropertyMap & aProperties ) throw();
         virtual ~SlideTransitionContext() throw() override;
diff --git a/include/oox/ppt/soundactioncontext.hxx b/include/oox/ppt/soundactioncontext.hxx
index 4680332a4fe4..99435959c472 100644
--- a/include/oox/ppt/soundactioncontext.hxx
+++ b/include/oox/ppt/soundactioncontext.hxx
@@ -36,7 +36,7 @@ namespace oox { namespace ppt {
 class SoundActionContext : public ::oox::core::FragmentHandler2
 {
 public:
-    SoundActionContext( ::oox::core::FragmentHandler2& rParent, PropertyMap & aProperties ) throw();
+    SoundActionContext( ::oox::core::FragmentHandler2 const & rParent, PropertyMap & aProperties ) throw();
     virtual ~SoundActionContext() throw() override;
 
     virtual void onEndElement() override;
diff --git a/include/oox/ppt/timenodelistcontext.hxx b/include/oox/ppt/timenodelistcontext.hxx
index 1012f7328c7b..e592cc289f33 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -40,10 +40,10 @@ namespace oox { namespace ppt {
     public:
         virtual ~TimeNodeContext() throw() override;
 
-        static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32  aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
+        static TimeNodeContext * SAL_CALL makeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32  aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode );
 
     protected:
-        TimeNodeContext( ::oox::core::FragmentHandler2& rParent, sal_Int32  aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
+        TimeNodeContext( ::oox::core::FragmentHandler2 const & rParent, sal_Int32  aElement, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttribs, const TimeNodePtr & pNode ) throw();
 
         sal_Int32 mnElement;
         TimeNodePtr mpNode;
@@ -54,7 +54,7 @@ namespace oox { namespace ppt {
 class TimeNodeListContext : public ::oox::core::FragmentHandler2
 {
 public:
-    TimeNodeListContext( ::oox::core::FragmentHandler2& rParent, TimeNodePtrList & aList ) throw();
+    TimeNodeListContext( ::oox::core::FragmentHandler2 const & rParent, TimeNodePtrList & aList ) throw();
 
     virtual ~TimeNodeListContext() throw() override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const AttributeList& rAttribs ) override;
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 44f973b57169..cad99b719c26 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -295,7 +295,7 @@ protected:
     /** Used by both RectangleShape and ComplexShape. */
     css::uno::Reference<css::drawing::XShape>createPictureObject(
             const css::uno::Reference< css::drawing::XShapes >& rxShapes,
-            const css::awt::Rectangle& rShapeRect, OUString& rGraphicPath ) const;
+            const css::awt::Rectangle& rShapeRect, OUString const & rGraphicPath ) const;
 
 private:
     OUString     maService;          ///< Name of the UNO shape service.
diff --git a/include/oox/vml/vmlshapecontext.hxx b/include/oox/vml/vmlshapecontext.hxx
index 1c1565b62397..fe7afb417b52 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -49,7 +49,7 @@ class ShapeLayoutContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            ShapeLayoutContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             Drawing& rDrawing );
 
     virtual ::oox::core::ContextHandlerRef
@@ -64,7 +64,7 @@ class ClientDataContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            ClientDataContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             ClientData& rClientData,
                             const AttributeList& rAttribs );
 
@@ -84,13 +84,13 @@ class ShapeContextBase : public ::oox::core::ContextHandler2
 public:
     static ::oox::core::ContextHandlerRef
                         createShapeContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             ShapeContainer& rShapes,
                             sal_Int32 nElement,
                             const AttributeList& rAttribs );
 
 protected:
-    explicit            ShapeContextBase( ::oox::core::ContextHandler2Helper& rParent );
+    explicit            ShapeContextBase( ::oox::core::ContextHandler2Helper const & rParent );
 };
 
 
@@ -98,7 +98,7 @@ class ShapeTypeContext : public ShapeContextBase
 {
 public:
     explicit            ShapeTypeContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             ShapeType& rShapeType,
                             const AttributeList& rAttribs );
 
@@ -121,7 +121,7 @@ class ShapeContext : public ShapeTypeContext
 {
 public:
     explicit            ShapeContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             ShapeBase& rShape,
                             const AttributeList& rAttribs );
 
@@ -154,7 +154,7 @@ class GroupShapeContext : public ShapeContext
 {
 public:
     explicit            GroupShapeContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             GroupShape& rShape,
                             const AttributeList& rAttribs );
 
@@ -170,7 +170,7 @@ class RectangleShapeContext : public ShapeContext
 {
 public:
     explicit            RectangleShapeContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             const AttributeList& rAttribs,
                             RectangleShape& rShape );
 
diff --git a/include/oox/vml/vmltextboxcontext.hxx b/include/oox/vml/vmltextboxcontext.hxx
index 801cccb13a3d..c31ddf6c5029 100644
--- a/include/oox/vml/vmltextboxcontext.hxx
+++ b/include/oox/vml/vmltextboxcontext.hxx
@@ -39,9 +39,9 @@ class TextPortionContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            TextPortionContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             TextBox& rTextBox,
-                            TextParagraphModel& rParagraph,
+                            TextParagraphModel const & rParagraph,
                             const TextFontModel& rParentFont,
                             sal_Int32 nElement,
                             const AttributeList& rAttribs );
@@ -64,7 +64,7 @@ class TextBoxContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            TextBoxContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             TextBox& rTextBox,
                             const AttributeList& rAttribs,
                             const GraphicHelper& graphicHelper );
diff --git a/oox/inc/drawingml/chart/plotareaconverter.hxx b/oox/inc/drawingml/chart/plotareaconverter.hxx
index 07061c1cc474..895a11977ede 100644
--- a/oox/inc/drawingml/chart/plotareaconverter.hxx
+++ b/oox/inc/drawingml/chart/plotareaconverter.hxx
@@ -43,7 +43,7 @@ public:
     /** Converts the OOXML plot area model to a chart2 diagram. */
     void                convertFromModel(
                             const css::uno::Reference< css::chart2::XDiagram >& rxDiagram,
-                            TypeGroupConverter& rTypeGroup );
+                            TypeGroupConverter const & rTypeGroup );
 };
 
 
diff --git a/oox/inc/drawingml/clrschemecontext.hxx b/oox/inc/drawingml/clrschemecontext.hxx
index b16f1c25a7f6..5947b3119b93 100644
--- a/oox/inc/drawingml/clrschemecontext.hxx
+++ b/oox/inc/drawingml/clrschemecontext.hxx
@@ -30,14 +30,14 @@ namespace oox { namespace drawingml {
 class clrMapContext : public oox::core::ContextHandler2
 {
 public:
-    clrMapContext( ::oox::core::ContextHandler2Helper& rParent,
+    clrMapContext( ::oox::core::ContextHandler2Helper const & rParent,
         const ::oox::AttributeList& rAttributes, ClrMap& rClrMap );
 };
 
 class clrSchemeColorContext : private Color, public ColorContext
 {
 public:
-    clrSchemeColorContext( ::oox::core::ContextHandler2Helper& rParent, ClrScheme& rClrScheme, sal_Int32 nColorToken );
+    clrSchemeColorContext( ::oox::core::ContextHandler2Helper const & rParent, ClrScheme& rClrScheme, sal_Int32 nColorToken );
     virtual ~clrSchemeColorContext() override;
 
 private:
@@ -48,7 +48,7 @@ private:
 class clrSchemeContext : public oox::core::ContextHandler2
 {
 public:
-    clrSchemeContext( ::oox::core::ContextHandler2Helper& rParent, ClrScheme& rClrScheme );
+    clrSchemeContext( ::oox::core::ContextHandler2Helper const & rParent, ClrScheme& rClrScheme );
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
 private:
diff --git a/oox/inc/drawingml/colorchoicecontext.hxx b/oox/inc/drawingml/colorchoicecontext.hxx
index 86d8ae7dade7..29889f494e3d 100644
--- a/oox/inc/drawingml/colorchoicecontext.hxx
+++ b/oox/inc/drawingml/colorchoicecontext.hxx
@@ -33,7 +33,7 @@ class Color;
 class ColorValueContext : public ::oox::core::ContextHandler2
 {
 public:
-    explicit            ColorValueContext( ::oox::core::ContextHandler2Helper& rParent, Color& rColor );
+    explicit            ColorValueContext( ::oox::core::ContextHandler2Helper const & rParent, Color& rColor );
 
 
     virtual void onStartElement(
@@ -54,7 +54,7 @@ private:
 class ColorContext : public ::oox::core::ContextHandler2
 {
 public:
-    explicit            ColorContext( ::oox::core::ContextHandler2Helper& rParent, Color& rColor );
+    explicit            ColorContext( ::oox::core::ContextHandler2Helper const & rParent, Color& rColor );
 
     virtual ::oox::core::ContextHandlerRef
                         onCreateContext(
diff --git a/oox/inc/drawingml/customshapegeometry.hxx b/oox/inc/drawingml/customshapegeometry.hxx
index a8a97c0882ad..ad447354fd77 100644
--- a/oox/inc/drawingml/customshapegeometry.hxx
+++ b/oox/inc/drawingml/customshapegeometry.hxx
@@ -32,7 +32,7 @@ namespace oox { namespace drawingml {
 class CustomShapeGeometryContext : public ::oox::core::ContextHandler2
 {
 public:
-    CustomShapeGeometryContext( ::oox::core::ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties );
+    CustomShapeGeometryContext( ::oox::core::ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties );
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 private:
@@ -44,7 +44,7 @@ private:
 class PresetShapeGeometryContext : public ::oox::core::ContextHandler2
 {
 public:
-    PresetShapeGeometryContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties );
+    PresetShapeGeometryContext( ::oox::core::ContextHandler2Helper const & rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties );
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 private:
@@ -56,7 +56,7 @@ private:
 class PresetTextShapeContext : public ::oox::core::ContextHandler2
 {
 public:
-    PresetTextShapeContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties );
+    PresetTextShapeContext( ::oox::core::ContextHandler2Helper const & rParent, const ::oox::AttributeList& rAttributes, CustomShapeProperties& rCustomShapeProperties );
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 private:
diff --git a/oox/inc/drawingml/diagram/diagram.hxx b/oox/inc/drawingml/diagram/diagram.hxx
index 05a4a5dffb9e..5277d98d2dee 100644
--- a/oox/inc/drawingml/diagram/diagram.hxx
+++ b/oox/inc/drawingml/diagram/diagram.hxx
@@ -34,7 +34,7 @@ namespace oox { namespace drawingml {
     generate and layout the shapes, and push it as children into the
     referenced shape.
  */
-void loadDiagram( ShapePtr& pShape,
+void loadDiagram( ShapePtr const & pShape,
                   core::XmlFilterBase& rFilter,
                   const OUString& rDataModelPath,
                   const OUString& rLayoutPath,
diff --git a/oox/inc/drawingml/guidcontext.hxx b/oox/inc/drawingml/guidcontext.hxx
index f43b0906af7d..d3b1aba2e05b 100644
--- a/oox/inc/drawingml/guidcontext.hxx
+++ b/oox/inc/drawingml/guidcontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml {
     {
 
     public:
-        GuidContext( ::oox::core::ContextHandler2Helper& rParent, OUString& rGuidId );
+        GuidContext( ::oox::core::ContextHandler2Helper const & rParent, OUString& rGuidId );
         virtual void onCharacters( const OUString& aChars ) override;
 
     private:
diff --git a/oox/inc/drawingml/linepropertiescontext.hxx b/oox/inc/drawingml/linepropertiescontext.hxx
index 950a7edf7926..5b33cdc28259 100644
--- a/oox/inc/drawingml/linepropertiescontext.hxx
+++ b/oox/inc/drawingml/linepropertiescontext.hxx
@@ -30,7 +30,7 @@ struct LineProperties;
 class LinePropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    LinePropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
+    LinePropertiesContext( ::oox::core::ContextHandler2Helper const & rParent,
             const ::oox::AttributeList& rAttributes,
             LineProperties& rLineProperties ) throw();
     virtual ~LinePropertiesContext() override;
diff --git a/oox/inc/drawingml/misccontexts.hxx b/oox/inc/drawingml/misccontexts.hxx
index 4c26599a9787..00c3c9a7d0dd 100644
--- a/oox/inc/drawingml/misccontexts.hxx
+++ b/oox/inc/drawingml/misccontexts.hxx
@@ -33,7 +33,7 @@ class SolidFillContext : public ColorContext
 {
 public:
     explicit            SolidFillContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             FillProperties& rFillProps );
 };
 
@@ -43,7 +43,7 @@ class GradientFillContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            GradientFillContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             const ::oox::AttributeList& rAttribs,
                             GradientFillProperties& rGradientProps );
 
@@ -61,7 +61,7 @@ class PatternFillContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            PatternFillContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             const ::oox::AttributeList& rAttribs,
                             PatternFillProperties& rPatternProps );
 
@@ -81,7 +81,7 @@ class ArtisticEffectContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            ArtisticEffectContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             ArtisticEffectProperties& rEffect );
     virtual             ~ArtisticEffectContext() override;
 
@@ -101,7 +101,7 @@ class BlipExtensionContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            BlipExtensionContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             BlipFillProperties& rBlipProps );
     virtual             ~BlipExtensionContext() override;
 
@@ -121,7 +121,7 @@ class DuotoneContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            DuotoneContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             BlipFillProperties& rBlipProps );
     virtual             ~DuotoneContext() override;
 
@@ -142,7 +142,7 @@ class ColorChangeContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            ColorChangeContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             const ::oox::AttributeList& rAttribs,
                             BlipFillProperties& rBlipProps );
     virtual             ~ColorChangeContext() override;
@@ -163,7 +163,7 @@ class BlipContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            BlipContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             const ::oox::AttributeList& rAttribs,
                             BlipFillProperties& rBlipProps );
 
@@ -181,7 +181,7 @@ class BlipFillContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            BlipFillContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             const ::oox::AttributeList& rAttribs,
                             BlipFillProperties& rBlipProps );
 
@@ -200,7 +200,7 @@ class FillPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
     explicit            FillPropertiesContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             FillProperties& rFillProps );
 
     virtual ::oox::core::ContextHandlerRef
@@ -210,7 +210,7 @@ public:
 
     static ::oox::core::ContextHandlerRef
                         createFillContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             sal_Int32 nElement,
                             const ::oox::AttributeList& rAttribs,
                             FillProperties& rFillProps );
@@ -230,7 +230,7 @@ class SimpleFillPropertiesContext : private FillProperties, public FillPropertie
 {
 public:
     explicit            SimpleFillPropertiesContext(
-                            ::oox::core::ContextHandler2Helper& rParent,
+                            ::oox::core::ContextHandler2Helper const & rParent,
                             Color& rColor );
     virtual             ~SimpleFillPropertiesContext() override;
 
diff --git a/oox/inc/drawingml/objectdefaultcontext.hxx b/oox/inc/drawingml/objectdefaultcontext.hxx
index f08092b4e6c2..bfc55842a053 100644
--- a/oox/inc/drawingml/objectdefaultcontext.hxx
+++ b/oox/inc/drawingml/objectdefaultcontext.hxx
@@ -29,7 +29,7 @@ class Theme;
 class objectDefaultContext : public oox::core::ContextHandler2
 {
 public:
-    objectDefaultContext( ::oox::core::ContextHandler2Helper& rParent, Theme& rTheme );
+    objectDefaultContext( ::oox::core::ContextHandler2Helper const & rParent, Theme& rTheme );
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
diff --git a/oox/inc/drawingml/scene3dcontext.hxx b/oox/inc/drawingml/scene3dcontext.hxx
index cfcb042bd262..6377062f62eb 100644
--- a/oox/inc/drawingml/scene3dcontext.hxx
+++ b/oox/inc/drawingml/scene3dcontext.hxx
@@ -30,7 +30,7 @@ struct Shape3DProperties;
 class Scene3DRotationPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    Scene3DRotationPropertiesContext( ::oox::core::ContextHandler2Helper& rParent, RotationProperties& rRotationProperties ) throw();
+    Scene3DRotationPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, RotationProperties& rRotationProperties ) throw();
 
     ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
@@ -41,7 +41,7 @@ private:
 class Scene3DPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    Scene3DPropertiesContext( ::oox::core::ContextHandler2Helper& rParent, Shape3DProperties& r3DProperties ) throw();
+    Scene3DPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, Shape3DProperties& r3DProperties ) throw();
 
     ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
@@ -52,7 +52,7 @@ private:
 class Shape3DPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    Shape3DPropertiesContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttribs, Shape3DProperties& r3DProperties ) throw();
+    Shape3DPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, const ::oox::AttributeList& rAttribs, Shape3DProperties& r3DProperties ) throw();
 
     ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/shapepropertiescontext.hxx b/oox/inc/drawingml/shapepropertiescontext.hxx
index d401aa7aca08..5d1e41ccabed 100644
--- a/oox/inc/drawingml/shapepropertiescontext.hxx
+++ b/oox/inc/drawingml/shapepropertiescontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml {
 class ShapePropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    ShapePropertiesContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rShape );
+    ShapePropertiesContext( ::oox::core::ContextHandler2Helper const & rParent, Shape& rShape );
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/shapestylecontext.hxx b/oox/inc/drawingml/shapestylecontext.hxx
index 693d9bcdbfdc..fe4851a38392 100644
--- a/oox/inc/drawingml/shapestylecontext.hxx
+++ b/oox/inc/drawingml/shapestylecontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml {
 class ShapeStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    ShapeStyleContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rShape );
+    ShapeStyleContext( ::oox::core::ContextHandler2Helper const & rParent, Shape& rShape );
     virtual ~ShapeStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/inc/drawingml/spdefcontext.hxx b/oox/inc/drawingml/spdefcontext.hxx
index 18785b9820b0..9d7e45839fec 100644
--- a/oox/inc/drawingml/spdefcontext.hxx
+++ b/oox/inc/drawingml/spdefcontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml {
 class spDefContext : public oox::core::ContextHandler2
 {
 public:
-    spDefContext( ::oox::core::ContextHandler2Helper& rParent, Shape& rDefaultObject );
+    spDefContext( ::oox::core::ContextHandler2Helper const & rParent, Shape& rDefaultObject );
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
diff --git a/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
index dda5376e0b64..9eb401acbd40 100644
--- a/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablebackgroundstylecontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml { namespace table {
 class TableBackgroundStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableBackgroundStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStyle& rTableStyle );
+    TableBackgroundStyleContext( ::oox::core::ContextHandler2Helper const & rParent, TableStyle& rTableStyle );
     virtual ~TableBackgroundStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/inc/drawingml/table/tablecellcontext.hxx b/oox/inc/drawingml/table/tablecellcontext.hxx
index 320c3ffd1805..f0bd393e9e7c 100644
--- a/oox/inc/drawingml/table/tablecellcontext.hxx
+++ b/oox/inc/drawingml/table/tablecellcontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml { namespace table {
 class TableCellContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableCellContext( ::oox::core::ContextHandler2Helper& rParent,
+    TableCellContext( ::oox::core::ContextHandler2Helper const & rParent,
         const ::oox::AttributeList& rAttribs, TableCell& rTableCell );
     virtual ~TableCellContext() override;
 
diff --git a/oox/inc/drawingml/table/tablecontext.hxx b/oox/inc/drawingml/table/tablecontext.hxx
index 4157347e73ce..bb69e2f37843 100644
--- a/oox/inc/drawingml/table/tablecontext.hxx
+++ b/oox/inc/drawingml/table/tablecontext.hxx
@@ -29,7 +29,7 @@ class TableProperties;
 class TableContext : public ShapeContext
 {
 public:
-    TableContext( ::oox::core::ContextHandler2Helper& rParent, const ShapePtr& pShapePtr );
+    TableContext( ::oox::core::ContextHandler2Helper const & rParent, const ShapePtr& pShapePtr );
     virtual ~TableContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/inc/drawingml/table/tablepartstylecontext.hxx b/oox/inc/drawingml/table/tablepartstylecontext.hxx
index 2a734d4d4ae5..a450f39d5ef7 100644
--- a/oox/inc/drawingml/table/tablepartstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablepartstylecontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml { namespace table {
 class TablePartStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TablePartStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStylePart& rTableStylePart );
+    TablePartStyleContext( ::oox::core::ContextHandler2Helper const & rParent, TableStylePart& rTableStylePart );
     virtual ~TablePartStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/inc/drawingml/table/tablerowcontext.hxx b/oox/inc/drawingml/table/tablerowcontext.hxx
index 129ff78d8b0c..2c0098313b34 100644
--- a/oox/inc/drawingml/table/tablerowcontext.hxx
+++ b/oox/inc/drawingml/table/tablerowcontext.hxx
@@ -29,7 +29,7 @@ class TableRow;
 class TableRowContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableRowContext( ::oox::core::ContextHandler2Helper& rParent,
+    TableRowContext( ::oox::core::ContextHandler2Helper const & rParent,
                      const ::oox::AttributeList& rAttribs, TableRow& rTableRow );
     virtual ~TableRowContext() override;
 
diff --git a/oox/inc/drawingml/table/tablestylecellstylecontext.hxx b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
index 5bce17c37397..686d26788349 100644
--- a/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestylecellstylecontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml { namespace table {
 class TableStyleCellStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableStyleCellStyleContext( ::oox::core::ContextHandler2Helper& rParent, TableStylePart& rTableStylePart );
+    TableStyleCellStyleContext( ::oox::core::ContextHandler2Helper const & rParent, TableStylePart& rTableStylePart );
     virtual ~TableStyleCellStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/inc/drawingml/table/tablestylecontext.hxx b/oox/inc/drawingml/table/tablestylecontext.hxx
index 72f747c04e5f..58af37dc7dcd 100644
--- a/oox/inc/drawingml/table/tablestylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestylecontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml { namespace table {
 class TableStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableStyleContext( ::oox::core::ContextHandler2Helper& rParent,
+    TableStyleContext( ::oox::core::ContextHandler2Helper const & rParent,
             const ::oox::AttributeList& rAttribs,
             TableStyle& rTableStyle );
     virtual ~TableStyleContext() override;
diff --git a/oox/inc/drawingml/table/tablestyletextstylecontext.hxx b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
index 9bef38329848..28a56f88c840 100644
--- a/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
+++ b/oox/inc/drawingml/table/tablestyletextstylecontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml { namespace table {
 class TableStyleTextStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TableStyleTextStyleContext( ::oox::core::ContextHandler2Helper& rParent,
+    TableStyleTextStyleContext( ::oox::core::ContextHandler2Helper const & rParent,
             const ::oox::AttributeList& rAttribs,
             TableStylePart& rTableStylePart );
     virtual ~TableStyleTextStyleContext() override;
diff --git a/oox/inc/drawingml/textbodycontext.hxx b/oox/inc/drawingml/textbodycontext.hxx
index faa222e733cd..ad1bac8c47a0 100644
--- a/oox/inc/drawingml/textbodycontext.hxx
+++ b/oox/inc/drawingml/textbodycontext.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace drawingml {
 class TextBodyContext : public ::oox::core::ContextHandler2
 {
 public:
-    TextBodyContext( ::oox::core::ContextHandler2Helper& rParent, TextBody& rTextBody );
+    TextBodyContext( ::oox::core::ContextHandler2Helper const & rParent, TextBody& rTextBody );
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
@@ -43,7 +43,7 @@ protected:
 class RegularTextRunContext : public ::oox::core::ContextHandler2
 {
 public:
-    RegularTextRunContext( ::oox::core::ContextHandler2Helper& rParent, TextRunPtr const & pRunPtr );
+    RegularTextRunContext( ::oox::core::ContextHandler2Helper const & rParent, TextRunPtr const & pRunPtr );
 
     virtual void onEndElement() override;
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/inc/drawingml/textbodypropertiescontext.hxx b/oox/inc/drawingml/textbodypropertiescontext.hxx
index 069edd2be2f9..7ca81ac45cb4 100644
--- a/oox/inc/drawingml/textbodypropertiescontext.hxx
+++ b/oox/inc/drawingml/textbodypropertiescontext.hxx
@@ -29,7 +29,7 @@ struct TextBodyProperties;
 class TextBodyPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    TextBodyPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
+    TextBodyPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent,
              const ::oox::AttributeList& rAttributes,
              TextBodyProperties& rTextBodyProp );
 
diff --git a/oox/inc/drawingml/textcharacterpropertiescontext.hxx b/oox/inc/drawingml/textcharacterpropertiescontext.hxx
index 716b4f097a86..c07c1fee24c6 100644
--- a/oox/inc/drawingml/textcharacterpropertiescontext.hxx
+++ b/oox/inc/drawingml/textcharacterpropertiescontext.hxx
@@ -29,7 +29,7 @@ struct TextCharacterProperties;
 class TextCharacterPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    TextCharacterPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
+    TextCharacterPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent,
             const ::oox::AttributeList& rAttribs,
             TextCharacterProperties& rTextCharacterProperties );
     virtual ~TextCharacterPropertiesContext() override;
diff --git a/oox/inc/drawingml/texteffectscontext.hxx b/oox/inc/drawingml/texteffectscontext.hxx
index 75d96bae9888..853d9dff57ef 100644
--- a/oox/inc/drawingml/texteffectscontext.hxx
+++ b/oox/inc/drawingml/texteffectscontext.hxx
@@ -23,7 +23,7 @@ namespace oox { namespace drawingml {
 class TextEffectsContext : public oox::core::ContextHandler2
 {
 public:
-    TextEffectsContext(oox::core::ContextHandler2Helper& rParent,
+    TextEffectsContext(oox::core::ContextHandler2Helper const & rParent,
                        sal_Int32 aElementToken,
                        std::vector<css::beans::PropertyValue>& rTextEffectsProperties);
     virtual ~TextEffectsContext() override;
diff --git a/oox/inc/drawingml/textfieldcontext.hxx b/oox/inc/drawingml/textfieldcontext.hxx
index 7f1efefd65d1..43bb17ee9c27 100644
--- a/oox/inc/drawingml/textfieldcontext.hxx
+++ b/oox/inc/drawingml/textfieldcontext.hxx
@@ -30,7 +30,7 @@ class TextFieldContext
     : public ::oox::core::ContextHandler2
 {
 public:
-    TextFieldContext( ::oox::core::ContextHandler2Helper& rParent,
+    TextFieldContext( ::oox::core::ContextHandler2Helper const & rParent,
                         const ::oox::AttributeList& rAttributes,
                         TextField& rTextField);
     virtual void onEndElement( ) override;
diff --git a/oox/inc/drawingml/textliststylecontext.hxx b/oox/inc/drawingml/textliststylecontext.hxx
index a48161410e81..736157030af8 100644
--- a/oox/inc/drawingml/textliststylecontext.hxx
+++ b/oox/inc/drawingml/textliststylecontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml {
 class TextListStyleContext : public ::oox::core::ContextHandler2
 {
 public:
-    TextListStyleContext( ::oox::core::ContextHandler2Helper& rParent, TextListStyle& rTextListStyle );
+    TextListStyleContext( ::oox::core::ContextHandler2Helper const & rParent, TextListStyle& rTextListStyle );
     virtual ~TextListStyleContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx
index c85a4f84905b..cac6d64f0447 100644
--- a/oox/inc/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/drawingml/textparagraphproperties.hxx
@@ -58,7 +58,7 @@ public:
     void setBulletSize(sal_Int16 nSize);
     void setFontSize(sal_Int16 nSize);
     void setStyleName( const OUString& rStyleName ) { maStyleName <<= rStyleName; }
-    void setGraphic( css::uno::Reference< css::graphic::XGraphic >& rXGraphic );
+    void setGraphic( css::uno::Reference< css::graphic::XGraphic > const & rXGraphic );
 
     std::shared_ptr< ::oox::drawingml::Color > maBulletColorPtr;
     css::uno::Any               mbBulletColorFollowText;
diff --git a/oox/inc/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
index ba3fe098db1b..b16ba562e550 100644
--- a/oox/inc/drawingml/textparagraphpropertiescontext.hxx
+++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
@@ -33,7 +33,7 @@ namespace oox { namespace drawingml {
 class TextParagraphPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    TextParagraphPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
+    TextParagraphPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent,
             const ::oox::AttributeList& rAttributes,
             TextParagraphProperties& rTextParagraphProperties );
     virtual ~TextParagraphPropertiesContext() override;
diff --git a/oox/inc/drawingml/themeelementscontext.hxx b/oox/inc/drawingml/themeelementscontext.hxx
index b806862efd60..f0116efc5988 100644
--- a/oox/inc/drawingml/themeelementscontext.hxx
+++ b/oox/inc/drawingml/themeelementscontext.hxx
@@ -30,7 +30,7 @@ class Theme;
 class ThemeElementsContext : public oox::core::ContextHandler2
 {
 public:
-    ThemeElementsContext( ::oox::core::ContextHandler2Helper& rParent, Theme& rTheme );
+    ThemeElementsContext( ::oox::core::ContextHandler2Helper const & rParent, Theme& rTheme );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 nElement,
         const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/inc/drawingml/transform2dcontext.hxx b/oox/inc/drawingml/transform2dcontext.hxx
index faba2789db99..df502d341484 100644
--- a/oox/inc/drawingml/transform2dcontext.hxx
+++ b/oox/inc/drawingml/transform2dcontext.hxx
@@ -31,7 +31,7 @@ class Shape;
 class Transform2DContext : public ::oox::core::ContextHandler2
 {
 public:
-    Transform2DContext( ::oox::core::ContextHandler2Helper& rParent,
+    Transform2DContext( ::oox::core::ContextHandler2Helper const & rParent,
                         const ::oox::AttributeList& rAttributes, Shape& rShape, bool btxXfrm = false ) throw();
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
 
diff --git a/oox/source/core/contexthandler2.cxx b/oox/source/core/contexthandler2.cxx
index 50a2587e3e1f..c6536d2f7169 100644
--- a/oox/source/core/contexthandler2.cxx
+++ b/oox/source/core/contexthandler2.cxx
@@ -173,8 +173,8 @@ void ContextHandler2Helper::processCollectedChars()
     }
 }
 
-ContextHandler2::ContextHandler2( ContextHandler2Helper& rParent ) :
-    ContextHandler( dynamic_cast< ContextHandler& >( rParent ) ),
+ContextHandler2::ContextHandler2( ContextHandler2Helper const & rParent ) :
+    ContextHandler( dynamic_cast< ContextHandler const & >( rParent ) ),
     ContextHandler2Helper( rParent )
 {
 }
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index 9e20540544ab..4945039c901b 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -379,7 +379,7 @@ VbaProject& FilterBase::getVbaProject() const
     return *mxImpl->mxVbaProject;
 }
 
-bool FilterBase::importBinaryData( StreamDataSequence& orDataSeq, const OUString& rStreamName )
+bool FilterBase::importBinaryData( StreamDataSequence const & orDataSeq, const OUString& rStreamName )
 {
     OSL_ENSURE( !rStreamName.isEmpty(), "FilterBase::importBinaryData - empty stream name" );
     if( rStreamName.isEmpty() )
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index f06516c51757..89b81e2db648 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -39,7 +39,7 @@ using namespace css::xml;
 
 namespace {
 
-std::vector<sal_uInt8> convertToVector(Sequence<sal_Int8>& input)
+std::vector<sal_uInt8> convertToVector(Sequence<sal_Int8> const & input)
 {
     const sal_uInt8* inputArray = reinterpret_cast<const sal_uInt8*>(input.getConstArray());
     return std::vector<sal_uInt8>(inputArray, inputArray + input.getLength());
@@ -191,7 +191,7 @@ bool DocumentDecryption::generateEncryptionKey(const OUString& rPassword)
     return false;
 }
 
-bool DocumentDecryption::readAgileEncryptionInfo(Reference< XInputStream >& xInputStream)
+bool DocumentDecryption::readAgileEncryptionInfo(Reference< XInputStream > const & xInputStream)
 {
     AgileEngine* engine = new AgileEngine;
     mEngine.reset(engine);
diff --git a/oox/source/drawingml/chart/converterbase.cxx b/oox/source/drawingml/chart/converterbase.cxx
index 9e5ee8f3ebc3..4fff03e7f63e 100644
--- a/oox/source/drawingml/chart/converterbase.cxx
+++ b/oox/source/drawingml/chart/converterbase.cxx
@@ -74,11 +74,11 @@ struct TitleLayoutInfo
     explicit     TitleLayoutInfo() : mpGetShape( nullptr ) {}
 
     void                convertTitlePos(
-                            ConverterRoot& rRoot,
+                            ConverterRoot const & rRoot,
                             const Reference< cssc::XChartDocument >& rxChart1Doc );
 };
 
-void TitleLayoutInfo::convertTitlePos( ConverterRoot& rRoot, const Reference< cssc::XChartDocument >& rxChart1Doc )
+void TitleLayoutInfo::convertTitlePos( ConverterRoot const & rRoot, const Reference< cssc::XChartDocument >& rxChart1Doc )
 {
     if( mxTitle.is() && mpGetShape ) try
     {
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx b/oox/source/drawingml/chart/plotareaconverter.cxx
index 9488567080c1..16e42e6b72ac 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -195,7 +195,7 @@ View3DConverter::~View3DConverter()
 {
 }
 
-void View3DConverter::convertFromModel( const Reference< XDiagram >& rxDiagram, TypeGroupConverter& rTypeGroup )
+void View3DConverter::convertFromModel( const Reference< XDiagram >& rxDiagram, TypeGroupConverter const & rTypeGroup )
 {
     namespace cssd = ::com::sun::star::drawing;
     PropertySet aPropSet( rxDiagram );
diff --git a/oox/source/drawingml/chart/seriescontext.cxx b/oox/source/drawingml/chart/seriescontext.cxx
index 56efbe260476..2a6a99f561aa 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -82,7 +82,7 @@ ContextHandlerRef lclDataLabelSharedCreateContext( ContextHandler2& rContext,
     return nullptr;
 }
 
-void lclDataLabelSharedCharacters( ContextHandler2& rContext, const OUString& rChars, DataLabelModelBase& orModel )
+void lclDataLabelSharedCharacters( ContextHandler2 const & rContext, const OUString& rChars, DataLabelModelBase& orModel )
 {
     if( rContext.isCurrentElement( C_TOKEN( separator ) ) )
         orModel.moaSeparator = rChars;
diff --git a/oox/source/drawingml/clrschemecontext.cxx b/oox/source/drawingml/clrschemecontext.cxx
index a8b91e7bf0ad..c35042ed9ffc 100644
--- a/oox/source/drawingml/clrschemecontext.cxx
+++ b/oox/source/drawingml/clrschemecontext.cxx
@@ -39,7 +39,7 @@ static void setClrMap( const ::oox::AttributeList& rAttributes,
     }
 }
 
-clrMapContext::clrMapContext( ContextHandler2Helper& rParent,
+clrMapContext::clrMapContext( ContextHandler2Helper const & rParent,
     const ::oox::AttributeList& rAttributes, ClrMap& rClrMap )
 : ContextHandler2( rParent )
 {
@@ -57,7 +57,7 @@ clrMapContext::clrMapContext( ContextHandler2Helper& rParent,
     setClrMap( rAttributes, rClrMap, XML_folHlink );
 }
 
-clrSchemeColorContext::clrSchemeColorContext( ContextHandler2Helper& rParent, ClrScheme& rClrScheme, sal_Int32 nColorToken ) :
+clrSchemeColorContext::clrSchemeColorContext( ContextHandler2Helper const & rParent, ClrScheme& rClrScheme, sal_Int32 nColorToken ) :
     ColorContext( rParent, *this ),
     mrClrScheme( rClrScheme ),
     mnColorToken( nColorToken )
@@ -69,7 +69,7 @@ clrSchemeColorContext::~clrSchemeColorContext()
     mrClrScheme.setColor( mnColorToken, getColor( getFilter().getGraphicHelper() ) );
 }
 
-clrSchemeContext::clrSchemeContext( ContextHandler2Helper& rParent, ClrScheme& rClrScheme ) :
+clrSchemeContext::clrSchemeContext( ContextHandler2Helper const & rParent, ClrScheme& rClrScheme ) :
     ContextHandler2( rParent ),
     mrClrScheme( rClrScheme )
 {
diff --git a/oox/source/drawingml/colorchoicecontext.cxx b/oox/source/drawingml/colorchoicecontext.cxx
index d1e5df65fded..7501cf158fa2 100644
--- a/oox/source/drawingml/colorchoicecontext.cxx
+++ b/oox/source/drawingml/colorchoicecontext.cxx
@@ -27,7 +27,7 @@
 namespace oox {
 namespace drawingml {
 
-ColorValueContext::ColorValueContext( ContextHandler2Helper& rParent, Color& rColor ) :
+ColorValueContext::ColorValueContext( ContextHandler2Helper const & rParent, Color& rColor ) :
     ContextHandler2( rParent ),
     mrColor( rColor )
 {
@@ -127,7 +127,7 @@ void ColorValueContext::onStartElement( const AttributeList& rAttribs )
     return nullptr;
 }
 
-ColorContext::ColorContext( ContextHandler2Helper& rParent, Color& rColor ) :
+ColorContext::ColorContext( ContextHandler2Helper const & rParent, Color& rColor ) :
     ContextHandler2( rParent ),
     mrColor( rColor )
 {
diff --git a/oox/source/drawingml/connectorshapecontext.cxx b/oox/source/drawingml/connectorshapecontext.cxx
index 26946dd163c1..898630497b41 100644
--- a/oox/source/drawingml/connectorshapecontext.cxx
+++ b/oox/source/drawingml/connectorshapecontext.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
-ConnectorShapeContext::ConnectorShapeContext( ContextHandler2Helper& rParent,
+ConnectorShapeContext::ConnectorShapeContext( ContextHandler2Helper const & rParent,
         const ShapePtr& pMasterShapePtr, const ShapePtr& pGroupShapePtr )
 : ShapeContext( rParent, pMasterShapePtr, pGroupShapePtr )
 {
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 4f515fd2ab65..142ca39bdc3d 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -424,7 +424,7 @@ static EnhancedCustomShapeParameter GetAdjCoordinate( CustomShapeProperties& rCu
 class GeomGuideListContext : public ContextHandler2
 {
 public:
-    GeomGuideListContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< CustomShapeGuide >& rGuideList );
+    GeomGuideListContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< CustomShapeGuide >& rGuideList );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
@@ -432,7 +432,7 @@ protected:
     CustomShapeProperties&              mrCustomShapeProperties;
 };
 
-GeomGuideListContext::GeomGuideListContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< CustomShapeGuide >& rGuideList )
+GeomGuideListContext::GeomGuideListContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< CustomShapeGuide >& rGuideList )
 : ContextHandler2( rParent )
 , mrGuideList( rGuideList )
 , mrCustomShapeProperties( rCustomShapeProperties )
@@ -626,10 +626,10 @@ static const OUString& GetGeomGuideName( const OUString& rValue )
 class AdjPoint2DContext : public ContextHandler2
 {
 public:
-    AdjPoint2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D );
+    AdjPoint2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D );
 };
 
-AdjPoint2DContext::AdjPoint2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D )
+AdjPoint2DContext::AdjPoint2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D )
 : ContextHandler2( rParent )
 {
     rAdjPoint2D.First = GetAdjCoordinate( rCustomShapeProperties, rAttribs.getString( XML_x ).get() );
@@ -640,7 +640,7 @@ AdjPoint2DContext::AdjPoint2DContext( ContextHandler2Helper& rParent, const Attr
 class XYAdjustHandleContext : public ContextHandler2
 {
 public:
-    XYAdjustHandleContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle );
+    XYAdjustHandleContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
@@ -648,7 +648,7 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
-XYAdjustHandleContext::XYAdjustHandleContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle )
+XYAdjustHandleContext::XYAdjustHandleContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle )
 : ContextHandler2( rParent )
 , mrAdjustHandle( rAdjustHandle )
 , mrCustomShapeProperties( rCustomShapeProperties )
@@ -690,7 +690,7 @@ ContextHandlerRef XYAdjustHandleContext::onCreateContext( sal_Int32 aElementToke
 class PolarAdjustHandleContext : public ContextHandler2
 {
 public:
-    PolarAdjustHandleContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle );
+    PolarAdjustHandleContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
@@ -698,7 +698,7 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
-PolarAdjustHandleContext::PolarAdjustHandleContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle )
+PolarAdjustHandleContext::PolarAdjustHandleContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, AdjustHandle& rAdjustHandle )
 : ContextHandler2( rParent )
 , mrAdjustHandle( rAdjustHandle )
 , mrCustomShapeProperties( rCustomShapeProperties )
@@ -743,7 +743,7 @@ ContextHandlerRef PolarAdjustHandleContext::onCreateContext( sal_Int32 aElementT
 class AdjustHandleListContext : public ContextHandler2
 {
 public:
-    AdjustHandleListContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< AdjustHandle >& rAdjustHandleList );
+    AdjustHandleListContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< AdjustHandle >& rAdjustHandleList );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
@@ -751,7 +751,7 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
-AdjustHandleListContext::AdjustHandleListContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< AdjustHandle >& rAdjustHandleList )
+AdjustHandleListContext::AdjustHandleListContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< AdjustHandle >& rAdjustHandleList )
 : ContextHandler2( rParent )
 , mrAdjustHandleList( rAdjustHandleList )
 , mrCustomShapeProperties( rCustomShapeProperties )
@@ -779,7 +779,7 @@ ContextHandlerRef AdjustHandleListContext::onCreateContext( sal_Int32 aElementTo
 class ConnectionSiteContext : public ContextHandler2
 {
 public:
-    ConnectionSiteContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, ConnectionSite& rConnectionSite );
+    ConnectionSiteContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, ConnectionSite& rConnectionSite );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
@@ -787,7 +787,7 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
-ConnectionSiteContext::ConnectionSiteContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, ConnectionSite& rConnectionSite )
+ConnectionSiteContext::ConnectionSiteContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, ConnectionSite& rConnectionSite )
 : ContextHandler2( rParent )
 , mrConnectionSite( rConnectionSite )
 , mrCustomShapeProperties( rCustomShapeProperties )
@@ -806,7 +806,7 @@ ContextHandlerRef ConnectionSiteContext::onCreateContext( sal_Int32 aElementToke
 class Path2DMoveToContext : public ContextHandler2
 {
 public:
-    Path2DMoveToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D );
+    Path2DMoveToContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
@@ -814,7 +814,7 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
-Path2DMoveToContext::Path2DMoveToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D )
+Path2DMoveToContext::Path2DMoveToContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D )
 : ContextHandler2( rParent )
 , mrAdjPoint2D( rAdjPoint2D )
 , mrCustomShapeProperties( rCustomShapeProperties )
@@ -832,7 +832,7 @@ ContextHandlerRef Path2DMoveToContext::onCreateContext( sal_Int32 aElementToken,
 class Path2DLineToContext : public ContextHandler2
 {
 public:
-    Path2DLineToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D );
+    Path2DLineToContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
@@ -840,7 +840,7 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
-Path2DLineToContext::Path2DLineToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D )
+Path2DLineToContext::Path2DLineToContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rAdjPoint2D )
 : ContextHandler2( rParent )
 , mrAdjPoint2D( rAdjPoint2D )
 , mrCustomShapeProperties( rCustomShapeProperties )
@@ -858,7 +858,7 @@ ContextHandlerRef Path2DLineToContext::onCreateContext( sal_Int32 aElementToken,
 class Path2DQuadBezierToContext : public ContextHandler2
 {
 public:
-    Path2DQuadBezierToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rPt1, EnhancedCustomShapeParameterPair& rPt2 );
+    Path2DQuadBezierToContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, EnhancedCustomShapeParameterPair& rPt1, EnhancedCustomShapeParameterPair& rPt2 );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
 protected:
@@ -868,7 +868,7 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
-Path2DQuadBezierToContext::Path2DQuadBezierToContext( ContextHandler2Helper& rParent,
+Path2DQuadBezierToContext::Path2DQuadBezierToContext( ContextHandler2Helper const & rParent,
     CustomShapeProperties& rCustomShapeProperties,
         EnhancedCustomShapeParameterPair& rPt1,
             EnhancedCustomShapeParameterPair& rPt2 )
@@ -891,7 +891,7 @@ ContextHandlerRef Path2DQuadBezierToContext::onCreateContext( sal_Int32 aElement
 class Path2DCubicBezierToContext : public ContextHandler2
 {
 public:
-    Path2DCubicBezierToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties,
+    Path2DCubicBezierToContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties,
         EnhancedCustomShapeParameterPair&, EnhancedCustomShapeParameterPair&, EnhancedCustomShapeParameterPair& );
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
 
@@ -903,7 +903,7 @@ protected:
     int nCount;
 };
 
-Path2DCubicBezierToContext::Path2DCubicBezierToContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties,
+Path2DCubicBezierToContext::Path2DCubicBezierToContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties,
     EnhancedCustomShapeParameterPair& rControlPt1,
         EnhancedCustomShapeParameterPair& rControlPt2,
             EnhancedCustomShapeParameterPair& rEndPt )
@@ -928,7 +928,7 @@ ContextHandlerRef Path2DCubicBezierToContext::onCreateContext( sal_Int32 aElemen
 class Path2DContext : public ContextHandler2
 {
 public:
-    Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D );
+    Path2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D );
     virtual ~Path2DContext() override;
     virtual ::oox::core::ContextHandlerRef
         onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
@@ -939,7 +939,7 @@ protected:
     CustomShapeProperties& mrCustomShapeProperties;
 };
 
-Path2DContext::Path2DContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D )
+Path2DContext::Path2DContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties, std::vector< css::drawing::EnhancedCustomShapeSegment >& rSegments, Path2D& rPath2D )
 : ContextHandler2( rParent )
 , mrPath2D( rPath2D )
 , mrSegments( rSegments )
@@ -1124,7 +1124,7 @@ ContextHandlerRef Path2DContext::onCreateContext( sal_Int32 aElementToken,
 class Path2DListContext : public ContextHandler2
 {
 public:
-    Path2DListContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< EnhancedCustomShapeSegment >& rSegments,
+    Path2DListContext( ContextHandler2Helper const & rParent, CustomShapeProperties & rCustomShapeProperties, std::vector< EnhancedCustomShapeSegment >& rSegments,
         std::vector< Path2D >& rPath2DList );
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( sal_Int32 aElementToken, const ::oox::AttributeList& rAttribs ) override;
@@ -1136,7 +1136,7 @@ protected:
     std::vector< Path2D >& mrPath2DList;
 };
 
-Path2DListContext::Path2DListContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< EnhancedCustomShapeSegment >& rSegments,
+Path2DListContext:: Path2DListContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties, std::vector< EnhancedCustomShapeSegment >& rSegments,
                                         std::vector< Path2D >& rPath2DList )
 : ContextHandler2( rParent )
 , mrCustomShapeProperties( rCustomShapeProperties )
@@ -1157,7 +1157,7 @@ ContextHandlerRef Path2DListContext::onCreateContext( sal_Int32 aElementToken, c
 }
 
 // CT_CustomGeometry2D
-CustomShapeGeometryContext::CustomShapeGeometryContext( ContextHandler2Helper& rParent, CustomShapeProperties& rCustomShapeProperties )
+CustomShapeGeometryContext::CustomShapeGeometryContext( ContextHandler2Helper const & rParent, CustomShapeProperties& rCustomShapeProperties )
 : ContextHandler2( rParent )
 , mrCustomShapeProperties( rCustomShapeProperties )
 {
@@ -1200,7 +1200,7 @@ ContextHandlerRef CustomShapeGeometryContext::onCreateContext( sal_Int32 aElemen
 }
 
 // CT_PresetGeometry2D
-PresetShapeGeometryContext::PresetShapeGeometryContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
+PresetShapeGeometryContext::PresetShapeGeometryContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
 : ContextHandler2( rParent )
 , mrCustomShapeProperties( rCustomShapeProperties )
 {
@@ -1218,7 +1218,7 @@ ContextHandlerRef PresetShapeGeometryContext::onCreateContext( sal_Int32 aElemen
 }
 
 // CT_PresetTextShape
-PresetTextShapeContext::PresetTextShapeContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
+PresetTextShapeContext::PresetTextShapeContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, CustomShapeProperties& rCustomShapeProperties )
 : ContextHandler2( rParent )
 , mrCustomShapeProperties( rCustomShapeProperties )
 {
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.cxx b/oox/source/drawingml/diagram/constraintlistcontext.cxx
index 87a52f14446f..4130cb6aea6d 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.cxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::xml::sax;
 namespace oox { namespace drawingml {
 
 // CT_ConstraintLists
-ConstraintListContext::ConstraintListContext( ContextHandler2Helper& rParent,
+ConstraintListContext::ConstraintListContext( ContextHandler2Helper const & rParent,
                                               const LayoutAtomPtr &pNode )
     : ContextHandler2( rParent )
     , mpNode( pNode )
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.hxx b/oox/source/drawingml/diagram/constraintlistcontext.hxx
index b1a9116aba33..057eda8dbcc7 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.hxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.hxx
@@ -29,7 +29,7 @@ namespace oox { namespace drawingml {
 class ConstraintListContext : public ::oox::core::ContextHandler2
 {
 public:
-    ConstraintListContext( ContextHandler2Helper& rParent, const LayoutAtomPtr &pNode );
+    ConstraintListContext( ContextHandler2Helper const & rParent, const LayoutAtomPtr &pNode );
     virtual ~ConstraintListContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const AttributeList& rAttribs ) override;
diff --git a/oox/source/drawingml/diagram/datamodelcontext.cxx b/oox/source/drawingml/diagram/datamodelcontext.cxx
index a48e2c292e4b..43d9bb547ecb 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.cxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.cxx
@@ -37,7 +37,7 @@ class CxnListContext
     : public ContextHandler2
 {
 public:
-    CxnListContext( ContextHandler2Helper& rParent,
+    CxnListContext( ContextHandler2Helper const & rParent,
                     dgm::Connections & aConnections )
         : ContextHandler2( rParent )
         , mrConnection( aConnections )
@@ -84,7 +84,7 @@ class PresLayoutVarsContext
     : public ContextHandler2
 {
 public:
-    PresLayoutVarsContext( ContextHandler2Helper& rParent,
+    PresLayoutVarsContext( ContextHandler2Helper const & rParent,
                            dgm::Point & rPoint ) :
         ContextHandler2( rParent ),
         mrPoint( rPoint )
@@ -137,7 +137,7 @@ class PropertiesContext
     : public ContextHandler2
 {
 public:
-    PropertiesContext( ContextHandler2Helper& rParent,
+    PropertiesContext( ContextHandler2Helper const & rParent,
                        dgm::Point & rPoint,
                        const AttributeList& rAttribs ) :
         ContextHandler2( rParent ),
@@ -201,7 +201,7 @@ class PtContext
     : public ContextHandler2
 {
 public:
-    PtContext( ContextHandler2Helper& rParent,
+    PtContext( ContextHandler2Helper const & rParent,
                const AttributeList& rAttribs,
                dgm::Point & rPoint):
         ContextHandler2( rParent ),
@@ -255,7 +255,7 @@ class PtListContext
     : public ContextHandler2
 {
 public:
-    PtListContext( ContextHandler2Helper& rParent,  dgm::Points& rPoints) :
+    PtListContext( ContextHandler2Helper const & rParent,  dgm::Points& rPoints) :
         ContextHandler2( rParent ),
         mrPoints( rPoints )
     {}
@@ -286,7 +286,7 @@ class BackgroundFormattingContext
     : public ContextHandler2
 {
 public:
-    BackgroundFormattingContext( ContextHandler2Helper& rParent, DiagramDataPtr & pModel )
+    BackgroundFormattingContext( ContextHandler2Helper const & rParent, DiagramDataPtr const & pModel )
         : ContextHandler2( rParent )
         , mpDataModel( pModel )
         {
@@ -322,7 +322,7 @@ private:
     DiagramDataPtr mpDataModel;
 };
 
-DataModelContext::DataModelContext( ContextHandler2Helper& rParent,
+DataModelContext::DataModelContext( ContextHandler2Helper const & rParent,
                                     const DiagramDataPtr & pDataModel )
     : ContextHandler2( rParent )
     , mpDataModel( pDataModel )
diff --git a/oox/source/drawingml/diagram/datamodelcontext.hxx b/oox/source/drawingml/diagram/datamodelcontext.hxx
index 2642be374e40..de2c3a20af49 100644
--- a/oox/source/drawingml/diagram/datamodelcontext.hxx
+++ b/oox/source/drawingml/diagram/datamodelcontext.hxx
@@ -31,7 +31,7 @@ namespace oox { namespace drawingml {
 class DataModelContext : public ::oox::core::ContextHandler2
 {
 public:
-    DataModelContext( ::oox::core::ContextHandler2Helper& rParent, const DiagramDataPtr & pDataModelPtr );
+    DataModelContext( ::oox::core::ContextHandler2Helper const & rParent, const DiagramDataPtr & pDataModelPtr );
     virtual ~DataModelContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/source/drawingml/diagram/diagram.cxx b/oox/source/drawingml/diagram/diagram.cxx
index 175df73e9420..ec396ceed9d3 100644
--- a/oox/source/drawingml/diagram/diagram.cxx
+++ b/oox/source/drawingml/diagram/diagram.cxx
@@ -397,7 +397,7 @@ void importFragment( core::XmlFilterBase& rFilter,
     rFilter.importFragment( rxHandler, xSerializer );
 }
 
-void loadDiagram( ShapePtr& pShape,
+void loadDiagram( ShapePtr const & pShape,
                   core::XmlFilterBase& rFilter,
                   const OUString& rDataModelPath,
                   const OUString& rLayoutPath,
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
index 56f81dca5867..d3f1f362e35c 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::xml::sax;
 namespace oox { namespace drawingml {
 
 // CT_DiagramDefinition
-DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper& rParent,
+DiagramDefinitionContext::DiagramDefinitionContext( ContextHandler2Helper const & rParent,
                                                     const AttributeList& rAttributes,
                                                     const DiagramLayoutPtr &pLayout )
     : ContextHandler2( rParent )
diff --git a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
index 9f5161b2f769..cc9da9159a81 100644
--- a/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
+++ b/oox/source/drawingml/diagram/diagramdefinitioncontext.hxx
@@ -28,7 +28,7 @@ namespace oox { namespace drawingml {
 class DiagramDefinitionContext : public ::oox::core::ContextHandler2
 {
 public:
-    DiagramDefinitionContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, const DiagramLayoutPtr &pLayout );
+    DiagramDefinitionContext( ::oox::core::ContextHandler2Helper const & rParent, const ::oox::AttributeList& rAttributes, const DiagramLayoutPtr &pLayout );
     virtual ~DiagramDefinitionContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
index a580da73ff32..f661d48389d2 100755
--- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
@@ -32,7 +32,7 @@ using namespace ::oox::core;
 
 namespace oox { namespace drawingml {
 
-void ShapeCreationVisitor::defaultVisit(LayoutAtom& rAtom)
+void ShapeCreationVisitor::defaultVisit(LayoutAtom const & rAtom)
 {
     for (const auto& pAtom : rAtom.getChildren())
         pAtom->accept(*this);
@@ -150,7 +150,7 @@ void ShapeCreationVisitor::visit(ShapeAtom& /*rAtom*/)
     // stop processing
 }
 
-void ShapeTemplateVisitor::defaultVisit(LayoutAtom& rAtom)
+void ShapeTemplateVisitor::defaultVisit(LayoutAtom const & rAtom)
 {
     // visit all children, one of them needs to be the layout algorithm
     for (const auto& pAtom : rAtom.getChildren())
@@ -202,7 +202,7 @@ void ShapeTemplateVisitor::visit(ShapeAtom& rAtom)
     mpShape.reset(new Shape(pCurrShape));
 }
 
-void ShapeLayoutingVisitor::defaultVisit(LayoutAtom& rAtom)
+void ShapeLayoutingVisitor::defaultVisit(LayoutAtom const & rAtom)
 {
     // visit all children, one of them needs to be the layout algorithm
     for (const auto& pAtom : rAtom.getChildren())
@@ -260,7 +260,7 @@ void ShapeLayoutingVisitor::visit(ShapeAtom& /*rAtom*/)
     // stop processing
 }
 
-void ShallowPresNameVisitor::defaultVisit(LayoutAtom& rAtom)
+void ShallowPresNameVisitor::defaultVisit(LayoutAtom const & rAtom)
 {
     // visit all children, at least one of them needs to have proper
     // name set
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.hxx b/oox/source/drawingml/diagram/layoutatomvisitors.hxx
index 3ffef36d8954..86432a8a4376 100755
--- a/oox/source/drawingml/diagram/layoutatomvisitors.hxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.hxx
@@ -34,7 +34,7 @@ class ShapeCreationVisitor : public LayoutAtomVisitor
     const Diagram& mrDgm;
     sal_Int32 mnCurrIdx;
 
-    void defaultVisit(LayoutAtom& rAtom);
+    void defaultVisit(LayoutAtom const & rAtom);
     virtual void visit(ConstraintAtom& rAtom) override;
     virtual void visit(AlgAtom& rAtom) override;
     virtual void visit(ForEachAtom& rAtom) override;
@@ -65,7 +65,7 @@ class ShapeTemplateVisitor : public LayoutAtomVisitor
     virtual void visit(ShapeAtom& rAtom) override;
 
 public:
-    void defaultVisit(LayoutAtom& rAtom);
+    void defaultVisit(LayoutAtom const & rAtom);
     ShapePtr getShapeCopy() const
         { return mpShape; }
 };
@@ -75,7 +75,7 @@ class ShapeLayoutingVisitor : public LayoutAtomVisitor
     LayoutNode* mpCurrentLayoutNode;
     bool mbLookForAlg;
 
-    void defaultVisit(LayoutAtom& rAtom);
+    void defaultVisit(LayoutAtom const & rAtom);
     virtual void visit(ConstraintAtom& rAtom) override;
     virtual void visit(AlgAtom& rAtom) override;
     virtual void visit(ForEachAtom& rAtom) override;
@@ -96,7 +96,7 @@ class ShallowPresNameVisitor : public LayoutAtomVisitor
     const Diagram& mrDgm;
     size_t mnCnt;
 
-    void defaultVisit(LayoutAtom& rAtom);
+    void defaultVisit(LayoutAtom const & rAtom);
     virtual void visit(ConstraintAtom& rAtom) override;
     virtual void visit(AlgAtom& rAtom) override;
     virtual void visit(ForEachAtom& rAtom) override;
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index 3a0aeba11563..70cd6c153f5f 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -39,7 +39,7 @@ class IfContext
     : public LayoutNodeContext
 {
 public:
-    IfContext( ContextHandler2Helper& rParent,
+    IfContext( ContextHandler2Helper const & rParent,
                const AttributeList& rAttribs,
                const ConditionAtomPtr& pAtom )
         : LayoutNodeContext( rParent, rAttribs, pAtom )
@@ -50,7 +50,7 @@ class AlgorithmContext
     : public ContextHandler2
 {
 public:
-    AlgorithmContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, const AlgAtomPtr & pNode )
+    AlgorithmContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, const AlgAtomPtr & pNode )
         : ContextHandler2( rParent )
         , mnRevision( 0 )
         , mpNode( pNode )
@@ -89,7 +89,7 @@ class ChooseContext
     : public ContextHandler2
 {
 public:
-    ChooseContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, const LayoutAtomPtr & pNode )
+    ChooseContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, const LayoutAtomPtr & pNode )
         : ContextHandler2( rParent )
         , mpNode( pNode )
         {
@@ -139,7 +139,7 @@ class ForEachContext
     : public LayoutNodeContext
 {
 public:
-    ForEachContext( ContextHandler2Helper& rParent, const AttributeList& rAttribs, const ForEachAtomPtr& pAtom )
+    ForEachContext( ContextHandler2Helper const & rParent, const AttributeList& rAttribs, const ForEachAtomPtr& pAtom )
         : LayoutNodeContext( rParent, rAttribs, pAtom )
         {
             rAttribs.getString( XML_ref );
@@ -152,7 +152,7 @@ class LayoutVariablePropertySetContext
     : public ContextHandler2
 {
 public:
-    LayoutVariablePropertySetContext( ContextHandler2Helper& rParent, LayoutNode::VarMap & aVar )
+    LayoutVariablePropertySetContext( ContextHandler2Helper const & rParent, LayoutNode::VarMap & aVar )
         : ContextHandler2( rParent )
         , mVariables( aVar )
         {
@@ -173,7 +173,7 @@ private:
 };
 
 // CT_LayoutNode
-LayoutNodeContext::LayoutNodeContext( ContextHandler2Helper& rParent,
+LayoutNodeContext::LayoutNodeContext( ContextHandler2Helper const & rParent,
                                       const AttributeList& rAttribs,
                                       const LayoutAtomPtr& pAtom )
     : ContextHandler2( rParent )
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.hxx b/oox/source/drawingml/diagram/layoutnodecontext.hxx
index a98c86713b21..85f73f029f24 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.hxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.hxx
@@ -29,7 +29,7 @@ namespace oox { namespace drawingml {
 class LayoutNodeContext : public ::oox::core::ContextHandler2
 {
 public:
-    LayoutNodeContext( ::oox::core::ContextHandler2Helper& rParent, const ::oox::AttributeList& rAttributes, const LayoutAtomPtr &pNode );
+    LayoutNodeContext( ::oox::core::ContextHandler2Helper const & rParent, const ::oox::AttributeList& rAttributes, const LayoutAtomPtr &pNode );
     virtual ~LayoutNodeContext() override;
 
     virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override;
diff --git a/oox/source/drawingml/effectpropertiescontext.cxx b/oox/source/drawingml/effectpropertiescontext.cxx
index dc7f85517ea2..560268f52563 100644
--- a/oox/source/drawingml/effectpropertiescontext.cxx
+++ b/oox/source/drawingml/effectpropertiescontext.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star::xml::sax;
 
 namespace oox { namespace drawingml {
 
-EffectPropertiesContext::EffectPropertiesContext( ContextHandler2Helper& rParent,
+EffectPropertiesContext::EffectPropertiesContext( ContextHandler2Helper const& rParent,
     EffectProperties& rEffectProperties ) throw()
 : ContextHandler2( rParent )
 , mrEffectProperties( rEffectProperties )
diff --git a/oox/source/drawingml/effectpropertiescontext.hxx b/oox/source/drawingml/effectpropertiescontext.hxx
index 4482db6fe0de..b0688c2838aa 100644
--- a/oox/source/drawingml/effectpropertiescontext.hxx
+++ b/oox/source/drawingml/effectpropertiescontext.hxx
@@ -20,7 +20,7 @@ struct Effect;
 class EffectPropertiesContext : public ::oox::core::ContextHandler2
 {
 public:
-    EffectPropertiesContext( ::oox::core::ContextHandler2Helper& rParent,
+    EffectPropertiesContext( ::oox::core::ContextHandler2Helper const & rParent,
             EffectProperties& rEffectProperties ) throw();
     virtual ~EffectPropertiesContext() override;
 
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index db77409cb0bb..3035a2d55844 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -71,7 +71,7 @@ namespace drawingml {
 
 // CT_Picture
 

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list