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

Grzegorz Araminowicz (via logerrit) logerrit at kemper.freedesktop.org
Tue May 28 17:06:07 UTC 2019


 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit baef4e11dd9d8c019dcf8667f88882db7d7c86fd
Author:     Grzegorz Araminowicz <grzegorz.araminowicz at collabora.com>
AuthorDate: Tue May 28 14:41:06 2019 +0200
Commit:     Grzegorz Araminowicz <grzegorz.araminowicz at collabora.com>
CommitDate: Tue May 28 19:05:15 2019 +0200

    SmartArt: simplify text body empty condition
    
    Change-Id: Ie1c14bdc4f4db6f8f919433d40ea2281736c38ed
    Reviewed-on: https://gerrit.libreoffice.org/73097
    Tested-by: Jenkins
    Reviewed-by: Grzegorz Araminowicz <grzegorz.araminowicz at collabora.com>

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index a9b2f0c1c5a1..675806767191 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -1153,12 +1153,8 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
             }
 
             TextBodyPtr pTextBody = rShape->getTextBody();
-            if (!pTextBody ||
-                pTextBody->getParagraphs().empty() ||
-                pTextBody->getParagraphs().front()->getRuns().empty())
-            {
+            if (!pTextBody || pTextBody->isEmpty())
                 break;
-            }
 
             // adjust text size to fit shape
             if (fFontSize != 0)


More information about the Libreoffice-commits mailing list