svx/source/tbxctrls/fontworkgallery.cxx | 2 +- sw/source/core/crsr/crsrsh.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
New commits: commit 7c66d037b09238709d78206431cf487443633787 Author: Caolán McNamara <[email protected]> AuthorDate: Wed Mar 15 12:55:39 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Mar 15 16:28:19 2023 +0000 cid#1522014 Dereference null return value Change-Id: I9c5b48ececd6be84d8f1a3c4a45b02d81641736e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148926 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 132a3cd7c9db..298801ace223 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -638,7 +638,7 @@ typename SwCursorShell::StartsWith SwCursorShell::StartsWith_() } nNode = rNodes.GetEndOfContent(); pContentNode = SwNodes::GoPrevious(&nNode); - if (pContentNode->GetTextNode()->IsHidden()) + if (pContentNode && pContentNode->GetTextNode()->IsHidden()) { return StartsWith::HiddenPara; } @@ -2798,7 +2798,7 @@ bool SwCursorShell::IsEndOfDoc() const if( !pCNd ) pCNd = SwNodes::GoPrevious( &aIdx ); - return aIdx == m_pCurrentCursor->GetPoint()->GetNode() && + return aIdx == m_pCurrentCursor->GetPoint()->GetNode() && pCNd && pCNd->Len() == m_pCurrentCursor->GetPoint()->GetContentIndex(); } commit a84a15eadc4ff5b142811117f548170f4a9d81ee Author: Caolán McNamara <[email protected]> AuthorDate: Wed Mar 15 12:52:06 2023 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Mar 15 16:28:11 2023 +0000 cid#1521990 silence Unchecked return value Change-Id: I7833b6ab19334ea17f5210a0381109aa55d6efd0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148925 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index da1df7a8fd96..b08698c03921 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -129,7 +129,7 @@ void FontWorkGalleryDialog::fillFavorites(sal_uInt16 nThemeId) maIdToTitleMap.clear(); std::vector<OUString> aTitles; - GalleryExplorer::FillObjListTitle(nThemeId, aTitles); + (void)GalleryExplorer::FillObjListTitle(nThemeId, aTitles); assert(aTitles.size() == nFavCount); for( size_t nFavorite = 1; nFavorite <= nFavCount; nFavorite++ )
