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

[Caolán McNamara (via logerrit)]

 sw/source/filter/ww8/docxattributeoutput.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit cd79fbd624679f68662177fa25ebdfeaf7b2d3be
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Oct 12 11:15:58 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Oct 12 13:34:23 2022 +0200

    cid#1515941 Dereference null return value
    
    Change-Id: Id6b191482c70a95d861ba771925570bc5992f534
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141250
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 73af98b6fac3..f2489186e9c5 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2465,11 +2465,10 @@ void DocxAttributeOutput::WriteContentControlStart()
 
     const OUString& rPrefixMapping = 
m_pContentControl->GetDataBindingPrefixMappings();
     const OUString& rXpath = m_pContentControl->GetDataBindingXpath();
-    if (!rXpath.isEmpty())
+    if (SwTextNode* pTextNode = !rXpath.isEmpty() ? 
m_pContentControl->GetTextNode() : nullptr)
     {
         // This content control has a data binding, update the data source.
         SwTextContentControl* pTextAttr = m_pContentControl->GetTextAttr();
-        SwTextNode* pTextNode = m_pContentControl->GetTextNode();
         SwPosition aPoint(*pTextNode, pTextAttr->GetStart());
         SwPosition aMark(*pTextNode, *pTextAttr->GetEnd());
         SwPaM aPam(aMark, aPoint);