pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug 60827

Browse Source
This commit is contained in:
Kulikova Svetlana
2023-01-25 14:40:19 +03:00
parent e649ecb7a0
commit 1cd49c52d2
3 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PdfFile/PdfWriter.cpp
View File

@ -172,7 +172,7 @@ void CPdfWriter::SetDocumentInfo(const std::wstring& wsTitle, const std::wstring
{ {
std::string sAuthor = U_TO_UTF8(wsCreator); std::string sAuthor = U_TO_UTF8(wsCreator);
NSStringUtils::string_replaceA(sAuthor, ";", ", "); NSStringUtils::string_replaceA(sAuthor, ";", ", ");
m_pDocument->SetAuthor(U_TO_UTF8(wsCreator)); m_pDocument->SetAuthor(sAuthor);
} }
if (!wsSubject.empty()) if (!wsSubject.empty())
m_pDocument->SetSubject(U_TO_UTF8(wsSubject)); m_pDocument->SetSubject(U_TO_UTF8(wsSubject));

3
PdfFile/SrcWriter/Document.cpp
View File

@ -144,7 +144,6 @@ namespace PdfWriter
m_pInfo->SetInfo(InfoProducer, sCreatorA.c_str()); m_pInfo->SetInfo(InfoProducer, sCreatorA.c_str());
m_pInfo->SetInfo(InfoCreator, sCreatorA.c_str()); m_pInfo->SetInfo(InfoCreator, sCreatorA.c_str());
CMetadata* pMetadata = m_pCatalog->AddMetadata(m_pXref, m_pInfo);
if (IsPDFA()) if (IsPDFA())
{ {
CArrayObject* pID = (CArrayObject*)m_pTrailer->Get("ID"); CArrayObject* pID = (CArrayObject*)m_pTrailer->Get("ID");
@ -231,7 +230,7 @@ namespace PdfWriter
} }
void CDocument::SaveToStream(CStream* pStream) void CDocument::SaveToStream(CStream* pStream)
{ {
unsigned long nRet = OK; m_pCatalog->AddMetadata(m_pXref, m_pInfo);
// Пишем заголовок // Пишем заголовок
if (IsPDFA()) if (IsPDFA())

38
PdfFile/SrcWriter/Metadata.cpp
View File

@ -59,11 +59,19 @@ namespace PdfWriter
// Begin // Begin
sXML += ("<?xpacket begin=\"" + sBOM + "\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>\n<x:xmpmeta xmlns:x=\"adobe:ns:meta/\" x:xmptk=\"3.1-701\">\n<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n"); sXML += ("<?xpacket begin=\"" + sBOM + "\" id=\"W5M0MpCehiHzreSzNTczkc9d\"?>\n<x:xmpmeta xmlns:x=\"adobe:ns:meta/\" x:xmptk=\"3.1-701\">\n<rdf:RDF xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">\n");
// Producer
sXML += "<rdf:Description rdf:about=\"\" xmlns:pdf=\"http://ns.adobe.com/pdf/1.3/\">\n"; sXML += "<rdf:Description rdf:about=\"\" xmlns:pdf=\"http://ns.adobe.com/pdf/1.3/\">\n";
// Producer
sXML += "<pdf:Producer>"; sXML += "<pdf:Producer>";
sXML += pInfo->GetInfo(InfoProducer); sXML += pInfo->GetInfo(InfoProducer);
sXML += "</pdf:Producer>\n"; sXML += "</pdf:Producer>\n";
// Keywords
const char* sKeywords = pInfo->GetInfo(InfoKeyWords);
if (sKeywords)
{
sXML += "<pdf:Keywords>";
sXML += sKeywords;
sXML += "</pdf:Keywords>\n";
}
sXML += "</rdf:Description>\n"; sXML += "</rdf:Description>\n";
// Creator Tool // Creator Tool
@ -93,6 +101,34 @@ namespace PdfWriter
sXML += "</rdf:Description>\n"; sXML += "</rdf:Description>\n";
// DC
const char* sTitle = pInfo->GetInfo(InfoTitle);
const char* sAuthor = pInfo->GetInfo(InfoAuthor);
const char* sSubject = pInfo->GetInfo(InfoSubject);
if (sTitle || sAuthor || sSubject)
{
sXML += "<rdf:Description rdf:about=\"\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n";
sXML += "<dc:format>application/pdf</dc:format>";
if (sSubject)
{
sXML += "<dc:description><rdf:Alt><rdf:li xml:lang=\"x-default\">";
sXML += sSubject;
sXML += "</rdf:li></rdf:Alt></dc:description>\n";
}
if (sAuthor)
{
sXML += "<dc:creator><rdf:Seq><rdf:li>";
sXML += sAuthor;
sXML += "</rdf:li></rdf:Seq></dc:creator>\n";
}
if (sTitle)
{
sXML += "<dc:title><rdf:Alt><rdf:li xml:lang=\"x-default\">";
sXML += sTitle;
sXML += "</rdf:li></rdf:Alt></dc:title>\n";
}
sXML += "</rdf:Description>\n";
}
if (pXref->IsPDFA()) if (pXref->IsPDFA())
{ {