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

[Dr. David Alan Gilbert (via logerrit)]

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

New commits:
commit 553cbea8f66abc08be9ebb9638b8a17b7ecf37a2
Author:     Dr. David Alan Gilbert <dave at treblig.org>
AuthorDate: Fri Nov 20 03:14:58 2020 +0000
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Nov 22 11:53:01 2020 +0100

    Fix ESCHER_Prop_pVertices/ESCHER_Prop_pSegmentInfo output
    
    Commit f1ec5dcfca45e reworked the output code to:
    
         OString pathString = aPath.makeStringAndClear();
         if ( !aPath.isEmpty() && pathString != "xe" )
    
    Unfortunately the 'AndClear' means that the isEmpty is always true
    so we never get the path string.  This happens on complex polygons;
    e.g. the orange arrows in tdf#138374
    
    Change-Id: I41e69f2e5eb73b49ff512d2c1ca94423bc0bb202
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106212
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index e3ed8547aaed..c708be927ef3 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -651,7 +651,7 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const tools::Rectangle&
                             }
                         }
                         OString pathString = aPath.makeStringAndClear();
-                        if ( !aPath.isEmpty() && pathString != "xe" )
+                        if ( !pathString.isEmpty() && pathString != "xe" )
                             m_pShapeAttrList->add( XML_path, pathString );
                     }
                     else