diff options
| author | Justin Luth <justin_luth@sil.org> | 2015-07-02 14:03:13 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-08 06:07:46 +0000 |
| commit | 9ab3e9292b093fc02c07fc52b25430d253277d1c (patch) | |
| tree | d896bc30499941bd5b0e4db5037000f7fde5c86d /oox/source/vml/vmlshapecontext.cxx | |
| parent | 66ed003f66b7b3171684d9aa8f753d5aeddb8e81 (diff) | |
tdf#87348 implement nonsequential and mso-next-textbox textbox chaining
cherry picked from commits 976add10b35e482251ed4c75957baeb6811e6e2c and
091fe76b6329b4bb974987554369cbfadd8f2401
Change-Id: I017049a8f3578ad4c2a1f549be1c683f98c20318
Reviewed-on: https://gerrit.libreoffice.org/16692
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'oox/source/vml/vmlshapecontext.cxx')
| -rw-r--r-- | oox/source/vml/vmlshapecontext.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/oox/source/vml/vmlshapecontext.cxx b/oox/source/vml/vmlshapecontext.cxx index 2f69efe3e7f2..4ea10e87bd98 100644 --- a/oox/source/vml/vmlshapecontext.cxx +++ b/oox/source/vml/vmlshapecontext.cxx @@ -269,6 +269,7 @@ ShapeTypeContext::ShapeTypeContext( ContextHandler2Helper& rParent, ShapeType& r // shape identifier and shape name bool bHasOspid = rAttribs.hasAttribute( O_TOKEN( spid ) ); mrTypeModel.maShapeId = rAttribs.getXString( bHasOspid ? O_TOKEN( spid ) : XML_id, OUString() ); + mrTypeModel.maLegacyId = rAttribs.getString( XML_id, OUString() ); OSL_ENSURE( !mrTypeModel.maShapeId.isEmpty(), "ShapeTypeContext::ShapeTypeContext - missing shape identifier" ); // if the o:spid attribute exists, the id attribute contains the user-defined shape name if( bHasOspid ) |