From 60fef0bfeb6df6512da07db899315f3480be3796 Mon Sep 17 00:00:00 2001 From: Skyler Grey Date: Thu, 26 Sep 2024 13:50:28 +0000 Subject: [PATCH] fix(lok): Expose the character encoding dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The character encoding dialog appears when importing a dialog with an ambiguous character encoding. At the point when it appears, the document isn't loaded, so we have to handle it in a similar way to the text import dialog or password prompt dialog, allowing it to function early. It's also required to make the dialog into a jsdialog, as tunneled dialogs do not work this early in the document loading process. I have not asynced the dialog here because there's no point. I did write code where I set up a dialog factory to do this similar to how other modules (sw, sc, sd, etc.) handle dialogs and make them async. Unfortunately, this dialog is not useful with multiple users, since as it's used on opening a document. It may, in the future, be useful to someone to make a patch that asyncs the other writerperfect dialog (epub export) so I have uploaded and abandoned my dialog factory patch as Id8ec474510f3c8637639ad59331156c6e75dafb4. Documents that require this dialog, whether async or not, cause crashes when someone opens the document before the first person has finished responding to this dialog. I still consider this behavior better than crashing whenever we attempt to show this dialog at all. Change-Id: Ibd36e695e733e07053bb6e22a510ac988be3ded2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174044 Tested-by: Jenkins CollaboraOffice Reviewed-by: Szymon Kłos (cherry picked from commit 283f771b92a14c06871c931b01174622b855abe5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174950 Tested-by: Jenkins --- vcl/jsdialog/enabled.cxx | 1 + writerperfect/inc/WPFTEncodingDialog.hxx | 2 ++ writerperfect/source/common/WPFTEncodingDialog.cxx | 10 ++++++++++ 3 files changed, 13 insertions(+) diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index e29fe6137886..93ee95617120 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -279,6 +279,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool bMobile) || rUIFile == u"filter/ui/warnpdfdialog.ui" // writerperfect || rUIFile == u"writerperfect/ui/exportepub.ui" + || rUIFile == u"writerperfect/ui/wpftencodingdialog.ui" // xmlsec || rUIFile == u"xmlsec/ui/certgeneral.ui" || rUIFile == u"xmlsec/ui/certpage.ui" diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx index f84b1b273635..62fb817842ba 100644 --- a/writerperfect/inc/WPFTEncodingDialog.hxx +++ b/writerperfect/inc/WPFTEncodingDialog.hxx @@ -37,6 +37,8 @@ private: private: DECL_DLLPRIVATE_LINK(CancelHdl, weld::Button&, void); + DECL_STATIC_LINK(WPFTEncodingDialog, InstallLOKNotifierHdl, void*, + vcl::ILibreOfficeKitNotifier*); WPFTEncodingDialog(WPFTEncodingDialog const&) = delete; WPFTEncodingDialog& operator=(WPFTEncodingDialog const&) = delete; diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx index 8a8fd6255ea6..dc440929dcea 100644 --- a/writerperfect/source/common/WPFTEncodingDialog.cxx +++ b/writerperfect/source/common/WPFTEncodingDialog.cxx @@ -25,6 +25,8 @@ #include +#include + namespace writerperfect { namespace @@ -105,6 +107,14 @@ WPFTEncodingDialog::WPFTEncodingDialog(weld::Window* pParent, const OUString& ti selectEncoding(*m_xLbCharset, encoding); m_xDialog->set_title(title); + + m_xDialog->SetInstallLOKNotifierHdl(LINK(this, WPFTEncodingDialog, InstallLOKNotifierHdl)); +} + +IMPL_STATIC_LINK_NOARG(WPFTEncodingDialog, InstallLOKNotifierHdl, void*, + vcl::ILibreOfficeKitNotifier*) +{ + return GetpApp(); } WPFTEncodingDialog::~WPFTEncodingDialog() {}