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

Конвертации строк переделаны на функции из DesktopEditor/Common

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62616 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Ilya.Kirillov
2015-05-19 07:36:15 +00:00
committed by Alexander Trofimov
parent 73f5c565d9
commit d92c01c247
2 changed files with 14 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
DjVuFile/DjVuFileImplementation.cpp
View File

@ -21,65 +21,15 @@ namespace NSDjvu
{
static GUTF8String MakeUTF8String(const std::wstring& wsText)
{
int nSize;
#ifdef _UNICODE
LPCWSTR pszUnicodeText = wsText.c_str();
#else
nSize = ::MultiByteToWideChar(CP_ACP, 0, (LPCSTR)strText, -1, NULL, 0);
if (nSize == 0)
return "";
LPWSTR pszUnicodeText = new WCHAR[nSize];
::MultiByteToWideChar(CP_ACP, 0, (LPCSTR)strText, -1, pszUnicodeText, nSize);
#endif
nSize = ::WideCharToMultiByte(CP_UTF8, 0, pszUnicodeText, -1, NULL, 0, NULL, NULL);
if (nSize == 0)
{
#ifndef _UNICODE
delete[] pszUnicodeText;
#endif
return "";
}
LPSTR pszTextUTF8 = new CHAR[nSize];
::WideCharToMultiByte(CP_UTF8, 0, pszUnicodeText, -1, pszTextUTF8, nSize, NULL, NULL);
GUTF8String utf8String(pszTextUTF8);
delete[] pszTextUTF8;
#ifndef _UNICODE
delete[] pszUnicodeText;
#endif
return utf8String;
//std::string sText = NSFile::CUtf8Converter::GetUtf8StringFromUnicode(wsText);
//GUTF8String utf8String(sText.c_str());
//return utf8String;
std::string sText = NSFile::CUtf8Converter::GetUtf8StringFromUnicode(wsText);
GUTF8String utf8String(sText.c_str());
return utf8String;
}
static CString MakeCString(GUTF8String& strText)
{
int nSize;
LPSTR pszUtf8Text = strText.getbuf();
//nSize = ::WideCharToMultiByte(CP_UTF8, 0, pszUtf8Text, -1, NULL, 0, NULL, NULL);
nSize = ::MultiByteToWideChar(CP_UTF8, 0, pszUtf8Text, -1, NULL, 0);
if (nSize == 0)
{
return _T("");
}
LPWSTR pszUnicodeText = new WCHAR[nSize];
::MultiByteToWideChar(CP_UTF8, 0, pszUtf8Text, -1, pszUnicodeText, nSize);
CString String(pszUnicodeText);
delete[] pszUnicodeText;
return String;
std::string sString(strText.getbuf());
std::wstring wsString = NSFile::CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)sString.c_str(), sString.length());
return CString(wsString.c_str());
}
static int GetInteger(const std::wstring& wsString)
{
@ -672,4 +622,4 @@ void CDjVuFileImplementation::ParseCoords(const std::wstring& wsCo
pdCoords[nIndex] = NSDjvu::GetInteger(vCoords.at(nIndex)) * dKoef;
}
}
}
}