[Libreoffice-commits] core.git: sc/inc sc/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue Mar 9 11:26:00 UTC 2021


 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(-)

New commits:
commit 6539456c4c8447cb43b0fb4a9129e649014d8366
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Mar 8 12:27:35 2021 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Mar 9 12:25:20 2021 +0100

    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 at redhat.com>

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")))


More information about the Libreoffice-commits mailing list