[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/filters/libmsooxml
From:       Lassi Taneli Nieminen <lassniem () gmail ! com>
Date:       2010-12-02 14:50:56
Message-ID: 20101202145056.55770AC8A4 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1202852 by lassin:

Fixed drawingML filter to ignore extLst in few places.


 M  +19 -2     MsooXmlCommonReaderDrawingMLImpl.h  
 M  +2 -0      MsooXmlCommonReaderDrawingMLMethods.h  


--- trunk/koffice/filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h #1202851:1202852
@@ -1064,7 +1064,7 @@
     - custGeom (Custom Geometry)  §20.1.9.8
     - effectDag (Effect Container)  §20.1.8.25
     - effectLst (Effect Container)  §20.1.8.26
-    - extLst (Extension List)  §20.1.2.2.15
+    - [done] extLst (Extension List)  §20.1.2.2.15
     - [done] gradFill (Gradient Fill)  §20.1.8.33
     - grpFill (Group Fill)  §20.1.8.35
     - ln (Outline)  §20.1.2.2.24
@@ -1093,6 +1093,9 @@
                 TRY_READ(xfrm)
                 m_xfrm_read = true;
             }
+            else if (qualifiedName() == QLatin1String("a:extLst")) {
+                TRY_READ(extLst)
+            }
             else if (qualifiedName() == QLatin1String("a:solidFill")) {
 #ifdef PPTXXMLSLIDEREADER_CPP
                 d->textBoxHasContent = true; // We count normal fill and gardient as content
@@ -2200,7 +2203,7 @@
     - clrChange (Color Change Effect)  §20.1.8.16
     - clrRepl (Solid Color Replacement)  §20.1.8.18
     - duotone (Duotone Effect)  §20.1.8.23
-    - extLst (Extension List)  §20.1.2.2.15
+    - [done] extLst (Extension List)  §20.1.2.2.15
     - fillOverlay (Fill Overlay Effect)  §20.1.8.29
     - [done] grayscl (Gray Scale Effect)  §20.1.8.34
     - hsl (Hue Saturation Luminance Effect)  §20.1.8.39
@@ -2250,6 +2253,7 @@
             TRY_READ_IF(biLevel)
             ELSE_TRY_READ_IF(grayscl)
             ELSE_TRY_READ_IF(lum)
+            ELSE_TRY_READ_IF(extLst)
 //! @todo add ELSE_WRONG_FORMAT
         }
     }
@@ -3724,6 +3728,19 @@
 }
 
 #undef CURRENT_EL
+#define CURRENT_EL extLst
+KoFilter::ConversionStatus MSOOXML_CURRENT_CLASS::read_extLst()
+{
+    READ_PROLOGUE
+    // This element can contain all kinds of extensions, but we do not support any of them
+    // atm, and therefore skip it, reading this element however is needed in order to not
+    // read elements indside of this elemetn by accident
+    skipCurrentElement();
+
+    READ_EPILOGUE
+}
+
+#undef CURRENT_EL
 #define CURRENT_EL scrgbClr
 //! RGB Color Model - Percentage Variant
 //! DrawingML ECMA-376 20.1.2.3.30, p. 3074.
--- trunk/koffice/filters/libmsooxml/MsooXmlCommonReaderDrawingMLMethods.h #1202851:1202852
@@ -51,6 +51,8 @@
 KoFilter::ConversionStatus read_nvCxnSpPr();
 KoFilter::ConversionStatus read_grpSp();
 
+KoFilter::ConversionStatus read_extLst();
+
 KoFilter::ConversionStatus read_grpSpPr();
 void preReadSp();
 void generateFrameSp();
[prev in list] [next in list] [prev in thread] [next in thread]