include/oox/ole/oleobjecthelper.hxx |2 +-
oox/source/ole/oleobjecthelper.cxx | 10 +++---
sw/qa/extras/ooxmlexport/data/tdf131537.odt |binary
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|7 +++
sw/source/filter/ww8/docxattributeoutput.cxx | 16 +++
include/oox/vml/vmltextbox.hxx|1
oox/source/vml/vmltextbox.cxx | 34
oox/source/vml/vmltextboxcontext.cxx |3 +
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx|8 ++
sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
include/oox/drawingml/shape.hxx | 16 ++
oox/source/drawingml/shape.cxx| 19 +++
oox/source/shape/WpsContext.cxx | 35 +-
oox/source/token/tokens.txt |1
sw/qa/extras/ooxmlexport/data/Linke