DocFile - fix WordArt в doc, полученного из docx

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

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -627,15 +627,16 @@ namespace DocFileFormat
 					if ((oPicture.mfp.mm > 98) && (NULL != oPicture.shapeContainer))
 					{
 						m_pXmlWriter->WriteNodeBegin (_T("w:pict"));
-						if (oPicture.blipStoreEntry)
+
+						if (oPicture.shapeContainer)
 						{
-							VMLPictureMapping oVMLPicture(m_context, m_pXmlWriter, false, _caller);
-							oPicture.Convert (&oVMLPicture);
+							VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, &oPicture,  _caller);
+							oPicture.shapeContainer->Convert(&oVmlWriter);
 						}
 						else
 						{
-							VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, &oPicture,  _caller);
-							oPicture.shapeContainer->Convert(&oVmlWriter);
+							VMLPictureMapping oVMLPicture(m_context, m_pXmlWriter, false, _caller);
+							oPicture.Convert (&oVMLPicture);
 						}
 						m_pXmlWriter->WriteNodeEnd	 (_T("w:pict"));
 					}                   

ASCOfficeDocFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//233
-#define INTVER 1,0,1,233
-#define STRVER "1,0,1,233\0"
+//234
+#define INTVER 1,0,1,234
+#define STRVER "1,0,1,234\0"