diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-03-02 20:22:30 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-03-03 05:52:55 +0100 |
| commit | e17224501e9f4f783d5be3f5aa9c7f6decd8a405 (patch) | |
| tree | a71050673f3bc76a5956a728262b12f9991247fe /sw/source/uibase/shells/textsh.cxx | |
| parent | 300eaa533eed3f9e07cf24d53e4e4c561be2fc3b (diff) | |
Revert "Make Chart Creation Wizard async"
This reverts commit ed86b6250cd00ed6b7bdb81307bc66adba129cae.
Reason for revert: Most Jenkins builds for that change were aborted
after timing out, and many other Gerrit Jenkins and tinderbox builds
now time out, too. It very much smells like that commit was the
culprit.
Change-Id: I5473c58957f92d63113e32f862ad9c114f9c844c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89803
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw/source/uibase/shells/textsh.cxx')
| -rw-r--r-- | sw/source/uibase/shells/textsh.cxx | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx index c16dcf1a7cfc..ef1341d078bc 100644 --- a/sw/source/uibase/shells/textsh.cxx +++ b/sw/source/uibase/shells/textsh.cxx @@ -87,30 +87,9 @@ using namespace ::com::sun::star; #include <drawdoc.hxx> #include <svtools/embedhlp.hxx> #include <sfx2/event.hxx> -#include <com/sun/star/ui/dialogs/DialogClosedEvent.hpp> -#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <IDocumentUndoRedo.hxx> SFX_IMPL_INTERFACE(SwTextShell, SwBaseShell) -IMPL_STATIC_LINK( SwTextShell, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, pEvent, void ) -{ - SwView* pView = ::GetActiveView(); - SwWrtShell& rWrtShell = pView->GetWrtShell(); - - sal_Int16 nDialogRet = pEvent->DialogResult; - if( nDialogRet == ui::dialogs::ExecutableDialogResults::CANCEL ) - { - rWrtShell.Undo(); - rWrtShell.GetIDocumentUndoRedo().ClearRedo(); - } - else - { - OSL_ENSURE( nDialogRet == ui::dialogs::ExecutableDialogResults::OK, - "dialog execution failed" ); - } -} - void SwTextShell::InitInterface_Impl() { GetStaticInterface()->RegisterPopupMenu("text"); @@ -324,7 +303,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) break; if(!rReq.IsAPI()) { - SwInsertChart( LINK( this, SwTextShell, DialogClosedHdl ) ); + SwInsertChart(); } else { |