diff options
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 4 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/misc/glossary.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/dochdl/gloshdl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/glossary.hxx | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index da48badefdd8..9c27f098eb29 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -502,7 +502,7 @@ public: const OString& sPage, SwWrtShell* pActShell, bool bNew) = 0; - virtual VclPtr<AbstractGlossaryDlg> CreateGlossaryDlg(SfxViewFrame* pViewFrame, + virtual VclPtr<AbstractGlossaryDlg> CreateGlossaryDlg(SfxViewFrame& rViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) = 0; virtual VclPtr<AbstractFieldInputDlg> CreateFieldInputDlg(weld::Widget *pParent, diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 9bcae1e2ef33..ecf45ec06109 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -1130,10 +1130,10 @@ VclPtr<SfxAbstractApplyTabDialog> SwAbstractDialogFactory_Impl::CreateTemplateDi sPage, pActShell, bNew)); } -VclPtr<AbstractGlossaryDlg> SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, +VclPtr<AbstractGlossaryDlg> SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxViewFrame& rViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) { - return VclPtr<AbstractGlossaryDlg_Impl>::Create(std::make_unique<SwGlossaryDlg>(pViewFrame, pGlosHdl, pWrtShell)); + return VclPtr<AbstractGlossaryDlg_Impl>::Create(std::make_unique<SwGlossaryDlg>(rViewFrame, pGlosHdl, pWrtShell)); } VclPtr<AbstractFieldInputDlg> SwAbstractDialogFactory_Impl::CreateFieldInputDlg(weld::Widget *pParent, diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 7ee78f4a5c05..d31e212accf4 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -794,7 +794,7 @@ public: const OString& sPage, SwWrtShell* pActShell, bool bNew) override; - virtual VclPtr<AbstractGlossaryDlg> CreateGlossaryDlg(SfxViewFrame* pViewFrame, + virtual VclPtr<AbstractGlossaryDlg> CreateGlossaryDlg(SfxViewFrame& rViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) override; virtual VclPtr<AbstractFieldInputDlg> CreateFieldInputDlg(weld::Widget *pParent, diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 33aefaa2ce39..a1b328e6a20e 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -288,9 +288,9 @@ public: } }; -SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame const * pViewFrame, +SwGlossaryDlg::SwGlossaryDlg(const SfxViewFrame& rViewFrame, SwGlossaryHdl * pGlosHdl, SwWrtShell *pWrtShell) - : SfxDialogController(pViewFrame->GetFrameWeld(), "modules/swriter/ui/autotext.ui", "AutoTextDialog") + : SfxDialogController(rViewFrame.GetFrameWeld(), "modules/swriter/ui/autotext.ui", "AutoTextDialog") , m_sReadonlyPath(SwResId(STR_READONLY_PATH)) , m_pGlossaryHdl(pGlosHdl) , m_bResume(false) diff --git a/sw/source/uibase/dochdl/gloshdl.cxx b/sw/source/uibase/dochdl/gloshdl.cxx index 4d5a7707dbfc..e70ed7ffc4b2 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_rViewFrame, this, m_pWrtShell)); + ScopedVclPtr<AbstractGlossaryDlg> pDlg(pFact->CreateGlossaryDlg(m_rViewFrame, this, m_pWrtShell)); OUString sName; OUString sShortName; diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index d0a99a86a664..ba6d82a5fc3e 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -109,7 +109,7 @@ class SwGlossaryDlg final : public SfxDialogController void DeleteEntry(); public: - SwGlossaryDlg(SfxViewFrame const * pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); + SwGlossaryDlg(const SfxViewFrame& rViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell); virtual short run() override; virtual ~SwGlossaryDlg() override; OUString GetCurrGrpName() const; |