для конвертации wordart doc-docx в поле shapetype прокинут тип от shape

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

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/PictureFrameType.h

@@ -7,10 +7,10 @@ namespace DocFileFormat
   class PictureFrameType: public ShapeType
   {
     public: 
-	  PictureFrameType():
+	  PictureFrameType() :
       ShapeType(msosptPictureFrame)
       {
-		this->Path = _T( "m@4@5l@4@11@9@11@9@5xe" );
+		/*this->Path = _T( "m@4@5l@4@11@9@11@9@5xe" );
 
 		this->Formulas.push_back( std::wstring( _T( "if lineDrawn pixelLineWidth 0" ) ) );
         this->Formulas.push_back( std::wstring( _T( "sum @0 1 0" ) ) );
@@ -23,7 +23,7 @@ namespace DocFileFormat
         this->Formulas.push_back( std::wstring( _T( "prod @7 21600 pixelWidth" ) ) );
         this->Formulas.push_back( std::wstring( _T( "sum @8 21600 0" ) ) );
         this->Formulas.push_back( std::wstring( _T( "prod @7 21600 pixelHeight" ) ) );
-        this->Formulas.push_back( std::wstring( _T( "sum @10 21600 0" ) ) );
+        this->Formulas.push_back( std::wstring( _T( "sum @10 21600 0" ) ) );*/
 
         //pictures are not stroked or fileld by default
         this->Filled = false;
@@ -33,6 +33,11 @@ namespace DocFileFormat
 		this->Lock.fUsefLockAspectRatio = true;
         this->Lock.fLockAspectRatio = true;
       }
+	  void SetType(unsigned int nType)
+	  {
+		  this->TypeCode = nType;
+		  return;
+	  }
 
 	  virtual ~PictureFrameType()
 	  {

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

@@ -44,6 +44,7 @@ namespace DocFileFormat
 
 			//v:shapetype
 			PictureFrameType type;
+			type.SetType(shape->Instance);
 			VMLShapeTypeMapping* vmlShapeTypeMapping = new VMLShapeTypeMapping( m_pXmlWriter, m_isBulletPicture );
 			type.Convert( vmlShapeTypeMapping );
 			RELEASEOBJECT( vmlShapeTypeMapping );

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcxproj

@@ -68,6 +68,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
+    <IncludePath>%(AdditionalIncludeDirectories);..\..\..\Common\DocxFormat\Source\XML\libxml2\XML\include\libxml;..\..\..\Common\DocxFormat\Source\XML\libxml2\XML\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
@@ -76,6 +77,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
     <IntDir>$(Configuration)\</IntDir>
+    <IncludePath>%(AdditionalIncludeDirectories);..\..\..\Common\DocxFormat\Source\XML\libxml2\XML\include\libxml;..\..\..\Common\DocxFormat\Source\XML\libxml2\XML\include;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
@@ -91,7 +93,6 @@
       <PrecompiledHeader />
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\..\..\Common\DocxFormat\Source\XML\libxml2\XML\include;..\..\..\Common\DocxFormat\Source\XML\libxml2\XML\include\libxml;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -377,6 +378,10 @@
       <Project>{a100103a-353e-45e8-a9b8-90b87cc5c0b0}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcxproj">
+      <Project>{21663823-de45-479b-91d0-b4fef4916ef0}</Project>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\DesktopEditor\graphics\graphics_vs2005.vcxproj">
       <Project>{37ca072a-5bde-498b-b3a7-5e404f5f9bf2}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>