[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - oox/source

Caolán McNamara caolanm at redhat.com
Thu Nov 30 21:43:02 UTC 2017


 oox/source/drawingml/textbody.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 7416251f918007430da562defba5d45d373f61b7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Nov 30 14:43:29 2017 +0000

    ofz: handle empty paragraphs case
    
    Change-Id: I4c928f55881c1f9147eec1018381b3d3064c58ee
    Reviewed-on: https://gerrit.libreoffice.org/45593
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/oox/source/drawingml/textbody.cxx b/oox/source/drawingml/textbody.cxx
index 8f3a08cf5733..eb27bda831ac 100644
--- a/oox/source/drawingml/textbody.cxx
+++ b/oox/source/drawingml/textbody.cxx
@@ -95,6 +95,9 @@ void TextBody::ApplyStyleEmpty(
 {
     assert(isEmpty());
 
+    if (maParagraphs.empty())
+        return;
+
     // Apply character properties
     TextListStyle aCombinedTextStyle;
     aCombinedTextStyle.apply( *pMasterTextListStylePtr );


More information about the Libreoffice-commits mailing list