OfficeDocFile.dll (win32 2005 build) ошибка в чтение свойств графики

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

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeOptions.h

@@ -595,7 +595,18 @@ namespace DocFileFormat
 			for (unsigned int i = 0; i < instance; ++i)
 			{
 				if (Options[i].fComplex)
-					Options[i].opComplex = Reader->ReadBytes( ( (int)Options[i].op + 6 ), true );
+				{
+					int read_size =  (int)Options[i].op + 6 ; //???? 	
+					//todooo !!!!    !!       Complex!!!		
+					switch(Options[i].pid)
+					{
+					case PropertyId::gtextUNICODE:
+					case PropertyId::gtextFont:
+						read_size =  (int)Options[i].op;
+						break;
+					}
+					Options[i].opComplex = Reader->ReadBytes( read_size, true );
+				}
 
 				OptionsByID.insert(pair<PropertyId, OptionEntry>(Options[i].pid, Options[i]));
 			}

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

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

ASCOfficeDocFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//236
-#define INTVER 1,0,1,236
-#define STRVER "1,0,1,236\0"
+//237
+#define INTVER 1,0,1,237
+#define STRVER "1,0,1,237\0"