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 /sc/source/ui/inc | |
| 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 'sc/source/ui/inc')
| -rw-r--r-- | sc/source/ui/inc/fuinsert.hxx | 14 | ||||
| -rw-r--r-- | sc/source/ui/inc/tabvwsh.hxx | 3 |
2 files changed, 3 insertions, 14 deletions
diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index cfad23933836..863aa6d88cb1 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -22,9 +22,6 @@ #include "fupoor.hxx" #include <scdllapi.h> -#include <svx/svdoole2.hxx> -#include <com/sun/star/ui/dialogs/DialogClosedEvent.hpp> -#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> class FuInsertGraphic : public FuPoor { @@ -43,14 +40,9 @@ public: class FuInsertChart : public FuPoor { - css::uno::Reference<css::ui::dialogs::XAsynchronousExecutableDialog> m_xDialog; - SdrOle2Obj* m_pInsertedObject; - - DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); - - public: - FuInsertChart( ScTabViewShell& pViewSh, vcl::Window* pWin, ScDrawView* pView, - SdrModel* pDoc, SfxRequest& rReq); +public: + FuInsertChart(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pView, + SdrModel* pDoc, SfxRequest& rReq); }; class FuInsertMedia : public FuPoor diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index df33dac2c00e..210cf689d2c1 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -59,7 +59,6 @@ class ScPageBreakShell; class ScDPObject; class ScNavigatorSettings; class ScRangeName; -class FuInsertChart; struct ScHeaderFieldData; @@ -98,7 +97,6 @@ private: sal_uInt16 nDrawSfxId; sal_uInt16 nFormSfxId; OUString sDrawCustom; // current custom shape type - std::unique_ptr<ScDrawShell> pDrawShell; std::unique_ptr<ScDrawTextObjectBar> pDrawTextShell; std::unique_ptr<ScEditShell> pEditShell; @@ -113,7 +111,6 @@ private: std::unique_ptr<ScPageBreakShell> pPageBreakShell; std::unique_ptr<svx::ExtrusionBar> pExtrusionBarShell; std::unique_ptr<svx::FontworkBar> pFontworkBarShell; - std::unique_ptr<FuInsertChart> pFuInsertChart; std::unique_ptr<FmFormShell> pFormShell; |