diff options
35 files changed, 61 insertions, 61 deletions
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 256b2100fb42..b31d4e553165 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -186,7 +186,7 @@ public: void Release( SfxControllerItem& rBinding ); SfxDispatcher* GetDispatcher() const { return pDispatcher; } - css::uno::Reference< css::frame::XDispatchRecorder > GetRecorder() const; + const css::uno::Reference< css::frame::XDispatchRecorder >& GetRecorder() const; css::uno::Reference < css::frame::XDispatch > GetDispatch( const SfxSlot*, const css::util::URL& aURL, bool bMasterCommand ); SAL_DLLPRIVATE void ContextChanged_Impl(); diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 8469fbc1974d..140bd0d69c5b 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -199,7 +199,7 @@ public: bool WantsFocus() const; virtual bool QueryClose(); - css::uno::Reference< css::frame::XFrame > GetFrame(); + const css::uno::Reference< css::frame::XFrame >& GetFrame(); void SetFrame( const css::uno::Reference< css::frame::XFrame > & ); SAL_DLLPRIVATE static void InitializeChildWinFactory_Impl(sal_uInt16, SfxChildWinInfo&); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 5cd2c50b11db..f7a202eb837d 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -106,30 +106,30 @@ public: void setAutoloadEnabled(bool i_val) { m_isAutoloadEnabled = i_val; } sal_Int32 getAutoloadDelay() const { return m_AutoloadDelay; } void setAutoloadDelay(sal_Int32 i_val) { m_AutoloadDelay = i_val; } - OUString getAutoloadURL() const { return m_AutoloadURL; } + const OUString& getAutoloadURL() const { return m_AutoloadURL; } void setAutoloadURL(const OUString& i_val) { m_AutoloadURL = i_val; } - OUString getDefaultTarget() const { return m_DefaultTarget; } + const OUString& getDefaultTarget() const { return m_DefaultTarget; } void setDefaultTarget(const OUString& i_val) { m_DefaultTarget = i_val; } - OUString getTemplateName() const { return m_TemplateName; } - OUString getAuthor() const { return m_Author; } + const OUString& getTemplateName() const { return m_TemplateName; } + const OUString& getAuthor() const { return m_Author; } void setAuthor(const OUString& i_val) { m_Author = i_val; } - css::util::DateTime + const css::util::DateTime& getCreationDate() const { return m_CreationDate; } void setCreationDate(const css::util::DateTime& i_val) { m_CreationDate = i_val; } - OUString getModifiedBy() const { return m_ModifiedBy; } + const OUString& getModifiedBy() const { return m_ModifiedBy; } void setModifiedBy(const OUString& i_val) { m_ModifiedBy = i_val; } - css::util::DateTime + const css::util::DateTime& getModificationDate() const { return m_ModificationDate; } void setModificationDate(const css::util::DateTime& i_val) { m_ModificationDate = i_val; } - OUString getPrintedBy() const { return m_PrintedBy; } + const OUString& getPrintedBy() const { return m_PrintedBy; } void setPrintedBy(const OUString& i_val) { m_PrintedBy = i_val; } - css::util::DateTime + const css::util::DateTime& getPrintDate() const { return m_PrintDate; } void setPrintDate(const css::util::DateTime& i_val) { m_PrintDate = i_val; @@ -138,13 +138,13 @@ public: void setEditingCycles(sal_Int16 i_val) { m_EditingCycles = i_val; } sal_Int32 getEditingDuration() const { return m_EditingDuration; } void setEditingDuration(sal_Int32 i_val) { m_EditingDuration = i_val; } - OUString getDescription() const { return m_Description; } + const OUString& getDescription() const { return m_Description; } void setDescription(const OUString& i_val) { m_Description = i_val; } - OUString getKeywords() const { return m_Keywords; } + const OUString& getKeywords() const { return m_Keywords; } void setKeywords(const OUString& i_val) { m_Keywords = i_val; } - OUString getSubject() const { return m_Subject; } + const OUString& getSubject() const { return m_Subject; } void setSubject(const OUString& i_val) { m_Subject = i_val; } - OUString getTitle() const { return m_Title; } + const OUString& getTitle() const { return m_Title; } void setTitle(const OUString& i_val) { m_Title = i_val; } /// reset user-specific data (author, modified-by, ...) @@ -165,7 +165,7 @@ public: void AddCustomProperty( const OUString& sName, const css::uno::Any& rValue ); - css::uno::Sequence< css::document::CmisProperty > + const css::uno::Sequence< css::document::CmisProperty >& GetCmisProperties() const { return m_aCmisProperties;} void SetCmisProperties(const css::uno::Sequence< css::document::CmisProperty >& cmisProps ); diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 150b03747b3c..487d3c36b775 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -117,7 +117,7 @@ public: * Does not take ownership of pFlt but pFlt needs to be around as long as the SfxMedium instance. */ void SetFilter(const std::shared_ptr<const SfxFilter>& pFilter); - std::shared_ptr<const SfxFilter> GetFilter() const; + const std::shared_ptr<const SfxFilter>& GetFilter() const; std::shared_ptr<const SfxFilter> GetOrigFilter() const; const OUString& GetOrigURL() const; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index 40a7f8081293..110745f94a05 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -97,11 +97,11 @@ public: sal_uInt16 GetType() const { return pMgr->GetType(); } SfxChildAlignment GetAlignment() const { return pMgr->GetAlignment(); } void SetAlignment(SfxChildAlignment eAlign) { pMgr->SetAlignment(eAlign); } - Size GetFloatingSize() const { return aFloatSize; } + const Size& GetFloatingSize() const { return aFloatSize; } void SetFloatingSize(const Size& rSize) { aFloatSize=rSize; } void SetMinOutputSizePixel( const Size& rSize ); - Size GetMinOutputSizePixel() const; + const Size& GetMinOutputSizePixel() const; virtual bool Notify( NotifyEvent& rNEvt ) override; DECL_LINK_TYPED(TimerHdl, Idle *, void); diff --git a/include/sfx2/event.hxx b/include/sfx2/event.hxx index 37a71b338015..eae08b3a6ec1 100644 --- a/include/sfx2/event.hxx +++ b/include/sfx2/event.hxx @@ -50,7 +50,7 @@ public: sal_uInt16 GetEventId() const { return nEventId; } - OUString GetEventName() const + const OUString& GetEventName() const { return aEventName; } SfxObjectShell* GetObjShell() const @@ -73,7 +73,7 @@ public: , xViewController( xController ) {} - css::uno::Reference< css::frame::XController2 > GetController() const + const css::uno::Reference< css::frame::XController2 >& GetController() const { return xViewController; } }; diff --git a/include/sfx2/filedlghelper.hxx b/include/sfx2/filedlghelper.hxx index 7bae388ab20d..5f4a24e8ce44 100644 --- a/include/sfx2/filedlghelper.hxx +++ b/include/sfx2/filedlghelper.hxx @@ -194,7 +194,7 @@ public: OUString GetDisplayDirectory() const; ErrCode GetGraphic( Graphic& rGraphic ) const; - css::uno::Reference < css::ui::dialogs::XFilePicker2 > GetFilePicker() const; + const css::uno::Reference < css::ui::dialogs::XFilePicker2 >& GetFilePicker() const; // XFilePickerListener methods void SAL_CALL FileSelectionChanged( const css::ui::dialogs::FilePickerEvent& aEvent ); diff --git a/include/sfx2/frame.hxx b/include/sfx2/frame.hxx index ce2860d52d0c..df47419733f4 100644 --- a/include/sfx2/frame.hxx +++ b/include/sfx2/frame.hxx @@ -143,7 +143,7 @@ public: void GetTargetList( TargetList& ) const; void UpdateDescriptor( SfxObjectShell *pDoc ); void Resize(); - css::uno::Reference< css::frame::XFrame > + const css::uno::Reference< css::frame::XFrame >& GetFrameInterface() const; void Appear(); void AppearWithUpdate(); @@ -234,7 +234,7 @@ class SFX2_DLLPUBLIC SfxUsrAnyItem : public SfxPoolItem public: static SfxPoolItem* CreateDefault(); SfxUsrAnyItem( sal_uInt16 nWhich, const css::uno::Any& rAny ); - css::uno::Any GetValue() const + const css::uno::Any& GetValue() const { return aValue; } virtual bool operator==( const SfxPoolItem& ) const override; virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; diff --git a/include/sfx2/ipclient.hxx b/include/sfx2/ipclient.hxx index f94d70608e6d..3419f08e8899 100644 --- a/include/sfx2/ipclient.hxx +++ b/include/sfx2/ipclient.hxx @@ -60,14 +60,14 @@ public: SfxViewShell* GetViewShell() const { return m_pViewSh; } vcl::Window* GetEditWin() const { return m_pEditWin; } - css::uno::Reference < css::embed::XEmbeddedObject > GetObject() const; + const css::uno::Reference < css::embed::XEmbeddedObject >& GetObject() const; void SetObject( const css::uno::Reference < css::embed::XEmbeddedObject >& rObject ); void SetObjectState( sal_Int32 ); bool IsObjectUIActive() const; bool IsObjectInPlaceActive() const; void DeactivateObject(); bool SetObjArea( const Rectangle & ); - Rectangle GetObjArea() const; + const Rectangle& GetObjArea() const; Rectangle GetScaledObjArea() const; void SetSizeScale( const Fraction & rScaleWidth, const Fraction & rScaleHeight ); void SetObjAreaAndScale( const Rectangle&, const Fraction&, const Fraction& ); diff --git a/include/sfx2/lnkbase.hxx b/include/sfx2/lnkbase.hxx index 9a98ddc6b837..36739c79ec17 100644 --- a/include/sfx2/lnkbase.hxx +++ b/include/sfx2/lnkbase.hxx @@ -123,7 +123,7 @@ public: SvLinkSource* GetObj() const { return xObj; } void SetLinkSourceName( const OUString & rName ); - OUString GetLinkSourceName() const { return aLinkName;} + const OUString& GetLinkSourceName() const { return aLinkName;} enum UpdateResult { SUCCESS = 0, diff --git a/include/sfx2/minfitem.hxx b/include/sfx2/minfitem.hxx index 3356911e2e2f..a80e5757a17a 100644 --- a/include/sfx2/minfitem.hxx +++ b/include/sfx2/minfitem.hxx @@ -47,15 +47,15 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; virtual bool operator==( const SfxPoolItem& ) const override; - OUString GetMethod() const + const OUString& GetMethod() const { return aMethodName; } void SetMethod( const OUString& r ) { aMethodName = r; } - OUString GetModule() const + const OUString& GetModule() const { return aModuleName; } void SetModule( const OUString& r ) { aModuleName = r; } - OUString GetLib() const + const OUString& GetLib() const { return aLibName; } void SetLib( const OUString& r ) { aLibName = r; } diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 86e891cfe4b9..bcdbad4dcf14 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -431,7 +431,7 @@ public: sal_uInt32 GetModifyPasswordHash() const; bool SetModifyPasswordHash( sal_uInt32 nHash ); - css::uno::Sequence< css::beans::PropertyValue > GetModifyPasswordInfo() const; + const css::uno::Sequence< css::beans::PropertyValue >& GetModifyPasswordInfo() const; bool SetModifyPasswordInfo( const css::uno::Sequence< css::beans::PropertyValue >& aInfo ); static sal_uInt32 HandleFilter( SfxMedium* pMedium, SfxObjectShell* pDoc ); diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index 4d6490e8da11..2cb5e6c9e9a1 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -49,7 +49,7 @@ public: PanelTitleBar* GetTitleBar() const; bool IsTitleBarOptional() const { return mbIsTitleBarOptional;} void SetUIElement (const css::uno::Reference<css::ui::XUIElement>& rxElement); - css::uno::Reference<css::ui::XSidebarPanel> GetPanelComponent() const { return mxPanelComponent;} + const css::uno::Reference<css::ui::XSidebarPanel>& GetPanelComponent() const { return mxPanelComponent;} css::uno::Reference<css::awt::XWindow> GetElementWindow(); void SetExpanded (const bool bIsExpanded); bool IsExpanded() const { return mbIsExpanded;} diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx index c968feced170..6c65867b2a76 100644 --- a/include/sfx2/sidebar/SidebarController.hxx +++ b/include/sfx2/sidebar/SidebarController.hxx @@ -145,7 +145,7 @@ public: // std::unique_ptr<ResourceManager> GetResourceManager() { return mpResourceManager;} - Context GetCurrentContext() const { return maCurrentContext;} + const Context& GetCurrentContext() const { return maCurrentContext;} bool IsDocumentReadOnly (void) const { return mbIsDocumentReadOnly;} void SwitchToDeck ( const ::rtl::OUString& rsDeckId); diff --git a/include/sfx2/sidebar/TitleBar.hxx b/include/sfx2/sidebar/TitleBar.hxx index 1e1fae598929..868e1327c0f1 100644 --- a/include/sfx2/sidebar/TitleBar.hxx +++ b/include/sfx2/sidebar/TitleBar.hxx @@ -36,7 +36,7 @@ public: virtual void dispose() override; void SetTitle (const OUString& rsTitle); - const OUString GetTitle() {return msTitle; } + const OUString& GetTitle() {return msTitle; } void SetIcon (const Image& rIcon); diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 382c250d933a..bf3a8773b3f0 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -250,7 +250,7 @@ public: virtual sfxpg DeactivatePage( SfxItemSet* pSet ); void SetUserData(const OUString& rString) { aUserString = rString; } - OUString GetUserData() { return aUserString; } + const OUString& GetUserData() { return aUserString; } virtual void FillUserData(); virtual bool IsReadOnly() const; virtual void PageCreated (const SfxAllItemSet& aSet); diff --git a/include/sfx2/titledockwin.hxx b/include/sfx2/titledockwin.hxx index 511818498e7f..4b21a8e9b6eb 100644 --- a/include/sfx2/titledockwin.hxx +++ b/include/sfx2/titledockwin.hxx @@ -53,7 +53,7 @@ namespace sfx2 /** Return the border that is painted around the inner window as decoration. */ - SvBorder GetDecorationBorder() const { return m_aBorder; } + const SvBorder& GetDecorationBorder() const { return m_aBorder; } protected: // Window overridables diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 53dcd84115ae..8abf52ce7d3d 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -287,7 +287,7 @@ public: void ExecPrint( const css::uno::Sequence < css::beans::PropertyValue >&, bool, bool ); // Like ExecPrint(), but only sets up for printing. Use Printer::ExecutePrintJob() and Printer::FinishPrintJob() afterwards. void StartPrint( const css::uno::Sequence < css::beans::PropertyValue >&, bool, bool ); - std::shared_ptr< vcl::PrinterController > GetPrinterController() const; + const std::shared_ptr< vcl::PrinterController >& GetPrinterController() const; void AddRemoveClipboardListener( const css::uno::Reference < css::datatransfer::clipboard::XClipboardListener>&, bool ); css::uno::Reference< css::datatransfer::clipboard::XClipboardNotifier > GetClipboardNotifier(); diff --git a/sfx2/inc/sorgitm.hxx b/sfx2/inc/sorgitm.hxx index 69c833ea9ab6..45b5d795803f 100644 --- a/sfx2/inc/sorgitm.hxx +++ b/sfx2/inc/sorgitm.hxx @@ -38,7 +38,7 @@ public: virtual bool operator==( const SfxPoolItem& ) const override; 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; - OUString getLanguage() const { return aLanguage; }; + const OUString& getLanguage() const { return aLanguage; }; }; #endif diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index c3e8218b65ac..d0c48f5393ff 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -688,7 +688,7 @@ bool SfxChildWindow::QueryClose() return bAllow; } -css::uno::Reference< css::frame::XFrame > SfxChildWindow::GetFrame() +const css::uno::Reference< css::frame::XFrame >& SfxChildWindow::GetFrame() { return pImp->xFrame; } diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index 8356c309c1c2..66a38edbeb70 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -74,7 +74,7 @@ public: virtual ~HelpInterceptor_Impl(); void setInterception( const css::uno::Reference< css::frame::XFrame >& xFrame ); - OUString GetCurrentURL() const { return m_aCurrentURL; } + const OUString& GetCurrentURL() const { return m_aCurrentURL; } const css::uno::Any& GetViewData()const {return m_aViewData;} @@ -129,7 +129,7 @@ public: throw( css::uno::RuntimeException, std::exception ) override; void SetChangeHdl( const Link<HelpListener_Impl&,void>& rLink ) { aChangeLink = rLink; } - OUString GetFactory() const { return aFactory; } + const OUString& GetFactory() const { return aFactory; } }; // HelpStatusListener_Impl ----------------------------------------------------- diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 93140f57686e..d340a8417e82 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -151,7 +151,7 @@ public: void SetDoubleClickHdl( const Link<ComboBox&,void>& rLink ); void SetFactory( const OUString& rFactory ); - inline OUString GetFactory() const { return sFactory; } + const OUString& GetFactory() const { return sFactory; } OUString GetSelectEntry() const; inline void SetFocusOnBox() { m_pIndexCB->GrabFocus(); } inline bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); } @@ -470,7 +470,7 @@ public: virtual void GetFocus() override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - inline css::uno::Reference < css::frame::XFrame2 > + const css::uno::Reference < css::frame::XFrame2 >& getFrame() const { return xFrame; } inline void SetSelectHdl( const Link<ToolBox *, void>& rLink ) { aToolBox->SetSelectHdl( rLink ); } @@ -478,7 +478,7 @@ public: void SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch ); void SetPageStyleHeaderOff() const; inline ToolBox& GetToolBox() { return *aToolBox.get(); } - void CloseFrame(); + void CloseFrame(); void DoSearch(); }; diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 1833992a5545..ccf5c2f81048 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -2085,7 +2085,7 @@ bool SfxBindings::ExecuteCommand_Impl( const OUString& rCommand ) return false; } -css::uno::Reference< css::frame::XDispatchRecorder > SfxBindings::GetRecorder() const +const css::uno::Reference< css::frame::XDispatchRecorder >& SfxBindings::GetRecorder() const { return pImp->xRecorder; } diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index caf0c64b0203..a53ff86e36c2 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -1724,7 +1724,7 @@ void SfxDockingWindow::SetMinOutputSizePixel( const Size& rSize ) } /** Set the minimum size which is returned.*/ -Size SfxDockingWindow::GetMinOutputSizePixel() const +const Size& SfxDockingWindow::GetMinOutputSizePixel() const { return pImp->aMinSize; } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 9882d0618b50..dd45218bcc46 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -2537,7 +2537,7 @@ void FileDialogHelper::SetCurrentFilter( const OUString& rFilter ) mpImp->setFilter( sFilter ); } -uno::Reference < XFilePicker2 > FileDialogHelper::GetFilePicker() const +const uno::Reference < XFilePicker2 >& FileDialogHelper::GetFilePicker() const { return mpImp->mxFileDlg; } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 9bc9d6f6e630..edbdcac3078d 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -542,8 +542,8 @@ public: void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX); size_t Count(); - OUString getName() { return aName; } - OUString getParent() { return aParent; } + const OUString& getName() { return aName; } + const OUString& getParent() { return aParent; } StyleTree_Impl *operator[](size_t idx) const { return pChildren[idx]; } }; diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index c9ecec7634fa..4362ddb64c53 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -2677,7 +2677,7 @@ void SfxMedium::SetFilter( const std::shared_ptr<const SfxFilter>& pFilter ) pImp->m_pFilter = pFilter; } -std::shared_ptr<const SfxFilter> SfxMedium::GetFilter() const +const std::shared_ptr<const SfxFilter>& SfxMedium::GetFilter() const { return pImp->m_pFilter; } diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 557278cd9029..07a852a298ba 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -231,9 +231,9 @@ public: bool GetTitleFromURL( const OUString& rURL, OUString& aTitle ); bool InsertRegion( RegionData_Impl *pData, size_t nPos = size_t(-1) ); - OUString GetRootURL() const { return maRootURL; } + const OUString& GetRootURL() const { return maRootURL; } - uno::Reference< XDocumentTemplates > getDocTemplates() { return mxTemplates; } + const uno::Reference< XDocumentTemplates >& getDocTemplates() { return mxTemplates; } }; diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index 175354c12fd6..14b427b8e4d6 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -277,10 +277,10 @@ public: ~SfxDocTplService_Impl(); bool init() { if ( !mbIsInitialized ) init_Impl(); return mbIsInitialized; } - Content getContent() const { return maRootContent; } + const Content& getContent() const { return maRootContent; } void setLocale( const lang::Locale & rLocale ); - lang::Locale getLocale(); + lang::Locale getLocale(); bool storeTemplate( const OUString& rGroupName, const OUString& rTemplateName, diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index e6c0ee950a28..87769d5e551e 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -622,7 +622,7 @@ bool SfxObjectShell::SetModifyPasswordHash( sal_uInt32 nHash ) return false; } -uno::Sequence< beans::PropertyValue > SfxObjectShell::GetModifyPasswordInfo() const +const uno::Sequence< beans::PropertyValue >& SfxObjectShell::GetModifyPasswordInfo() const { return pImp->m_aModifyPasswordInfo; } diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index 51d9e2a48408..c34c0890f5be 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -105,7 +105,7 @@ public: { DBG_ASSERT( !pInternalController, "Only one internal controller allowed!" ); pInternalController = pCtrl; } void ReleaseInternalController() { pInternalController = nullptr; } SfxControllerItem* GetInternalController() const { return pInternalController; } - css::uno::Reference < css::frame::XDispatch > + const css::uno::Reference < css::frame::XDispatch >& GetInternalDispatch() const { return xMyDispatch; } void SetInternalDispatch( const css::uno::Reference < css::frame::XDispatch >& rDisp ) diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index e4fa1d660c4d..dcc0fd3dd51a 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -304,7 +304,7 @@ public: bool IsVisible_Impl( sal_uInt16 nMode ) const; bool IsFloating( sal_uInt16 nId ); void SetActiveChild_Impl( vcl::Window *pChild ); - VclPtr<vcl::Window> GetActiveChild_Impl() const { return pActiveChild; } + const VclPtr<vcl::Window>& GetActiveChild_Impl() const { return pActiveChild; } // Methods for StatusBar void ResetStatusBar_Impl(); diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 013bd14583cc..6850a4ef0afd 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -702,7 +702,7 @@ css::uno::Reference< css::frame::XController > SfxFrame::GetController() const return css::uno::Reference< css::frame::XController > (); } -css::uno::Reference< css::frame::XFrame > SfxFrame::GetFrameInterface() const +const css::uno::Reference< css::frame::XFrame >& SfxFrame::GetFrameInterface() const { return pImp->xFrame; } diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index cd3f783fc9dd..a586a26f3187 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -666,7 +666,7 @@ sal_Int64 SfxInPlaceClient::GetObjectMiscStatus() const } -uno::Reference < embed::XEmbeddedObject > SfxInPlaceClient::GetObject() const +const uno::Reference < embed::XEmbeddedObject >& SfxInPlaceClient::GetObject() const { return m_pImp->m_xObject; } @@ -738,7 +738,7 @@ bool SfxInPlaceClient::SetObjArea( const Rectangle& rArea ) } -Rectangle SfxInPlaceClient::GetObjArea() const +const Rectangle& SfxInPlaceClient::GetObjArea() const { return m_pImp->m_aObjArea; } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 448c043c0796..12018db5cb5c 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -622,7 +622,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro Printer::PrintJob( GetPrinterController(), aJobSetup ); } -std::shared_ptr< vcl::PrinterController > SfxViewShell::GetPrinterController() const +const std::shared_ptr< vcl::PrinterController >& SfxViewShell::GetPrinterController() const { return pImp->m_xPrinterController; } |