[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/uibase/app/swmodul1.cxx |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

New commits:
commit 26003c60aa0b539da1a05874278e5cd05b327aae
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Feb 23 10:29:19 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Feb 23 12:59:48 2022 +0100

    cid#1500615 silence Dereference after null check
    
    Change-Id: Ide4089fa37786f3bccb03cc679306a26e60aca73
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130421
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/uibase/app/swmodul1.cxx 
b/sw/source/uibase/app/swmodul1.cxx
index af4d63e1e13f..183ce20261b4 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -596,35 +596,40 @@ FieldUnit SwModule::GetMetric( bool bWeb ) const
             GetUsrPref(false);
         pPref = m_pUsrPref.get();
     }
+    assert(pPref && "pPref is set by here");
     return pPref->GetMetric();
 }
 
 // Pass-through Update-Status
 sal_uInt16 SwModule::GetLinkUpdMode() const
 {
-    if(!m_pUsrPref)
+    if (!m_pUsrPref)
         GetUsrPref(false);
+    assert(m_pUsrPref && "m_pUsrPref is set by here");
     return o3tl::narrowing<sal_uInt16>(m_pUsrPref->GetUpdateLinkMode());
 }
 
 SwFieldUpdateFlags SwModule::GetFieldUpdateFlags() const
 {
-    if(!m_pUsrPref)
+    if (!m_pUsrPref)
         GetUsrPref(false);
+    assert(m_pUsrPref && "m_pUsrPref is set by here");
     return m_pUsrPref->GetFieldUpdateFlags();
 }
 
 void SwModule::ApplyFieldUpdateFlags(SwFieldUpdateFlags eFieldFlags)
 {
-    if(!m_pUsrPref)
+    if (!m_pUsrPref)
         GetUsrPref(false);
+    assert(m_pUsrPref && "m_pUsrPref is set by here");
     m_pUsrPref->SetFieldUpdateFlags(eFieldFlags);
 }
 
 void SwModule::ApplyLinkMode(sal_Int32 nNewLinkMode)
 {
-    if(!m_pUsrPref)
+    if (!m_pUsrPref)
         GetUsrPref(false);
+    assert(m_pUsrPref && "m_pUsrPref is set by here");
     m_pUsrPref->SetUpdateLinkMode(nNewLinkMode);
 }