summaryrefslogtreecommitdiff
path: root/sw/source/ui/dialog/swdlgfact.hxx
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2020-05-19 16:55:39 +0200
committerSzymon Kłos <szymon.klos@collabora.com>2020-05-21 11:11:32 +0200
commitc0f402da0f3ae8318103fc269e98c25617e83111 (patch)
tree5e8a277abb84c6f98ab71ad382754ac9ec2a2b7f /sw/source/ui/dialog/swdlgfact.hxx
parent6010da281c57c007f3dfcbd1c3c12d351d01205c (diff)
Make Insert Table dialog async
Change-Id: Id2458c16f259a58e2376f42104a9a6c9056cab11 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94536 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94589 Tested-by: Jenkins
Diffstat (limited to 'sw/source/ui/dialog/swdlgfact.hxx')
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx11
1 files changed, 6 insertions, 5 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 315cfba7b143..9f84f34a44a8 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -471,16 +471,17 @@ public:
class SwInsTableDlg;
class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
{
- std::unique_ptr<SwInsTableDlg> m_xDlg;
+protected:
+ std::shared_ptr<weld::DialogController> m_xDlg;
public:
- explicit AbstractInsTableDlg_Impl(std::unique_ptr<SwInsTableDlg> p)
- : m_xDlg(std::move(p))
+ explicit AbstractInsTableDlg_Impl(std::shared_ptr<weld::DialogController> p)
+ : m_xDlg(p)
{
}
- virtual short Execute() override;
virtual void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
SwInsertTableOptions& rInsTableFlags, OUString& rTableAutoFormatName,
std::unique_ptr<SwTableAutoFormat>& prTAFormat ) override;
+ virtual std::shared_ptr<weld::DialogController> getDialogController() override { return m_xDlg; }
};
class SwJavaEditDialog;
@@ -728,7 +729,7 @@ public:
weld::Window * pParent, SwWrtShell &rSh, bool bEd = false) override;
virtual VclPtr<VclAbstractDialog> CreateTitlePageDlg(weld::Window* pParent) override;
virtual VclPtr<VclAbstractDialog> CreateVclSwViewDialog(SwView& rView) override;
- virtual VclPtr<AbstractInsTableDlg> CreateInsTableDlg(SwView& rView) override;
+ virtual std::shared_ptr<AbstractInsTableDlg> CreateInsTableDlg(SwView& rView) override;
virtual VclPtr<AbstractJavaEditDialog> CreateJavaEditDialog(weld::Window* pParent,
SwWrtShell* pWrtSh) override;
virtual VclPtr<AbstractMailMergeDlg> CreateMailMergeDlg(