6 files changed, 7 insertions, 7 deletions
diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx
index 88aa8a72961f..a29ea074b220 100644
--- a/oox/source/drawingml/customshapegeometry.cxx
+++ b/oox/source/drawingml/customshapegeometry.cxx
@@ -596,7 +596,7 @@ ContextHandlerRef GeomGuideListContext::onCreateContext( sal_Int32 aElementToken
     return this;
 }
 
-static const OUString GetGeomGuideName( const OUString& rValue )
+static const OUString& GetGeomGuideName( const OUString& rValue )
 {
     return rValue;
 }
diff --git a/oox/source/drawingml/diagram/diagram.hxx b/oox/source/drawingml/diagram/diagram.hxx
index 3c88772f0c04..81a14bafb5fc 100644
--- a/oox/source/drawingml/diagram/diagram.hxx
+++ b/oox/source/drawingml/diagram/diagram.hxx
@@ -262,7 +262,7 @@ class Diagram
 {
 public:
     void setData( const DiagramDataPtr & );
-    DiagramDataPtr getData() const
+    const DiagramDataPtr& getData() const
         {
             return mpData;
         }
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 9e7f3caefb7f..7eae88618ebb 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -359,8 +359,8 @@ public:
             sResult = maGUID.copy(1, maGUID.getLength() - 2 );
         return sResult;
     }
-    OUString getFullName() { return maFullName; }
-    OUString getTypeName() { return maTypeName; }
+    const OUString& getFullName() { return maFullName; }
+    const OUString& getTypeName() { return maTypeName; }
     bool isValid() { return mpModel != nullptr; }
     void exportName( const Reference< XOutputStream >& rxOut );
     void exportCompObj( const Reference< XOutputStream >& rxOut );
diff --git a/oox/source/shape/LockedCanvasContext.hxx b/oox/source/shape/LockedCanvasContext.hxx
index a2e430c67938..21dc10f3f804 100644
--- a/oox/source/shape/LockedCanvasContext.hxx
+++ b/oox/source/shape/LockedCanvasContext.hxx
@@ -27,7 +27,7 @@ public:
 
     virtual ::oox::core::ContextHandlerRef onCreateContext(sal_Int32 Element, const ::oox::AttributeList& rAttribs) override;
 
-    oox::drawingml::ShapePtr getShape()
+    const oox::drawingml::ShapePtr& getShape()
     {
         return mpShape;
     }
diff --git a/oox/source/shape/WpgContext.hxx b/oox/source/shape/WpgContext.hxx
index ed0cebf1e245..a212bef255cd 100644
--- a/oox/source/shape/WpgContext.hxx
+++ b/oox/source/shape/WpgContext.hxx
@@ -27,7 +27,7 @@ public:
 
     virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override;
 
-    oox::drawingml::ShapePtr getShape()
+    const oox::drawingml::ShapePtr& getShape()
     {
         return mpShape;
     }
diff --git a/oox/source/shape/WpsContext.hxx b/oox/source/shape/WpsContext.hxx
index 90fd3fb9aa21..b7dfb1d95c35 100644
--- a/oox/source/shape/WpsContext.hxx
+++ b/oox/source/shape/WpsContext.hxx
@@ -27,7 +27,7 @@ public:
 
     virtual oox::core::ContextHandlerRef onCreateContext(sal_Int32 nElementToken, const oox::AttributeList& rAttribs) override;
 
-    oox::drawingml::ShapePtr getShape()
+    const oox::drawingml::ShapePtr& getShape()
     {
         return mpShape;
     }