DocFile - fix картинки Long_Division_Enhanced_VIPs-download.doc

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

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -628,16 +628,25 @@ namespace DocFileFormat
 					{
 						m_pXmlWriter->WriteNodeBegin (_T("w:pict"));
 
+						bool picture = true;
+
 						if (oPicture.shapeContainer)
 						{
-							VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, &oPicture,  _caller);
-							oPicture.shapeContainer->Convert(&oVmlWriter);
+							int shape_type = oPicture.shapeContainer->getShapeType();
+
+							if (shape_type != msosptPictureFrame) picture = false;
 						}
-						else
+						
+						if (picture)
 						{
 							VMLPictureMapping oVMLPicture(m_context, m_pXmlWriter, false, _caller);
 							oPicture.Convert (&oVMLPicture);
+						}else
+						{
+							VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, &oPicture,  _caller);
+							oPicture.shapeContainer->Convert(&oVmlWriter);
 						}
+						
 						m_pXmlWriter->WriteNodeEnd	 (_T("w:pict"));
 					}                   
 				}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeContainer.h

@@ -2,6 +2,7 @@
 
 #include "RegularContainer.h"
 #include "ShapeOptions.h"
+#include "Shape.h"
 
 namespace DocFileFormat
 {
@@ -22,6 +23,22 @@ namespace DocFileFormat
 		{ 
 		}
 
+		int getShapeType()
+		{
+			int ret = 0;
+
+			for ( vector<Record*>::const_iterator iter = this->Children.begin(); iter != this->Children.end(); iter++ )
+			{
+				Shape* sh = dynamic_cast<Shape*>( *iter );
+				if (sh)
+				{
+					if (sh->shapeType) return sh->shapeType->GetTypeCode();
+					else return 0;
+				}
+			}
+			return 0;
+		}
+
 		virtual ~ShapeContainer()
 		{
 		}

ASCOfficeDocFile/version.h

@@ -2,6 +2,6 @@
 //1
 //0
 //1
-//238
-#define INTVER 1,0,1,238
-#define STRVER "1,0,1,238\0"
+//239
+#define INTVER 1,0,1,239
+#define STRVER "1,0,1,239\0"