правки под ревизию 63369

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63372 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -682,7 +682,7 @@ namespace DocFileFormat
 
 					case gtextUNICODE:
 					{
-						std::wstring text = NSString::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex, (iter->op-2)/2);
+						std::wstring text = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex, (iter->op-2)/2);
 
 						text = FormatUtils::XmlEncode(text);
 						text = ReplaceString(text, _T("\n"), _T("
"));
@@ -691,7 +691,7 @@ namespace DocFileFormat
 
 					case gtextFont:
 					{
-						std::wstring font = NSString::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex, (iter->op-8)/2);
+						std::wstring font = NSStringExt::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex, (iter->op-8)/2);
 						font = std::wstring(_T("\"")) + font + std::wstring(_T("\""));
 						appendStyleProperty(&m_textPathStyle, L"font-family", font);
 					}break;

ASCOfficePDFWriter/PdfWriterLib/PdfWriterLib.cpp

@@ -3057,7 +3057,7 @@ void CPdfWriterLib::OnlineWordToPdfInternal(BYTE* dstArray, LONG len, const std:
                     
                     std::wstring wsTempString = NSCommonReader::ReadString16(current, curindex, _sLen);
                     
-                    CString base64TempFile;
+					std::wstring base64TempFile;
                     if (0 == wsTempString.find(_T("data:")))
                     {
                         try
@@ -3076,8 +3076,8 @@ void CPdfWriterLib::OnlineWordToPdfInternal(BYTE* dstArray, LONG len, const std:
                             if (Base64::Base64Decode(sBase64MultyByte.c_str(), sBase64MultyByte.length(),
                                                      byteIm, &nBuffLen))
                             {
-                                WriteFile_ (base64TempFile, byteIm, nBuffLen);
-                                wsTempString = string2std_string(base64TempFile);
+                                WriteFile_ (std_string2string(base64TempFile), byteIm, nBuffLen);
+                                wsTempString = base64TempFile;
                             }
                             else throw;
                         }
@@ -3320,7 +3320,7 @@ void CPdfWriterLib::OnlineWordToPdfInternal(BYTE* dstArray, LONG len, const std:
                     _sLen = NSCommonReader::ReadInt(current, curindex);
                     std::wstring wsTempString = NSCommonReader::ReadString16(current, curindex, _sLen);
 					
-                    CString base64TempFile;
+					std::wstring base64TempFile;
                     if (0 == wsTempString.find(_T("data:")))
                     {
                         try
@@ -3338,8 +3338,8 @@ void CPdfWriterLib::OnlineWordToPdfInternal(BYTE* dstArray, LONG len, const std:
                             
                             if (Base64::Base64Decode(sBase64MultyByte.c_str(), sBase64MultyByte.length(), byteIm, &nBuffLen))
                             {
-                                WriteFile_ (base64TempFile, byteIm,nBuffLen);
-                                wsTempString = string2std_string(base64TempFile);
+                                WriteFile_ (std_string2string(base64TempFile), byteIm,nBuffLen);
+                                wsTempString = base64TempFile;
                             }
                             else throw;
                         }