loplugin:passstuffbyref in dbaccess

Change-Id: Ice52ebbfeca45c8587fdcd0d3dea5c02c7de27e3

56 files changed, 91 insertions, 91 deletions

diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx
index c623d3481344..15ec6604bf83 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -152,7 +152,7 @@ namespace dbaccess
         void deregisterOldRow(const TORowSetOldRowHelperRef& _rRow);
 
     // css::sdbc::XResultSetMetaDataSupplier
-        css::uno::Reference< css::sdbc::XResultSetMetaData > getMetaData(  ) { return m_xMetaData;}
+        const css::uno::Reference< css::sdbc::XResultSetMetaData >& getMetaData(  ) { return m_xMetaData;}
 
     // css::sdbcx::XRowLocate
         css::uno::Any getBookmark(  );
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx
index 43bc253e0aa9..4b4c97e35a39 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.hxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.hxx
@@ -69,7 +69,7 @@ namespace dbaccess
 
         void setBookmark(const css::uno::Any&  _rBookmark);
 
-        ORowSetCacheMap::iterator getIter() const { return m_aIter; }
+        const ORowSetCacheMap::iterator& getIter() const { return m_aIter; }
     };
 }
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHEITERATOR_HXX
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index 604c1dfc65c8..ece120f3ebd0 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -43,7 +43,7 @@ namespace dbaccess
             : m_aRow(_rRow)
         {}
 
-        inline ORowSetRow getRow() const { return m_aRow; }
+        const ORowSetRow& getRow() const { return m_aRow; }
         inline void clearRow() { m_aRow = nullptr; }
         inline void setRow(const ORowSetRow& _rRow) { m_aRow = _rRow; }
     };
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 8de14c6f7de2..ca3003ec5a02 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -281,8 +281,8 @@ public:
 
     void dispose();
 
-    inline OUString getURL() const               { return m_sDocumentURL;     }
-    inline OUString getDocFileLocation() const   { return m_sDocFileLocation; }
+    const OUString& getURL() const               { return m_sDocumentURL;     }
+    const OUString& getDocFileLocation() const   { return m_sDocFileLocation; }
 
     css::uno::Reference< css::embed::XStorage >
             getStorage( const ObjectType _eType );
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 258be0fd9b18..ea409eb0bd74 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -332,8 +332,8 @@ namespace dbaccess
     public:
         ODocumentSaveContinuation() { }
 
-        inline Reference<XContent>  getContent() const { return m_xParentContainer; }
-        inline OUString      getName() const { return m_sName; }
+        const Reference<XContent>& getContent() const { return m_xParentContainer; }
+        const OUString&       getName() const { return m_sName; }
 
         // XInteractionDocumentSave
         virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException, std::exception) override;
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 768b4b92e4ad..59f768bcae59 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.hxx
@@ -180,7 +180,7 @@ namespace dbaccess
 
         const css::uno::Reference< css::uno::XComponentContext >& getContext() const { return m_aContext; }
 
-        inline TContentPtr getImpl() const { return m_pImpl; }
+        const TContentPtr& getImpl() const { return m_pImpl; }
 
     protected:
         virtual OUString determineContentType() const = 0;
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx
index b2d2a64ee817..755246cc62bf 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -62,7 +62,7 @@ namespace dbaccess
 
         inline void setName( const OUString& _sName ) { m_sName = _sName; }
         void setDefinition( const css::uno::Reference< css::beans::XPropertySet >& _xDest);
-        inline css::uno::Reference< css::beans::XPropertySet > getDefinition() const { return m_xDest; }
+        const css::uno::Reference< css::beans::XPropertySet >& getDefinition() const { return m_xDest; }
     };
 
 }   // namespace dbaccess
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx
index ef559f333399..d95e185562b5 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -150,7 +150,7 @@ namespace dbaccess
         virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
         static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
 
-        css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const { return m_xMetaData; }
+        const css::uno::Reference< css::sdbc::XDatabaseMetaData>& getMetaData() const { return m_xMetaData; }
 
         // XColumnsSupplier
         virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getColumns(  ) throw (css::uno::RuntimeException, std::exception) override;
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index eaa1b0d1b1c8..ff5346edb66d 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -137,7 +137,7 @@ protected:
         given here.
     */
     void                setElementApproval( PContainerApprove _pElementApproval ) { m_pElementApproval = _pElementApproval; }
-    PContainerApprove   getElementApproval() const { return m_pElementApproval; }
+    const PContainerApprove& getElementApproval() const { return m_pElementApproval; }
 
 protected:
     virtual ~ODefinitionContainer();
diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx
index a4b7c6ff6489..4a8243686eeb 100644
--- a/dbaccess/source/core/inc/userinformation.hxx
+++ b/dbaccess/source/core/inc/userinformation.hxx
@@ -31,7 +31,7 @@ class UserInformation
 public:
     UserInformation();
 
