corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g..@apache.org
Subject incubator-corinthia git commit: Revert mistaken odf approach 2
Date Sat, 25 Apr 2015 14:01:04 GMT
Repository: incubator-corinthia
Updated Branches:
  refs/heads/master af7174928 -> d929743bc


Revert mistaken odf approach 2


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/d929743b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/d929743b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/d929743b

Branch: refs/heads/master
Commit: d929743bc35ef8446e3caf617ecc2fe06f271f87
Parents: af71749
Author: Gabriela Gibson <gbg@apache.org>
Authored: Sat Apr 25 15:01:22 2015 +0100
Committer: Gabriela Gibson <gbg@apache.org>
Committed: Sat Apr 25 15:01:22 2015 +0100

----------------------------------------------------------------------
 DocFormats/filters/odf/CMakeLists.txt     | 1 -
 DocFormats/filters/odf/src/text/ODFText.c | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/d929743b/DocFormats/filters/odf/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/CMakeLists.txt b/DocFormats/filters/odf/CMakeLists.txt
index 67642a4..b38a965 100644
--- a/DocFormats/filters/odf/CMakeLists.txt
+++ b/DocFormats/filters/odf/CMakeLists.txt
@@ -54,7 +54,6 @@ include_directories(../../core/src/xml)
 include_directories(../../filters/latex/src)
 include_directories(../../filters/odf/src)
 include_directories(../../filters/ooxml/src/common)
-include_directories(../../filters/ooxml/src/odf)
 include_directories(../../filters/ooxml/src/word)
 include_directories(../../filters/ooxml/src/word/formatting)
 include_directories(../../filters/ooxml/src/word/lenses)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/d929743b/DocFormats/filters/odf/src/text/ODFText.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/text/ODFText.c b/DocFormats/filters/odf/src/text/ODFText.c
index 683e2d6..02ab2a9 100644
--- a/DocFormats/filters/odf/src/text/ODFText.c
+++ b/DocFormats/filters/odf/src/text/ODFText.c
@@ -18,8 +18,6 @@
 #include "DFPlatform.h"
 #include "ODFText.h"
 #include "ODFPackage.h"
-#include "ODF.h"
-#include "ODFConverter.h"
 
 DFDocument *ODFTextGet(DFStorage *concreteStorage, DFStorage *abstractStorage, const char
*idPrefix, DFError **error)
 {
@@ -35,11 +33,12 @@ DFDocument *ODFTextGet(DFStorage *concreteStorage, DFStorage *abstractStorage,
c
 
     htmlDoc = DFDocumentNew();
 
+    // WordConverterGet
     if (!ODFConverterGet(htmlDoc,abstractStorage,odfPackage,idPrefix,error))
         goto end;
 
     ok = 1;
-    
+
 end:
     /*
     ODFPackageRelease(odfPackage);


Mime
View raw message