pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 01:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/hotfix/v5.2.5' into develop

Browse Source
This commit is contained in:
ElenaSubbotina
2018-12-13 12:15:05 +03:00
parent e0630979c5 724335bdda
commit c4a46114a2
68 changed files with 778 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
DesktopEditor/common/StringExt.cpp
View File

@ -283,7 +283,7 @@ namespace NSStringExt
return pUnicodes;
}
unsigned short* CConverter::GetUtf16FromUnicode(const std::wstring& wsUnicodeText, unsigned int& unLen)
unsigned short* CConverter::GetUtf16FromUnicode(const std::wstring& wsUnicodeText, unsigned int& unLen, const bool& bIsLE)
{
unsigned int unTextLen = (unsigned int)wsUnicodeText.size();
if (unTextLen <= 0)
@ -338,6 +338,18 @@ namespace NSStringExt
}
}
if (!bIsLE)
{
unsigned char* pDataReverce = (unsigned char*)pUtf16;
unsigned int unLen2 = unLen << 1;
for (unsigned int i = 0; i < unLen2; i += 2)
{
unsigned char tmp = pDataReverce[i];
pDataReverce[i] = pDataReverce[i + 1];
pDataReverce[i + 1] = tmp;
}
}
return pUtf16;
}
}