-    css::lang::Locale      getUserLanguage() const { return m_aUserLocale; }
+    const css::lang::Locale& getUserLanguage() const { return m_aUserLocale; }
 };
 
 #endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_USERINFORMATION_HXX
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index ad6d3eb86890..237d0467792d 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -191,7 +191,7 @@ public:
     // XExporter
     virtual void SAL_CALL setSourceDocument( const css::uno::Reference< css::lang::XComponent >& xDoc ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
 
-    inline Reference<XPropertySet> getDataSource() const { return m_xDataSource; }
+    const Reference<XPropertySet>& getDataSource() const { return m_xDataSource; }
 };
 
 } // dbaxml
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 2b3daecfad21..5db692434af9 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -124,7 +124,7 @@ public:
     virtual void SetViewSettings(const css::uno::Sequence<css::beans::PropertyValue>& aViewProps) override;
     virtual void SetConfigurationSettings(const css::uno::Sequence<css::beans::PropertyValue>& aConfigProps) override;
 
-    inline Reference<XPropertySet> getDataSource() const { return m_xDataSource; }
+    const Reference<XPropertySet>& getDataSource() const { return m_xDataSource; }
 
     inline const TPropertyNameMap& getQuerySettings() const { return m_aQuerySettings;}
 
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx
index 33cdbbd0c945..cdb7b4055a31 100644
--- a/dbaccess/source/inc/OAuthenticationContinuation.hxx
+++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx
@@ -58,8 +58,8 @@ public:
     void SAL_CALL setRememberAccount( css::ucb::RememberAuthentication Remember ) throw(css::uno::RuntimeException, std::exception) override;
 
     void            setCanChangeUserName( bool bVal )  { m_bCanSetUserName = bVal; }
-    OUString getUser() const             { return m_sUser; }
-    OUString getPassword() const         { return m_sPassword; }
+    const OUString& getUser() const             { return m_sUser; }
+    const OUString& getPassword() const         { return m_sPassword; }
     bool        getRememberPassword() const { return m_bRemberPassword; }
 };
 
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 73a4073270c6..302ae2fca9c2 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -135,7 +135,7 @@ class OParameterContinuation : public OInteraction< XInteractionSupplyParameters
 public:
     OParameterContinuation() { }
 
-    Sequence< PropertyValue >   getValues() const { return m_aValues; }
+    const Sequence< PropertyValue >&  getValues() const { return m_aValues; }
 
 // XInteractionSupplyParameters
     virtual void SAL_CALL setParameters( const Sequence< PropertyValue >& _rValues ) throw(RuntimeException, std::exception) override;
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index eef6891b5a56..3ebaef041568 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -95,7 +95,7 @@ namespace dbaui
 
             @return the connection data
         */
-        inline TTableConnectionData::value_type getData() const { return m_pConnData; }
+        const TTableConnectionData::value_type& getData() const { return m_pConnData; }
 
         void lateInit();
 
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index c487f2c59d10..64efba450f4e 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -90,7 +90,7 @@ namespace dbaui
         /// clear the password in the current data source's item set
         void        clearPassword();
 
-        inline css::uno::Reference< css::uno::XComponentContext > getORB() const { return m_xContext; }
+        const css::uno::Reference< css::uno::XComponentContext >& getORB() const { return m_xContext; }
 
         /** creates a new connection. The caller is responsible to dispose it !!!!
         */
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 9d965437b4c5..9c3b8f9b615e 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -104,8 +104,8 @@ namespace dbaui
         {
         }
 
-        inline ::svt::PWindowEventFilter getEventFilter() const   { return m_pEventFilter; }
-        inline ::svt::PWindowOperator    getOperator() const      { return m_pOperator; }
+        const ::svt::PWindowEventFilter& getEventFilter() const   { return m_pEventFilter; }
+        const ::svt::PWindowOperator&    getOperator() const      { return m_pOperator; }
 
     private:
         ::svt::PWindowEventFilter   m_pEventFilter;
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index d4f3b6771674..385c939d4ab7 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -43,7 +43,7 @@ public:
     OTableIndex( const OTableIndex& _rSource) : aIndexFileName(_rSource.aIndexFileName) { }
     explicit OTableIndex( const OUString& rFileName ) : aIndexFileName( rFileName ) { }
 
-    OUString GetIndexFileName() const { return aIndexFileName; }
+    const OUString& GetIndexFileName() const { return aIndexFileName; }
 };
 
 typedef ::std::list< OTableIndex >  TableIndexList;
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index c88bbbf6968b..f4fdd703cdbe 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -339,7 +339,7 @@ void OSaveAsDlg::implInit()
     m_pImpl->m_pTitle->GrabFocus();
 }
 
