Commit 43b82290 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

x2t linux build with doc wordArt + коррекция

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63553 954022d7-b5bf-4e40-9824-e11837661b57
parent c2c384d8
...@@ -6,6 +6,11 @@ ...@@ -6,6 +6,11 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
#ifdef __linux__
#include <string.h>
#endif
namespace NSStringExt namespace NSStringExt
{ {
#define NSSTRING_COMMON_CP(UnicodeMapCP, lCount, pData) \ #define NSSTRING_COMMON_CP(UnicodeMapCP, lCount, pData) \
...@@ -404,7 +409,7 @@ namespace NSStringExt ...@@ -404,7 +409,7 @@ namespace NSStringExt
arrElements.clear(); arrElements.clear();
for (int nIndex = 0, nCount = arrCurrent.size(); nIndex < nCount; nIndex++) for (int nIndex = 0, nCount = arrCurrent.size(); nIndex < nCount; nIndex++)
{ {
std::vector<std::wstring>& arrTemp = Split(arrCurrent.at(nIndex), wChar); std::vector<std::wstring> arrTemp = Split(arrCurrent.at(nIndex), wChar);
arrElements.insert(arrElements.end(), arrTemp.begin(), arrTemp.end()); arrElements.insert(arrElements.end(), arrTemp.begin(), arrTemp.end());
} }
arrCurrent = arrElements; arrCurrent = arrElements;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment