include/vcl/svapp.hxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1c65d5f8d3d4665e20d4feb17037633c63e4f445
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue Dec 26 11:33:44 2023 +0600
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Dec 26 12:11:15 2023 +0100
Make GetpApp() the pNotifier's default value
It fixes asserts in various places where a message box wants to show
in Lok case
Change-Id: If3c18e92c131de640281f3365567d66b4e14e1ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161299
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 36d7eeb1fc06..6566b78d0375 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -219,6 +219,8 @@ enum class DialogCancelMode {
Fatal ///< cancel any dialogs by std::abort
};
+VCL_DLLPUBLIC class Application* GetpApp();
+
/**
@brief Base class used mainly for the LibreOffice Desktop class.
@@ -1313,7 +1315,7 @@ public:
static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent,
VclMessageType eMessageType,
VclButtonsType
eButtonType, const OUString& rPrimaryMessage,
- const
ILibreOfficeKitNotifier* pNotifier = nullptr);
+ const
ILibreOfficeKitNotifier* pNotifier = GetpApp());
static weld::Window* GetFrameWeld(const
css::uno::Reference<css::awt::XWindow>& rWindow);
@@ -1418,8 +1420,6 @@ public:
~SolarMutexReleaser() { Application::AcquireSolarMutex( mnReleased ); }
};
-VCL_DLLPUBLIC Application* GetpApp();
-
// returns true if vcl is already initialized
VCL_DLLPUBLIC bool IsVCLInit();
// returns true if vcl successfully initializes or was already initialized
