[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-0' - cui/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Jan 17 09:25:43 UTC 2019


 cui/source/tabpages/numfmt.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 88cfaa624edb2cd2ee1c75c22e69f856c80a542f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 9 16:13:24 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 17 10:25:18 2019 +0100

    Resolves: tdf#122356 on row-activate click ok button
    
    instead of proceeding directy to the ok response. Because there is
    an additional handler installed in the okbutton to do extra stuff
    that is needed to make this work
    
    Change-Id: I9646ea6978533084c6c9c48b03806e46eaa49c33
    Reviewed-on: https://gerrit.libreoffice.org/66047
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit f3ff8ba104e8271e7a33c5cbb94ab8f561dd4a38)
    Reviewed-on: https://gerrit.libreoffice.org/66473
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index d3eb10e38b42..344e381546b5 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -1139,7 +1139,10 @@ IMPL_LINK(SvxNumberFormatTabPage, DoubleClickHdl_Impl, weld::TreeView&, rLb, voi
     SelFormatHdl_Impl(&rLb);
 
     if (SfxTabDialogController* pController = GetDialogController())
-        pController->getDialog()->response(RET_OK);
+    {
+        weld::Button& rOkButton = pController->GetOKButton();
+        rOkButton.clicked();
+    }
     else
     {
         SfxSingleTabDialog* pParent = dynamic_cast<SfxSingleTabDialog*>(GetParentDialog());


More information about the Libreoffice-commits mailing list