From 6539456c4c8447cb43b0fb4a9129e649014d8366 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 8 Mar 2021 12:27:35 +0000 Subject: let ScLinkedAreaDlg have a Widget parent instead of a Window MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ida871186e5d15290ed2520b18651bad211799c1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112167 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sc/inc/scabstdlg.hxx | 2 +- sc/source/ui/attrdlg/scdlgfact.cxx | 2 +- sc/source/ui/attrdlg/scdlgfact.hxx | 2 +- sc/source/ui/inc/linkarea.hxx | 2 +- sc/source/ui/miscdlgs/linkarea.cxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 0656ca16cc10..5613755aa0ee 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -458,7 +458,7 @@ public: SCTAB nTabCount, bool bFromFile) = 0; virtual VclPtr CreateScSelEntryDlg(weld::Window* pParent, const std::vector &rEntryList) = 0; - virtual VclPtr CreateScLinkedAreaDlg(weld::Window* pParent) = 0; + virtual VclPtr CreateScLinkedAreaDlg(weld::Widget* pParent) = 0; virtual VclPtr CreateScMetricInputDlg(weld::Window* pParent, const OString& sDialogName, diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index bc22a3fb443a..bfa48eeefb3f 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -1088,7 +1088,7 @@ VclPtr ScAbstractDialogFactory_Impl::CreateScSelEntryDlg( return VclPtr::Create(std::make_unique(pParent, rEntryList)); } -VclPtr ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(weld::Window* pParent) +VclPtr ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(weld::Widget* pParent) { return VclPtr::Create(std::make_unique(pParent)); } diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index f48e2b4f2cfd..0b47be0ec368 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -735,7 +735,7 @@ public: virtual VclPtr CreateScSelEntryDlg(weld::Window* pParent, const std::vector &rEntryList) override; - virtual VclPtr CreateScLinkedAreaDlg(weld::Window* pParent) override; + virtual VclPtr CreateScLinkedAreaDlg(weld::Widget* pParent) override; virtual VclPtr CreateScMetricInputDlg(weld::Window* pParent, const OString& sDialogName, diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 85cf87f06c29..9d039a47daac 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -57,7 +57,7 @@ private: const OUString& rOptions ); public: - ScLinkedAreaDlg(weld::Window* pParent); + ScLinkedAreaDlg(weld::Widget* pParent); virtual ~ScLinkedAreaDlg() override; void InitFromOldLink( const OUString& rFile, const OUString& rFilter, diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index c4c23b1ba369..b8bc66c8d2a9 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -35,7 +35,7 @@ #include #include -ScLinkedAreaDlg::ScLinkedAreaDlg(weld::Window* pParent) +ScLinkedAreaDlg::ScLinkedAreaDlg(weld::Widget* pParent) : GenericDialogController(pParent, "modules/scalc/ui/externaldata.ui", "ExternalDataDialog") , m_pSourceShell(nullptr) , m_xCbUrl(new SvtURLBox(m_xBuilder->weld_combo_box("url"))) -- cgit