-OUString OSaveAsDlg::getName() const
+const OUString& OSaveAsDlg::getName() const
 {
     return m_pImpl->m_aName;
 }
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 7869805dd4d9..3ab74d63e4b2 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -72,7 +72,7 @@ namespace dbaui
         void            SetTypeSelectHandler( const Link<OGeneralPage&,void>& _rHandler ) { m_aTypeSelectHandler = _rHandler; }
 
         /// get the currently selected datasource type
-        OUString     GetSelectedType() const { return m_eCurrentSelection; }
+        const OUString&  GetSelectedType() const { return m_eCurrentSelection; }
 
     protected:
         // SfxTabPage overridables
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index 5d0fcae75c5e..eb60baddf113 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -66,7 +66,7 @@ public:
 #else
     bool        isLoaded() const { return false; }
 #endif
-    OUString    getLibraryName() const { return m_sLibPath; }
+    const OUString& getLibraryName() const { return m_sLibPath; }
 
     void        getDatasourceNames(StringBag& _rNames);
 
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 6ef0fc750283..ac8bce123bf0 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -86,7 +86,7 @@ namespace
         {
         }
 
-        OUString  getLabel() const
+        const OUString&  getLabel() const
         {
             return m_label;
         }
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx
index f1ac9a1682cb..794c3213807e 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -58,7 +58,7 @@ namespace dbaui
                         ,const css::uno::Reference< css::uno::XComponentContext >& _rxContext);
         virtual ~OCollectionView();
         virtual void dispose() override;
-        css::uno::Reference< css::ucb::XContent> getSelectedFolder() const { return m_xContent;}
+        const css::uno::Reference< css::ucb::XContent>& getSelectedFolder() const { return m_xContent;}
         OUString getName() const;
     };
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx
index 2fc65b4cff6d..3e0590fcea4c 100644
--- a/dbaccess/source/ui/inc/ConnectionLine.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLine.hxx
@@ -62,7 +62,7 @@ namespace dbaui
         Rectangle           GetSourceTextPos() const;
         Rectangle           GetDestTextPos() const;
 
-        OConnectionLineDataRef  GetData() const { return m_pData; }
+        const OConnectionLineDataRef& GetData() const { return m_pData; }
 
         Point               getMidPoint() const;
     };
diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx
index 520797e18c74..17f463e1fa56 100644
--- a/dbaccess/source/ui/inc/ConnectionLineData.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineData.hxx
@@ -66,7 +66,7 @@ namespace dbaui
         void SetDestFieldName( const OUString& rDestFieldName ){ SetFieldName(JTCS_TO, rDestFieldName); }
 
         // member access (read)
-        OUString GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; }
+        const OUString& GetFieldName(EConnectionSide nWhich) const { return (nWhich == JTCS_FROM) ? m_aSourceFieldName : m_aDestFieldName; }
         OUString GetSourceFieldName() const { return GetFieldName(JTCS_FROM); }
         OUString GetDestFieldName() const { return GetFieldName(JTCS_TO); }
 
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index 3e4849725c9a..0603efee7195 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.hxx
@@ -39,7 +39,7 @@ namespace dbaui
         virtual bool IsModified() const override { return IsValueChangedFromSaved(); }
 
         short GetPos() const { return m_nPos; }
-        OUString GetHelp() const { return m_strHelpText; }
+        const OUString& GetHelp() const { return m_strHelpText; }
     };
 
     class OPropEditCtrl :   public Edit
@@ -54,7 +54,7 @@ namespace dbaui
         virtual bool IsModified() const override { return IsValueChangedFromSaved(); }
 
         short GetPos() const { return m_nPos; }
-        OUString GetHelp() const { return m_strHelpText; }
+        const OUString& GetHelp() const { return m_strHelpText; }
     };
 
     class OPropNumericEditCtrl : public NumericField
@@ -68,7 +68,7 @@ namespace dbaui
         virtual bool IsModified() const override { return IsValueChangedFromSaved(); }
 
         short GetPos() const { return m_nPos; }
-        OUString GetHelp() const { return m_strHelpText; }
+        const OUString& GetHelp() const { return m_strHelpText; }
 
         void SetSpecialReadOnly(bool _bReadOnly);
     };
@@ -84,7 +84,7 @@ namespace dbaui
         bool IsModified() const { return IsValueChangedFromSaved(); }
 
         short GetPos() const { return m_nPos; }
-        OUString GetHelp() const { return m_strHelpText; }
+        const OUString& GetHelp() const { return m_strHelpText; }
     };
 
 }
diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx
index e6128c11f9c2..19faa09fdc76 100644
--- a/dbaccess/source/ui/inc/FieldDescriptions.hxx
+++ b/dbaccess/source/ui/inc/FieldDescriptions.hxx
@@ -102,7 +102,7 @@ namespace dbaui
         sal_Int32                   GetIsNullable()         const;
         sal_Int32                   GetFormatKey()          const;
         SvxCellHorJustify           GetHorJustify()         const;
