pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

49327

Browse Source 
delete dsterms and add nbsp entity
This commit is contained in:
Kulikova Svetlana
2021-04-02 14:19:14 +03:00
parent bd79385830
commit 78ee67dcaf
3 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DesktopEditor/doctrenderer/doctrenderer.cpp
View File

@ -1010,19 +1010,6 @@ namespace NSDoctRenderer
strReturnParams += L"</dc:language>"; strReturnParams += L"</dc:language>";
} }
js_results = js_objectCore->call_func("asc_getCreated", 1, args);
if(try_catch->Check())
{
strError = L"code=\"get_created\"";
bIsBreak = true;
}
else if (!js_results->isNull())
{
strReturnParams += L"<dcterms:created xsi:type=\"dcterms:W3CDTF\">";
strReturnParams += js_results->toStringW();
strReturnParams += L"</dcterms:created>";
}
js_results = js_objectCore->call_func("asc_getKeywords", 1, args); js_results = js_objectCore->call_func("asc_getKeywords", 1, args);
if(try_catch->Check()) if(try_catch->Check())
{ {

2
EpubFile/src/CEpubFile.cpp
View File

@ -321,7 +321,7 @@ HRESULT CEpubFile::FromHtml(const std::wstring& sHtmlFile, const std::wstring& s
NSFile::CFileBinary oIndexHtml; NSFile::CFileBinary oIndexHtml;
if (oIndexHtml.CreateFileW(m_sTempDir + L"/OEBPS/index.html")) if (oIndexHtml.CreateFileW(m_sTempDir + L"/OEBPS/index.html"))
{ {
oIndexHtml.WriteStringUTF8(L"<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\"><html xmlns=\"http://www.w3.org/1999/xhtml\">"); oIndexHtml.WriteStringUTF8(L"<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\" [<!ENTITY nbsp \"&#160;\">]><html xmlns=\"http://www.w3.org/1999/xhtml\">");
oIndexHtml.WriteStringUTF8(sIndexHtml); oIndexHtml.WriteStringUTF8(sIndexHtml);
oIndexHtml.CloseFile(); oIndexHtml.CloseFile();
} }

8
Fb2File/Fb2File.cpp
View File

@ -1710,7 +1710,7 @@ HRESULT CFb2File::FromHtml(const std::wstring& sHtmlFile, const std::wstring& sC
oDocument.WriteString(L"<title-info>"); oDocument.WriteString(L"<title-info>");
std::wstring sBookTitle = NSFile::GetFileName(sDst); std::wstring sBookTitle = NSFile::GetFileName(sDst);
std::wstring sAuthor = sBookTitle; std::wstring sAuthor = sBookTitle;
std::wstring sAnnotation, sKeywords, sDate; std::wstring sAnnotation, sKeywords;
std::wstring sLanguage = L"en-EN", sVersion = L"1.0"; std::wstring sLanguage = L"en-EN", sVersion = L"1.0";
std::wstring sIdentifier = GenerateUUID(); std::wstring sIdentifier = GenerateUUID();
XmlUtils::CXmlLiteReader oCoreReader; XmlUtils::CXmlLiteReader oCoreReader;
@ -1732,8 +1732,6 @@ HRESULT CFb2File::FromHtml(const std::wstring& sHtmlFile, const std::wstring& sC
sIdentifier = oCoreReader.GetText2(); sIdentifier = oCoreReader.GetText2();
else if (sName == L"dc:language") else if (sName == L"dc:language")
sLanguage = oCoreReader.GetText2(); sLanguage = oCoreReader.GetText2();
else if (sName == L"dcterms:created")
sDate = oCoreReader.GetText2();
else if (sName == L"cp:version") else if (sName == L"cp:version")
sVersion = oCoreReader.GetText2(); sVersion = oCoreReader.GetText2();
} }
@ -1752,9 +1750,7 @@ HRESULT CFb2File::FromHtml(const std::wstring& sHtmlFile, const std::wstring& sC
oDocument.WriteString(L"</lang></title-info><document-info><author><nickname>"); oDocument.WriteString(L"</lang></title-info><document-info><author><nickname>");
// document-info // document-info
oDocument.WriteString(sAuthor); oDocument.WriteString(sAuthor);
oDocument.WriteString(L"</nickname></author><date>"); oDocument.WriteString(L"</nickname></author><date></date><id>");
oDocument.WriteString(sDate);
oDocument.WriteString(L"</date><id>");
oDocument.WriteString(sIdentifier); oDocument.WriteString(sIdentifier);
oDocument.WriteString(L"</id><version>"); oDocument.WriteString(L"</id><version>");
oDocument.WriteString(sVersion); oDocument.WriteString(sVersion);