diff options
author | Muhammet Kara <muhammet.kara@collabora.com> | 2019-07-10 22:08:01 +0300 |
---|---|---|
committer | Muhammet Kara <muhammet.kara@collabora.com> | 2019-07-11 07:14:31 +0200 |
commit | 4e3304892171a494101c4defc4d805599cf1fc7b (patch) | |
tree | 4c6a98610fbb27d26980a58d2d62c5cc6533d5c7 /cui | |
parent | d064b51afc84af92f877dc33c683c9521a6cd937 (diff) |
lokdialog: Convert the Paste Special dialog to async exec for sw
Change-Id: I0c75def6ea09bcb191a8023421b371b49205e712
Reviewed-on: https://gerrit.libreoffice.org/75378
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.kara@collabora.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/factory/dlgfact.cxx | 5 | ||||
-rw-r--r-- | cui/source/factory/dlgfact.hxx | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 19bd83ed5ad0..bd23fc1981d3 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -264,6 +264,11 @@ short AbstractPasteDialog_Impl::Execute() return m_xDlg->run(); } +bool AbstractPasteDialog_Impl::StartExecuteAsync(AsyncContext &rCtx) +{ + return SfxDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn); +} + short AbstractInsertObjectDialog_Impl::Execute() { return m_xDlg->run(); diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index f0e343947aaf..0badc8fffd98 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -561,13 +561,14 @@ public: class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog { - std::unique_ptr<SvPasteObjectDialog> m_xDlg; + std::shared_ptr<SvPasteObjectDialog> m_xDlg; public: explicit AbstractPasteDialog_Impl(std::unique_ptr<SvPasteObjectDialog> p) : m_xDlg(std::move(p)) { } virtual short Execute() override; + virtual bool StartExecuteAsync(AsyncContext &rCtx) override; public: virtual void Insert( SotClipboardFormatId nFormat, const OUString & rFormatName ) override; virtual void SetObjName( const SvGlobalName & rClass, const OUString & rObjName ) override; |