cui/source/dialogs/hldoctp.cxx | 11 +++++++---- sfx2/source/doc/guisaveas.cxx | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-)
New commits: commit 70b6d04570b22e766d1f04921cf05f9f9cdd3108 Author: Noel Grandin <[email protected]> AuthorDate: Thu Sep 5 12:22:45 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Sep 5 13:51:15 2024 +0200 tdf#162728 Crash on saving in Math Formula editor regression from commit ece0729e18b4b306933439d1a329df192fc504d3 Author: Noel Grandin <[email protected]> Date: Tue Aug 13 13:43:25 2024 +0200 use less exception throwing for flow control Change-Id: I52dcb717e309c70d10a0609b04b2c9c659c423cf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172908 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 3cd788f5dc4b..a1a127a18ff6 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -226,7 +226,7 @@ public: try { uno::Reference< lang::XMultiServiceFactory > xDocSettingsSupplier( xModel, uno::UNO_QUERY ); - if (xModel) + if (xDocSettingsSupplier) { m_xDocumentSettings.set( xDocSettingsSupplier->createInstance( u"com.sun.star.document.Settings"_ustr ), commit 6633afe0ff18e5921eb96be2f863f28bd7e1110d Author: Noel Grandin <[email protected]> AuthorDate: Thu Sep 5 12:11:27 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Thu Sep 5 13:51:07 2024 +0200 fix crash in Hyperlink dialog which I managed to trigger by hitting escape repeatedly while it was trying to load the targets window Change-Id: I4c7cb3a30104c58bfc6652923a0aa2169c1bf3bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172907 Reviewed-by: Noel Grandin <[email protected]> Tested-by: Jenkins diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index b414309bea0b..c8ed1de2fa6b 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -253,10 +253,13 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void) { weld::WaitObject aWait(mpDialog->getDialog()); - if ( maStrURL.equalsIgnoreAsciiCase( INET_FILE_SCHEME ) ) - mxMarkWnd->RefreshTree ( u""_ustr ); - else - mxMarkWnd->RefreshTree ( maStrURL ); + if (mxMarkWnd) + { + if ( maStrURL.equalsIgnoreAsciiCase( INET_FILE_SCHEME ) ) + mxMarkWnd->RefreshTree ( u""_ustr ); + else + mxMarkWnd->RefreshTree ( maStrURL ); + } } }
