[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sc/source

merttumer (via logerrit) logerrit at kemper.freedesktop.org
Mon Apr 26 08:03:52 UTC 2021


 sc/source/ui/dbgui/scuiasciiopt.cxx |    7 +++++++
 sc/source/ui/inc/scuiasciiopt.hxx   |    2 ++
 2 files changed, 9 insertions(+)

New commits:
commit a31145dee7908dd1dc800cdc0aea26b5fd17645d
Author:     merttumer <mert.tumer at collabora.com>
AuthorDate: Mon Apr 26 06:52:34 2021 +0300
Commit:     Mert Tumer <mert.tumer at collabora.com>
CommitDate: Mon Apr 26 10:03:19 2021 +0200

    lok: add global notifier to the "Text Import Dialog"
    
    This dialog is displayed before the document is loaded
    so no way to get access to the view shell notifier
    when model/view/controller are not created yet.
    
    Change-Id: Ic9259b0b1d72b2c4f29b7265742136e650c7b67b
    Signed-off-by: merttumer <mert.tumer at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114637
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 75d915438f44..58e50fb943d5 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -36,6 +36,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <miscuno.hxx>
 #include <osl/diagnose.h>
+#include <vcl/svapp.hxx>
 
 //! TODO make dynamic
 const SCSIZE ASCIIDLG_MAXROWS                = MAXROWCOUNT;
@@ -516,6 +517,12 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatNa
         mxCkbSkipEmptyCells->set_active(false);
         mxCkbSkipEmptyCells->hide();
     }
+    m_xDialog->SetInstallLOKNotifierHdl(LINK(this, ScImportAsciiDlg, InstallLOKNotifierHdl));
+}
+
+IMPL_STATIC_LINK_NOARG(ScImportAsciiDlg, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*)
+{
+    return GetpApp();
 }
 
 ScImportAsciiDlg::~ScImportAsciiDlg()
diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx
index 1b263931bc6f..b8cb2bcc6794 100644
--- a/sc/source/ui/inc/scuiasciiopt.hxx
+++ b/sc/source/ui/inc/scuiasciiopt.hxx
@@ -121,6 +121,8 @@ private:
                                 DECL_LINK( LbColTypeHdl, weld::ComboBox&, void );
                                 DECL_LINK( UpdateTextHdl, ScCsvTableBox&, void );
                                 DECL_LINK( ColTypeHdl, ScCsvTableBox&, void );
+                                DECL_STATIC_LINK(ScImportAsciiDlg, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*);
+
 };
 
 inline bool ScImportAsciiDlg::Seek(sal_uLong nPos)


More information about the Libreoffice-commits mailing list