summaryrefslogtreecommitdiff
path: root/sw/source/ui/dialog/swdlgfact.hxx
diff options
context:
space:
mode:
authorSkyler Grey <skyler3665@gmail.com>2022-08-03 09:54:45 +0100
committerSzymon Kłos <szymon.klos@collabora.com>2022-11-20 10:40:49 +0100
commitb5d3a3ac031d055e433eb2b79b48f6d00fb0e0d6 (patch)
tree46fe3e67e8aa69a4bd92341844a0684f3eeab869 /sw/source/ui/dialog/swdlgfact.hxx
parent67160035d65f9b43b8483e5900d2a2812e1bbecc (diff)
Turn the split table dialog into an async JSDialog
- Previously the split table dialog was not an async dialog, and it wasn't a JSDialog either - A non-async dialog has issues when multiple people try to change something using the dialog at the same time. Generally the changes from one person will not be applied until all people who opened the dialog later than them have submitted - This PR makes the dialog async, fixing multi-user issues with it - This PR makes the dialog into a JSDialog, rendering it on the client with native HTML elements Signed-off-by: Skyler Grey <skyler3665@gmail.com> Change-Id: I9254bc1b635531c8b38d1ade76f99ffdda145b35 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137741 Reviewed-by: Szymon Kłos <szymon.klos@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142972 Tested-by: Jenkins
Diffstat (limited to 'sw/source/ui/dialog/swdlgfact.hxx')
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index f97ff430c294..c0326249a15b 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -236,13 +236,14 @@ public:
class AbstractSplitTableDialog_Impl : public AbstractSplitTableDialog // add for
{
- std::unique_ptr<SwSplitTableDlg> m_xDlg;
+ std::shared_ptr<SwSplitTableDlg> m_xDlg;
public:
- explicit AbstractSplitTableDialog_Impl(std::unique_ptr<SwSplitTableDlg> p)
+ explicit AbstractSplitTableDialog_Impl(std::shared_ptr<SwSplitTableDlg> p)
: m_xDlg(std::move(p))
{
}
virtual short Execute() override;
+ virtual bool StartExecuteAsync(AsyncContext &rCtx) override;
virtual SplitTable_HeadlineOption GetSplitMode() override;
};