-        TOTypeInfoSP                getTypeInfo()           const { return m_pType;}
+        const TOTypeInfoSP&         getTypeInfo()           const { return m_pType;}
         TOTypeInfoSP                getSpecialTypeInfo()    const;
         bool                    IsAutoIncrement()       const;
         bool                    IsPrimaryKey()          const { return m_bIsPrimaryKey;}
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index c5034724df7e..daaaacf90523 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.hxx
@@ -167,7 +167,7 @@ namespace dbaui
 
         bool ScrollPane( long nDelta, bool bHoriz, bool bPaintScrollBars );
         sal_uLong GetTabWinCount();
-        Point GetScrollOffset() const { return m_aScrollOffset; }
+        const Point& GetScrollOffset() const { return m_aScrollOffset; }
 
         OJoinDesignView* getDesignView() const { return m_pView; }
         OTableWindow* GetTabWindow( const OUString& rName );
@@ -257,7 +257,7 @@ namespace dbaui
         */
         bool isMovementAllowed(const Point& _rPoint,const Size& _rSize);
 
-        Size getRealOutputSize() const { return m_aOutputSize; }
+        const Size& getRealOutputSize() const { return m_aOutputSize; }
 
         virtual void EnsureVisible(const OTableWindow* _pWin);
         void EnsureVisible(const Point& _rPoint,const Size& _rSize);
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index 67f8f8e5d962..4632104fac11 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.hxx
@@ -105,8 +105,8 @@ namespace dbaui
         void setSlotEnabled(sal_Int32 _nSlotId, bool _bEnable);
         void setNoneVisbleRow(sal_Int32 _nRows);
 
-        css::lang::Locale      getLocale() const           { return m_aLocale;}
-        OUString                     getDecimalSeparator() const { return m_sDecimalSep;}
+        const css::lang::Locale&      getLocale() const           { return m_aLocale;}
+        const OUString&               getDecimalSeparator() const { return m_sDecimalSep;}
 
         SqlParseError   InsertField( const OTableFieldDescRef& rInfo, bool bActivate = true);
         bool            HasFieldByAliasName(const OUString& rFieldName, OTableFieldDescRef& rInfo) const;
diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx
index 20ee39555754..964c9bdad711 100644
--- a/dbaccess/source/ui/inc/TableConnection.hxx
+++ b/dbaccess/source/ui/inc/TableConnection.hxx
@@ -91,7 +91,7 @@ namespace dbaui
 
         Rectangle   GetBoundingRect() const;
 
-        inline TTableConnectionData::value_type GetData() const { return m_pData; }
+        const TTableConnectionData::value_type& GetData() const { return m_pData; }
         const ::std::vector<OConnectionLine*>&  GetConnLineList() const { return m_vConnLine; }
         inline OJoinTableView*                  GetParent() const { return m_pParent; }
         virtual void Draw(vcl::RenderContext& rRenderContext, const Rectangle& rRect);
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index 1e93fb5be00e..c29d27831e76 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.hxx
@@ -85,13 +85,13 @@ namespace dbaui
         const OConnectionLineDataVec& GetConnLineDataList() const { return m_vConnLineData; }
         OConnectionLineDataVec& GetConnLineDataList() { return m_vConnLineData; }
 
-        inline TTableWindowData::value_type getReferencingTable() const { return m_pReferencingTable; }
-        inline TTableWindowData::value_type getReferencedTable()  const { return m_pReferencedTable;  }
+        const TTableWindowData::value_type& getReferencingTable() const { return m_pReferencingTable; }
+        const TTableWindowData::value_type& getReferencedTable()  const { return m_pReferencedTable;  }
 
         inline void setReferencingTable(const TTableWindowData::value_type& _pTable) { m_pReferencingTable = _pTable; }
         inline void setReferencedTable(const TTableWindowData::value_type& _pTable)  { m_pReferencedTable  = _pTable; }
 
