diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-11-07 20:23:51 +0100 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-11-08 16:59:52 +0100 |
| commit | 5a33306a377e7fa29303395dc361efa262787264 (patch) | |
| tree | 9430c4dd5d9313a596213c646fb0b73da9a04ea3 /filter | |
| parent | 71c497d0eff0fc4179f31512c75029c48a1c9407 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/escherex.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 |