vcl/source/app/svapp.cxx | 1 + vcl/source/window/dialog.cxx | 1 - vcl/unx/generic/app/gensys.cxx | 2 -- vcl/win/app/salinfo.cxx | 1 - 4 files changed, 1 insertion(+), 4 deletions(-)
New commits: commit 55e667b4d297dcd0b7cb5c7a9ef589212731f077 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Feb 27 22:41:46 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 16:34:21 2026 +0100 vcl: Call ImplHideSplash from Application::ShowNativeErrorBox Call it right in there instead of from inside multiple implementations of the virtual ShowNativeMessageBox::ShowNativeMessageBox that gets called next. Change-Id: I8eb68974f7b89235f54f8600a940295093dc0bb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200658 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 648ffdc02f68..14b6c9def363 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -1639,6 +1639,7 @@ void Application::EnableSafeMode() void Application::ShowNativeErrorBox(const OUString& sTitle , const OUString& sMessage) { + ImplHideSplash(); ImplGetSalSystem()->ShowNativeMessageBox(sTitle, sMessage); } diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 674f78a021a8..aa051393bed8 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -122,7 +122,6 @@ static bool ImplIsMnemonicCtrl( vcl::Window* pWindow ) return false; } -// Called by native error dialog popup implementations void ImplHideSplash() { ImplSVData* pSVData = ImplGetSVData(); diff --git a/vcl/unx/generic/app/gensys.cxx b/vcl/unx/generic/app/gensys.cxx index 8fab4a760a34..c7c2ff89889a 100644 --- a/vcl/unx/generic/app/gensys.cxx +++ b/vcl/unx/generic/app/gensys.cxx @@ -41,8 +41,6 @@ void SalGenericSystem::ShowNativeMessageBox(const OUString& rTitle, const OUStri { std::vector< OUString > aButtons; - ImplHideSplash(); - aButtons.push_back( u"OK"_ustr ); ShowNativeDialog(rTitle, rMessage, aButtons); } diff --git a/vcl/win/app/salinfo.cxx b/vcl/win/app/salinfo.cxx index 87547a9b119d..831f903bcfbd 100644 --- a/vcl/win/app/salinfo.cxx +++ b/vcl/win/app/salinfo.cxx @@ -166,7 +166,6 @@ AbsoluteScreenPixelRectangle WinSalSystem::GetDisplayScreenPosSizePixel( unsigne void WinSalSystem::ShowNativeMessageBox(const OUString& rTitle, const OUString& rMessage) { - ImplHideSplash(); MessageBoxW(nullptr, o3tl::toW(rMessage.getStr()), o3tl::toW(rTitle.getStr()), MB_TASKMODAL | MB_SETFOREGROUND | MB_ICONWARNING | MB_DEFBUTTON1); }
