| ba6c1353 | 07-Oct-2018 |
Matthias Seidel <mseidel@apache.org> |
i127873 - Merge r1838291 from trunk
Ignore the SP_FGROUP flag on shape records. Instead assume that the
first shape in a shape group is the group shape. Add a new flag
parameter to SvxMSDffManager
i127873 - Merge r1838291 from trunk
Ignore the SP_FGROUP flag on shape records. Instead assume that the
first shape in a shape group is the group shape. Add a new flag
parameter to SvxMSDffManager::ImportShape() to indicate the whether
or not this is a group shape based on the calling context. Call
SvxMSDffManager::ImportShape() directly from SvxMSDffManager::ImportGroup()
instead of indirectly via SvxMSDffManager::ImportObj() to facilitate
passing the context information.
Don't call SvxMSDffManager::ProcessObj() from SvxMSDffManager::ImportShape()
when processing a group shape. SvxMSDffManager::ImportObj() expects
SvxMSDffManager::ImportShape() to return a pointer to an SdrObjGroup
object in this case, and SvxMSDffManager::ProcessObj() may replace
the SdrObjGroup object with some other type of shape object.
Change some C-style SdrObjGroup* casts to dynamic_cast so that incorrect
casts will create a NULL pointer and fail quickly rather than executing
methods on an object of the wrong type and doing something possibly
undefined.
Submitted by: truckman
git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO416@1843062 13f79535-47bb-0310-9956-ffa450edef68
show more ...
|