diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-02-17 12:36:23 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2023-02-17 15:43:07 +0000 |
| commit | 5ed00392ee3b2ba7babeb88527ceaafc3da3f443 (patch) | |
| tree | 0b3f5e00fe801b82da2de76ee6a12dab57603b6b | |
| parent | 8bc365b8dd33feefd33fe4d64a80b9753401cba1 (diff) | |
use a reference here to flag its never null
Change-Id: Ic38d95d7c50d5807c9c94cc0851422bb1c60912a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147214
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/uibase/dochdl/gloshdl.cxx | 6 | ||||
| -rw-r--r-- | sw/source/uibase/inc/gloshdl.hxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/uiview/view.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 4820584268aa..4d5a7707dbfc 100644 --- a/sw/source/uibase/dochdl/gloshdl.cxx +++ b/sw/source/uibase/dochdl/gloshdl.cxx @@ -69,7 +69,7 @@ struct TextBlockInfo_Impl void SwGlossaryHdl::GlossaryDlg() { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); - ScopedVclPtr<AbstractGlossaryDlg> pDlg(pFact->CreateGlossaryDlg(m_pViewFrame, this, m_pWrtShell)); + ScopedVclPtr<AbstractGlossaryDlg> pDlg(pFact->CreateGlossaryDlg(&m_rViewFrame, this, m_pWrtShell)); OUString sName; OUString sShortName; @@ -607,10 +607,10 @@ void SwGlossaryHdl::GetMacros( const OUString &rShortName, } // ctor, dtor -SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame* pVwFrame, SwWrtShell *pSh) +SwGlossaryHdl::SwGlossaryHdl(SfxViewFrame& rVwFrame, SwWrtShell *pSh) : m_rStatGlossaries( *::GetGlossaries() ), m_aCurGrp( SwGlossaries::GetDefName() ), - m_pViewFrame( pVwFrame ), + m_rViewFrame(rVwFrame), m_pWrtShell( pSh ) { } diff --git a/sw/source/uibase/inc/gloshdl.hxx b/sw/source/uibase/inc/gloshdl.hxx index 530d0b6bc4a0..c7f0187000c8 100644 --- a/sw/source/uibase/inc/gloshdl.hxx +++ b/sw/source/uibase/inc/gloshdl.hxx @@ -36,7 +36,7 @@ class SW_DLLPUBLIC SwGlossaryHdl SwGlossaries& m_rStatGlossaries; OUString m_aCurGrp; - SfxViewFrame* m_pViewFrame; + SfxViewFrame& m_rViewFrame; SwWrtShell* m_pWrtShell; std::unique_ptr<SwTextBlocks> m_pCurGrp; @@ -91,7 +91,7 @@ public: bool ImportGlossaries( const OUString& rName ); - SwGlossaryHdl(SfxViewFrame* pViewFrame, SwWrtShell *); + SwGlossaryHdl(SfxViewFrame& rViewFrame, SwWrtShell*); ~SwGlossaryHdl(); }; diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx index 3d4c9695a392..df599d79ff54 100644 --- a/sw/source/uibase/uiview/view.cxx +++ b/sw/source/uibase/uiview/view.cxx @@ -1677,7 +1677,7 @@ OUString SwView::GetSelectionTextParam( bool bCompleteWrds, bool bEraseTrail ) SwGlossaryHdl* SwView::GetGlosHdl() { if(!m_pGlosHdl) - m_pGlosHdl.reset(new SwGlossaryHdl(&GetViewFrame(), m_pWrtShell.get())); + m_pGlosHdl.reset(new SwGlossaryHdl(GetViewFrame(), m_pWrtShell.get())); return m_pGlosHdl.get(); } |