From e17224501e9f4f783d5be3f5aa9c7f6decd8a405 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 2 Mar 2020 20:22:30 +0100 Subject: 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 --- sw/source/uibase/inc/chartins.hxx | 8 +------- sw/source/uibase/inc/textsh.hxx | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'sw/source/uibase/inc') diff --git a/sw/source/uibase/inc/chartins.hxx b/sw/source/uibase/inc/chartins.hxx index d258053ae985..383e0fda1a58 100644 --- a/sw/source/uibase/inc/chartins.hxx +++ b/sw/source/uibase/inc/chartins.hxx @@ -20,17 +20,11 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX #include -#include namespace vcl { class Window; } Point SwGetChartDialogPos( const vcl::Window *pParentWin, const Size& rDialogSize, const tools::Rectangle& rLogicChart ); - -class SwInsertChart -{ -public: - SwInsertChart( const Link& rLink ); -}; +void SwInsertChart(); #endif // INCLUDED_SW_SOURCE_UIBASE_INC_CHARTINS_HXX diff --git a/sw/source/uibase/inc/textsh.hxx b/sw/source/uibase/inc/textsh.hxx index 849bffcf4f2b..9ec521afe647 100644 --- a/sw/source/uibase/inc/textsh.hxx +++ b/sw/source/uibase/inc/textsh.hxx @@ -22,13 +22,11 @@ #include "basesh.hxx" #include -#include class AbstractSvxPostItDialog; class SwFieldMgr; class SwFlyFrameAttrMgr; class SvxHyperlinkItem; -class SwInsertChart; class SW_DLLPUBLIC SwTextShell: public SwBaseShell { @@ -48,7 +46,6 @@ private: public: DECL_LINK( RedlineNextHdl, AbstractSvxPostItDialog&, void ); DECL_LINK( RedlinePrevHdl, AbstractSvxPostItDialog&, void ); - DECL_STATIC_LINK( SwTextShell, DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); void Execute(SfxRequest &); void GetState(SfxItemSet &); -- cgit