diff options
Diffstat (limited to 'sw/inc')
41 files changed, 106 insertions, 106 deletions
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index c6738fac6132..7bb7d123a17a 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -161,7 +161,7 @@ class SwSidebarWin : public vcl::Window void SetChangeTracking( const SwPostItHelper::SwLayoutStatus aStatus, const Color& aColor); SwPostItHelper::SwLayoutStatus GetLayoutStatus() { return mLayoutStatus; } - Color GetChangeColor() { return mChangeColor; } + const Color& GetChangeColor() { return mChangeColor; } virtual bool IsProtected() { diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx index 16595d1e7891..13b8e6184e3e 100644 --- a/sw/inc/SwAppletImpl.hxx +++ b/sw/inc/SwAppletImpl.hxx @@ -63,7 +63,7 @@ public: void AppendParam( const OUString& rName, const OUString& rValue ); #endif void FinishApplet(); - css::uno::Reference < css::embed::XEmbeddedObject > GetApplet() { return xApplet; } + const css::uno::Reference < css::embed::XEmbeddedObject >& GetApplet() { return xApplet; } SfxItemSet& GetItemSet() { return aItemSet; } const OUString& GetAltText() const { return sAlt; } void SetAltText( const OUString& rAlt ) {sAlt = rAlt;} diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx index db27fec04a2c..835ed8ae87fe 100644 --- a/sw/inc/ToxWhitespaceStripper.hxx +++ b/sw/inc/ToxWhitespaceStripper.hxx @@ -38,7 +38,7 @@ public: sal_Int32 GetPositionInStrippedString(sal_Int32 pos) const; - OUString + const OUString& GetStrippedString() const { return mStripped;} private: diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx index bce4ccb46e48..885892d35797 100644 --- a/sw/inc/accmap.hxx +++ b/sw/inc/accmap.hxx @@ -298,7 +298,7 @@ private: public: virtual bool IsDocumentSelAll() override; - css::uno::WeakReference < css::accessibility::XAccessible > + const css::uno::WeakReference < css::accessibility::XAccessible >& GetCursorContext() const { return mxCursorContext; } //Para Container for InvalidateCursorPosition diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index e1907b3279a3..e82d9ffb7788 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -351,7 +351,7 @@ class SW_DLLPUBLIC SwAnchoredObject // accessors to the current relative position (relative to anchor // position of anchor frame) - const Point GetCurrRelPos() const { return maRelPos;} + const Point& GetCurrRelPos() const { return maRelPos;} void SetCurrRelPos( Point _aRelPos ); // accessors to the format diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx index 7228b63b27dc..219335120d9b 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -138,7 +138,7 @@ public: LanguageType GetLanguage() const {return m_eLanguage;} void SetLanguage(LanguageType nLang) {m_eLanguage = nLang;} - OUString GetSortAlgorithm() const {return m_sSortAlgorithm;} + const OUString& GetSortAlgorithm() const {return m_sSortAlgorithm;} void SetSortAlgorithm(const OUString& rSet) {m_sSortAlgorithm = rSet;} }; diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx index e681a25fead8..f00f80bed351 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -132,7 +132,7 @@ public: bool IsValid() const { return m_bValidValue; } void ChgValid( bool bNew ) { m_bValidValue = bNew; } - OUString GetFormula() const { return m_sFormula; } + const OUString& GetFormula() const { return m_sFormula; } void SetFormula( const OUString& rNew ) { m_sFormula = rNew; diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx index 9889ecbc49eb..575bdb2540d5 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -71,16 +71,16 @@ public: inline sal_uInt8 GetLevel() const; inline void SetLevel(sal_uInt8); - inline OUString GetNumber() const; - inline OUString GetTitle() const; + inline const OUString& GetNumber() const; + inline const OUString& GetTitle() const; virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; inline sal_uInt8 SwChapterField::GetLevel() const { return nLevel; } inline void SwChapterField::SetLevel(sal_uInt8 nLev) { nLevel = nLev; } -inline OUString SwChapterField::GetNumber() const { return sNumber; } -inline OUString SwChapterField::GetTitle() const { return sTitle; } +inline const OUString& SwChapterField::GetNumber() const { return sNumber; } +inline const OUString& SwChapterField::GetTitle() const { return sTitle; } #endif // INCLUDED_SW_INC_CHPFLD_HXX diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx index ef00108213e1..5a9d07564bd3 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -46,7 +46,7 @@ public: inline void AddRef() { nRefCnt++; } void ReleaseRef(); - OUString GetColumnName() const {return sColumn;} + const OUString& GetColumnName() const {return sColumn;} const SwDBData& GetDBData() const {return aDBData;} virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 583e902b3958..c916542ca462 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -451,7 +451,7 @@ public: ); void setEmbeddedName(const OUString& rEmbeddedName, SwDocShell& rDocShell); - OUString getEmbeddedName() const; + const OUString& getEmbeddedName() const; static void StoreEmbeddedDataSource(const css::uno::Reference<css::frame::XStorable>& xStorable, const css::uno::Reference<css::embed::XStorage>& xStorage, diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx index 7b9868638ac4..953f0ee6af06 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -45,7 +45,7 @@ public: SfxLinkUpdateMode = SfxLinkUpdateMode::ONCALL ); virtual ~SwDDEFieldType(); - OUString GetExpansion() const { return aExpansion; } + const OUString& GetExpansion() const { return aExpansion; } void SetExpansion( const OUString& rStr ) { aExpansion = rStr; bCRLFFlag = false; } diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 1dbf4adb07f2..7b64365e679c 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -589,7 +589,7 @@ public: bool getDocReadOnly() const { return mbReadOnly; } void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; } - const OUString getDocAccTitle() const { return msDocAccTitle; } + const OUString& getDocAccTitle() const { return msDocAccTitle; } // INextInterface here DECL_LINK_TYPED(CalcFieldValueHdl, EditFieldInfo*, void); @@ -975,7 +975,7 @@ public: void SetUpdateTOX( bool bFlag = true ) { mbUpdateTOX = bFlag; } bool IsUpdateTOX() const { return mbUpdateTOX; } - OUString GetTOIAutoMarkURL() const {return msTOIAutoMarkURL;} + const OUString& GetTOIAutoMarkURL() const {return msTOIAutoMarkURL;} void SetTOIAutoMarkURL(const OUString& rSet) {msTOIAutoMarkURL = rSet;} bool IsInReading() const { return mbInReading; } @@ -1357,7 +1357,7 @@ public: /** in case during copying of embedded object a new shell is created, it should be set here and cleaned later */ void SetTmpDocShell( SfxObjectShellLock rLock ) { mxTmpDocShell = rLock; } - SfxObjectShellLock GetTmpDocShell() { return mxTmpDocShell; } + const SfxObjectShellLock& GetTmpDocShell() { return mxTmpDocShell; } // For Autotexts? (text modules) They have only one SVPersist at their disposal. SfxObjectShell* GetPersist() const; @@ -1596,7 +1596,7 @@ public: // access methods for XForms model(s) // access container for XForms model; will be NULL if !isXForms() - css::uno::Reference<css::container::XNameContainer> + const css::uno::Reference<css::container::XNameContainer>& getXForms() const { return mxXForms;} css::uno::Reference< css::linguistic2::XProofreadingIterator > GetGCIterator() const; @@ -1616,7 +1616,7 @@ public: css::uno::Reference< css::script::vba::XVBAEventProcessor > GetVbaEventProcessor(); void SetVBATemplateToProjectCache( css::uno::Reference< css::container::XNameContainer >& xCache ) { m_xTemplateToProjectCache = xCache; }; - css::uno::Reference< css::container::XNameContainer > GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; }; + const css::uno::Reference< css::container::XNameContainer >& GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; }; ::sfx2::IXmlIdRegistry& GetXmlIdRegistry(); ::sw::MetaFieldManager & GetMetaFieldManager(); ::sw::UndoManager & GetUndoManager(); diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 18f6b70fdb97..32eb94b39139 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -173,7 +173,7 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; - OUString GetUserString() const { return sUserStr; } + const OUString& GetUserString() const { return sUserStr; } void SetUserString( const OUString& rS ) { sUserStr = rS; } }; @@ -197,7 +197,7 @@ public: virtual SwField* Copy() const override; inline void SetExpansion(const OUString& rStr) { aContent = rStr; } - inline OUString GetContent() const { return aContent; } + const OUString& GetContent() const { return aContent; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; @@ -224,7 +224,7 @@ public: virtual SwField* Copy() const override; inline void SetExpansion(const OUString& rStr) { aContent = rStr; } - inline OUString GetContent() const { return aContent; } + const OUString& GetContent() const { return aContent; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; @@ -402,7 +402,7 @@ public: SwMacroField( SwMacroFieldType*, const OUString& rLibAndName, const OUString& rText); - inline OUString GetMacro() const { return aMacro; } + const OUString& GetMacro() const { return aMacro; } OUString GetLibName() const; OUString GetMacroName() const; SvxMacro GetSvxMacro() const; @@ -463,7 +463,7 @@ public: virtual OUString Expand() const override; virtual SwField* Copy() const override; - inline const DateTime GetDateTime() const { return aDateTime; } + const DateTime& GetDateTime() const { return aDateTime; } inline const Date GetDate() const { return aDateTime.GetDate(); } inline const tools::Time GetTime() const { return aDateTime.GetTime(); } @@ -513,10 +513,10 @@ public: SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFormat=0); virtual void SetSubType(sal_uInt16) override; - virtual sal_uInt16 GetSubType() const override; + virtual sal_uInt16 GetSubType() const override; virtual void SetLanguage(sal_uInt16 nLng) override; virtual OUString GetFieldName() const override; - OUString GetName() const { return aName; } + const OUString& GetName() const { return aName; } void SetName( const OUString& rName ) { aName = rName; } inline void SetExpansion(const OUString& rStr) { aContent = rStr; } virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override; diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index c51f1bddf163..99c9c6e612a3 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -100,7 +100,7 @@ public: virtual void SetValue( const double& rVal ) override; virtual void SetLanguage(sal_uInt16 nLng) override; - inline OUString GetExpStr() const; + inline const OUString& GetExpStr() const; inline void ChgExpStr(const OUString& rExpand); /// Called by formatting. @@ -132,7 +132,7 @@ public: inline void SwGetExpField::ChgExpStr(const OUString& rExpand) { sExpand = rExpand;} -inline OUString SwGetExpField::GetExpStr() const +inline const OUString& SwGetExpField::GetExpStr() const { return sExpand; } /// Called by formatting. @@ -173,16 +173,16 @@ public: void SetDeleted( bool b ) { bDeleted = b; } /// Overlay, because set-field takes care for its being updated by itself. - inline OUString GetSetRefName() const; + inline const OUString& GetSetRefName() const; void SetSeqRefNo( SwSetExpField& rField ); size_t GetSeqFieldList( SwSeqFieldList& rList ); /// Number sequence fields chapterwise if required. - OUString GetDelimiter() const { return sDelim; } + const OUString& GetDelimiter() const { return sDelim; } void SetDelimiter( const OUString& s ) { sDelim = s; } - sal_uInt8 GetOutlineLvl() const { return nLevel; } + sal_uInt8 GetOutlineLvl() const { return nLevel; } void SetOutlineLvl( sal_uInt8 n ) { nLevel = n; } void SetChapter( SwSetExpField& rField, const SwNode& rNd ); @@ -204,7 +204,7 @@ inline void SwSetExpFieldType::SetType( sal_uInt16 nTyp ) inline sal_uInt16 SwSetExpFieldType::GetType() const { return nType; } -inline OUString SwSetExpFieldType::GetSetRefName() const +inline const OUString& SwSetExpFieldType::GetSetRefName() const { return sName; } class SW_DLLPUBLIC SwSetExpField : public SwFormulaField @@ -227,12 +227,12 @@ public: virtual void SetValue( const double& rVal ) override; - inline OUString GetExpStr() const; + inline const OUString& GetExpStr() const; inline void ChgExpStr( const OUString& rExpand ); inline void SetPromptText(const OUString& rStr); - inline OUString GetPromptText() const; + inline const OUString& GetPromptText() const; inline void SetInputFlag(bool bInp); inline bool GetInputFlag() const; @@ -258,7 +258,7 @@ public: virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override; }; -inline OUString SwSetExpField::GetExpStr() const +inline const OUString& SwSetExpField::GetExpStr() const { return sExpand; } inline void SwSetExpField::ChgExpStr( const OUString& rExpand ) @@ -267,7 +267,7 @@ inline void SwSetExpField::ChgExpStr( const OUString& rExpand ) inline void SwSetExpField::SetPromptText(const OUString& rStr) { aPText = rStr; } -inline OUString SwSetExpField::GetPromptText() const +inline const OUString& SwSetExpField::GetPromptText() const { return aPText; } inline void SwSetExpField::SetInputFlag(bool bInp) @@ -340,11 +340,11 @@ public: virtual OUString GetPar2() const override; virtual void SetPar2(const OUString& rStr) override; - OUString GetHelp() const; - void SetHelp(const OUString & rStr); + const OUString& GetHelp() const; + void SetHelp(const OUString & rStr); - OUString GetToolTip() const; - void SetToolTip(const OUString & rStr); + const OUString& GetToolTip() const; + void SetToolTip(const OUString & rStr); virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nSub) override; @@ -403,10 +403,10 @@ public: sal_uInt16 nSubType = 0, sal_uLong nFormat = 0); virtual void SetValue( const double& rVal ) override; - virtual sal_uInt16 GetSubType() const override; + virtual sal_uInt16 GetSubType() const override; virtual void SetSubType(sal_uInt16 nType) override; - OUString GetExpStr() const { return sExpand; } + const OUString& GetExpStr() const { return sExpand; } void ChgExpStr(const OUString& rStr) { sExpand = rStr; } void CalcField( SwTableCalcPara& rCalcPara ); diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx index c736476060fa..4fb85b4c24e0 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -53,8 +53,8 @@ public: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - void SetStyleHandle( std::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; } - const std::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; } + void SetStyleHandle( const std::shared_ptr<SfxItemSet>& pHandle ) { mpHandle = pHandle; } + const std::shared_ptr<SfxItemSet>& GetStyleHandle() const { return mpHandle; } void dumpAsXml(struct _xmlTextWriter* pWriter) const override; }; diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx index 96f53dcf7845..eadf2320240b 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -64,7 +64,7 @@ public: void InvalidateFootnote(); - OUString GetNumStr() const { return m_aNumber; } + const OUString& GetNumStr() const { return m_aNumber; } sal_uInt16 GetNumber() const { return m_nNumber; } bool IsEndNote() const { return m_bEndNote;} diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index b4ba789d582a..d660f9973153 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -212,7 +212,7 @@ public: ::std::vector< css::uno::Reference<css::text::XTextField> > getMetaFields(); /// Copy document properties from rSource to m_xDocumentProperties. void copyDocumentProperties(const SwDoc& rSource); - css::uno::Reference<css::document::XDocumentProperties> getDocumentProperties(); + const css::uno::Reference<css::document::XDocumentProperties>& getDocumentProperties(); }; } // namespace sw diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 63018fda786f..e62120fdc759 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -67,7 +67,7 @@ public: SwPageDesc *GetPageDesc() { return static_cast<SwPageDesc*>(GetRegisteredIn()); } const SwPageDesc *GetPageDesc() const { return static_cast<const SwPageDesc*>(GetRegisteredIn()); } - ::boost::optional<sal_uInt16> GetNumOffset() const { return oNumOffset; } + const ::boost::optional<sal_uInt16>& GetNumOffset() const { return oNumOffset; } void SetNumOffset( const ::boost::optional<sal_uInt16>& oNum ) { oNumOffset = oNum; } /// Query / set where attribute is anchored. diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 62f27043e5de..8f8b68515a69 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -56,10 +56,10 @@ public: const SwTextRuby* GetTextRuby() const { return pTextAttr; } - OUString GetText() const { return sRubyText; } + const OUString& GetText() const { return sRubyText; } void SetText( const OUString& rText ) { sRubyText = rText; } - OUString GetCharFormatName() const { return sCharFormatName; } + const OUString& GetCharFormatName() const { return sCharFormatName; } void SetCharFormatName( const OUString& rNm ) { sCharFormatName = rNm; } sal_uInt16 GetCharFormatId() const { return nCharFormatId; } diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index 20eb332719fa..b1de04e06685 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -63,13 +63,13 @@ public: void SetURL(const OUString &rURL, bool bServerMap); void SetMap( const ImageMap *pM ); ///< Pointer will be copied. - OUString GetTargetFrameName()const { return sTargetFrameName; } - OUString GetURL() const { return sURL; } + const OUString& GetTargetFrameName()const { return sTargetFrameName; } + const OUString& GetURL() const { return sURL; } bool IsServerMap() const { return bIsServerMap; } const ImageMap *GetMap() const { return pMap; } ImageMap *GetMap() { return pMap; } - OUString GetName() const { return sName; } + const OUString& GetName() const { return sName; } void SetName( const OUString& rNm ) { sName = rNm; } }; diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index f629093fff73..747c6a8b448d 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -109,7 +109,7 @@ public: inline SwFormat* DerivedFrom() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); } inline bool IsDefault() const { return DerivedFrom() == nullptr; } - inline OUString GetName() const { return m_aFormatName; } + const OUString& GetName() const { return m_aFormatName; } inline bool HasName(const OUString &rName) const { return m_aFormatName == rName; } void SetName( const OUString& rNewName, bool bBroadcast=false ); diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 6294d6a1c2f9..2748fa02abc1 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -255,7 +255,7 @@ class SwStringMsgPoolItem : public SwMsgPoolItem OUString m_sStr; public: - OUString GetString() const { return m_sStr; } + const OUString& GetString() const { return m_sStr; } SwStringMsgPoolItem( sal_uInt16 nId, const OUString& rStr ) : SwMsgPoolItem( nId ), m_sStr( rStr ) diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index 341e560109c3..4cd232e32479 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -64,7 +64,7 @@ public: const SvxNumberType &GetNumType() const { return aType; } void SetNumType( SvxNumberType aNew ){ aType = aNew; } - OUString GetDivider() const { return aDivider; } + const OUString& GetDivider() const { return aDivider; } void SetDivider( const OUString &r ) { aDivider = r; } sal_uInt16 GetDividerCountBy() const { return nDividerCountBy; } void SetDividerCountBy( sal_uInt16 n ) { nDividerCountBy = n; } diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 0a58737c3ba3..543e6afb95b6 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -291,7 +291,7 @@ public: { bHTML ? (aWebTableConfig.bInsTableAlignNum = b) : (aTableConfig.bInsTableAlignNum = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - SwInsertTableOptions GetInsTableFlags(bool bHTML) const + const SwInsertTableOptions& GetInsTableFlags(bool bHTML) const { return bHTML ? aWebInsertConfig.aInsTableOpts : aInsertConfig.aInsTableOpts;} void SetInsTableFlags( bool bHTML, const SwInsertTableOptions& rOpts ) { bHTML ? (aWebInsertConfig.aInsTableOpts = rOpts) : (aInsertConfig.aInsTableOpts = rOpts); @@ -320,15 +320,15 @@ public: bool IsAskForMailMerge() const { return aMiscConfig.bAskForMailMergeInPrint;} - OUString GetNameFromColumn() const { return aMiscConfig.sNameFromColumn; } + const OUString& GetNameFromColumn() const { return aMiscConfig.sNameFromColumn; } void SetNameFromColumn( const OUString& rSet ) { aMiscConfig.sNameFromColumn = rSet; aMiscConfig.SetModified();} - OUString GetMailingPath() const { return aMiscConfig.sMailingPath; } + const OUString& GetMailingPath() const { return aMiscConfig.sMailingPath; } void SetMailingPath(const OUString& sPath) { aMiscConfig.sMailingPath = sPath; aMiscConfig.SetModified();} - OUString GetWordDelimiter() const { return aMiscConfig.sWordDelimiter; } + const OUString& GetWordDelimiter() const { return aMiscConfig.sWordDelimiter; } void SetWordDelimiter(const OUString& sDelim) { aMiscConfig.sWordDelimiter = sDelim; aMiscConfig.SetModified();} diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx index 15bf06052554..d05630f91789 100644 --- a/sw/inc/modeltoviewhelper.hxx +++ b/sw/inc/modeltoviewhelper.hxx @@ -162,7 +162,7 @@ public: */ ModelPosition ConvertToModelPosition( sal_Int32 nViewPos ) const; - OUString getViewText() const { return m_aRetText; } + const OUString& getViewText() const { return m_aRetText; } Positions const& getFieldPositions() const { return m_FieldPositions; } Positions const& getFootnotePositions() const { return m_FootnotePositions;} }; diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index 3c29befdf9d2..776cdf7aedcf 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -180,7 +180,7 @@ public: bool IsGrfLink() const { return refLink.Is(); } bool IsLinkedFile() const; bool IsLinkedDDE() const; - tools::SvRef<sfx2::SvBaseLink> GetLink() const { return refLink; } + const tools::SvRef<sfx2::SvBaseLink>& GetLink() const { return refLink; } bool GetFileFilterNms( OUString* pFileNm, OUString* pFilterNm ) const; void ReleaseLink(); diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index d5c78b7ae072..fe1bab2f599d 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -59,7 +59,7 @@ public: const css::uno::Reference < css::embed::XEmbeddedObject > GetOleRef(); svt::EmbeddedObjectRef& GetObject(); - OUString GetCurrentPersistName() const { return aName; } + const OUString& GetCurrentPersistName() const { return aName; } OUString GetStyleString(); bool IsOleRef() const; ///< To avoid unnecessary loading of object. }; @@ -133,7 +133,7 @@ public: // #i99665# bool IsChart() const; - OUString GetChartTableName() const { return sChartTableName; } + const OUString& GetChartTableName() const { return sChartTableName; } void SetChartTableName( const OUString& rNm ) { sChartTableName = rNm; } }; diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index f6c8ec9321b4..1d7f8b7d1e60 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -194,7 +194,7 @@ public: { msDefaultListId = sDefaultListId; } - inline OUString GetDefaultListId() const + const OUString& GetDefaultListId() const { return msDefaultListId; } @@ -224,7 +224,7 @@ public: and copies them if appropriate. */ void CheckCharFormats( SwDoc* pDoc ); - OUString GetName() const { return msName; } + const OUString& GetName() const { return msName; } void SetName( const OUString& rNm, IDocumentListsAccess& rDocListAccess ); diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index 4553d81849e5..d55e85117808 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -166,7 +166,7 @@ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) override; public: - OUString GetName() const { return m_StyleName; } + const OUString& GetName() const { return m_StyleName; } void SetName(const OUString& rNewName) { m_StyleName = rNewName; } bool GetLandscape() const { return m_IsLandscape; } diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index 52710893ffdc..f51bf9fa4edb 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -153,7 +153,7 @@ public: bool IsPrintBlackFont() const { return m_bPrintBlackFont; } bool IsPrintSingleJobs() const { return m_bPrintSingleJobs; } SwPostItMode GetPrintPostIts() const { return m_nPrintPostIts; } - const OUString GetFaxName() const { return m_sFaxName; } + const OUString& GetFaxName() const { return m_sFaxName; } bool IsPrintHiddenText() const { return m_bPrintHiddenText; } bool IsPrintTextPlaceholder() const { return m_bPrintTextPlaceholder; } @@ -290,7 +290,7 @@ public: PagePairsVec_t & GetPagePairsForProspectPrinting() { return m_aPagePairs; } const PagePairsVec_t & GetPagePairsForProspectPrinting() const { return m_aPagePairs; } - OUString GetPageRange() const { return m_aPageRange; } + const OUString& GetPageRange() const { return m_aPageRange; } void SetPageRange( const OUString &rRange ) { m_aPageRange = rRange; } }; diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 010e08a82dec..5257afea4ba1 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -103,7 +103,7 @@ public: virtual OUString GetFieldName() const override; - OUString GetSetRefName() const { return sSetRefName; } + const OUString& GetSetRefName() const { return sSetRefName; } // #i81002# /** The <SwTextField> instance, which represents the text attribute for the diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx index 9de8d05f782f..680379f3d2e3 100644 --- a/sw/inc/rubylist.hxx +++ b/sw/inc/rubylist.hxx @@ -33,7 +33,7 @@ public: SwRubyListEntry() : m_aRubyAttr( OUString() ) {} ~SwRubyListEntry(); - OUString GetText() const { return m_sText; } + const OUString& GetText() const { return m_sText; } void SetText( const OUString& rStr ) { m_sText = rStr; } const SwFormatRuby& GetRubyAttr() const { return m_aRubyAttr; } diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index d98df2cf3993..4fea7232048c 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -90,7 +90,7 @@ public: SwSectionData & operator=(SwSectionData const&); bool operator==(SwSectionData const&) const; - OUString GetSectionName() const { return m_sSectionName; } + const OUString& GetSectionName() const { return m_sSectionName; } void SetSectionName(OUString const& rName){ m_sSectionName = rName; } SectionType GetType() const { return m_eType; } void SetType(SectionType const eNew) { m_eType = eNew; } @@ -111,16 +111,16 @@ public: void SetCondHidden(bool const bFlag = true) { m_bCondHiddenFlag = bFlag; } bool IsCondHidden() const { return m_bCondHiddenFlag; } - OUString GetCondition() const { return m_sCondition; } + const OUString& GetCondition() const { return m_sCondition; } void SetCondition(OUString const& rNew) { m_sCondition = rNew; } - OUString GetLinkFileName() const { return m_sLinkFileName; } + const OUString& GetLinkFileName() const { return m_sLinkFileName; } void SetLinkFileName(OUString const& rNew) { m_sLinkFileName = rNew; } - OUString GetLinkFilePassword() const { return m_sLinkFilePassword; } + const OUString& GetLinkFilePassword() const { return m_sLinkFilePassword; } void SetLinkFilePassword(OUString const& rS){ m_sLinkFilePassword = rS; } css::uno::Sequence<sal_Int8> const& GetPassword() const diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 6c6160224602..d3b7f200733b 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -67,7 +67,7 @@ class SW_DLLPUBLIC SwAsciiOptions public: - OUString GetFontName() const { return sFont; } + const OUString& GetFontName() const { return sFont; } void SetFontName( const OUString& rFont ) { sFont = rFont; } rtl_TextEncoding GetCharSet() const { return eCharSet; } @@ -167,7 +167,7 @@ public: bool HasGlossaries( const Reader& ); bool ReadGlossaries( const Reader&, SwTextBlocks&, bool bSaveRelFiles ); - OUString GetBaseURL() const { return sBaseURL;} + const OUString& GetBaseURL() const { return sBaseURL;} protected: void SetBaseURL( const OUString& rURL ) { sBaseURL = rURL; } @@ -251,8 +251,8 @@ public: virtual size_t GetSectionList( SfxMedium& rMedium, std::vector<OUString*>& rStrings ) const; - tools::SvRef<SotStorage> getSotStorageRef() { return pStg; }; - void setSotStorageRef(tools::SvRef<SotStorage> pStgRef) { pStg = pStgRef; }; + const tools::SvRef<SotStorage>& getSotStorageRef() { return pStg; }; + void setSotStorageRef(const tools::SvRef<SotStorage>& pStgRef) { pStg = pStgRef; }; private: virtual sal_uLong Read(SwDoc &, const OUString& rBaseURL, SwPaM &, const OUString &)=0; @@ -276,7 +276,7 @@ class SW_DLLPUBLIC StgReader : public Reader public: virtual int GetReaderType() override; - OUString GetFltName() { return aFltName; } + const OUString& GetFltName() { return aFltName; } virtual void SetFltName( const OUString& r ) override; }; @@ -421,7 +421,7 @@ public: const SwAsciiOptions& GetAsciiOptions() const { return aAscOpts; } void SetAsciiOptions( const SwAsciiOptions& rOpt ) { aAscOpts = rOpt; } - OUString GetBaseURL() const { return sBaseURL;} + const OUString& GetBaseURL() const { return sBaseURL;} // Look up next bookmark position from bookmark-table. sal_Int32 FindPos_Bkmk( const SwPosition& rPos ) const; diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx index 9b1457dc6b0e..e601d71f5586 100644 --- a/sw/inc/splargs.hxx +++ b/sw/inc/splargs.hxx @@ -146,7 +146,7 @@ public: { xHyphWord = rxHW; } - css::uno::Reference< css::linguistic2::XHyphenatedWord > GetHyphWord() + const css::uno::Reference< css::linguistic2::XHyphenatedWord >& GetHyphWord() { return xHyphWord; } diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index 05b74ee71a07..eb5607e8d709 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -229,7 +229,7 @@ public: static void CheckSpellChanges( bool bOnlineSpelling, bool bIsSpellWrongAgain, bool bIsSpellAllAgain, bool bSmartTags ); - inline css::uno::Reference< css::linguistic2::XLinguServiceEventListener > + inline const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& GetLngSvcEvtListener(); void CreateLngSvcEvtListener(); @@ -240,7 +240,7 @@ public: GetLanguageGuesser(); }; -inline css::uno::Reference< css::linguistic2::XLinguServiceEventListener > +inline const css::uno::Reference< css::linguistic2::XLinguServiceEventListener >& SwModule::GetLngSvcEvtListener() { return m_xLinguServiceEventListener; diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index 09ad765a8e6c..327e168da7f3 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -177,7 +177,7 @@ public: bool IsNewModel() const { return m_bNewModel; } /// Return the table style name of this table. - OUString GetTableStyleName() const { return maTableStyleName; } + const OUString& GetTableStyleName() const { return maTableStyleName; } /// Set the new table style name for this table. void SetTableStyleName(const OUString& rName) { maTableStyleName = rName; } diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 38dbe06aacab..016fdfc041ab 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -266,7 +266,7 @@ public: const SwBoxAutoFormat& GetBoxFormat( sal_uInt8 nPos ) const; void SetName( const OUString& rNew ) { m_aName = rNew; nStrResId = USHRT_MAX; } - OUString GetName() const { return m_aName; } + const OUString& GetName() const { return m_aName; } enum UpdateFlags { UPDATE_CHAR = 1, UPDATE_BOX = 2, UPDATE_ALL = 3 }; void UpdateFromSet( sal_uInt8 nPos, const SfxItemSet& rSet, diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 13d1e15d1df8..a025b7d699df 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -100,17 +100,17 @@ public: OUString GetText() const; inline bool IsAlternativeText() const; - inline OUString GetAlternativeText() const; + inline const OUString& GetAlternativeText() const; inline void SetAlternativeText( const OUString& rAlt ); // content or user defined index inline void SetLevel(sal_uInt16 nLevel); - inline sal_uInt16 GetLevel() const; + inline sal_uInt16 GetLevel() const; inline void SetBookmarkName( const OUString& bName); - inline OUString GetBookmarkName() const; + inline const OUString& GetBookmarkName() const; inline void SetEntryTypeName( const OUString& sName); - inline OUString GetEntryTypeName() const; + inline const OUString& GetEntryTypeName() const; // for alphabetical index only inline void SetPrimaryKey(const OUString& rStr ); @@ -155,7 +155,7 @@ public: // @@@ public copy ctor, but no copy assignment? SwTOXType(const SwTOXType& rCopy); - inline OUString GetTypeName() const; + inline const OUString& GetTypeName() const; inline TOXTypes GetType() const; private: @@ -438,7 +438,7 @@ public: sal_uInt16 GetCreateType() const; // creation types - OUString GetTOXName() const {return m_aName;} + const OUString& GetTOXName() const {return m_aName;} void SetTOXName(const OUString& rSet) {m_aName = rSet;} // for record the TOC field expression of MS Word binary format @@ -447,8 +447,8 @@ public: void EnableKeepExpression() {mbKeepExpression = true;} void DisableKeepExpression() {mbKeepExpression = false;} - OUString GetTitle() const; // Title - OUString GetBookmarkName() const; + const OUString& GetTitle() const; // Title + const OUString& GetBookmarkName() const; OUString GetTypeName() const; // Name const SwForm& GetTOXForm() const; // description of the lines @@ -459,11 +459,11 @@ public: TOXTypes GetType() const; - OUString GetMainEntryCharStyle() const {return m_sMainEntryCharStyle;} + const OUString& GetMainEntryCharStyle() const {return m_sMainEntryCharStyle;} void SetMainEntryCharStyle(const OUString& rSet) {m_sMainEntryCharStyle = rSet;} // for record the Index field expression of MS Word - OUString GetEntryTypeName() const; + const OUString& GetEntryTypeName() const; void SetEntryTypeName(const OUString& sName); // content index only @@ -502,7 +502,7 @@ public: bool IsProtected() const { return m_bProtected; } void SetProtected(bool bSet) { m_bProtected = bSet; } - OUString GetSequenceName() const {return m_sSequenceName;} + const OUString& GetSequenceName() const {return m_sSequenceName;} void SetSequenceName(const OUString& rSet) {m_sSequenceName = rSet;} SwCaptionDisplay GetCaptionDisplay() const { return m_eCaptionDisplay;} @@ -516,7 +516,7 @@ public: LanguageType GetLanguage() const {return m_eLanguage;} void SetLanguage(LanguageType nLang) {m_eLanguage = nLang;} - OUString GetSortAlgorithm()const {return m_sSortAlgorithm;} + const OUString& GetSortAlgorithm()const {return m_sSortAlgorithm;} void SetSortAlgorithm(const OUString& rSet) {m_sSortAlgorithm = rSet;} // #i21237# void AdjustTabStops( SwDoc & rDoc ) @@ -530,13 +530,13 @@ public: //SwTOXMark -inline OUString SwTOXMark::GetAlternativeText() const +inline const OUString& SwTOXMark::GetAlternativeText() const { return m_aAltText; } -inline OUString SwTOXMark::GetBookmarkName() const +inline const OUString& SwTOXMark::GetBookmarkName() const { return m_aBookmarkName; } -inline OUString SwTOXMark::GetEntryTypeName() const +inline const OUString& SwTOXMark::GetEntryTypeName() const { return m_aEntryTypeName; } inline const SwTOXType* SwTOXMark::GetTOXType() const @@ -663,7 +663,7 @@ inline sal_uInt16 SwForm::GetFormMax() const //SwTOXType -inline OUString SwTOXType::GetTypeName() const +inline const OUString& SwTOXType::GetTypeName() const { return m_aName; } inline TOXTypes SwTOXType::GetType() const @@ -677,13 +677,13 @@ inline const SwTOXType* SwTOXBase::GetTOXType() const inline sal_uInt16 SwTOXBase::GetCreateType() const { return m_nCreateType; } -inline OUString SwTOXBase::GetTitle() const +inline const OUString& SwTOXBase::GetTitle() const { return m_aTitle; } -inline OUString SwTOXBase::GetBookmarkName() const +inline const OUString& SwTOXBase::GetBookmarkName() const { return m_aBookmarkName; } -inline OUString SwTOXBase::GetEntryTypeName() const +inline const OUString& SwTOXBase::GetEntryTypeName() const { return m_aEntryTypeName; } inline OUString SwTOXBase::GetTypeName() const diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx index 8a14e748f377..1f66b81c81f0 100644 --- a/sw/inc/unodraw.hxx +++ b/sw/inc/unodraw.hxx @@ -272,7 +272,7 @@ public: SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;} SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } - css::uno::Reference< css::uno::XAggregation > GetAggregationInterface() {return xShapeAgg;} + const css::uno::Reference< css::uno::XAggregation >& GetAggregationInterface() {return xShapeAgg;} // helper static void AddExistingShapeToFormat( SdrObject& _rObj ); diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index 7e10aca52564..dff4f1f8aee0 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -204,7 +204,7 @@ public: static bool isInvalidStyle(const OUString &rName); void Invalidate() {pDocShell = nullptr;} - OUString GetCreatedNumRuleName() const {return m_sCreatedNumRuleName;} + const OUString& GetCreatedNumRuleName() const {return m_sCreatedNumRuleName;} static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFormat( const SwNumFormat& rFormat, OUString const& rCharFormatName, |