(2.0.1.328): ASCOfficeDocxFile2

'txbx' может также прописано как 'textbox' (1 (45).docx)

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

ASCOfficeDocxFile2/version.h

@@ -2,6 +2,6 @@
 //2
 //0
 //1
-//327
-#define INTVER 2,0,1,327
-#define STRVER "2,0,1,327\0"
+//328
+#define INTVER 2,0,1,328
+#define STRVER "2,0,1,328\0"

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp

@@ -52,7 +52,7 @@ namespace PPTX
 						style = oNode;
 					else if (_T("txBody") == strName)
 						txBody = oNode;
-					else if (_T("txbx") == strName || _T("textbox") == strNam)
+					else if (_T("txbx") == strName || _T("textbox") == strName)
 					{
 						XmlUtils::CXmlNode _node = oNode.ReadNode(_T("w:txbxContent"));
 						if (_node.IsValid())

XlsxSerializerCom/Reader/ChartFromToBinary.cpp

@@ -5586,8 +5586,8 @@ namespace BinXlsxRW{
 		CT_RotX* poVal = static_cast<CT_RotX*>(poResult);
 		if(c_oserct_rotxVAL == type)
 		{
-            signed char* pNewElem = new signed char;
-			*pNewElem = m_oBufferedStream.GetUChar();
+			signed char* pNewElem = new signed char;
+			*pNewElem = m_oBufferedStream.GetChar();
 			poVal->m_val = pNewElem;
 		}
 		else
@@ -10397,7 +10397,7 @@ namespace BinXlsxRW{
 		if(NULL != oVal.m_val)
 		{
 			int nCurPos = m_oBcw.WriteItemStart(c_oserct_rotxVAL);
-			m_oBcw.m_oStream.WriteBYTE(*oVal.m_val);
+			m_oBcw.m_oStream.WriteSBYTE(*oVal.m_val);
 			m_oBcw.WriteItemEnd(nCurPos);
 		}
 	}