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

pageBreakBefore and batchmode

Browse Source
This commit is contained in:
Svetlana Kulikova
2020-07-22 11:44:33 +03:00
parent 25c3011fb3
commit 4490ff1d61
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Fb2File/Fb2File.cpp
View File

@ -251,8 +251,8 @@ public:
while(m_oLightReader.MoveToNextAttribute())
{
std::wstring sName = m_oLightReader.GetName();
size_t nLen = sName.length() - 4;
if(sName.substr(nLen > 0 ? nLen : 0) == L"href")
size_t nLen = (sName.length() > 4 ? sName.length() - 4 : 0);
if(sName.substr(nLen) == L"href")
sImageName = m_oLightReader.GetText().substr(1);
}
m_oLightReader.MoveToElement();
@ -300,6 +300,7 @@ public:
// имеет право писать p
void readTitle(std::wstring sLevel, NSStringUtils::CStringBuilder& oBuilder)
{
bool bFirstP = true;
int nDeath = m_oLightReader.GetDepth();
while(m_oLightReader.ReadNextSiblingNode(nDeath))
{
@ -309,7 +310,14 @@ public:
// Пишем title + sLevel
oBuilder += L"<w:p><w:pPr><w:pStyle w:val=\"";
oBuilder += sLevel;
oBuilder += L"\"/></w:pPr>";
oBuilder += L"\"/>";
// Заголовок книги с новой страницы
if(sLevel == L"title" && bFirstP)
{
oBuilder += L"<w:pageBreakBefore/>";
bFirstP = false;
}
oBuilder += L"</w:pPr>";
// Пишем ссылку от оглавления
std::wstring sContentsId;
if(sLevel == L"title1")
@ -407,8 +415,8 @@ public:
while(m_oLightReader.MoveToNextAttribute())
{
std::wstring sTName = m_oLightReader.GetName();
size_t nLen = sTName.length() - 4;
if(sTName.substr(nLen > 0 ? nLen : 0) == L"href")
size_t nLen = (sTName.length() > 4 ? sTName.length() - 4 : 0);
if(sTName.substr(nLen) == L"href")
{
sFootnoteName = m_oLightReader.GetText().substr(1);
break;
@ -789,9 +797,6 @@ public:
}
}
oContents += L"</w:sdtContent></w:sdt>";
// Разрыв страницы
oContents += L"<w:p><w:r><w:br w:type=\"page\"/></w:r></w:p>";
return true;
}
@ -813,14 +818,16 @@ public:
if(m_oLightReader.GetName() == L"title")
{
std::wstring sContentsId = std::to_wstring(nContentsId++);
oContents += L"<w:p><w:pPr><w:pStyle w:val=\"contents\"/><w:tabs><w:tab w:val=\"right\" w:pos=\"9355\" w:leader=\"none\"/></w:tabs></w:pPr>";
oContents += L"<w:p><w:pPr><w:pStyle w:val=\"contents\"/><w:tabs><w:tab w:val=\"right\" w:pos=\"9355\" w:leader=\"none\"/></w:tabs>";
// Абзац с новой страницы
if(bFirstP)
oContents += L"<w:pageBreakBefore/>";
oContents += L"</w:pPr>";
if(bFirstP)
{
oContents += L"<w:r><w:fldChar w:fldCharType=\"begin\"/><w:instrText xml:space=\"preserve\">TOC \\n \\h </w:instrText><w:fldChar w:fldCharType=\"separate\"/></w:r>";
bFirstP = false;
}
oContents += L"<w:hyperlink w:tooltip=\"Current Document\" w:anchor=\"_Toc";
oContents += sContentsId;
oContents += L"\" w:history=\"1\">";
@ -1192,8 +1199,6 @@ public:
oBuilder += L"</w:p>";
}
}
// Разрыв страницы
oBuilder += L"<w:p><w:r><w:br w:type=\"page\"/></w:r></w:p>";
}
// Читаем genre (один или более)
else if(sName == L"genre")

13
Fb2File/test/main.cpp
View File

@ -41,11 +41,12 @@ int main()
NSDirectory::DeleteDirectory(sOutputDirectory);
NSDirectory::CreateDirectory(sOutputDirectory);
// Выставляем временную директорию
std::wstring sTmp = NSFile::GetProcessDirectory() + L"/tmp";
for(std::wstring sFile : arrFiles)
{
CFb2File oFile;
// Выставляем временную директорию
oFile.SetTmpDirectory(NSFile::GetProcessDirectory() + L"/tmp");
std::wstring sFileName = NSFile::GetFileName(sFile);
std::wcout << sFileName << std::endl;
if(!oFile.IsFb2File(sFile))
@ -55,9 +56,14 @@ int main()
std::cout << "This isn't a fb2 file" << std::endl;
continue;
}
HRESULT nResConvert = oFile.Open(sFile, sOutputDirectory, &oParams);
NSDirectory::DeleteDirectory(sTmp);
NSDirectory::CreateDirectory(sTmp);
HRESULT nResConvert = oFile.Open(sFile, sTmp, &oParams);
if(nResConvert == S_OK)
{
std::cout << "Success" << std::endl;
NSFile::CFileBinary::Copy(sTmp + L"/" + sFileName + L".docx", sOutputDirectory + L"/" + sFileName + L".docx");
}
else
{
nErrorCol++;
@ -74,7 +80,6 @@ int main()
else
{
CFb2File oFile;
oFile.SetTmpDirectory(NSFile::GetProcessDirectory() + L"/tmp");
// Файл, который открываем
std::wstring sFile = NSFile::GetProcessDirectory() + L"/../../../examples/test2.fb2";