pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '8c726e475a562e64a39d36cac32226249a3f7697' into feature/odf

Browse Source
This commit is contained in:
Elena.Subbotina
2021-09-07 12:10:14 +03:00
parent 34a525e74d 8c726e475a
commit 761ceab8d2
471 changed files with 32245 additions and 18962 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DesktopEditor/xml/libxml2/xmlIO.c
View File

@ -41,6 +41,10 @@
#if defined(WIN32) || defined(_WIN32)
#include <windows.h>
#include "io.h"
#endif
#if defined(__linux__)
#include "unistd.h"
#endif
#if defined(_WIN32_WCE)

7
DesktopEditor/xml/src/xmldom.cpp
View File

@ -706,8 +706,11 @@ namespace XmlUtils
std::wstring sRes;
if (!GetAttributeIfExist(strAttributeName, sRes))
{
if (!GetTextIfExist(sRes))
sRes = strDefaultValue;
CXmlNode oTemp;
if (GetNode(strAttributeName, oTemp))
sRes = oTemp.GetText();
else
sRes = strDefaultValue;
}
return sRes;
}

4
DesktopEditor/xml/src/xmllight_private.h
View File

@ -32,8 +32,8 @@
#ifndef _BUILD_XMLLIGHT_PRIVATE_CROSSPLATFORM_H_
#define _BUILD_XMLLIGHT_PRIVATE_CROSSPLATFORM_H_
#include "../../../DesktopEditor/common/File.h"
#include "../../../DesktopEditor/common/StringExt.h"
#include "../../common/File.h"
#include "../../common/StringExt.h"
#ifdef _IOS
#include <libxml2/libxml/xmlreader.h>