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: Make it compile with ODFConverterGet() added in.
Date Thu, 23 Apr 2015 23:31:12 GMT
Repository: incubator-corinthia
Updated Branches:
  refs/heads/master c4ea2ed93 -> ff322cb4f


Make it compile with ODFConverterGet() added in.

* DocFormats/filters/odf/CMakeLists.txt
  (include_directories): Add ../../filters/ooxml/src/odf)

* DocFormats/filters/odf/src/text/ODFText.c
  (ODFTextGet): Uncomment call to ODFConverterGet().


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

Branch: refs/heads/master
Commit: ff322cb4f981a0b1de476cfc5c9afa8d23d500ce
Parents: c4ea2ed
Author: Gabriela Gibson <gbg@apache.org>
Authored: Fri Apr 24 00:31:20 2015 +0100
Committer: Gabriela Gibson <gbg@apache.org>
Committed: Fri Apr 24 00:31:20 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/ff322cb4/DocFormats/filters/odf/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/CMakeLists.txt b/DocFormats/filters/odf/CMakeLists.txt
index b38a965..67642a4 100644
--- a/DocFormats/filters/odf/CMakeLists.txt
+++ b/DocFormats/filters/odf/CMakeLists.txt
@@ -54,6 +54,7 @@ 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/ff322cb4/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 02ab2a9..683e2d6 100644
--- a/DocFormats/filters/odf/src/text/ODFText.c
+++ b/DocFormats/filters/odf/src/text/ODFText.c
@@ -18,6 +18,8 @@
 #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)
 {
@@ -33,12 +35,11 @@ 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