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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Aug 31 07:28:06 UTC 2018


 sw/source/core/unocore/unocrsrhelper.cxx |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 6fe7b0ae629a258649feb5b8dfc87d6579321587
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Aug 30 16:59:40 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Aug 31 09:27:35 2018 +0200

    Resolves: tdf#119607 crash in calling getPropertyState on TextParagraph
    
    Change-Id: Ib7091473e3547241e95dc3d3921abf650f288aff
    Reviewed-on: https://gerrit.libreoffice.org/59824
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 4bd17b5c681f..af5322b35d58 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -600,8 +600,11 @@ bool getCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry
             SwTextNode* pTextNode = rPam.GetPoint()->nNode.GetNode().GetTextNode();
             if (pTextNode)
             {
-                uno::Reference<text::XTextContent> xParagraph = SwXParagraph::CreateXParagraph(*pTextNode->GetDoc(), pTextNode);
-                *pAny <<= xParagraph;
+                if (pAny)
+                {
+                    uno::Reference<text::XTextContent> xParagraph = SwXParagraph::CreateXParagraph(*pTextNode->GetDoc(), pTextNode);
+                    *pAny <<= xParagraph;
+                }
             }
             else
                 eNewState = PropertyState_DEFAULT_VALUE;


More information about the Libreoffice-commits mailing list