From kde-commits  Mon Sep 20 19:32:53 2010
From: Carlos Licea <carlos_licea () hotmail ! com>
Date: Mon, 20 Sep 2010 19:32:53 +0000
To: kde-commits
Subject: koffice/filters/libmsooxml
Message-Id: <20100920193253.CBD7DAC88E () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128501084610992

SVN commit 1177635 by clicea:

Now that we got the stack corruption sorted out, we can enable this
shared methods again. We still need to make use of them again.

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


--- trunk/koffice/filters/libmsooxml/MsooXmlDrawingTableStyleReader.cpp #1177634:1177635
@@ -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 #1177634:1177635
@@ -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;