dbaccess/source/ui/dlg/ConnectionPage.cxx | 4 ++--
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 4 ++--
dbaccess/source/ui/dlg/detailpages.cxx | 2 +-
svx/source/svdraw/svdmrkv1.cxx | 1 +
4 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit b5a37d8239dd2c7f31d8a107add1f84b69b68422
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu May 16 23:03:42 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri May 17 12:57:37 2024 +0200
WaE: C6011 Dereferencing NULL pointer warnings
Change-Id: I4bb077ea634d9ca3e238981cfcc307a1b6caf7c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167757
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 003e16671ac8..46f577703891 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -231,7 +231,7 @@ namespace dbaui
}
IMPL_LINK_NOARG(OConnectionTabPage, OnTestJavaClickHdl, weld::Button&,
void)
{
- OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
+ assert(m_pAdminDialog && "No Admin dialog set! ->GPF");
bool bSuccess = false;
#if HAVE_FEATURE_JAVA
try
@@ -255,7 +255,7 @@ namespace dbaui
}
bool OConnectionTabPage::checkTestConnection()
{
- OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
+ assert(m_pAdminDialog && "No Admin dialog set! ->GPF");
bool bEnableTestConnection = !m_xConnectionURL->get_visible() ||
!m_xConnectionURL->GetTextNoPrefix().isEmpty();
if ( m_pCollection->determineType(m_eType) == ::dbaccess::DST_JDBC )
bEnableTestConnection = bEnableTestConnection &&
(!o3tl::trim(m_xJavaDriver->get_text()).empty());
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 8665a0d9ef2d..2a3824bec6a4 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -468,7 +468,7 @@ using namespace ::com::sun::star;
IMPL_LINK_NOARG(OGeneralSpecialJDBCConnectionPageSetup,
OnTestJavaClickHdl, weld::Button&, void)
{
- OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
+ assert(m_pAdminDialog && "No Admin dialog set! ->GPF");
bool bSuccess = false;
#if HAVE_FEATURE_JAVA
@@ -704,7 +704,7 @@ using namespace ::com::sun::star;
IMPL_LINK_NOARG(OJDBCConnectionPageSetup, OnTestJavaClickHdl,
weld::Button&, void)
{
- OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
+ assert(m_pAdminDialog && "No Admin dialog set! ->GPF");
bool bSuccess = false;
#if HAVE_FEATURE_JAVA
try
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx
b/dbaccess/source/ui/dlg/detailpages.cxx
index 79413a62c6d9..65af148913ba 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -445,7 +445,7 @@ namespace dbaui
}
IMPL_LINK_NOARG(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl,
weld::Button&, void)
{
- OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
+ assert(m_pAdminDialog && "No Admin dialog set! ->GPF");
OSL_ENSURE(m_bUseClass,"Who called me?");
bool bSuccess = false;
diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx
index 9c732262bcc9..f8e039468231 100644
--- a/svx/source/svdraw/svdmrkv1.cxx
+++ b/svx/source/svdraw/svdmrkv1.cxx
@@ -207,6 +207,7 @@ bool SdrMarkView::MarkPoints(const tools::Rectangle* pRect,
bool bUnmark)
pPV0=pPV;
} else {
#ifdef DBG_UTIL
+ assert(pObj);
if (pObj->IsInserted()) {
OSL_FAIL("SdrMarkView::MarkPoints(const Rectangle*
pRect): Selected object not found.");
}