-        OUString GetConnName() const { return m_aConnName; }
+        const OUString& GetConnName() const { return m_aConnName; }
 
         /** Update create a new connection
 
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index e6b600e822dd..4788fb8997f3 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.hxx
@@ -87,7 +87,7 @@ namespace dbaui
     public:
         OTableController(const css::uno::Reference< css::uno::XComponentContext >& _rM);
 
-        css::uno::Reference< css::beans::XPropertySet >       getTable() { return m_xTable;}
+        const css::uno::Reference< css::beans::XPropertySet >&  getTable() { return m_xTable;}
 
         bool     isAddAllowed()     const;
         bool     isDropAllowed()    const;
@@ -109,7 +109,7 @@ namespace dbaui
         inline TOTypeInfoSP                 getTypeInfo(sal_Int32 _nPos) const { return m_aTypeInfoIndex[_nPos]->second; }
         TOTypeInfoSP                        getTypeInfoByType(sal_Int32 _nDataType) const;
 
-        inline TOTypeInfoSP                 getTypeInfoFallBack() const { return m_pTypeInfo; }
+        const TOTypeInfoSP&                 getTypeInfoFallBack() const { return m_pTypeInfo; }
 
         virtual bool                        Construct(vcl::Window* pParent) override;
         // XEventListener
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index acb6ab4f5638..3ad829b4eac9 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.hxx
@@ -87,7 +87,7 @@ namespace dbaui
         OTableFieldDescWin*     GetDescWin()    const { return m_pWin ? m_pWin->GetDescWin() : nullptr; }
         OTableController&       getController() const { return m_rController; }
 
-        css::lang::Locale      getLocale() const { return m_aLocale;}
+        const css::lang::Locale& getLocale() const { return m_aLocale;}
 
         // IClipboardTest
         virtual bool isCutAllowed() override;
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 3f60df883e97..0650119acb7b 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.hxx
@@ -94,11 +94,11 @@ namespace dbaui
         void SetFunctionType( sal_Int32 eTyp ) { m_eFunctionType = eTyp; }
         void SetColumnId(sal_uInt16 _nColumnId) { m_nColumnId = _nColumnId; }
 
-        OUString GetField() const { return m_aFieldName;}
-        OUString GetFieldAlias() const { return m_aFieldAlias;}
-        OUString GetTable() const { return m_aTableName;}
-        OUString GetAlias() const { return m_aAliasName;}
-        OUString GetFunction() const { return m_aFunctionName;}
+        const OUString& GetField() const { return m_aFieldName;}
+        const OUString& GetFieldAlias() const { return m_aFieldAlias;}
+        const OUString& GetTable() const { return m_aTableName;}
+        const OUString& GetAlias() const { return m_aAliasName;}
+        const OUString& GetFunction() const { return m_aFunctionName;}
         sal_Int32 GetDataType() const { return m_eDataType; }
         ETableFieldType GetFieldType() const { return m_eFieldType; }
         EOrderDir GetOrderDir() const { return m_eOrderDir; }
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index c06038be478e..10e47b4e6d49 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -144,9 +144,9 @@ namespace dbaui
         OUString             GetTableName() const { return m_pData->GetTableName(); }
         OUString             GetWinName() const { return m_pData->GetWinName(); }
         OUString             GetComposedName() const { return m_pData->GetComposedName(); }
-        VclPtr<OTableWindowListBox>  GetListBox() const { return m_xListBox; }
-        TTableWindowData::value_type GetData() const { return m_pData; }
-        VclPtr<OTableWindowTitle>    GetTitleCtrl() { return m_xTitle; }
+        const VclPtr<OTableWindowListBox>&  GetListBox() const { return m_xListBox; }
+        const TTableWindowData::value_type& GetData() const { return m_pData; }
+        const VclPtr<OTableWindowTitle>&    GetTitleCtrl() { return m_xTitle; }
 
         /** returns the name which should be used when displaying join or relations
             @return
diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx
index 77b66ceb0a56..a598c0285f5c 100644
--- a/dbaccess/source/ui/inc/TableWindowData.hxx
+++ b/dbaccess/source/ui/inc/TableWindowData.hxx
@@ -66,11 +66,11 @@ namespace dbaui
         bool init(const css::uno::Reference< css::sdbc::XConnection  >& _xConnection
                  ,bool _bAllowQueries);
 
-        inline OUString GetComposedName()    const { return m_sComposedName; }
-        inline OUString GetTableName()       const { return m_aTableName; }
-        inline OUString GetWinName()         const { return m_aWinName; }
-        inline Point GetPosition()                  const { return m_aPosition; }
-        inline Size GetSize()                       const { return m_aSize; }
+        const OUString& GetComposedName()    const { return m_sComposedName; }
+        const OUString& GetTableName()       const { return m_aTableName; }
+        const OUString& GetWinName()         const { return m_aWinName; }
+        const Point& GetPosition()                  const { return m_aPosition; }
+        const Size& GetSize()                       const { return m_aSize; }
         inline bool IsShowAll()                     const { return m_bShowAll; }
         inline bool isQuery()                       const { return m_bIsQuery; }
         inline bool isValid()                       const { return m_bIsValid; } // it is either a table or query but it is known
diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx
index 951964bf6f62..423bbfc55f07 100644
--- a/dbaccess/source/ui/inc/TypeInfo.hxx
+++ b/dbaccess/source/ui/inc/TypeInfo.hxx
@@ -100,7 +100,7 @@ const sal_uInt16 TYPE_BIT       = 31;
                 ,bCaseSensitive(false)
                 ,bUnsigned(false)
         {}
-        inline OUString  getDBName() const { return aTypeName; }
+        const OUString& getDBName() const { return aTypeName; }
 
     };
 
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 16fa2775ef47..212d03445ffc 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -335,8 +335,8 @@ namespace dbaui
 
         // returns a vector where the position of a column and if the column is in the selection
         // when not the value is COLUMN_POSITION_NOT_FOUND == (sal_uInt32)-1
-        ODatabaseExport::TPositions GetColumnPositions()    const { return m_vColumnPos; }
-        ::std::vector<sal_Int32>    GetColumnTypes()        const { return m_vColumnTypes; }
+        const ODatabaseExport::TPositions& GetColumnPositions()    const { return m_vColumnPos; }
+        const ::std::vector<sal_Int32>&    GetColumnTypes()        const { return m_vColumnTypes; }
         bool                        UseHeaderLine()         const { return m_bUseHeaderLine; }
         void                        setUseHeaderLine(bool _bUseHeaderLine) { m_bUseHeaderLine = _bUseHeaderLine; }
 
@@ -367,22 +367,22 @@ namespace dbaui
             @return
                 The name of the primary key.
         */
