diff --git a/Fb2File/Fb2File.cpp b/Fb2File/Fb2File.cpp index a5507041e8..21b793deb6 100644 --- a/Fb2File/Fb2File.cpp +++ b/Fb2File/Fb2File.cpp @@ -5,6 +5,7 @@ #include "../DesktopEditor/common/Directory.h" #include "../DesktopEditor/common/StringBuilder.h" #include "../DesktopEditor/common/SystemUtils.h" +#include "../OfficeUtils/src/OfficeUtils.h" #include "./template/template.h" #include @@ -320,8 +321,8 @@ public: m_oBuilder += L""; else if(sName == L"text-author") { - m_oBuilder += L""; - readP(L"", m_oBuilder); + m_oBuilder += L""; + readP(L"", m_oBuilder); m_oBuilder += L""; } } @@ -449,8 +450,8 @@ public: // Читаем text-author (любое) else if(sName == L"text-author") { - m_oBuilder += L""; - readP(L"", m_oBuilder); + m_oBuilder += L""; + readP(L"", m_oBuilder); m_oBuilder += L""; } // Читаем date (ноль или один) @@ -485,8 +486,8 @@ public: readTable(); else if(sName == L"text-author") { - m_oBuilder += L""; - readP(L"", m_oBuilder); + m_oBuilder += L""; + readP(L"", m_oBuilder); m_oBuilder += L""; } } @@ -568,7 +569,12 @@ public: std::wstring sName = m_oLightReader.GetName(); // Читаем title (ноль или один) if(sName == L"title") - readTitle(L"title" + (nLevel == 0 ? L"" : std::to_wstring(nLevel))); + { + std::wstring sTitle = L""; + if(nLevel < 9) + sTitle = L"title" + (nLevel == 0 ? L"" : std::to_wstring(nLevel)); + readTitle(sTitle); + } // Читаем epigraph (любое) else if(sName == L"epigraph") readEpigraph(); @@ -1056,7 +1062,6 @@ void CFb2File::SetTmpDirectory(const std::wstring& sFolder) int CFb2File::Convert(const std::wstring& sPath, const std::wstring& sDirectory, bool bNeedDocx) { // Копирование шаблона - // присутствует КОСТЫЛЬ - путь к шаблону относительно теста /* std::wstring sTemplate = sDirectory + L"/../../../../template/"; COfficeUtils oZip; diff --git a/Fb2File/template/template.docx b/Fb2File/template/template.docx index ccfd9135eb..baafb29ee7 100644 Binary files a/Fb2File/template/template.docx and b/Fb2File/template/template.docx differ diff --git a/Fb2File/test/main.cpp b/Fb2File/test/main.cpp index 41a22ed929..72d7b59919 100644 --- a/Fb2File/test/main.cpp +++ b/Fb2File/test/main.cpp @@ -10,7 +10,7 @@ int main() oFile.SetTmpDirectory(NSFile::GetProcessDirectory() + L"/tmp"); // файл, который открываем - std::wstring sFile = NSFile::GetProcessDirectory() + L"/../../../examples/8-sezon-groz.fb2"; + std::wstring sFile = NSFile::GetProcessDirectory() + L"/../../../examples/1-posledneye-zhelaniye.fb2"; // директория, где будем создавать docx std::wstring sOutputDirectory = NSFile::GetProcessDirectory() + L"/res";