summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-03-08 12:27:35 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-03-09 12:25:20 +0100
commit6539456c4c8447cb43b0fb4a9129e649014d8366 (patch)
tree1611168a070a714f16d6f75c709b76a1a18dc48b
parent2fb274950e5207ca55f4f52325fb522bd44024e1 (diff)
let ScLinkedAreaDlg have a Widget parent instead of a Window
Change-Id: Ida871186e5d15290ed2520b18651bad211799c1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112167 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/inc/scabstdlg.hxx2
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.cxx2
-rw-r--r--sc/source/ui/attrdlg/scdlgfact.hxx2
-rw-r--r--sc/source/ui/inc/linkarea.hxx2
-rw-r--r--sc/source/ui/miscdlgs/linkarea.cxx2
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<AbstractScSelEntryDlg > CreateScSelEntryDlg(weld::Window* pParent, const std::vector<OUString> &rEntryList) = 0;
- virtual VclPtr<AbstractScLinkedAreaDlg> CreateScLinkedAreaDlg(weld::Window* pParent) = 0;
+ virtual VclPtr<AbstractScLinkedAreaDlg> CreateScLinkedAreaDlg(weld::Widget* pParent) = 0;
virtual VclPtr<AbstractScMetricInputDlg> 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<AbstractScSelEntryDlg> ScAbstractDialogFactory_Impl::CreateScSelEntryDlg(
return VclPtr<AbstractScSelEntryDlg_Impl>::Create(std::make_unique<ScSelEntryDlg>(pParent, rEntryList));
}
-VclPtr<AbstractScLinkedAreaDlg> ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(weld::Window* pParent)
+VclPtr<AbstractScLinkedAreaDlg> ScAbstractDialogFactory_Impl::CreateScLinkedAreaDlg(weld::Widget* pParent)
{
return VclPtr<AbstractScLinkedAreaDlg_Impl>::Create(std::make_unique<ScLinkedAreaDlg>(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<AbstractScSelEntryDlg> CreateScSelEntryDlg(weld::Window* pParent, const std::vector<OUString> &rEntryList) override;
- virtual VclPtr<AbstractScLinkedAreaDlg> CreateScLinkedAreaDlg(weld::Window* pParent) override;
+ virtual VclPtr<AbstractScLinkedAreaDlg> CreateScLinkedAreaDlg(weld::Widget* pParent) override;
virtual VclPtr<AbstractScMetricInputDlg> 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 <scresid.hxx>
#include <strings.hrc>
-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")))