diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2022-11-17 21:40:54 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2022-11-18 11:48:39 +0100 |
| commit | f3af2b8d041232708cc2df56592c561e463a2362 (patch) | |
| tree | cd4da09784b8131ec5c26f50a2d2f8b25a604bc3 | |
| parent | 81a3e33aa203e852b9810fb8e9b17c1930269606 (diff) | |
jsdialog: enable Delete content dialog
Dialog had unused m_xBtnOk which has defined standard
response in .ui file - no need to bind anything in the code.
Change-Id: Ie743485bb30a03b82a87dc69015a704e14c39384
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142903
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
| -rw-r--r-- | sc/source/ui/inc/delcodlg.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/miscdlgs/delcodlg.cxx | 1 | ||||
| -rw-r--r-- | vcl/jsdialog/enabled.cxx | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index c23deed4fcc6..7c49a79f9d33 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -35,7 +35,6 @@ private: std::unique_ptr<weld::CheckButton> m_xBtnDelNotes; std::unique_ptr<weld::CheckButton> m_xBtnDelAttrs; std::unique_ptr<weld::CheckButton> m_xBtnDelObjects; - std::unique_ptr<weld::Button> m_xBtnOk; static bool bPreviousAllCheck; static InsertDeleteFlags nPreviousChecks; diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 9d804c252419..56334ba9ca9c 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -37,7 +37,6 @@ ScDeleteContentsDlg::ScDeleteContentsDlg(weld::Window* pParent) , m_xBtnDelNotes(m_xBuilder->weld_check_button("comments")) , m_xBtnDelAttrs(m_xBuilder->weld_check_button("formats")) , m_xBtnDelObjects(m_xBuilder->weld_check_button("objects")) - , m_xBtnOk(m_xBuilder->weld_button("ok")) { m_xBtnDelAll->set_active( ScDeleteContentsDlg::bPreviousAllCheck ); m_xBtnDelStrings->set_active( bool(InsertDeleteFlags::STRING & ScDeleteContentsDlg::nPreviousChecks) ); diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index fd2afd7bbf68..249b18a05d67 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -74,7 +74,8 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"modules/swriter/ui/captionoptions.ui" || rUIFile == u"cui/ui/formatnumberdialog.ui" || rUIFile == u"cui/ui/password.ui" - || rUIFile == u"cui/ui/numberingformatpage.ui") + || rUIFile == u"cui/ui/numberingformatpage.ui" + || rUIFile == u"modules/scalc/ui/deletecontents.ui") { return true; } |