[Libreoffice-commits] core.git: sw/uiconfig

[Julien Nabet (via logerrit)]

 sw/uiconfig/swriter/ui/tocdialog.ui |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a9af05467ef43dd53ec1666ce35f70a439065c89
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Jan 14 18:27:01 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 14 21:08:55 2021 +0100

    Replace gtk-close to gtk-cancel (sw TOC dialog)
    
    In sw/uiconfig/swriter/ui/tocdialog.ui
    we got:
    id="cancel"
    <action-widget response="-6">cancel</action-widget>
    
    In sw/source/ui/index/cnttab.cxx
    we got:
    SfxTabDialogController(pParent, "modules/swriter/ui/tocdialog.ui", "TocDialog", &rSet)
    which contains std::unique_ptr<weld::Button> m_xCancelBtn;
    
    and finally if you change some options in the TOC dialog and click on "Close"
    then open again the dialog, all the changed options are reverted.
    
    => UI impact, the button is renamed "Cancel" instead of "Close"
    
    Change-Id: Ia99e7c8a10da51f258faf0833ea1931ce62364bb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109301
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/uiconfig/swriter/ui/tocdialog.ui b/sw/uiconfig/swriter/ui/tocdialog.ui
index 9cc5485f2bd0..b60995274956 100644
--- a/sw/uiconfig/swriter/ui/tocdialog.ui
+++ b/sw/uiconfig/swriter/ui/tocdialog.ui
@@ -55,7 +55,7 @@
             </child>
             <child>
               <object class="GtkButton" id="cancel">
-                <property name="label">gtk-close</property>
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>