sc/source/ui/dbgui/pvfundlg.cxx | 2 +- sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit cf93998eb5abc193d95ae5433bf4dfd11a9d62d8 Author: Julien Nabet <serval2...@yahoo.fr> AuthorDate: Tue Jan 12 20:09:40 2021 +0100 Commit: Caolán McNamara <caol...@redhat.com> CommitDate: Wed Jan 13 16:12:09 2021 +0100 Revert "pivot table: make options cancel button working" + fix crash again In the dialog, you have 3 buttons "Help", "Cancel" and "OK" Using "Cancel" will call "close" which doesn't revert back changes. To test this: - Launch Calc - Create an array with 2 cols (qtX and qtY) and put 2 rows of values - Create a pivot dialog - Put qtX in "Filters" part - Double click on qtX (=> "Data Field" dialog appears) - Click "Options..." (=> "Data Field Options" dialog appears) - Enable any checkbox (eg: Empty line after each time) + click "OK" (=> dialog "Data Field Options" closes) - Click "Options..." again (the checkbox is still enabled as expected) - Disable the checkbox + click "Cancel" (=> dialog "Data Field Options" closes) - Click "Options..." again (the checkbox is still enabled as NOT expected) So revert the below quoted commit and fix this by using "cancel" in: - action-widget response - id for the GtkButton - the use of the id to initialize m_xBtnCancel with m_xBuilder->weld_button This reverts commit c2a349bc1482482d3e5ec06232c166d77fe9b602. Change-Id: I555a90706de635e90b0ee397dfd958df55b5c40a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109193 Tested-by: Jenkins Reviewed-by: Szymon Kłos <szymon.k...@collabora.com> diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index d8f5eaf0c46a..431ef89407de 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -651,7 +651,7 @@ ScDPSubtotalOptDlg::ScDPSubtotalOptDlg(weld::Window* pParent, ScDPObject& rDPObj , m_xFtHierarchy(m_xBuilder->weld_label("hierarchyft")) , m_xLbHierarchy(m_xBuilder->weld_combo_box("hierarchy")) , m_xBtnOk(m_xBuilder->weld_button("ok")) - , m_xBtnCancel(m_xBuilder->weld_button("close")) + , m_xBtnCancel(m_xBuilder->weld_button("cancel")) , mrDPObj(rDPObj) , maLabelData(rLabelData) { diff --git a/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui index 9a11dc9645f3..5a543f479508 100644 --- a/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui +++ b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui @@ -58,7 +58,7 @@ </packing> </child> <child> - <object class="GtkButton" id="close"> + <object class="GtkButton" id="cancel"> <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> @@ -623,7 +623,7 @@ </child> <action-widgets> <action-widget response="-5">ok</action-widget> - <action-widget response="-6">close</action-widget> + <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> <child type="titlebar"> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits