sc/source/ui/condformat/condformatmgr.cxx | 2 +-
sd/source/ui/view/drviews4.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit f8299ece8244a2ff8c68c2376410947769dc1414
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Aug 3 21:48:04 2025 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Aug 7 17:52:07 2025 +0200
cid#1660263 Explicit null dereferenced
Change-Id: Id6d36908f93783b8b742e59861452cef00a43dca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188895
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Jenkins
(cherry picked from commit 916d3500d1e7cc1ee62da902552ee747493b0abd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189048
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit a51a775ea87010286e6624b06e9805bcca2bb95f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189061
diff --git a/sc/source/ui/condformat/condformatmgr.cxx
b/sc/source/ui/condformat/condformatmgr.cxx
index 2e5cef3a01a0..5e60a2a2a70d 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -124,7 +124,7 @@ std::unique_ptr<ScConditionalFormatList>
ScCondFormatManagerDlg::GetConditionalF
void ScCondFormatManagerDlg::UpdateButtonSensitivity()
{
- bool bNewSensitivity = !m_xFormatList->empty();
+ bool bNewSensitivity = m_xFormatList && !m_xFormatList->empty();
m_xBtnRemove->set_sensitive(bNewSensitivity);
m_xBtnEdit->set_sensitive(bNewSensitivity);
}
commit 4d1d9073dcf53cb7222ed766785c130033acc708
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Jul 31 19:47:42 2025 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Aug 7 17:51:56 2025 +0200
cid#1660814 Dereference null return value
Change-Id: I78d031b29feb278b2a5f2e0fdb5bb43bd8664831
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188715
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit 3e0e4d141bc0bb1f9ca5cd7766cd64c7ae16d4f5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189051
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit d5e73fee5fecceaf711cb2f74eb1ff7a26f2be29)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189076
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 764eef122571..85039d388815 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -166,8 +166,8 @@ void DrawViewShell::DeleteActualLayer()
aString));
if (xQueryBox->run() == RET_YES)
{
- const SdrLayer* pLayer = rAdmin.GetLayer(aName);
- mpDrawView->DeleteLayer( pLayer->GetName() );
+ if (const SdrLayer* pLayer = rAdmin.GetLayer(aName))
+ mpDrawView->DeleteLayer(pLayer->GetName());
/* in order to redraw TabBar and Window; should be initiated later on
by
a hint from Joe (as by a change if the layer order). */
