include/vcl/svapp.hxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit ee3894a25c28e16f3f6b6f11e8a69d9738f1fc9f
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sun Jan 7 16:51:46 2024 +0100
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Tue Jan 9 06:14:24 2024 +0100
Revert "Make GetpApp() the pNotifier's default value"
This reverts commit 1c65d5f8d3d4665e20d4feb17037633c63e4f445.
Reason for revert: not the right way to do.
See
https://gerrit.libreoffice.org/c/core/+/161313/1#message-c7716cdedebe48aee3d7b6b766bbf9c519c11c38
Change-Id: I20dc16dcb0ef8535fee450e3bdb57bef857af4ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161751
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 6566b78d0375..36d7eeb1fc06 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -219,8 +219,6 @@ 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.
@@ -1315,7 +1313,7 @@ public:
static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent,
VclMessageType eMessageType,
VclButtonsType
eButtonType, const OUString& rPrimaryMessage,
- const
ILibreOfficeKitNotifier* pNotifier = GetpApp());
+ const
ILibreOfficeKitNotifier* pNotifier = nullptr);
static weld::Window* GetFrameWeld(const
css::uno::Reference<css::awt::XWindow>& rWindow);
@@ -1420,6 +1418,8 @@ 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
