You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by ja...@apache.org on 2015/02/13 09:52:27 UTC
[15/38] incubator-corinthia git commit: Word: Make conversion
function names consistent
Word: Make conversion function names consistent
WordConverterUpdateFromHTML -> WordConverterPut
WordConverterConvertToHTML -> WordConverterGet
WordPackageUpdateFromHTML -> WordPackagePut
WordPackageGenerateHTML -> WordPackageGet
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/474eb4ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/474eb4ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/474eb4ca
Branch: refs/heads/experimentZip
Commit: 474eb4caeb29f2353a0fadeef3f5a6bd8bc3b5ee
Parents: db23077
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Sun Jan 11 03:39:06 2015 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Sun Jan 11 03:39:06 2015 +0700
----------------------------------------------------------------------
DocFormats/filters/ooxml/src/word/Word.c | 6 +++---
DocFormats/filters/ooxml/src/word/WordConverter.c | 4 ++--
DocFormats/filters/ooxml/src/word/WordConverter.h | 4 ++--
DocFormats/filters/ooxml/src/word/WordPackage.c | 8 ++++----
DocFormats/filters/ooxml/src/word/WordPackage.h | 4 ++--
5 files changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/474eb4ca/DocFormats/filters/ooxml/src/word/Word.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/Word.c b/DocFormats/filters/ooxml/src/word/Word.c
index e17387d..5e977e7 100644
--- a/DocFormats/filters/ooxml/src/word/Word.c
+++ b/DocFormats/filters/ooxml/src/word/Word.c
@@ -34,7 +34,7 @@ DFDocument *WordGet(DFStorage *concreteStorage, DFStorage *abstractStorage, DFEr
if (wordPackage == NULL)
goto end;
- htmlDoc = WordPackageGenerateHTML(wordPackage,abstractStorage,"word",error,warnings);
+ htmlDoc = WordPackageGet(wordPackage,abstractStorage,"word",error,warnings);
if (htmlDoc == NULL)
goto end;
@@ -71,7 +71,7 @@ int WordPut(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocument *
if (wordPackage == NULL)
goto end;
- if (!WordPackageUpdateFromHTML(wordPackage,htmlDoc,abstractStorage,idPrefix,error,warnings))
+ if (!WordPackagePut(wordPackage,htmlDoc,abstractStorage,idPrefix,error,warnings))
goto end;
if (warnings->len > 0) {
@@ -108,7 +108,7 @@ int WordCreate(DFStorage *concreteStorage, DFStorage *abstractStorage, DFDocumen
// a new word or odf file from it.
HTMLBreakBDTRefs(htmlDoc->docNode,idPrefix);
- if (!WordPackageUpdateFromHTML(wordPackage,htmlDoc,abstractStorage,idPrefix,error,warnings))
+ if (!WordPackagePut(wordPackage,htmlDoc,abstractStorage,idPrefix,error,warnings))
goto end;
if (warnings->len > 0) {
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/474eb4ca/DocFormats/filters/ooxml/src/word/WordConverter.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.c b/DocFormats/filters/ooxml/src/word/WordConverter.c
index 5e3a2fa..b0cfd09 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.c
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.c
@@ -674,7 +674,7 @@ DFNode *WordConverterGetConcrete(WordPutData *put, DFNode *abstract)
return node;
}
-int WordConverterConvertToHTML(WordConverter *converter, DFError **error)
+int WordConverterGet(WordConverter *converter, DFError **error)
{
converter->haveFields = Word_simplifyFields(converter->package);
Word_mergeRuns(converter->package);
@@ -796,7 +796,7 @@ static void addMissingDefaultStyles(WordConverter *converter)
}
}
-int WordConverterUpdateFromHTML(WordConverter *converter, DFError **error)
+int WordConverterPut(WordConverter *converter, DFError **error)
{
if (converter->package->document == NULL) {
DFErrorFormat(error,"document.xml not found");
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/474eb4ca/DocFormats/filters/ooxml/src/word/WordConverter.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.h b/DocFormats/filters/ooxml/src/word/WordConverter.h
index cd31e68..b4accad 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.h
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.h
@@ -103,8 +103,8 @@ WordConverter *WordConverterNew(DFDocument *html, DFStorage *abstractStorage,
DFBuffer *warnings);
void WordConverterFree(WordConverter *converter);
-int WordConverterConvertToHTML(WordConverter *converter, DFError **error);
-int WordConverterUpdateFromHTML(WordConverter *converter, DFError **error);
+int WordConverterGet(WordConverter *converter, DFError **error);
+int WordConverterPut(WordConverter *converter, DFError **error);
void WordConverterWarning(WordConverter *converter, const char *format, ...) ATTRIBUTE_FORMAT(printf,2,3);
char *WordStyleIdForStyle(CSSStyle *style);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/474eb4ca/DocFormats/filters/ooxml/src/word/WordPackage.c
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordPackage.c b/DocFormats/filters/ooxml/src/word/WordPackage.c
index 86b3bed..994eca5 100644
--- a/DocFormats/filters/ooxml/src/word/WordPackage.c
+++ b/DocFormats/filters/ooxml/src/word/WordPackage.c
@@ -383,25 +383,25 @@ int WordPackageSave(WordPackage *package, DFError **error)
return 1;
}
-DFDocument *WordPackageGenerateHTML(WordPackage *package, DFStorage *abstractStorage, const char *idPrefix,
+DFDocument *WordPackageGet(WordPackage *package, DFStorage *abstractStorage, const char *idPrefix,
DFError **error, DFBuffer *warnings)
{
DFDocument *html = DFDocumentNew();
WordConverter *converter = WordConverterNew(html,abstractStorage,idPrefix,package,warnings);
- int ok = WordConverterConvertToHTML(converter,error);
+ int ok = WordConverterGet(converter,error);
WordConverterFree(converter);
if (!ok)
return 0;
return html;
}
-int WordPackageUpdateFromHTML(WordPackage *package, DFDocument *input, DFStorage *abstractStorage,
+int WordPackagePut(WordPackage *package, DFDocument *input, DFStorage *abstractStorage,
const char *idPrefix, DFError **error, DFBuffer *warnings)
{
HTML_normalizeDocument(input);
HTML_pushDownInlineProperties(input->docNode);
WordConverter *converter = WordConverterNew(input,abstractStorage,idPrefix,package,warnings);
- int ok = WordConverterUpdateFromHTML(converter,error);
+ int ok = WordConverterPut(converter,error);
WordConverterFree(converter);
if (!ok)
return 0;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/474eb4ca/DocFormats/filters/ooxml/src/word/WordPackage.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordPackage.h b/DocFormats/filters/ooxml/src/word/WordPackage.h
index e074c5e..31f8457 100644
--- a/DocFormats/filters/ooxml/src/word/WordPackage.h
+++ b/DocFormats/filters/ooxml/src/word/WordPackage.h
@@ -58,9 +58,9 @@ void WordPackageExpandBookmarks(WordPackage *package);
WordPackage *WordPackageOpenNew(DFStorage *storage, DFError **error);
WordPackage *WordPackageOpenFrom(DFStorage *storage, DFError **error);
int WordPackageSave(WordPackage *package, DFError **error);
-DFDocument *WordPackageGenerateHTML(WordPackage *package, DFStorage *abstractStorage, const char *idPrefix,
+DFDocument *WordPackageGet(WordPackage *package, DFStorage *abstractStorage, const char *idPrefix,
DFError **error, DFBuffer *warnings);
-int WordPackageUpdateFromHTML(WordPackage *package, DFDocument *input, DFStorage *abstractStorage,
+int WordPackagePut(WordPackage *package, DFDocument *input, DFStorage *abstractStorage,
const char *idPrefix, DFError **error, DFBuffer *warnings);
#endif