-        OUString getPrimaryKeyName() const { return m_aKeyName; }
+        const OUString& getPrimaryKeyName() const { return m_aKeyName; }
 
         const OTypeInfoMap& getTypeInfo()                       const { return m_aTypeInfo; }
 
         TOTypeInfoSP        getDestTypeInfo(sal_Int32 _nPos)    const { return m_aDestTypeInfoIndex[_nPos]->second; }
         const OTypeInfoMap& getDestTypeInfo()                   const { return m_aDestTypeInfo; }
 
-        css::lang::Locale  GetLocale() const { return m_aLocale; }
-        css::uno::Reference< css::util::XNumberFormatter > GetFormatter() const { return m_xFormatter; }
-        css::uno::Reference< css::uno::XComponentContext> GetComponentContext() const { return m_xContext; }
+        const css::lang::Locale&  GetLocale() const { return m_aLocale; }
+        const css::uno::Reference< css::util::XNumberFormatter >& GetFormatter() const { return m_xFormatter; }
+        const css::uno::Reference< css::uno::XComponentContext>& GetComponentContext() const { return m_xContext; }
 
         const ODatabaseExport::TColumns&        getSourceColumns() const{ return m_vSourceColumns; }
         const ODatabaseExport::TColumnVector&   getSrcVector() const    { return m_vSourceVec; }
         ODatabaseExport::TColumns&              getDestColumns()        { return m_vDestColumns; }
         const ODatabaseExport::TColumnVector&   getDestVector() const   { return m_aDestVec; }
-        OUString getName() const { return m_sName; }
+        const OUString& getName() const { return m_sName; }
 
         /** clears the dest vectors
         */
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 0a08bcddce1f..d5fc7a93b037 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -124,13 +124,13 @@ namespace dbaui
 
     // attribute access
     protected:
-        css::uno::Reference< css::sdbc::XRowSet >             getRowSet()         const   { return m_xRowSet; }
-        css::uno::Reference< css::sdbcx::XColumnsSupplier >   getColumnsSupplier()const   { return m_xColumnsSupplier; }
-        css::uno::Reference< css::form::XLoadable >           getLoadable()       const   { return m_xLoadable; }
+        const css::uno::Reference< css::sdbc::XRowSet >&             getRowSet()         const   { return m_xRowSet; }
+        const css::uno::Reference< css::sdbcx::XColumnsSupplier >&   getColumnsSupplier()const   { return m_xColumnsSupplier; }
+        const css::uno::Reference< css::form::XLoadable >&           getLoadable()       const   { return m_xLoadable; }
 
-        css::uno::Reference< css::form::XFormComponent >      getFormComponent()  const   { return m_xGridModel; }
-        css::uno::Reference< css::awt::XControlModel >        getControlModel()   const   { return css::uno::Reference< css::awt::XControlModel > (m_xGridModel, css::uno::UNO_QUERY); }
-        css::uno::Reference< css::util::XNumberFormatter >    getNumberFormatter()const   { return m_xFormatter; }
+        const css::uno::Reference< css::form::XFormComponent >&      getFormComponent()  const   { return m_xGridModel; }
+        css::uno::Reference< css::awt::XControlModel >               getControlModel()   const   { return css::uno::Reference< css::awt::XControlModel > (m_xGridModel, css::uno::UNO_QUERY); }
+        const css::uno::Reference< css::util::XNumberFormatter >&    getNumberFormatter()const   { return m_xFormatter; }
 
         bool    isValid() const         { return m_xRowSet.is() && m_xGridModel.is(); }
         bool    isValidCursor() const;  // checks the css::data::XDatabaseCursor-interface of m_xRowSet
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index acc2584a1f62..d20d90231b08 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -54,7 +54,7 @@ namespace dbaui
         DECL_LINK_TYPED( SplitHdl, Splitter*, void );
     // attribute access
     public:
