diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-03-08 20:58:06 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-03-09 13:02:24 +0100 |
| commit | 6b6cf8aa25cebb5b8e5592973391e42ec25dd482 (patch) | |
| tree | cbef2d78f7065457daccc73f7842b8f669da39c3 | |
| parent | 77285d2d0266e074520c539556e5a2b660d43b11 (diff) | |
let SwMultiTOXTabDialog have a Widget parent instead of a Window
Change-Id: I7a7ae6cd5240257a0f2e33e89d20a1799b29013d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112195
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/inc/swabstdlg.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.cxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 2 | ||||
| -rw-r--r-- | sw/source/ui/index/cnttab.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/inc/swuicnttab.hxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/glbltree.cxx | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index b96fc4b8c463..35b81e524754 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -481,7 +481,7 @@ public: const SfxItemSet* pSwItemSet, SwWrtShell &) = 0; virtual VclPtr<AbstractMultiTOXTabDialog> CreateMultiTOXTabDialog( - weld::Window* pParent, const SfxItemSet& rSet, + weld::Widget* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, bool bGlobal) = 0; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 56709f9646ce..9fcc14e8a587 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -1103,7 +1103,7 @@ VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateOutlineTabDialo return VclPtr<AbstractTabController_Impl>::Create(std::make_shared<SwOutlineTabDialog>(pParent, pSwItemSet, rWrtSh)); } -VclPtr<AbstractMultiTOXTabDialog> SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog(weld::Window* pParent, const SfxItemSet& rSet, +VclPtr<AbstractMultiTOXTabDialog> SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog(weld::Widget* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, bool bGlobal) { return VclPtr<AbstractMultiTOXTabDialog_Impl>::Create(std::make_shared<SwMultiTOXTabDialog>(pParent, rSet, rShell, pCurTOX, USHRT_MAX, bGlobal)); diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 15a668c6ea78..3561adbb77d5 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -748,7 +748,7 @@ public: const SfxItemSet* pSwItemSet, SwWrtShell &) override; virtual VclPtr<AbstractMultiTOXTabDialog> CreateMultiTOXTabDialog( - weld::Window* pParent, const SfxItemSet& rSet, + weld::Widget* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, bool bGlobal) override; diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 7174fac03651..5aceedce652b 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -193,7 +193,7 @@ sal_uInt16 CurTOXType::GetFlatIndex() const ? TOX_AUTHORITIES + nIndex : eType ); } -SwMultiTOXTabDialog::SwMultiTOXTabDialog(weld::Window* pParent, const SfxItemSet& rSet, +SwMultiTOXTabDialog::SwMultiTOXTabDialog(weld::Widget* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType, bool bGlobal) : SfxTabDialogController(pParent, "modules/swriter/ui/tocdialog.ui", "TocDialog", &rSet) diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 117da38f3f03..16756594f82b 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -87,7 +87,7 @@ class SwMultiTOXTabDialog : public SfxTabDialogController DECL_LINK(ShowPreviewHdl, weld::ToggleButton&, void); public: - SwMultiTOXTabDialog(weld::Window* pParent, const SfxItemSet& rSet, + SwMultiTOXTabDialog(weld::Widget* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, SwTOXBase* pCurTOX, sal_uInt16 nToxType, bool bGlobal); diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 754adf7dc736..745ac10ce8d1 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -665,7 +665,7 @@ void SwGlobalTree::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ScopedVclPtr<AbstractMultiTOXTabDialog> pDlg(pFact->CreateMultiTOXTabDialog( - m_xDialog->GetFrameWeld(), aSet, + m_xTreeView.get(), aSet, *m_pActiveShell, nullptr, true)); |