diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-04-15 11:02:16 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@cib.de> | 2020-04-16 12:43:46 +0200 |
| commit | 53e3446dd29cb74642800124a372d696f19a6828 (patch) | |
| tree | 80cb95b3c3cdf0b0e43fdf65b76ad19a8369e713 /include | |
| parent | d1655a9a565dd629741c7dd3b0462a7900f067e3 (diff) | |
Resolves: tdf#122491 ClassificationDialog::run() is not called
when using DialogController::runAsync so the custom override
isn't called so the special setup and save-on-ok aren't called.
move the setup into the ctor seeing as the dialog is only run once
after ctoring and add a OK handling that does the on-ok setting save and
have setupValues call readIn on "m_aInitialValues" because that
gets called after the ctor
Change-Id: I8183fc4b0f5de2844562c971c86d655f2d4920ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92288
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/ClassificationDialog.hxx | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx index 3d9dace58d0b..d03445c77730 100644 --- a/include/svx/ClassificationDialog.hxx +++ b/include/svx/ClassificationDialog.hxx @@ -54,6 +54,7 @@ private: std::unique_ptr<weld::CustomWeld> m_xEditWindowWeld; DECL_LINK(ButtonClicked, weld::Button&, void); + DECL_LINK(OkHdl, weld::Button&, void); DECL_LINK(SelectToolboxHdl, weld::ToggleButton&, void); DECL_LINK(SelectClassificationHdl, weld::ComboBox&, void); DECL_LINK(SelectMarkingHdl, weld::TreeView&, bool); @@ -77,8 +78,6 @@ public: ClassificationDialog(weld::Window* pParent, bool bPerParagraph, const std::function<void()>& rParagraphSignHandler = [](){}); ~ClassificationDialog() override; - short run() override; - std::vector<ClassificationResult> getResult(); void setupValues(std::vector<ClassificationResult> const & rInput); }; |