filter/source/msfilter/escherex.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 5a33306a377e7fa29303395dc361efa262787264 Author: Jochen Nitschke <[email protected]> Date: Tue Nov 7 20:23:51 2017 +0100 tdf#113254 fix regression - images not displayed in MSO regression of commit 31ee13b5a40715e217711e48753eeb7170e3349c convert SHAPEFLAG defines to scoped enum ShapeFlag This patch restores original behaviour and re-adds clarified comment. Change-Id: Ie4f75902611127ccef7fa1ca3d32b87f06675db4 Reviewed-on: https://gerrit.libreoffice.org/44424 Tested-by: Jenkins <[email protected]> Reviewed-by: Jochen Nitschke <[email protected]> diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx index 9a83f2697ea8..79624155282e 100644 --- a/filter/source/msfilter/escherex.cxx +++ b/filter/source/msfilter/escherex.cxx @@ -5294,7 +5294,7 @@ void EscherEx::AddShape( sal_uInt32 nShpInstance, ShapeFlag nFlags, sal_uInt32 n if ( !nShapeID ) nShapeID = GenerateShapeId(); - if (!(nFlags & ShapeFlag::Group)) + if (nFlags ^ ShapeFlag::Group) // no pure group shape { if ( mnGroupLevel > 1 ) nFlags |= ShapeFlag::Child; // this not a topmost shape _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
