core.git: Branch 'distro/collabora/co-24.04' - sc/source

[Pranam Lashkari (via logerrit)]

 sc/source/ui/dbgui/scuiasciiopt.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 290d70a476bab7d100baa3568ec547633109033e
Author:     Pranam Lashkari <lpra...@collabora.com>
AuthorDate: Fri Apr 26 23:51:14 2024 +0100
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Apr 29 12:15:13 2024 +0200

    LOK: hide cancel button in csv import dialog
    
    it did not make any sense to have cancel button in this dialog
    because it would not load file at all.
    user can still use close button in title bar to close dialog
    
    Change-Id: Id3ba3e4030553db18bdbd068d92b3395f4fb8c3d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166764
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 601323a6586d..b4b446ea7d58 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -605,6 +605,9 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, 
std::u16string_view aD
         mxCkbSkipEmptyCells->set_active(false);
         mxCkbSkipEmptyCells->hide();
     }
+
+    if (comphelper::LibreOfficeKit::isActive())
+        m_xBuilder->weld_button("cancel")->hide();
     m_xDialog->SetInstallLOKNotifierHdl(LINK(this, ScImportAsciiDlg, 
InstallLOKNotifierHdl));
 }