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

Change regex engine to boost (gcc error)

Browse Source
This commit is contained in:
Oleg Korshul
2022-07-09 11:56:53 +03:00
committed by catbasilio
parent 3ab0a4ee5e
commit eae4921ccd
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
HtmlFile2/htmlfile2.cpp
View File

@ -26,7 +26,7 @@
#include "../DesktopEditor/graphics/pro/Graphics.h"
#include "htmlfile2.h"
#include <regex>
#include <boost/regex.hpp>
#ifndef VALUE2STR
#define VALUE_TO_STRING(x) #x
@ -1072,12 +1072,19 @@ private:
std::wstring wsType = L"dxa";
//Если ширина указана в %, то используем тип dxa, если же в других ндтнтцах измерения, то в pct
#if 1
// проблема с regex в старом gcc (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52719)
boost::wregex oWidthRegex(L"((width)+)[\\s]*:[\\s]*(.+%)");
bool bIsWidthPct = boost::regex_search(sSelectors.back().m_sStyle, oWidthRegex);
#else
std::wregex oWidthRegex(L"((width)+)[\\s]*:[\\s]*(.+%)");
bool bIsWidthPct = std::regex_search(sSelectors.back().m_sStyle.data(), oWidthRegex);
#endif
if (std::regex_search(sSelectors.back().m_sStyle.data(), oWidthRegex))
wsType = L"pct";
if (bIsWidthPct)
wsType = L"pct";
else
nWidth *= 10;
nWidth *= 10;
//-------------------------
if (nWidth > 0)