[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - oox/source

[Xisco Fauli (via logerrit)]

 oox/source/drawingml/transform2dcontext.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d0fc7fc65ae320b0df6ce93c01cb432e21876778
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Dec 21 10:28:28 2022 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Dec 22 09:11:11 2022 +0000

    oox: fix crash in oox::drawingml::Transform2DContext::onCreateContext
    
    Similar to 68a259f5af8757923be8a226631f38366fe8e37b
    "tdf#152606: fix crash when opening specific pptx"
    
    See 
https://crashreport.libreoffice.org/stats/signature/oox::drawingml::Transform2DContext::onCreateContext(long,oox::AttributeList%20const%20&)
    
    Change-Id: Iac769edadb72590d8aef1ea3fc3845fce7a0bd86
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144648
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    (cherry picked from commit ad3a1ed90fc5a19c0191ec572f12f359f98a0958)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144669
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144701
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/oox/source/drawingml/transform2dcontext.cxx 
b/oox/source/drawingml/transform2dcontext.cxx
index a16d55639f75..08ec71f5a70b 100644
--- a/oox/source/drawingml/transform2dcontext.cxx
+++ b/oox/source/drawingml/transform2dcontext.cxx
@@ -53,7 +53,7 @@ ContextHandlerRef Transform2DContext::onCreateContext( 
sal_Int32 aElementToken,
     {
         // Workaround: only for rectangles
         const sal_Int32 nType = 
mrShape.getCustomShapeProperties()->getShapePresetType();
-        if( nType == XML_rect || nType == XML_roundRect || nType == 
XML_ellipse )
+        if( mrShape.getTextBody() && ( nType == XML_rect || nType == 
XML_roundRect || nType == XML_ellipse ) )
         {
             switch( aElementToken )
             {