-        css::uno::Reference< css::awt::XControl >             getGridControl() const  { return m_xGrid; }
+        const css::uno::Reference< css::awt::XControl >&  getGridControl() const  { return m_xGrid; }
         SbaGridControl*         getVclControl() const;
 
     public:
@@ -79,7 +79,7 @@ namespace dbaui
         void    showStatus( const OUString& _rStatus );
         void    hideStatus();
 
-        css::uno::Reference< css::awt::XControlContainer >     getContainer() { return m_xMe; }
+        const css::uno::Reference< css::awt::XControlContainer >& getContainer() { return m_xMe; }
 
     protected:
         virtual bool PreNotify( NotifyEvent& rNEvt ) override;
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index 87a957c0ec0e..8d6771ad6039 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -73,8 +73,8 @@ namespace dbaui
     public:
         CharsetDisplayDerefHelper(const CharsetDisplayDerefHelper& _rSource);
 
-        OUString     getIanaName() const         { return CharsetDisplayDerefHelper_Base::getIanaName(); }
-        OUString     getDisplayName() const      { return m_sDisplayName; }
+        OUString        getIanaName() const         { return CharsetDisplayDerefHelper_Base::getIanaName(); }
+        const OUString& getDisplayName() const      { return m_sDisplayName; }
 
     protected:
         CharsetDisplayDerefHelper(const ::dbtools::CharsetIteratorDerefHelper& _rBase, const OUString& _rDisplayName);
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index f5096b5b34d9..7487246903b3 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -63,7 +63,7 @@ public:
     void     SetTextNoPrefix(const OUString& _rText);
 
     inline void      SaveValueNoPrefix()             { m_sSaveValueNoPrefix = GetTextNoPrefix(); }
-    inline OUString  GetSavedValueNoPrefix() const   { return m_sSaveValueNoPrefix; }
+    const OUString&  GetSavedValueNoPrefix() const   { return m_sSaveValueNoPrefix; }
     inline void      SetTypeCollection(::dbaccess::ODsnTypeCollection* _pTypeCollection) { m_pTypeCollection = _pTypeCollection; }
 };
 
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index 07d44c8393f0..e01d3d2114be 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -68,7 +68,7 @@ namespace dbaui
         virtual ~OSaveAsDlg();
         virtual void dispose() override;
 
-        OUString getName() const;
+        const OUString& getName() const;
         OUString getCatalog() const;
         OUString getSchema() const;
     private:
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index c9d7093db9de..5468a19a5a39 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -149,7 +149,7 @@ namespace dbaui
         sal_Int32                           m_nNamePropHandle;
 
     public:
-        css::uno::Reference< css::sdbc::XRowSet >  getAttachedForm() const { return m_xMainForm; }
+        const css::uno::Reference< css::sdbc::XRowSet >& getAttachedForm() const { return m_xMainForm; }
 
     public:
         SbaXFormAdapter();
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index 79edb77d937e..dd7fd7654ea9 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -86,7 +86,7 @@ namespace dbaui
         virtual ~OParameterDialog();
         virtual void dispose() override;
 
-        css::uno::Sequence< css::beans::PropertyValue >
+        const css::uno::Sequence< css::beans::PropertyValue >&
                     getValues() const { return m_aFinalValues; }
 
     protected:
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index 89f5310189cb..a74b7ae43014 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -61,7 +61,7 @@ namespace dbaui
             // called when the beamer has been disposed
         void    disposingPreview();
 
-        css::uno::Reference< css::frame::XFrame2 >
+        const css::uno::Reference< css::frame::XFrame2 >&
                 getPreviewFrame() const { return m_xBeamer; }
 
         OQueryDesignView*   getDesignView() { return m_pViewSwitch->getDesignView(); }
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index a16c53b4fc31..a98649595a2e 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -143,7 +143,7 @@ namespace dbaui
         bool        isDistinct()            const { return m_bDistinct; }
         sal_Int64       getLimit()              const { return m_nLimit; }
 
-        OUString getStatement()          const { return m_sStatement; }
+        const OUString& getStatement()          const { return m_sStatement; }
         sal_Int32       getSplitPos()           const { return m_nSplitPos;}
         sal_Int32       getVisibleRows()        const { return m_nVisibleRows; }
 
diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx
index 7bfc7d834f68..2f9a44dca551 100644
--- a/dbaccess/source/ui/inc/queryorder.hxx
+++ b/dbaccess/source/ui/inc/queryorder.hxx
@@ -89,7 +89,7 @@ namespace dbaui
         void            BuildOrderPart();
 
         OUString GetOrderList( ) const;
