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

List:       kde-commits
Subject:    koffice/filters/kpresenter/pptx
From:       Carlos Licea <carlos_licea () hotmail ! com>
Date:       2010-08-17 4:14:06
Message-ID: 20100817041406.58720AC871 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1164539 by clicea:

Pass around the tableStyleList.

 M  +6 -3      PptxXmlDocumentReader.cpp  
 M  +4 -2      PptxXmlSlideReader.cpp  
 M  +4 -1      PptxXmlSlideReader.h  


--- trunk/koffice/filters/kpresenter/pptx/PptxXmlDocumentReader.cpp #1164538:1164539
@@ -198,7 +198,8 @@
         result,
         &d->slideMasterPageProperties, //PptxSlideMasterPageProperties
         *m_context->relationships,
-        d->commentAuthors
+        d->commentAuthors,
+        d->tableStyleList
     );
     PptxXmlSlideReader slideLayoutReader(this);
     KoFilter::ConversionStatus status = m_context->import->loadAndParseDocument(
@@ -258,7 +259,8 @@
         slideLayoutProperties,
         &d->slideMasterPageProperties,
         *m_context->relationships,
-        d->commentAuthors
+        d->commentAuthors,
+        d->tableStyleList
     );
     PptxXmlSlideReader slideReader(this);
     KoFilter::ConversionStatus status = m_context->import->loadAndParseDocument(
@@ -310,7 +312,8 @@
         0,
         &d->slideMasterPageProperties,
         *m_context->relationships,
-        d->commentAuthors
+        d->commentAuthors,
+        d->tableStyleList
     );
     PptxXmlSlideReader slideMasterReader(this);
     KoFilter::ConversionStatus status = m_context->import->loadAndParseDocument(
--- trunk/koffice/filters/kpresenter/pptx/PptxXmlSlideReader.cpp #1164538:1164539
@@ -33,6 +33,7 @@
 #include <MsooXmlUtils.h>
 #include <MsooXmlRelationships.h>
 #include <MsooXmlUnits.h>
+#include <MsooXmlDrawingTableStyleReader.h>
 
 #include <KoXmlWriter.h>
 #include <KoGenStyles.h>
@@ -234,13 +235,14 @@
     PptxSlideLayoutProperties* _slideLayoutProperties,
     PptxSlideMasterPageProperties* _slideMasterPageProperties,
     MSOOXML::MsooXmlRelationships& _relationships,
-    QMap<int, QString> _commentAuthors)
+    QMap<int, QString> _commentAuthors,
+    MSOOXML::TableStyleList *_tableStyleList)
         : MSOOXML::MsooXmlReaderContext(&_relationships),
         import(&_import), path(_path), file(_file),
         slideNumber(_slideNumber), themes(&_themes), type(_type),
         slideProperties(_slideProperties), slideLayoutProperties(_slideLayoutProperties),
         slideMasterPageProperties(_slideMasterPageProperties),
-        commentAuthors(_commentAuthors)
+        commentAuthors(_commentAuthors), tableStyleList(_tableStyleList)
 {
 }
 
--- trunk/koffice/filters/kpresenter/pptx/PptxXmlSlideReader.h #1164538:1164539
@@ -35,6 +35,7 @@
 namespace MSOOXML
 {
 class MsooXmlRelationships;
+class TableStyleList;
 }
 
 //! Data structure collecting information about single slide's shape (p:sp)
@@ -236,7 +237,8 @@
         PptxSlideLayoutProperties* _slideLayoutProperties,
         PptxSlideMasterPageProperties* _slideMasterPageProperties,
         MSOOXML::MsooXmlRelationships& _relationships,
-        QMap<int, QString> _commentAuthors);
+        QMap<int, QString> _commentAuthors,
+        MSOOXML::TableStyleList *tableStyleList);
     PptxImport* import;
     const QString path;
     const QString file;
@@ -248,6 +250,7 @@
     PptxSlideMasterPageProperties* slideMasterPageProperties;
     QString pageDrawStyleName; //!< written in read_sldInternal()
     QMap<int, QString> commentAuthors;
+    MSOOXML::TableStyleList *tableStyleList;
 };
 
 #endif
[prev in list] [next in list] [prev in thread] [next in thread]