diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-28 10:01:37 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-09-28 11:28:41 +0200 |
commit | 6c6c1eea82b259c7aec1e0ed5ff86bfd2eb0243f (patch) | |
tree | 87e8ccbbfc4d369e079098eb8be09abf988f1c44 /sw/source/uibase | |
parent | fc79f23922ccae8b494b31a5dd7bb4767e50c87e (diff) |
loplugin:constmethod in sw
Change-Id: I73c3c6d2165287d2d581a04b23b1d3b48166a488
Reviewed-on: https://gerrit.libreoffice.org/79780
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
53 files changed, 85 insertions, 85 deletions
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx index 61a881b314a7..cc225e872aeb 100644 --- a/sw/source/uibase/app/swmodul1.cxx +++ b/sw/source/uibase/app/swmodul1.cxx @@ -554,7 +554,7 @@ void SwModule::GetFormatAuthorAttr( std::size_t nAuthor, SfxItemSet &rSet ) lcl_FillAuthorAttr( nAuthor, rSet, m_pModuleConfig->GetFormatAuthorAttr() ); } -sal_uInt16 SwModule::GetRedlineMarkPos() +sal_uInt16 SwModule::GetRedlineMarkPos() const { return m_pModuleConfig->GetMarkAlignMode(); } @@ -584,7 +584,7 @@ void SwModule::SetSplitVerticalByDefault(bool bHTML, bool value) m_pModuleConfig->SetSplitVerticalByDefault(bHTML, value); } -const Color &SwModule::GetRedlineMarkColor() +const Color &SwModule::GetRedlineMarkColor() const { return m_pModuleConfig->GetMarkAlignColor(); } diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx index 7c9a027ed031..3a5c34ab8515 100644 --- a/sw/source/uibase/config/modcfg.cxx +++ b/sw/source/uibase/config/modcfg.cxx @@ -456,7 +456,7 @@ enum InsertConfigProp INS_PROP_CAP_OBJECT_OLEMISC_CHARACTERSTYLE, //92 INS_PROP_CAP_OBJECT_OLEMISC_APPLYATTRIBUTES //93 }; -const Sequence<OUString>& SwInsertConfig::GetPropertyNames() +const Sequence<OUString>& SwInsertConfig::GetPropertyNames() const { static Sequence<OUString> aNames { diff --git a/sw/source/uibase/config/prtopt.cxx b/sw/source/uibase/config/prtopt.cxx index 7ded55bfa0de..ceba29eac7bf 100644 --- a/sw/source/uibase/config/prtopt.cxx +++ b/sw/source/uibase/config/prtopt.cxx @@ -29,7 +29,7 @@ using namespace utl; using namespace com::sun::star::uno; // Ctor -Sequence<OUString> SwPrintOptions::GetPropertyNames() +Sequence<OUString> SwPrintOptions::GetPropertyNames() const { static const char* aPropNames[] = { diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx index 26c81f745a45..0246b6f039d6 100644 --- a/sw/source/uibase/config/usrpref.cxx +++ b/sw/source/uibase/config/usrpref.cxx @@ -82,7 +82,7 @@ SwMasterUsrPref::~SwMasterUsrPref() { } -Sequence<OUString> SwContentViewConfig::GetPropertyNames() +Sequence<OUString> SwContentViewConfig::GetPropertyNames() const { static const char* aPropNames[] = { @@ -224,7 +224,7 @@ void SwContentViewConfig::Load() } } -Sequence<OUString> SwLayoutViewConfig::GetPropertyNames() +Sequence<OUString> SwLayoutViewConfig::GetPropertyNames() const { static const char* aPropNames[] = { diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx index afbb49f38f61..eea90633e048 100644 --- a/sw/source/uibase/dbui/dbtree.cxx +++ b/sw/source/uibase/dbui/dbtree.cxx @@ -393,7 +393,7 @@ void SwDBTreeList::SetWrtShell(SwWrtShell& rSh) namespace { - void GotoRootLevelParent(weld::TreeView& rTreeView, weld::TreeIter& rEntry) + void GotoRootLevelParent(const weld::TreeView& rTreeView, weld::TreeIter& rEntry) { while (rTreeView.get_iter_depth(rEntry)) rTreeView.iter_parent(rEntry); diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx index 316002aedf85..65625e3fdc9c 100644 --- a/sw/source/uibase/dbui/mmconfigitem.cxx +++ b/sw/source/uibase/dbui/mmconfigitem.cxx @@ -801,12 +801,12 @@ void SwMailMergeConfigItem::SetCurrentConnection( m_pImpl->SetModified(); } -Reference< XDataSource> const & SwMailMergeConfigItem::GetSource() +Reference< XDataSource> const & SwMailMergeConfigItem::GetSource() const { return m_pImpl->m_xSource; } -SharedConnection const & SwMailMergeConfigItem::GetConnection() +SharedConnection const & SwMailMergeConfigItem::GetConnection() const { return m_pImpl->m_xConnection; } diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 0e1d5c46dc6b..b40d6990d192 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -222,7 +222,7 @@ bool SwGlossaryHdl::DelGroup(const OUString &rGrpName) } // ask for number of autotexts -sal_uInt16 SwGlossaryHdl::GetGlossaryCnt() +sal_uInt16 SwGlossaryHdl::GetGlossaryCnt() const { return pCurGrp ? pCurGrp->GetCount() : 0; } diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index 055d091a75f9..8bc1036978dd 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -3193,7 +3193,7 @@ bool SwTransferable::PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper& return SwTransferable::PasteFormat( rSh, rData, SotClipboardFormatId::STRING ); } -void SwTransferable::PrePasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData, VclPtr<SfxAbstractPasteDialog>& pDlg ) +void SwTransferable::PrePasteSpecial( const SwWrtShell& rSh, TransferableDataHelper& rData, const VclPtr<SfxAbstractPasteDialog>& pDlg ) { DataFlavorExVector aFormats( rData.GetDataFlavorExVector() ); TransferableObjectDescriptor aDesc; diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx index bedbbedc01a4..7bd3ae6f4e3b 100644 --- a/sw/source/uibase/docvw/AnnotationWin.cxx +++ b/sw/source/uibase/docvw/AnnotationWin.cxx @@ -466,7 +466,7 @@ void SwAnnotationWin::UpdateText(const OUString& aText) UpdateData(); } -SvxLanguageItem SwAnnotationWin::GetLanguage() +SvxLanguageItem SwAnnotationWin::GetLanguage() const { // set initial language for outliner SvtScriptType nScriptType = SvtLanguageOptions::GetScriptTypeOfLanguage( mpField->GetLanguage() ); @@ -481,24 +481,24 @@ SvxLanguageItem SwAnnotationWin::GetLanguage() return SvxLanguageItem(mpField->GetLanguage(),nLangWhichId); } -bool SwAnnotationWin::IsProtected() +bool SwAnnotationWin::IsProtected() const { return mbReadonly || GetLayoutStatus() == SwPostItHelper::DELETED || ( mpFormatField && mpFormatField->IsProtect() ); } -OUString SwAnnotationWin::GetAuthor() +OUString SwAnnotationWin::GetAuthor() const { return mpField->GetPar1(); } -Date SwAnnotationWin::GetDate() +Date SwAnnotationWin::GetDate() const { return mpField->GetDate(); } -tools::Time SwAnnotationWin::GetTime() +tools::Time SwAnnotationWin::GetTime() const { return mpField->GetTime(); } diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 70f900cc5516..137791a8edc5 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -1352,12 +1352,12 @@ void SwAnnotationWin::ResetAttributes() mpOutlinerView->SetAttribs(DefaultItem()); } -sal_Int32 SwAnnotationWin::GetScrollbarWidth() +sal_Int32 SwAnnotationWin::GetScrollbarWidth() const { return mrView.GetWrtShell().GetViewOptions()->GetZoom() / 10; } -sal_Int32 SwAnnotationWin::GetMetaButtonAreaWidth() +sal_Int32 SwAnnotationWin::GetMetaButtonAreaWidth() const { const Fraction& f( GetMapMode().GetScaleX() ); return long(METABUTTON_AREA_WIDTH * f); @@ -1375,12 +1375,12 @@ sal_Int32 SwAnnotationWin::GetNumFields() return IsThreadResolved() ? 3 : 2; } -sal_Int32 SwAnnotationWin::GetMinimumSizeWithMeta() +sal_Int32 SwAnnotationWin::GetMinimumSizeWithMeta() const { return mrMgr.GetMinimumSizeWithMeta(); } -sal_Int32 SwAnnotationWin::GetMinimumSizeWithoutMeta() +sal_Int32 SwAnnotationWin::GetMinimumSizeWithoutMeta() const { const Fraction& f(mrView.GetWrtShellPtr()->GetOut()->GetMapMode().GetScaleY()); return long(POSTIT_MINIMUMSIZE_WITHOUT_META * f); diff --git a/sw/source/uibase/docvw/FrameControlsManager.cxx b/sw/source/uibase/docvw/FrameControlsManager.cxx index eb816515ea07..2b7eb90c66dc 100644 --- a/sw/source/uibase/docvw/FrameControlsManager.cxx +++ b/sw/source/uibase/docvw/FrameControlsManager.cxx @@ -179,7 +179,7 @@ SwFrameMenuButtonBase::SwFrameMenuButtonBase( SwEditWin* pEditWin, const SwFrame { } -const SwPageFrame* SwFrameMenuButtonBase::GetPageFrame() +const SwPageFrame* SwFrameMenuButtonBase::GetPageFrame() const { if (m_pFrame->IsPageFrame()) return static_cast<const SwPageFrame*>( m_pFrame ); diff --git a/sw/source/uibase/docvw/HeaderFooterWin.cxx b/sw/source/uibase/docvw/HeaderFooterWin.cxx index 45d84a630281..fed8e4834948 100644 --- a/sw/source/uibase/docvw/HeaderFooterWin.cxx +++ b/sw/source/uibase/docvw/HeaderFooterWin.cxx @@ -389,7 +389,7 @@ void SwHeaderFooterWin::Paint(vcl::RenderContext& rRenderContext, const ::tools: pProcessor->process(aGhostedSeq); } -bool SwHeaderFooterWin::IsEmptyHeaderFooter( ) +bool SwHeaderFooterWin::IsEmptyHeaderFooter( ) const { bool bResult = true; diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index b13ca6a135a4..73950af7db24 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -2451,7 +2451,7 @@ void SwPostItMgr::ShowHideResolvedNotes(bool visible) { LayoutPostIts(); } -void SwPostItMgr::UpdateResolvedStatus(sw::annotation::SwAnnotationWin* topNote) { +void SwPostItMgr::UpdateResolvedStatus(const sw::annotation::SwAnnotationWin* topNote) { // Given the topmost note as an argument, scans over all notes and sets the // 'resolved' state of each descendant of the top notes to the resolved state // of the top note. diff --git a/sw/source/uibase/docvw/ShadowOverlayObject.hxx b/sw/source/uibase/docvw/ShadowOverlayObject.hxx index 637d088eab7b..ec2c7eaf44c1 100644 --- a/sw/source/uibase/docvw/ShadowOverlayObject.hxx +++ b/sw/source/uibase/docvw/ShadowOverlayObject.hxx @@ -51,7 +51,7 @@ public: virtual ~ShadowOverlayObject() override; void SetShadowState(ShadowState aState); - ShadowState GetShadowState() {return mShadowState;} + ShadowState GetShadowState() const {return mShadowState;} void SetPosition( const basegfx::B2DPoint& rPoint1, const basegfx::B2DPoint& rPoint2 ); diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 8c2d5e389bfc..494983820978 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -233,7 +233,7 @@ public: const Point& GetLastPos() const { return aLastPos; } void SetLastPos( const Point& rNew ) { aLastPos = rNew; } void SetPos( const Point& rNew ) { pHdl->SetPos( rNew ); } - const Point& GetHdlPos() { return aHdlPos; } + const Point& GetHdlPos() const { return aHdlPos; } SdrHdl* GetHdl() const { return pHdl; } void ChgHdl( SdrHdl* pNew ) { @@ -5145,7 +5145,7 @@ bool SwEditWin::EnterDrawMode(const MouseEvent& rMEvt, const Point& aDocPos) return false; } -bool SwEditWin::IsDrawSelMode() +bool SwEditWin::IsDrawSelMode() const { return IsObjectSelect(); } diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx index 3c1e1be14732..c77189bbd0fd 100644 --- a/sw/source/uibase/envelp/labimg.cxx +++ b/sw/source/uibase/envelp/labimg.cxx @@ -184,7 +184,7 @@ SfxPoolItem* SwLabItem::Clone(SfxItemPool*) const return new SwLabItem(*this); } -Sequence<OUString> SwLabCfgItem::GetPropertyNames() +Sequence<OUString> SwLabCfgItem::GetPropertyNames() const { static const char* aLabelPropNames[] = { diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx index 2ef085d3bde5..bf2ff623920a 100644 --- a/sw/source/uibase/inc/FrameControl.hxx +++ b/sw/source/uibase/inc/FrameControl.hxx @@ -64,7 +64,7 @@ public: virtual const SwFrame* GetFrame() override { return m_pFrame; } virtual SwEditWin* GetEditWin() override { return m_pEditWin; } - const SwPageFrame* GetPageFrame(); + const SwPageFrame* GetPageFrame() const; }; #endif diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx index ddca1de58034..441007363011 100644 --- a/sw/source/uibase/inc/HeaderFooterWin.hxx +++ b/sw/source/uibase/inc/HeaderFooterWin.hxx @@ -57,8 +57,8 @@ public: virtual void ShowAll( bool bShow ) override; virtual bool Contains( const Point &rDocPt ) const override; - bool IsHeader() { return m_bIsHeader; }; - bool IsEmptyHeaderFooter( ); + bool IsHeader() const { return m_bIsHeader; }; + bool IsEmptyHeaderFooter( ) const; void ExecuteCommand(const OString &rIdent); diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index e58325272a34..f11bdc198ccd 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -36,7 +36,7 @@ public: void InsertBookmark(sw::mark::IMark* pMark); void SelectByName(const OUString& sName); sw::mark::IMark* GetBookmarkByName(const OUString& sName); - OUString GetNameProposal(); + OUString GetNameProposal() const; void unselect_all() { m_xControl->unselect_all(); } bool has_focus() const { return m_xControl->has_focus(); } diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx index ae4c3df7dcc1..c0d4e221b3cc 100644 --- a/sw/source/uibase/inc/content.hxx +++ b/sw/source/uibase/inc/content.hxx @@ -84,7 +84,7 @@ public: virtual bool IsProtect() const override; const OUString& GetURL() const { return sURL; } - const SwTextINetFormat* GetINetAttr() { return pINetAttr; } + const SwTextINetFormat* GetINetAttr() const { return pINetAttr; } }; class SwPostItContent : public SwContent @@ -165,7 +165,7 @@ public: /** Deliver content, for that if necessary fill the list */ const SwContent* GetMember(size_t nIndex); - const OUString& GetName() {return m_sContentTypeName;} + const OUString& GetName() const {return m_sContentTypeName;} const OUString& GetSingleName() const {return m_sSingleContentTypeName;} const OUString& GetTypeToken() const{return m_sTypeToken;} diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index f748759e97ec..9ea8f9f9ffc9 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -165,7 +165,7 @@ class SwContentTree final void EditEntry( SvTreeListEntry const * pEntry, EditEntryMode nMode ); - void GotoContent(SwContent* pCnt); + void GotoContent(const SwContent* pCnt); static void SetInDrag(bool bSet) {bIsInDrag = bSet;} virtual VclPtr<PopupMenu> CreateContextMenu() override; @@ -219,11 +219,11 @@ public: /** folded together will not be glidled */ void HideTree(); - bool IsConstantView() { return State::CONSTANT == m_eState; } - bool IsActiveView() { return State::ACTIVE == m_eState; } - bool IsHiddenView() { return State::HIDDEN == m_eState; } + bool IsConstantView() const { return State::CONSTANT == m_eState; } + bool IsActiveView() const { return State::ACTIVE == m_eState; } + bool IsHiddenView() const { return State::HIDDEN == m_eState; } - const SwWrtShell* GetActiveWrtShell() {return m_pActiveShell;} + const SwWrtShell* GetActiveWrtShell() const {return m_pActiveShell;} SwWrtShell* GetHiddenWrtShell() {return m_pHiddenShell;} DECL_LINK( ContentDoubleClickHdl, SvTreeListBox*, bool ); diff --git a/sw/source/uibase/inc/drawbase.hxx b/sw/source/uibase/inc/drawbase.hxx index 247609943118..6aeb4455a3a1 100644 --- a/sw/source/uibase/inc/drawbase.hxx +++ b/sw/source/uibase/inc/drawbase.hxx @@ -40,7 +40,7 @@ protected: bool m_bCreateObj :1; bool m_bInsForm :1; - Point GetDefaultCenterPos(); + Point GetDefaultCenterPos() const; public: SwDrawBase(SwWrtShell *pSh, SwEditWin* pWin, SwView* pView); virtual ~SwDrawBase(); @@ -57,7 +57,7 @@ public: void BreakCreate(); void SetSlotId(sal_uInt16 nSlot) {m_nSlotId = nSlot;} - sal_uInt16 GetSlotId() { return m_nSlotId;} + sal_uInt16 GetSlotId() const { return m_nSlotId;} virtual void Activate(const sal_uInt16 nSlotId); // activate function virtual void Deactivate(); // deactivate function diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx index 58e878903482..47a9fbd448c9 100644 --- a/sw/source/uibase/inc/drwtxtsh.hxx +++ b/sw/source/uibase/inc/drwtxtsh.hxx @@ -36,7 +36,7 @@ class SwDrawTextShell: public SfxShell void SetAttrToMarked(const SfxItemSet& rAttr); void InsertSymbol(SfxRequest& rReq); - bool IsTextEdit(); + bool IsTextEdit() const; public: SFX_DECL_INTERFACE(SW_DRWTXTSHELL) diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index 36aee0b1f6fd..0f7d992734ad 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -201,8 +201,8 @@ public: virtual void KeyInput(const KeyEvent &rKEvt) override; void UpdatePointer(const Point &, sal_uInt16 nButtons = 0); - bool IsDrawSelMode(); - bool IsDrawAction() { return m_bInsDraw; } + bool IsDrawSelMode() const; + bool IsDrawAction() const { return m_bInsDraw; } void SetDrawAction(bool bFlag) { m_bInsDraw = bFlag; } void SetObjectSelect( bool bVal ) { m_bObjectSelect = bVal; } diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 01fe977ee6c7..a26a21e40a9b 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -164,7 +164,7 @@ class SwFramePage: public SfxTabPage static sal_Int32 GetMapPos(const FrameMap *pMap, const weld::ComboBox& rAlignLB); static sal_Int16 GetAlignment(FrameMap const *pMap, sal_Int32 nMapPos, const weld::ComboBox& rRelationLB); static sal_Int16 GetRelation(const weld::ComboBox& rRelationLB); - RndStdIds GetAnchor(); + RndStdIds GetAnchor() const; void setOptimalFrameWidth(); void setOptimalRelWidth(); @@ -188,7 +188,7 @@ public: void SetNewFrame(bool bNewFrame) { m_bNew = bNewFrame; } void SetFormatUsed(bool bFormat); void SetFrameType(const OUString &rType) { m_sDlgType = rType; } - bool IsInGraficMode() { return m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"; } + bool IsInGraficMode() const { return m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog"; } void EnableVerticalPositioning( bool bEnable ); }; diff --git a/sw/source/uibase/inc/frmsh.hxx b/sw/source/uibase/inc/frmsh.hxx index e3e900acce56..3bb36497bfed 100644 --- a/sw/source/uibase/inc/frmsh.hxx +++ b/sw/source/uibase/inc/frmsh.hxx @@ -36,7 +36,7 @@ public: void Execute(SfxRequest &); void ExecMove(SfxRequest& rReq); - void ExecField(SfxRequest& rReq); + void ExecField(const SfxRequest& rReq); void GetState(SfxItemSet &); void ExecFrameStyle(SfxRequest const & rReq); void GetLineStyleState(SfxItemSet &rSet); diff --git a/sw/source/uibase/inc/glosdoc.hxx b/sw/source/uibase/inc/glosdoc.hxx index 41ff64825b7d..14b4be59eef6 100644 --- a/sw/source/uibase/inc/glosdoc.hxx +++ b/sw/source/uibase/inc/glosdoc.hxx @@ -116,7 +116,7 @@ public: SwDocShellRef EditGroupDoc(const OUString &rGrpName, const OUString& rShortName, bool bShow = true ); void UpdateGlosPath(bool bFull); void ShowError(); - bool IsGlosPathErr() { return m_bError; } + bool IsGlosPathErr() const { return m_bError; } std::vector<OUString> const& GetPathArray() const { return m_PathArr; } }; diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx index bf36a84da410..bdd26ed28a4d 100644 --- a/sw/source/uibase/inc/gloshdl.hxx +++ b/sw/source/uibase/inc/gloshdl.hxx @@ -55,7 +55,7 @@ public: void RenameGroup(const OUString& rOld, OUString& rNew, const OUString& rNewTitle); void SetCurGroup(const OUString &aGrp, bool bApi = false, bool bAlwaysCreateNew = false); - sal_uInt16 GetGlossaryCnt(); + sal_uInt16 GetGlossaryCnt() const; OUString GetGlossaryName(sal_uInt16); OUString GetGlossaryShortName(const OUString &rName); OUString GetGlossaryShortName(sal_uInt16); diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index ad0cb10515f8..cb4dde5b9938 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -63,9 +63,9 @@ public: SwInsFootNoteDlg(weld::Window * pParent, SwWrtShell &rSh, bool bEd); virtual ~SwInsFootNoteDlg() COVERITY_NOEXCEPT_FALSE override; - const OUString& GetFontName() { return m_aFontName; } + const OUString& GetFontName() const { return m_aFontName; } bool IsEndNote() const { return m_xEndNoteBtn->get_active(); } - OUString GetStr() + OUString GetStr() const { if (m_xNumberCharBtn->get_active()) return m_xNumberCharEdit->get_text(); diff --git a/sw/source/uibase/inc/labimg.hxx b/sw/source/uibase/inc/labimg.hxx index a1c211dbcb5e..100cbec2d9c1 100644 --- a/sw/source/uibase/inc/labimg.hxx +++ b/sw/source/uibase/inc/labimg.hxx @@ -108,7 +108,7 @@ private: SwLabItem aItem; bool const bIsLabel; - css::uno::Sequence<OUString> GetPropertyNames(); + css::uno::Sequence<OUString> GetPropertyNames() const; virtual void ImplCommit() override; diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index a70318ee25b7..a123aecd3d35 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -126,7 +126,7 @@ public: css::uno::Sequence< css::uno::Any > const * pSelection); virtual ~SwMailMergeDlg() override; - DBManagerOptions GetMergeType() { return nMergeType; } + DBManagerOptions GetMergeType() const { return nMergeType; } bool IsSaveSingleDoc() const { return m_xSaveSingleDocRB->get_active(); } bool IsGenerateFromDataBase() const { return m_xGenerateFromDataBaseCB->get_active(); } diff --git a/sw/source/uibase/inc/mmconfigitem.hxx b/sw/source/uibase/inc/mmconfigitem.hxx index da02ec600e90..d21bed6cd210 100644 --- a/sw/source/uibase/inc/mmconfigitem.hxx +++ b/sw/source/uibase/inc/mmconfigitem.hxx @@ -84,9 +84,9 @@ public: css::uno::Reference< css::sdbcx::XColumnsSupplier> const & xColumnsSupplier, const SwDBData& rDBData); - css::uno::Reference< css::sdbc::XDataSource> const & GetSource(); + css::uno::Reference< css::sdbc::XDataSource> const & GetSource() const; - SharedConnection const & GetConnection(); + SharedConnection const & GetConnection() const; css::uno::Reference< css::sdbcx::XColumnsSupplier> const & GetColumnsSupplier(); diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx index 291fe8a7e5b5..b264dcf8cfdc 100644 --- a/sw/source/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/uibase/inc/numberingtypelistbox.hxx @@ -49,7 +49,7 @@ public: void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xWidget->connect_changed(rLink); } void Reload(SwInsertNumTypes nTypeFlags); - SvxNumType GetSelectedNumberingType(); + SvxNumType GetSelectedNumberingType() const; bool SelectNumberingType(SvxNumType nType); void SetNoSelection() { m_xWidget->set_active(-1); } void set_sensitive(bool bEnable) { m_xWidget->set_sensitive(bEnable); } diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index fe800e41ca26..3010288f51e8 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -78,7 +78,7 @@ class SwEditRegionDlg : public SfxDialogController std::unique_ptr<weld::Button> m_xDismiss; std::unique_ptr<weld::Widget> m_xHideFrame; - void RecurseList(const SwSectionFormat* pFormat, weld::TreeIter* pIter); + void RecurseList(const SwSectionFormat* pFormat, const weld::TreeIter* pIter); size_t FindArrPos(const SwSectionFormat* pFormat); DECL_LINK( GetFirstEntryHdl, weld::TreeView&, void ); diff --git a/sw/source/uibase/inc/scroll.hxx b/sw/source/uibase/inc/scroll.hxx index 2741f3cf194e..772011c595ec 100644 --- a/sw/source/uibase/inc/scroll.hxx +++ b/sw/source/uibase/inc/scroll.hxx @@ -46,7 +46,7 @@ public: bool IsHoriScroll() const { return bHori; } void SetAuto(bool bSet); - bool IsAuto() { return bAuto;} + bool IsAuto() const { return bAuto;} SwScrollbar(vcl::Window *pParent, bool bHori ); virtual ~SwScrollbar() override; diff --git a/sw/source/uibase/inc/srcedtw.hxx b/sw/source/uibase/inc/srcedtw.hxx index beb43502c158..5a12c3b01cf3 100644 --- a/sw/source/uibase/inc/srcedtw.hxx +++ b/sw/source/uibase/inc/srcedtw.hxx @@ -136,7 +136,7 @@ public: { return m_pTextEngine->IsModified();} void SetReadonly(bool bSet){m_bReadonly = bSet;} - bool IsReadonly(){return m_bReadonly;} + bool IsReadonly() const {return m_bReadonly;} void SetStartLine(sal_uInt16 nLine){m_nStartLine = nLine;} diff --git a/sw/source/uibase/inc/srcview.hxx b/sw/source/uibase/inc/srcview.hxx index 60b866371352..a2e8277b9892 100644 --- a/sw/source/uibase/inc/srcview.hxx +++ b/sw/source/uibase/inc/srcview.hxx @@ -65,7 +65,7 @@ public: void SaveContent(const OUString& rTmpFile); void SaveContentTo(SfxMedium& rMed); - bool IsModified() {return aEditWin->IsModified();} + bool IsModified() const {return aEditWin->IsModified();} void Execute(SfxRequest&); void GetState(SfxItemSet&); diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx index 0b6cccc381a2..680e808767b8 100644 --- a/sw/source/uibase/inc/swdtflvr.hxx +++ b/sw/source/uibase/inc/swdtflvr.hxx @@ -199,7 +199,7 @@ public: * @param rSh * @param rFormatUsed */ - static void PrePasteSpecial( SwWrtShell& rSh, TransferableDataHelper&, VclPtr<SfxAbstractPasteDialog>& pDlg ); + static void PrePasteSpecial( const SwWrtShell& rSh, TransferableDataHelper&, const VclPtr<SfxAbstractPasteDialog>& pDlg ); static bool PasteFormat( SwWrtShell& rSh, TransferableDataHelper& rData, SotClipboardFormatId nFormat ); diff --git a/sw/source/uibase/inc/toxmgr.hxx b/sw/source/uibase/inc/toxmgr.hxx index 12cad3c88fe8..0fde183fd437 100644 --- a/sw/source/uibase/inc/toxmgr.hxx +++ b/sw/source/uibase/inc/toxmgr.hxx @@ -246,7 +246,7 @@ public: void PrevTOXMark(bool bSame=false); // get current TOXmarks - sal_uInt16 GetTOXMarkCount(); + sal_uInt16 GetTOXMarkCount() const; SwTOXMark* GetTOXMark(sal_uInt16 nId); SwTOXMark* GetCurTOXMark(); void SetCurTOXMark(sal_uInt16 nId); @@ -260,7 +260,7 @@ public: }; // inlines -inline sal_uInt16 SwTOXMgr::GetTOXMarkCount() +inline sal_uInt16 SwTOXMgr::GetTOXMarkCount() const { return aCurMarks.size(); } inline SwTOXMark* SwTOXMgr::GetCurTOXMark() diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx index fe01807ef2a0..f4e58ad73d92 100644 --- a/sw/source/uibase/inc/uivwimp.hxx +++ b/sw/source/uibase/inc/uivwimp.hxx @@ -123,7 +123,7 @@ public: SwXTextView* GetUNOObject_Impl(); void Invalidate(); - ShellMode GetShellMode() {return eShellMode;} + ShellMode GetShellMode() const {return eShellMode;} void ExecuteScan(SfxRequest& rReq); SwScannerEventListener& GetScannerEventListener(); @@ -136,7 +136,7 @@ public: { xConfigItem = rItem; } - std::shared_ptr<SwMailMergeConfigItem> const & GetMailMergeConfigItem() {return xConfigItem;} + std::shared_ptr<SwMailMergeConfigItem> const & GetMailMergeConfigItem() const {return xConfigItem;} //#i33307# restore editing position void SetRestorePosition(const Point& rCursorPos, bool bSelectObj) diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx index 6e7e27359579..c386d0c145fd 100644 --- a/sw/source/uibase/inc/unoatxt.hxx +++ b/sw/source/uibase/inc/unoatxt.hxx @@ -233,9 +233,9 @@ public: virtual css::uno::Reference< css::container::XNameReplace > SAL_CALL getEvents( ) override; void Invalidate() {pGlossaries = nullptr;} - const SwGlossaries* GetGlossaries() { return pGlossaries; } - const OUString& GetGroupName() {return sGroupName;} - const OUString& GetEntryName() {return sEntryName;} + const SwGlossaries* GetGlossaries() const { return pGlossaries; } + const OUString& GetGroupName() const {return sGroupName;} + const OUString& GetEntryName() const {return sEntryName;} }; /** Implement the XNameAccess for the AutoText events */ diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx index 08306e66008e..cd3d2f098f2f 100644 --- a/sw/source/uibase/inc/usrpref.hxx +++ b/sw/source/uibase/inc/usrpref.hxx @@ -33,7 +33,7 @@ private: SwMasterUsrPref& rParent; bool const bWeb; - css::uno::Sequence<OUString> GetPropertyNames(); + css::uno::Sequence<OUString> GetPropertyNames() const; virtual void ImplCommit() override; @@ -54,7 +54,7 @@ private: SwMasterUsrPref& rParent; bool const bWeb; - css::uno::Sequence<OUString> GetPropertyNames(); + css::uno::Sequence<OUString> GetPropertyNames() const; virtual void ImplCommit() override; diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx index 850f0f03ad48..37601b232577 100644 --- a/sw/source/uibase/inc/wrtsh.hxx +++ b/sw/source/uibase/inc/wrtsh.hxx @@ -485,7 +485,7 @@ typedef bool (SwWrtShell:: *FNSimpleMove)(); virtual void SetShowHeaderFooterSeparator( FrameControlType eControl, bool bShow ) override; /// Inserts a new annotation/comment at the current cursor position / selection. - void InsertPostIt(SwFieldMgr& rFieldMgr, SfxRequest& rReq); + void InsertPostIt(SwFieldMgr& rFieldMgr, const SfxRequest& rReq); private: diff --git a/sw/source/uibase/misc/numberingtypelistbox.cxx b/sw/source/uibase/misc/numberingtypelistbox.cxx index 4aacd48ba78b..36e4787aec91 100644 --- a/sw/source/uibase/misc/numberingtypelistbox.cxx +++ b/sw/source/uibase/misc/numberingtypelistbox.cxx @@ -118,7 +118,7 @@ void SwNumberingTypeListBox::Reload(SwInsertNumTypes nTypeFlags) } } -SvxNumType SwNumberingTypeListBox::GetSelectedNumberingType() +SvxNumType SwNumberingTypeListBox::GetSelectedNumberingType() const { SvxNumType nRet = SVX_NUM_CHARS_UPPER_LETTER; int nSelPos = m_xWidget->get_active(); diff --git a/sw/source/uibase/ribbar/drawbase.cxx b/sw/source/uibase/ribbar/drawbase.cxx index 7f590817086c..ddfb69f0bb6e 100644 --- a/sw/source/uibase/ribbar/drawbase.cxx +++ b/sw/source/uibase/ribbar/drawbase.cxx @@ -523,7 +523,7 @@ void SwDrawBase::CreateDefaultObject() m_pSh->CreateDefaultShape( static_cast< sal_uInt16 >(m_pWin->GetSdrDrawMode()), aRect, m_nSlotId); } -Point SwDrawBase::GetDefaultCenterPos() +Point SwDrawBase::GetDefaultCenterPos() const { Size aDocSz(m_pSh->GetDocSize()); diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx index 2ff34c56ebc0..04435600b453 100644 --- a/sw/source/uibase/shells/drwtxtsh.cxx +++ b/sw/source/uibase/shells/drwtxtsh.cxx @@ -173,7 +173,7 @@ void SwDrawTextShell::SetAttrToMarked(const SfxItemSet& rAttr) } } -bool SwDrawTextShell::IsTextEdit() +bool SwDrawTextShell::IsTextEdit() const { return pSdrView->IsTextEdit(); } diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx index 38e085f2442b..50abc9c6f06f 100644 --- a/sw/source/uibase/shells/frmsh.cxx +++ b/sw/source/uibase/shells/frmsh.cxx @@ -129,7 +129,7 @@ void SwFrameShell::ExecMove(SfxRequest& rReq) } } -void SwFrameShell::ExecField(SfxRequest& rReq) +void SwFrameShell::ExecField(const SfxRequest& rReq) { SwWrtShell& rSh = GetShell(); sal_uInt16 nSlot = rReq.GetSlot(); diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index e0b50c5cb593..56f363cc0285 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -111,7 +111,7 @@ void SwView::InitInterface_Impl() } -ShellMode SwView::GetShellMode() +ShellMode SwView::GetShellMode() const { return m_pViewImpl->GetShellMode(); } diff --git a/sw/source/uibase/uiview/viewdlg2.cxx b/sw/source/uibase/uiview/viewdlg2.cxx index 40263d66b9f0..ba691407af19 100644 --- a/sw/source/uibase/uiview/viewdlg2.cxx +++ b/sw/source/uibase/uiview/viewdlg2.cxx @@ -101,7 +101,7 @@ void SwView::ExecDlgExt(SfxRequest const &rReq) } } -bool SwView::isSignatureLineSelected() +bool SwView::isSignatureLineSelected() const { SwWrtShell& rSh = GetWrtShell(); SdrView* pSdrView = rSh.GetDrawView(); @@ -122,7 +122,7 @@ bool SwView::isSignatureLineSelected() return pGraphic->isSignatureLine(); } -bool SwView::isSignatureLineSigned() +bool SwView::isSignatureLineSigned() const { SwWrtShell& rSh = GetWrtShell(); SdrView* pSdrView = rSh.GetDrawView(); @@ -143,7 +143,7 @@ bool SwView::isSignatureLineSigned() return pGraphic->isSignatureLineSigned(); } -bool SwView::isQRCodeSelected() +bool SwView::isQRCodeSelected() const { SwWrtShell& rSh = GetWrtShell(); SdrView* pSdrView = rSh.GetDrawView(); diff --git a/sw/source/uibase/uiview/viewdraw.cxx b/sw/source/uibase/uiview/viewdraw.cxx index e9372ceefb24..5b23eff34d18 100644 --- a/sw/source/uibase/uiview/viewdraw.cxx +++ b/sw/source/uibase/uiview/viewdraw.cxx @@ -624,7 +624,7 @@ SdrView* SwView::GetDrawView() const return GetWrtShell().GetDrawView(); } -bool SwView::IsBezierEditMode() +bool SwView::IsBezierEditMode() const { return (!IsDrawSelMode() && GetWrtShell().GetDrawView()->HasMarkablePoints()); } diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 98ddeefbeec3..21eb1ca77826 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -295,7 +295,7 @@ void SwView::SetRedlineAuthor(const OUString& rAuthor) m_pViewImpl->m_sRedlineAuthor = rAuthor; } -const OUString& SwView::GetRedlineAuthor() +const OUString& SwView::GetRedlineAuthor() const { return m_pViewImpl->m_sRedlineAuthor; } diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx index f979bf97d915..d6c6a7d7e9b0 100644 --- a/sw/source/uibase/utlui/content.cxx +++ b/sw/source/uibase/utlui/content.cxx @@ -3619,7 +3619,7 @@ void SwContentTree::EditEntry(SvTreeListEntry const * pEntry, EditEntryMode nMod } } -void SwContentTree::GotoContent(SwContent* pCnt) +void SwContentTree::GotoContent(const SwContent* pCnt) { m_pActiveShell->EnterStdMode(); @@ -3628,7 +3628,7 @@ void SwContentTree::GotoContent(SwContent* pCnt) { case ContentTypeId::OUTLINE : { - m_pActiveShell->GotoOutline(static_cast<SwOutlineContent*>(pCnt)->GetOutlinePos()); + m_pActiveShell->GotoOutline(static_cast<const SwOutlineContent*>(pCnt)->GetOutlinePos()); } break; case ContentTypeId::TABLE : @@ -3657,7 +3657,7 @@ void SwContentTree::GotoContent(SwContent* pCnt) case ContentTypeId::URLFIELD: { if(m_pActiveShell->GotoINetAttr( - *static_cast<SwURLFieldContent*>(pCnt)->GetINetAttr() )) + *static_cast<const SwURLFieldContent*>(pCnt)->GetINetAttr() )) { m_pActiveShell->Right( CRSR_SKIP_CHARS, true, 1, false); m_pActiveShell->SwCursorShell::SelectTextAttr( RES_TXTATR_INETFMT, true ); @@ -3679,7 +3679,7 @@ void SwContentTree::GotoContent(SwContent* pCnt) break; case ContentTypeId::POSTIT: m_pActiveShell->GetView().GetPostItMgr()->AssureStdModeAtShell(); - m_pActiveShell->GotoFormatField(*static_cast<SwPostItContent*>(pCnt)->GetPostIt()); + m_pActiveShell->GotoFormatField(*static_cast<const SwPostItContent*>(pCnt)->GetPostIt()); break; case ContentTypeId::DRAWOBJECT: { diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index 013da2115b51..dfd7e91e44a6 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -1900,7 +1900,7 @@ void SwWrtShell::SetShowHeaderFooterSeparator( FrameControlType eControl, bool b GetView().GetEditWin().GetFrameControlsManager().HideControls( eControl ); } -void SwWrtShell::InsertPostIt(SwFieldMgr& rFieldMgr, SfxRequest& rReq) +void SwWrtShell::InsertPostIt(SwFieldMgr& rFieldMgr, const SfxRequest& rReq) { SwPostItField* pPostIt = dynamic_cast<SwPostItField*>(rFieldMgr.GetCurField()); bool bNew = !(pPostIt && pPostIt->GetTyp()->Which() == SwFieldIds::Postit); |