-        OUString GetOrignalOrder() const { return m_sOrgOrder; }
+        const OUString& GetOrignalOrder() const { return m_sOrgOrder; }
 
     private:
         void            impl_initializeOrderList_nothrow();
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx
index 67999030cb4d..58ed2c13d4f1 100644
--- a/dbaccess/source/ui/inc/sbamultiplex.hxx
+++ b/dbaccess/source/ui/inc/sbamultiplex.hxx
@@ -341,7 +341,7 @@ namespace dbaui
     private:
         css::frame::FeatureStateEvent  m_aLastKnownStatus;
     public:                                                                                 \
-        inline css::frame::FeatureStateEvent getLastEvent( ) const { return m_aLastKnownStatus; }
+        const css::frame::FeatureStateEvent& getLastEvent( ) const { return m_aLastKnownStatus; }
     END_DECLARE_LISTENER_MULTIPLEXER()
 
     // css::form::XLoadListener
diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx
index 2500033a56fb..9ed631a6b7d9 100644
--- a/dbaccess/source/ui/inc/stringlistitem.hxx
+++ b/dbaccess/source/ui/inc/stringlistitem.hxx
@@ -42,7 +42,7 @@ public:
     virtual bool             operator==(const SfxPoolItem& _rItem) const override;
     virtual SfxPoolItem*     Clone(SfxItemPool* _pPool = nullptr) const override;
 
-    css::uno::Sequence< OUString >  getList() const { return m_aList; }
+    const css::uno::Sequence< OUString >& getList() const { return m_aList; }
 };
 
 }   // namespace dbaui
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index f0f5eeef6d0a..3fb396a20587 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -102,7 +102,7 @@ namespace dbaui
 
         const Reference< XDataSource >&             getDataSource() const { return m_xDataSource; }
         const Reference< XPropertySet >&            getDataSourceProps() const { return m_xDataSourceProps; }
-        const Reference< XOfficeDatabaseDocument >  getDatabaseDocument() const { return m_xDocument; }
+        const Reference< XOfficeDatabaseDocument >&  getDatabaseDocument() const { return m_xDocument; }
 
         bool is() const { return m_xDataSource.is(); }
 
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx b/dbaccess/source/ui/misc/dsmeta.cxx
index ecae43d52ddd..bf21780c92f7 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -151,7 +151,7 @@ namespace dbaui
     public:
         explicit DataSourceMetaData_Impl(const OUString& rURL);
 
-        OUString getType() const { return m_sURL; }
+        const OUString& getType() const { return m_sURL; }
 
     private:
         const OUString m_sURL;
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index 88786772b255..13ef2b03034f 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.hxx
@@ -145,7 +145,7 @@ namespace dbaui
 
         ::std::vector< ::std::shared_ptr<OTableRow> >* GetRowList(){ return m_pRowList; }
 
-        ::std::shared_ptr<OTableRow>         GetActRow(){ return pActRow; }
+        const ::std::shared_ptr<OTableRow>& GetActRow(){ return pActRow; }
         void CellModified( long nRow, sal_uInt16 nColId );
         void SetReadOnly( bool bRead=true );
 
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx
index 33cc1717bb65..f4d2470f433f 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.hxx
@@ -60,7 +60,7 @@ class OColumnControlModel :  public ::comphelper::OMutexAndBroadcastHelper
     sal_Int32                   m_nWidth;
 // [properties]
 
-    inline css::uno::Reference< css::lang::XMultiServiceFactory> getORB() const { return m_xORB; }
+    const css::uno::Reference< css::lang::XMultiServiceFactory>& getORB() const { return m_xORB; }
     void registerProperties();
 protected:
 
diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx
index b73831c9f33a..dffc73bb7abd 100644
--- a/include/dbaccess/dataview.hxx
+++ b/include/dbaccess/dataview.hxx
@@ -60,7 +60,7 @@ namespace dbaui
 
         inline IController& getCommandController() const { return *m_xController.get(); }
 
-        css::uno::Reference< css::uno::XComponentContext > getORB() { return m_xContext;}
+        const css::uno::Reference< css::uno::XComponentContext >& getORB() { return m_xContext;}
 
         // the default implementation simply calls resizeAll( GetSizePixel() )
         virtual void Resize() override;
diff --git a/include/dbaccess/genericcontroller.hxx b/include/dbaccess/genericcontroller.hxx
index 85a49a73da23..75b50bee42ab 100644
--- a/include/dbaccess/genericcontroller.hxx
+++ b/include/dbaccess/genericcontroller.hxx
@@ -404,7 +404,7 @@ namespace dbaui
         DECL_LINK_TYPED(OnAsyncCloseTask, void*, void);
 
     public:
-        css::uno::Reference< css::uno::XComponentContext >  getORB() const { return m_xContext; }
+        const css::uno::Reference< css::uno::XComponentContext >& getORB() const { return m_xContext; }
         ODataView*  getView() const { return m_pView; }
         void        setView( const VclPtr<ODataView>& i_rView );
         void        clearView();