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

List:       kde-commits
Subject:    koffice/filters/libmsooxml
From:       Carlos Licea <carlos_licea () hotmail ! com>
Date:       2010-09-14 19:07:14
Message-ID: 20100914190714.2D0EFAC88F () svn ! kde ! org
[Download RAW message or body]

SVN commit 1175334 by clicea:

Lets not use the Common Methods includes, even if that means we're losing much
functionality for now (and that it will create code duplication.)

 M  +10 -10    MsooXmlDrawingTableStyleReader.cpp  
 M  +2 -2      MsooXmlDrawingTableStyleReader.h  


--- trunk/koffice/filters/libmsooxml/MsooXmlDrawingTableStyleReader.cpp #1175333:1175334
@@ -520,7 +520,7 @@
 
     Border border;
     border.setSide(Border::Bottom);
-    border.setColor(m_currentPen.color());
+//     border.setColor(m_currentPen.color());
     //FIXME don't asume it's solid
     border.setStyle(MSOOXML::Border::Solid);
     m_currentStyleProperties.addBorder(border);
@@ -546,7 +546,7 @@
 
     Border border;
     border.setSide(Border::Top);
-    border.setColor(m_currentPen.color());
+//     border.setColor(m_currentPen.color());
     //FIXME don't asume it's solid
     border.setStyle(MSOOXML::Border::Solid);
     m_currentStyleProperties.addBorder(border);
@@ -572,7 +572,7 @@
 
     Border border;
     border.setSide(Border::Left);
-    border.setColor(m_currentPen.color());
+//     border.setColor(m_currentPen.color());
     //FIXME don't asume it's solid
     border.setStyle(MSOOXML::Border::Solid);
     m_currentStyleProperties.addBorder(border);
@@ -598,7 +598,7 @@
 
     Border border;
     border.setSide(Border::Right);
-    border.setColor(m_currentPen.color());
+//     border.setColor(m_currentPen.color());
     //FIXME don't asume it's solid
     border.setStyle(MSOOXML::Border::Solid);
     m_currentStyleProperties.addBorder(border);
@@ -650,12 +650,12 @@
 //     READ_EPILOGUE
 // }
 
-#define blipFill_NS "a"
-#define SETUP_PARA_STYLE_IN_READ_P
+// #define blipFill_NS "a"
+// #define SETUP_PARA_STYLE_IN_READ_P
 
-#include <MsooXmlCommonReaderImpl.h>
+// #include <MsooXmlCommonReaderImpl.h>
 
-#define DRAWINGML_NS "a"
-#define DRAWINGML_PIC_NS "p" // DrawingML/Picture
+// #define DRAWINGML_NS "a"
+// #define DRAWINGML_PIC_NS "p" // DrawingML/Picture
 
-#include <MsooXmlCommonReaderDrawingMLImpl.h>
+// #include <MsooXmlCommonReaderDrawingMLImpl.h>
--- trunk/koffice/filters/libmsooxml/MsooXmlDrawingTableStyleReader.h #1175333:1175334
@@ -201,8 +201,8 @@
     KoFilter::ConversionStatus read_tcBdr();
 
     //get read_ln and friends, it's a shame I have to get a lot of crap alongside
-    #include <MsooXmlCommonReaderMethods.h>
-    #include <MsooXmlCommonReaderDrawingMLMethods.h>
+//     #include <MsooXmlCommonReaderMethods.h>
+//     #include <MsooXmlCommonReaderDrawingMLMethods.h>
 
 private:
     MsooXmlDrawingTableStyleContext* m_context;
[prev in list] [next in list] [prev in thread] [next in thread]