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

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

SVN commit 1164555 by clicea:

Adapt to changes in the TableStyleReader context.

 M  +8 -3      kpresenter/pptx/PptxXmlDocumentReader.cpp  
 M  +7 -5      libmsooxml/MsooXmlDrawingTableStyleReader.h  


--- trunk/koffice/filters/kpresenter/pptx/PptxXmlDocumentReader.cpp #1164554:1164555
@@ -152,11 +152,16 @@
         d->commentAuthors = autorsContext.authors;
     }
     {
-        MSOOXML::MsooXmlDrawingTableStyleReader tableStyleReader(this);
         d->tableStyleList = new MSOOXML::TableStyleList();
-        MSOOXML::MsooXmlDrawingTableStyleContext tableStyleReaderContext;
-        tableStyleReaderContext.styleList = d->tableStyleList;
+
         const QString tableStylesFilePath = m_context->relationships->targetForType(m_context->path, \
m_context->file, MSOOXML::Relationships::tableStyles); +        QString tableStylesFile;
+        QString tableStylesPath;
+        MSOOXML::Utils::splitPathAndFile(tableStylesFilePath, &tableStylesPath, &tableStylesFile);
+
+        MSOOXML::MsooXmlDrawingTableStyleReader tableStyleReader(this);
+        MSOOXML::MsooXmlDrawingTableStyleContext tableStyleReaderContext(m_context->import, \
tableStylesPath, +                                                                         \
                tableStylesFile, m_context->themes, d->tableStyleList);
         m_context->import->loadAndParseDocument(&tableStyleReader, tableStylesFilePath, \
&tableStyleReaderContext);  }
 
--- trunk/koffice/filters/libmsooxml/MsooXmlDrawingTableStyleReader.h #1164554:1164555
@@ -161,16 +161,18 @@
 };
 
 class MsooXmlImport;
-class MsooXmlDrawingTableStyleContext : public MSOOXML::MsooXmlReaderContext
+class MSOOXML_EXPORT MsooXmlDrawingTableStyleContext : public MSOOXML::MsooXmlReaderContext
 {
 public:
+    MsooXmlDrawingTableStyleContext(MSOOXML::MsooXmlImport* _import, const QString& _path, const \
QString& _file, const QMap< QString, MSOOXML::DrawingMLTheme* >* _themes, MSOOXML::TableStyleList* \
_styleList); +    virtual ~MsooXmlDrawingTableStyleContext();
+
     TableStyleList* styleList;
 
-    //Should be mostly unused, those members are needed by some functions not used
-    //in this file
+    //Those members are used by some methods included
     MsooXmlImport* import;
-    const QString path;
-    const QString file;
+    QString path;
+    QString file;
     const QMap<QString, MSOOXML::DrawingMLTheme*>* themes;
 };
 


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