diff options
| author | Gülşah Köse <gulsah.kose@collabora.com> | 2021-07-07 00:27:58 +0300 |
|---|---|---|
| committer | Gülşah Köse <gulsah.kose@collabora.com> | 2021-07-12 15:46:23 +0200 |
| commit | 4151286957e28f915a254468aa692bc7e8d3ab8e (patch) | |
| tree | 757fd8da391ce6d10429ffa558cf0537c83010de /include/oox/drawingml/graphicshapecontext.hxx | |
| parent | e3bbc3c712c9e7eab603fcea0882b154f9b3dfc6 (diff) | |
tdf143222 Handle alternate content of graphicData element.
Handle alternate content and make true choice.
According to ooxml spec ole object requires exactly one pic
element. (ECMA-376 Part 1, Annex A, CT_OleObject). In the
current case first choice has not pic element and we should
allow fallback processing.
Change-Id: I30b7de703b8c2f00d6bf286e05eea505ac3627f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118539
Tested-by: Jenkins
Reviewed-by: Gülşah Köse <gulsah.kose@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118678
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'include/oox/drawingml/graphicshapecontext.hxx')
| -rw-r--r-- | include/oox/drawingml/graphicshapecontext.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx index 14b49f23615c..c27a8e6cfa8d 100644 --- a/include/oox/drawingml/graphicshapecontext.hxx +++ b/include/oox/drawingml/graphicshapecontext.hxx @@ -62,6 +62,7 @@ public: OleObjectGraphicDataContext( ::oox::core::ContextHandler2Helper const & rParent, const ShapePtr& pShapePtr ); virtual ~OleObjectGraphicDataContext() override; virtual ::oox::core::ContextHandlerRef onCreateContext( ::sal_Int32 Element, const ::oox::AttributeList& rAttribs ) override; + virtual void onEndElement() override; private: ::oox::vml::OleObjectInfo& mrOleObjectInfo; |