[Libreoffice-commits] core.git: oox/source

[Miklos Vajna]

 oox/source/ppt/extdrawingfragmenthandler.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 8c6776f27cef1e2b7b40957f1801b08707bc3230
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Feb 10 16:41:55 2017 +0100

    Related: tdf#105707 PPTX import: warn on empty SmartArt fallback
    
    This second related situation is about when there is drawingML fallback
    for the SmartArt, but it's ampty shape tree, which is never created with
    MSO2010+ (those shape trees always have at least one element). This is
    as bad as the missing drawingML fallback, so warn on it.
    
    Change-Id: I539d05154a4d1fcd5871dfc29616f77eb9945454
    Reviewed-on: https://gerrit.libreoffice.org/34131
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx
index 72b33ff..7d1a3cf 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -11,6 +11,7 @@
 
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
+#include <oox/core/xmlfilterbase.hxx>
 
 using namespace ::oox::core;
 using namespace ::com::sun::star::xml::sax;
@@ -35,7 +36,9 @@ ExtDrawingFragmentHandler::ExtDrawingFragmentHandler( XmlFilterBase& rFilter,
 
 ExtDrawingFragmentHandler::~ExtDrawingFragmentHandler( ) throw ()
 {
-
+    // Empty DrawingML fallback, need to warn the user at the end.
+    if (mpShapePtr && mpShapePtr->getChildren().empty())
+        getFilter().setMissingExtDrawing();
 }
 
 ContextHandlerRef