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

rewrite grepPaths() std -> boost

Browse Source
This commit is contained in:
Ivan Morozov
2021-09-10 18:15:52 +03:00
parent 4813f1d07a
commit 14f0249708
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/Converter.cpp
View File

@ -609,7 +609,7 @@ void PPT_FORMAT::CPPTXWriter::WriteThemes()
int nStartLayout = 0, nIndexTheme = 0; int nStartLayout = 0, nIndexTheme = 0;
auto arrRT = m_pDocument->getArrRoundTripTheme(); auto arrRT = m_pDocument->getArrRoundTripTheme();
if (arrRT.empty()) // - см баг 52046 // if (arrRT.empty()) // - см баг 52046
{ {
for (size_t i = 0; i < m_pDocument->m_arThemes.size(); i++) for (size_t i = 0; i < m_pDocument->m_arThemes.size(); i++)
{ {
@ -618,10 +618,10 @@ void PPT_FORMAT::CPPTXWriter::WriteThemes()
m_pShapeWriter->m_pTheme = NULL; m_pShapeWriter->m_pTheme = NULL;
} }
} }
else // else
{ // {
WriteRoundTripThemes(arrRT, nIndexTheme, nStartLayout); // WriteRoundTripThemes(arrRT, nIndexTheme, nStartLayout);
} // }
WriteTheme(m_pDocument->m_pNotesMaster, nIndexTheme, nStartLayout); WriteTheme(m_pDocument->m_pNotesMaster, nIndexTheme, nStartLayout);
WriteTheme(m_pDocument->m_pHandoutMaster, nIndexTheme, nStartLayout); WriteTheme(m_pDocument->m_pHandoutMaster, nIndexTheme, nStartLayout);
@ -631,8 +631,12 @@ void CPPTXWriter::WriteRoundTripThemes(const std::vector<CRecordRoundTripThemeAt
{ {
PPT_FORMAT::CRelsGenerator themeRels(&m_oManager); PPT_FORMAT::CRelsGenerator themeRels(&m_oManager);
std::unordered_set<std::string> writedFilesHash; std::unordered_set<std::string> writedFilesHash;
int i = 0;
for (const auto* pRTT : arrRTThemes) for (const auto* pRTT : arrRTThemes)
{ {
if ((int)m_pDocument->m_arThemes.size() > i)
m_pShapeWriter->m_pTheme = m_pDocument->m_arThemes[i++].get();
if (pRTT == nullptr) if (pRTT == nullptr)
continue; continue;
@ -757,6 +761,7 @@ void CPPTXWriter::WriteRoundTripThemes(const std::vector<CRecordRoundTripThemeAt
RELEASEOBJECT(utf8Data); RELEASEOBJECT(utf8Data);
// utf8DataSize = 0; // utf8DataSize = 0;
} }
m_pShapeWriter->m_pTheme = NULL;
} }
// for (auto& oldTheme : m_pDocument->m_arThemes) // for (auto& oldTheme : m_pDocument->m_arThemes)
@ -823,15 +828,21 @@ void PPT_FORMAT::CPPTXWriter::WriteTheme(CThemePtr pTheme, int & nIndexTheme, in
<a:fillToRect l=\"50000\" t=\"50000\" r=\"50000\" b=\"50000\"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme>")); <a:fillToRect l=\"50000\" t=\"50000\" r=\"50000\" b=\"50000\"/></a:path></a:gradFill></a:bgFillStyleLst></a:fmtScheme>"));
oStringWriter.WriteString(std::wstring(L"</a:themeElements><a:objectDefaults/>")); oStringWriter.WriteString(std::wstring(L"</a:themeElements><a:objectDefaults/>"));
oStringWriter.WriteString(std::wstring(L"<a:extraClrSchemeLst>"));
for (size_t i = 0 ; i < pTheme->m_arExtraColorScheme.size(); i++) if (pTheme->m_arExtraColorScheme.size())
{ {
std::wstring str = L" " + std::to_wstring(i + 1); oStringWriter.WriteString(std::wstring(L"<a:extraClrSchemeLst>"));
WriteColorScheme(oStringWriter, pTheme->m_sThemeName + str, pTheme->m_arExtraColorScheme[i], true); //extra
} for (size_t i = 0 ; i < pTheme->m_arExtraColorScheme.size(); i++)
{
std::wstring str = L" " + std::to_wstring(i + 1);
WriteColorScheme(oStringWriter, pTheme->m_sThemeName + str, pTheme->m_arExtraColorScheme[i], true); //extra
}
oStringWriter.WriteString(std::wstring(L"</a:extraClrSchemeLst>"));
} else
oStringWriter.WriteString(std::wstring(L"<a:extraClrSchemeLst/>"));
oStringWriter.WriteString(std::wstring(L"</a:extraClrSchemeLst>"));
oStringWriter.WriteString(std::wstring(L"</a:theme>")); oStringWriter.WriteString(std::wstring(L"</a:theme>"));
oFile.WriteStringUTF8(oStringWriter.GetData()); oFile.WriteStringUTF8(oStringWriter.GetData());

4
Common/kernel.pro
View File

@ -15,6 +15,10 @@ DEFINES += KERNEL_USE_DYNAMIC_LIBRARY_BUILDING
# CONFIG # CONFIG
HEADERS += ./kernel_config.h HEADERS += ./kernel_config.h
#BOOST
include($$PWD/../../../Common/3dParty/boost/boost.pri)
CORE_ROOT_DIR = $$PWD/.. CORE_ROOT_DIR = $$PWD/..
PWD_ROOT_DIR = $$PWD PWD_ROOT_DIR = $$PWD
include(../Common/base.pri) include(../Common/base.pri)

8
DesktopEditor/common/Directory.cpp
View File

@ -53,7 +53,7 @@
#endif #endif
#include <string.h> #include <string.h>
#include <regex> #include <boost/regex.hpp>
#include "Directory.h" #include "Directory.h"
namespace NSDirectory namespace NSDirectory
@ -588,11 +588,11 @@ namespace NSDirectory
std::vector<std::wstring> GrepPaths(const std::vector<std::wstring> &paths, const std::wstring &strRegEx) std::vector<std::wstring> GrepPaths(const std::vector<std::wstring> &paths, const std::wstring &strRegEx)
{ {
std::vector<std::wstring> filtredPaths; std::vector<std::wstring> filtredPaths;
std::wregex regEx(strRegEx); boost::wregex regEx(strRegEx);
std::wsmatch wSmath; boost::wsmatch wSmath;
for (const auto& path : paths) for (const auto& path : paths)
{ {
if (std::regex_match(path, wSmath, regEx)) if (boost::regex_match(path, wSmath, regEx))
filtredPaths.push_back(path); filtredPaths.push_back(path);
} }