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

List:       kde-commits
Subject:    koffice/filters
From:       Lassi Taneli Nieminen <lassniem () gmail ! com>
Date:       2010-10-30 11:40:23
Message-ID: 20101030114023.75F3EAC899 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1191283 by lassin:

Made ooxml filters use pole from libmsooxml instead of including it separately.


 M  +0 -1      kpresenter/pptx/CMakeLists.txt  
 M  +0 -1      kspread/xlsx/CMakeLists.txt  
 M  +0 -1      kword/docx/CMakeLists.txt  
 M  +4 -2      libmsooxml/pole.h  


--- trunk/koffice/filters/kpresenter/pptx/CMakeLists.txt #1191282:1191283
@@ -12,7 +12,6 @@
     PptxXmlSlideReader.cpp
     PptxXmlCommentsReader.cpp
     PptxXmlCommentAuthorsReader.cpp
-    ${CMAKE_SOURCE_DIR}/filters/libmsooxml/pole.cpp
     ${CMAKE_SOURCE_DIR}/filters/kspread/xlsx/ChartExport.cpp
     ${CMAKE_SOURCE_DIR}/filters/kspread/xlsx/XlsxXmlChartReader.cpp
 )
--- trunk/koffice/filters/kspread/xlsx/CMakeLists.txt #1191282:1191283
@@ -18,7 +18,6 @@
     NumberFormatParser.cpp
     ChartExport.cpp
     FormulaParser.cpp
-    ${CMAKE_SOURCE_DIR}/filters/libmsooxml/pole.cpp
 )
 
 kde4_add_plugin(xlsximport WITH_PREFIX ${xlsximport_PART_SRCS})
--- trunk/koffice/filters/kword/docx/CMakeLists.txt #1191282:1191283
@@ -19,7 +19,6 @@
     DocxXmlFootnoteReader.cpp
     DocxXmlEndnoteReader.cpp
     DocxImport.cpp
-    ${CMAKE_SOURCE_DIR}/filters/libmsooxml/pole.cpp
     ${CMAKE_SOURCE_DIR}/filters/kspread/xlsx/ChartExport.cpp
     ${CMAKE_SOURCE_DIR}/filters/kspread/xlsx/XlsxXmlChartReader.cpp
 )
--- trunk/koffice/filters/libmsooxml/pole.h #1191282:1191283
@@ -29,6 +29,8 @@
 #ifndef POLE_H
 #define POLE_H
 
+#include "msooxml_export.h"
+
 class QIODevice;
 
 #include <string>
@@ -41,7 +43,7 @@
 class Stream;
 class StreamIO;
 
-class Storage
+class MSOOXML_EXPORT Storage
 {
     friend class Stream;
     friend class StreamOut;
@@ -108,7 +110,7 @@
 
 };
 
-class Stream
+class MSOOXML_EXPORT Stream
 {
     friend class Storage;
     friend class StorageIO;
[prev in list] [next in list] [prev in thread] [next in thread]