From 4151286957e28f915a254468aa692bc7e8d3ab8e Mon Sep 17 00:00:00 2001 From: Gülşah Köse Date: Wed, 7 Jul 2021 00:27:58 +0300 Subject: tdf143222 Handle alternate content of graphicData element. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118678 Tested-by: Jenkins CollaboraOffice Reviewed-by: Mike Kaganski --- include/oox/drawingml/graphicshapecontext.hxx | 1 + 1 file changed, 1 insertion(+) (limited to 'include/oox/drawingml/graphicshapecontext.hxx') 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; -- cgit