для ошибок компиляции "cannot pass objects of non-trivially-copyable type through '...'"

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

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -1372,7 +1372,7 @@ public:
 		}
 		else if( c_oSer_tblpPrType::Paddings == type )
 		{
-			Paddings oPaddings;
+			PaddingsToWrite oPaddings;
 			res = Read2(length, &Binary_tblPrReader::ReadPaddings, this, &oPaddings);
 			if(oPaddings.bLeft)
 			{
@@ -1709,14 +1709,14 @@ public:
 			res = c_oSerConstants::ReadUnknown;
 		return res;
 	};
-	int ReadPaddingsOut(long length, Paddings* oPaddings)
+	int ReadPaddingsOut(long length, PaddingsToWrite* oPaddings)
 	{
 		return Read2(length, &Binary_tblPrReader::ReadPaddings, this, oPaddings);
 	}
 	int ReadPaddings(BYTE type, long length, void* poResult)
 	{
 		int res = c_oSerConstants::ReadOk;
-		Paddings* oPaddings = static_cast<Paddings*>(poResult);
+		PaddingsToWrite* oPaddings = static_cast<PaddingsToWrite*>(poResult);
 		if (c_oSerPaddingType::left == type)
 		{
 			oPaddings->bLeft = true;

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -3253,7 +3253,7 @@ namespace BinXlsxRW {
 			if(TRUE == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
 			{
 				CFile oFile;
-				oFile.CreateFileW(sFileDst);
+				oFile.CreateFile(sFileDst);
 				oFile.WriteStringUTF8(WriteFileHeader(nBinBufferLen));
 				oFile.WriteFile(pbBase64Buffer, nBase64BufferLen);
 				oFile.CloseFile();
@@ -3400,7 +3400,7 @@ namespace BinXlsxRW {
 			if(TRUE == Base64::Base64Encode(pData, nLength, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
 			{
 				CFile oFile;
-				oFile.CreateFileW(sFileOutput);
+				oFile.CreateFile(sFileOutput);
 				oFile.WriteStringUTF8(WriteDefaultFileHeader(nLength));
 				oFile.WriteFile(pbBase64Buffer, nBase64BufferLen);
 				oFile.CloseFile();
@@ -3585,7 +3585,7 @@ namespace BinXlsxRW {
 			if (TRUE == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
 			{
 				CFile oFile;
-				oFile.CreateFileW(sFileOutput);
+				oFile.CreateFile(sFileOutput);
 				oFile.WriteStringUTF8(WriteDefaultFileHeader(nBinBufferLen));
 				oFile.WriteFile(pbBase64Buffer, nBase64BufferLen);
 				oFile.CloseFile();
@@ -3642,7 +3642,7 @@ namespace BinXlsxRW {
 			if(TRUE == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
 			{
 				CFile oFile;
-				oFile.CreateFileW(sFileOutput);
+				oFile.CreateFile(sFileOutput);
 				oFile.WriteStringUTF8(WriteDefaultFileHeader(nBinBufferLen));
 				oFile.WriteFile(pbBase64Buffer, nBase64BufferLen);
 				oFile.CloseFile();

XlsxSerializerCom/Writer/BinaryReader.h

@@ -2402,7 +2402,7 @@ namespace BinXlsxRW {
 				if(S_OK == hRes && NULL != bstrXml)
 				{
 					pCellAnchor->m_oXml.Init();
-					pCellAnchor->m_oXml->AppendFormat(_T("%s<xdr:clientData/>"), *bstrXml);
+					pCellAnchor->m_oXml->AppendFormat(_T("%s<xdr:clientData/>"), (const TCHAR *) bstrXml);
 				}
 				RELEASEOBJECT(bstrXml);
 			}
@@ -2556,7 +2556,7 @@ namespace BinXlsxRW {
 					else
 						sRId = pPair->second;
 					pCellAnchor->m_oXml.Init();
-					pCellAnchor->m_oXml->AppendFormat(_T("<xdr:pic><xdr:nvPicPr><xdr:cNvPr id=\"1\" name=\"Image 1\"></xdr:cNvPr><xdr:cNvPicPr><a:picLocks noChangeAspect=\"1\"></a:picLocks></xdr:cNvPicPr></xdr:nvPicPr><xdr:blipFill><a:blip r:embed=\"%s\"></a:blip><a:stretch></a:stretch></xdr:blipFill><xdr:spPr><a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic><xdr:clientData/>"), sRId);
+					pCellAnchor->m_oXml->AppendFormat(_T("<xdr:pic><xdr:nvPicPr><xdr:cNvPr id=\"1\" name=\"Image 1\"></xdr:cNvPr><xdr:cNvPicPr><a:picLocks noChangeAspect=\"1\"></a:picLocks></xdr:cNvPicPr></xdr:nvPicPr><xdr:blipFill><a:blip r:embed=\"%s\"></a:blip><a:stretch></a:stretch></xdr:blipFill><xdr:spPr><a:prstGeom prst=\"rect\"><a:avLst/></a:prstGeom></xdr:spPr></xdr:pic><xdr:clientData/>"), (const TCHAR *) sRId);
 				}
 			}
 			else
@@ -2703,7 +2703,7 @@ namespace BinXlsxRW {
 			{
 				double dValue = m_oBufferedStream.GetDoubleReal();
 				pCell->m_oValue.Init();
-				pCell->m_oValue->m_sText.AppendFormat(_T("%s"), OOX::Spreadsheet::SpreadsheetCommon::WriteDouble(dValue));
+				pCell->m_oValue->m_sText.AppendFormat(_T("%s"), (const TCHAR *) OOX::Spreadsheet::SpreadsheetCommon::WriteDouble(dValue));
 			}
 			else
 				res = c_oSerConstants::ReadUnknown;