сделана конвертация WordArt из doc в docx

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

ASCOfficeDocFile/Common/XmlTools.h

@@ -14,7 +14,19 @@ using namespace std;
     #include "../../Common/DocxFormat/Source/Base/ASCString.h"
 #endif
 
+inline static std::wstring ReplaceString(std::wstring subject, const std::wstring& search, const std::wstring& replace) 
+{
+	size_t pos = 0;
+
+	while ((pos = subject.find(search, pos)) != std::string::npos)
+	{
+		subject.replace(pos, search.length(), replace);
+		pos += replace.length();
+	}
 
+	return subject;
+}
+//----------------------------------------------------------------
 namespace XMLTools
 {
 	/*========================================================================================================

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -614,7 +614,7 @@ namespace DocFileFormat
 						if (pShape)
 						{
 							m_pXmlWriter->WriteNodeBegin (_T("w:pict"));
-							VMLShapeMapping oVmlWriter (m_pXmlWriter, pSpa, NULL, m_context, _caller);
+							VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, pSpa, NULL,  _caller);
 							pShape->Convert(&oVmlWriter);
 							m_pXmlWriter->WriteNodeEnd (_T("w:pict"));
 						}
@@ -626,15 +626,18 @@ namespace DocFileFormat
 
 					if ((oPicture.mfp.mm > 98) && (NULL != oPicture.shapeContainer))
 					{
-						VMLPictureMapping* pVMLPicture	=	new VMLPictureMapping(m_context, m_pXmlWriter, false, _caller);
-						if (pVMLPicture)
+						m_pXmlWriter->WriteNodeBegin (_T("w:pict"));
+						if (oPicture.blipStoreEntry)
 						{
-							m_pXmlWriter->WriteNodeBegin (_T("w:pict"));
-							oPicture.Convert (pVMLPicture);
-							m_pXmlWriter->WriteNodeEnd	 (_T("w:pict"));
-
-							RELEASEOBJECT(pVMLPicture);
+							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"));
 					}                   
 				}
 				else if ((TextMark::AutoNumberedFootnoteReference == c) && fSpec)

ASCOfficeDocFile/DocDocxConverter/NumberingMapping.cpp

@@ -462,7 +462,7 @@ namespace DocFileFormat
 					}
 					else
 					{
-						VMLShapeMapping oShape (m_pXmlWriter, NULL, &pict, m_context,this,true);
+						VMLShapeMapping oShape (m_context, m_pXmlWriter, NULL, &pict, this,true);
 						pict.shapeContainer->Convert(&oShape);
 					}
 

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shape.h

@@ -73,7 +73,13 @@ namespace DocFileFormat
 			fHaveAnchor			=	FormatUtils::BitmaskToBool( flag, 0x200 );
 			fBackground			=	FormatUtils::BitmaskToBool( flag, 0x400 );
 			fHaveSpt			=	FormatUtils::BitmaskToBool( flag, 0x800 );
-			shapeType			=	ShapeTypeFactory::NewShapeType((MSOSPT)Instance);
+
+			if (Instance > 0)
+				shapeType			=	ShapeTypeFactory::NewShapeType((MSOSPT)Instance);
+			else if (!fHaveSpt)
+			{
+				shapeType			=	ShapeTypeFactory::NewShapeType(msosptNotPrimitive);
+			}
 		}
 
 		virtual Record* NewObject( IBinaryReader* _reader, unsigned int bodySize, unsigned int typeCode, unsigned int version, unsigned int instance )

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeType.h

@@ -315,6 +315,9 @@ namespace DocFileFormat
 		/// By default nothing is locked.
 		ProtectionBooleanProperties Lock;
 
+		///
+		std::wstring Textpath;
+
 	protected:
 		unsigned int TypeCode;
 	};

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeTypeFactory.cpp

@@ -37,6 +37,7 @@
 #include "Shapetypes/BracketsType.h"
 #include "Shapetypes/CalloutsType.h"
 #include "Shapetypes/Connector.h"
+#include "Shapetypes/WordArtText.h"
 
 namespace DocFileFormat
 {
@@ -81,7 +82,6 @@ namespace DocFileFormat
 		case msosptDonut						:	{	pShape	=	new DonutType();						}	break;
 		case msosptPictureFrame 				:	{	pShape	=	new PictureFrameType();					}	break;
 		case msosptTextBox						:	{	pShape	=	new TextboxType();						}	break;
-		case msosptTextStop						:	{	pShape	=	new TextStop();							}	break;
 		case msosptBevel						:	{	pShape	=	new BevelType();						}	break;			
 		case msosptPentagon						:	{	pShape	=	new PentagonType();						}	break;
 		case msosptFoldedCorner 				:	{	pShape	=	new FoldedCornerlType();				}	break;
@@ -182,6 +182,50 @@ namespace DocFileFormat
 		case msosptCurvedConnector3				:	{	pShape	=	new CurvedConnector3();					}	break;		
 		case msosptCurvedConnector4				:	{	pShape	=	new CurvedConnector4();					}	break;		
 		case msosptCurvedConnector5				:	{	pShape	=	new CurvedConnector5();					}	break;		
+//wordArt		
+		
+		case msosptTextStop						:	{	pShape	=	new WordArtTextStop();					}	break;
+		case msosptTextArchUpCurve				:	{	pShape	=	new WordArtTextArchUpCurve();			}	break;
+		case msosptTextPlainText				:
+	//без детализаций - todooo прописать формулы
+		case msosptTextTriangle					:
+		case msosptTextTriangleInverted			:
+		case msosptTextChevron					:
+		case msosptTextChevronInverted			:
+		case msosptTextRingInside				:
+		case msosptTextRingOutside				:
+		case msosptTextArchDownCurve			:
+		case msosptTextCircleCurve				:
+		case msosptTextButtonCurve				:
+		case msosptTextArchUpPour				:
+		case msosptTextArchDownPour				:
+		case msosptTextCirclePour				:
+		case msosptTextButtonPour				:
+		case msosptTextCurveUp					:
+		case msosptTextCurveDown				:
+		case msosptTextCascadeUp				:
+		case msosptTextCascadeDown				:
+		case msosptTextWave1					:
+		case msosptTextWave2					:
+		case msosptTextWave3					:
+		case msosptTextWave4					:
+		case msosptTextInflate					:
+		case msosptTextDeflate					:
+		case msosptTextInflateBottom			:
+		case msosptTextDeflateBottom			:
+		case msosptTextInflateTop				:
+		case msosptTextDeflateTop				:
+		case msosptTextDeflateInflate			:
+		case msosptTextDeflateInflateDeflate	:
+		case msosptTextFadeRight				:
+		case msosptTextFadeLeft					:
+		case msosptTextFadeUp					:
+		case msosptTextFadeDown					:
+		case msosptTextSlantUp					:
+		case msosptTextSlantDown				:
+		case msosptTextCanUp					:
+		case msosptTextCanDown					:
+													{	pShape	=	new WordArtTextType(TypeCode);			}	break;
 
 		default									:	{	pShape	=	NULL;									}	break;
 		}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/TextboxType.h

@@ -12,36 +12,10 @@ namespace DocFileFormat
 			ShapeConcentricFill =	true;
 			Joins				=	miter;
 			Path				=	_T("m,l,21600r21600,l21600,xe");
-		}
-
-		virtual ~TextboxType()
-		{
-
-		}
-	};
 
-	class TextStop : public ShapeType
-	{
-	public:
-		TextStop () : ShapeType(msosptTextStop)
-		{
-			Joins				=	miter;
-			Path				=	_T("m0@4l@2,l@3,l21600@4em0@5l@2,21600l@3,21600l21600@5e");
-
-			Formulas.push_back(_T("val #0"));	
-			Formulas.push_back(_T("prod width 1 3"));	
-			Formulas.push_back(_T("sum 0 @1 0"));	
-			Formulas.push_back(_T("sum width 0 @1"));	
-			Formulas.push_back(_T("sum 0 @0 0"));	
-			Formulas.push_back(_T("sum height 0 @0"));	
-
-			AdjustmentValues	=	_T("5400");
-			Handle one;
-			one.position		=	_T("0,@0");
-			Handles.push_back (one);
 		}
 
-		virtual ~TextStop ()
+		virtual ~TextboxType()
 		{
 
 		}

ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/WordArtText.h

+#pragma once
+
+#include "../ShapeType.h"
+
+namespace DocFileFormat
+{
+	class WordArtTextType: public ShapeType
+	{
+	public:
+		WordArtTextType(int txStyle):
+		ShapeType((MSOSPT)txStyle)
+		{
+			this->Path		= _T( "m@7,l@8,m@5,21600l@6,21600e" ); 
+			this->Textpath	= _T(" on=\"t\" style=\"v-text-kern:t\" fitpath=\"t\"");
+
+			 AdjustmentValues	=	_T("10800");
+		}
+
+		virtual ~WordArtTextType()
+		{
+		}
+	};
+
+	class WordArtTextStop : public WordArtTextType
+	{
+	public:
+		WordArtTextStop () : WordArtTextType(msosptTextStop)
+		{
+			this->Joins				=	miter;
+			this->Path				=	_T("m0@4l@2,l@3,l21600@4em0@5l@2,21600l@3,21600l21600@5e");
+
+			Formulas.push_back(_T("val #0"));	
+			Formulas.push_back(_T("prod width 1 3"));	
+			Formulas.push_back(_T("sum 0 @1 0"));	
+			Formulas.push_back(_T("sum width 0 @1"));	
+			Formulas.push_back(_T("sum 0 @0 0"));	
+			Formulas.push_back(_T("sum height 0 @0"));	
+
+			AdjustmentValues	=	_T("5400");
+			Handle one;
+			one.position		=	_T("0,@0");
+			Handles.push_back (one);
+		}
+
+		virtual ~WordArtTextStop ()
+		{
+
+		}
+	};
+
+	class WordArtTextArchUpCurve : public WordArtTextType
+	{
+	public:
+		WordArtTextArchUpCurve () : WordArtTextType(msosptTextArchUpCurve)
+		{
+			Path				=	_T("al10800,10800,10800,10800@2@14e");
+
+			Formulas.push_back(_T("val #1"));
+			Formulas.push_back(_T("val #0"));
+			Formulas.push_back(_T("sum 0 0 #0"));
+			Formulas.push_back(_T("sumangle #0 0 180"));
+			Formulas.push_back(_T("sumangle #0 0 90"));
+			Formulas.push_back(_T("prod @4 2 1"));
+			Formulas.push_back(_T("sumangle #0 90 0"));
+			Formulas.push_back(_T("prod @6 2 1"));
+			Formulas.push_back(_T("abs #0"));
+			Formulas.push_back(_T("sumangle @8 0 90"));
+			Formulas.push_back(_T("if @9 @7 @5"));
+			Formulas.push_back(_T("sumangle @10 0 360"));
+			Formulas.push_back(_T("if @10 @11 @10"));
+			Formulas.push_back(_T("sumangle @12 0 360"));
+			Formulas.push_back(_T("if @12 @13 @12"));
+			Formulas.push_back(_T("sum 0 0 @14"));
+			Formulas.push_back(_T("val 10800"));
+			Formulas.push_back(_T("cos 10800 #0"));
+			Formulas.push_back(_T("sin 10800 #0"));
+			Formulas.push_back(_T("sum @17 10800 0"));
+			Formulas.push_back(_T("sum @18 10800 0"));
+			Formulas.push_back(_T("sum 10800 0 @17"));
+			Formulas.push_back(_T("if @9 0 21600"));
+			Formulas.push_back(_T("sum 10800 0 @18"));
+
+			AdjustmentValues	=	_T("11796480");
+			Handle one;
+			one.position		=	_T("@16,#0");
+			one.polar			=	_T("10800,10800");
+			Handles.push_back (one);
+		}
+
+		virtual ~WordArtTextArchUpCurve ()
+		{
+
+		}
+	};
+}

ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp

@@ -12,18 +12,7 @@
 #include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
 #include "../../DesktopEditor/common/File.h"
 
-inline static std::wstring ReplaceString(std::wstring subject, const std::wstring& search, const std::wstring& replace) 
-{
-	size_t pos = 0;
 
-	while ((pos = subject.find(search, pos)) != std::string::npos)
-	{
-		subject.replace(pos, search.length(), replace);
-		pos += replace.length();
-	}
-
-	return subject;
-}
 
 namespace DocFileFormat
 {

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.cpp

 
 #include "VMLPictureMapping.h"
 
+#include "OfficeDrawing/GeometryBooleanProperties.h"
+#include "OfficeDrawing/GeometryTextBooleanProperties.h"
+
+#include "../../DesktopEditor/common/String.h"
+
+
 namespace DocFileFormat
 {
+	void VMLPictureMapping::appendStyleProperty(std::wstring* b, const std::wstring& propName, const std::wstring& propValue) const
+	{
+		if ( b != NULL )
+		{
+			b->operator += ( propName );
+			b->operator += ( _T( ":" ) );
+			b->operator += ( propValue );
+			b->operator +=( _T( ";" ) );
+		}
+	}
+
 	VMLPictureMapping::VMLPictureMapping(ConversionContext* ctx, XmlUtils::CXmlWriter* writer, bool olePreview, IMapping* caller, bool isBulletPicture) : PropertiesMapping(writer)
 	{
 		m_ctx				=	ctx;
@@ -37,7 +54,7 @@ namespace DocFileFormat
 	{
 		PictureDescriptor* pict = static_cast<PictureDescriptor*>(visited);
 
-		if (CopyPicture(pict->blipStoreEntry))
+		if (pict->shapeContainer || pict->blipStoreEntry)
 		{
 			Shape* shape				=	static_cast<Shape*>(*(pict->shapeContainer->Children.begin()));
 			list<OptionEntry> options	=	pict->shapeContainer->ExtractOptions();
@@ -148,10 +165,13 @@ namespace DocFileFormat
 
 			m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
 
-			//v:imageData
-			appendValueAttribute(m_imageData, _T( "r:id" ), ( wstring( _T( "rId" ) ) + FormatUtils::IntToWideString(m_nImageId) ).c_str());
-			appendValueAttribute(m_imageData, _T( "o:title" ) , _T( "" ));
-			m_pXmlWriter->WriteString(m_imageData->GetXMLString().c_str());
+			if (CopyPicture(pict->blipStoreEntry))
+			{
+				//v:imageData
+				appendValueAttribute(m_imageData, _T( "r:id" ), ( wstring( _T( "rId" ) ) + FormatUtils::IntToWideString(m_nImageId) ).c_str());
+				appendValueAttribute(m_imageData, _T( "o:title" ) , _T( "" ));
+				m_pXmlWriter->WriteString(m_imageData->GetXMLString().c_str());
+			}
 
 			//borders
 			writePictureBorder( _T( "bordertop" ), pict->brcTop );
@@ -175,7 +195,7 @@ namespace DocFileFormat
 		m_pXmlWriter->WriteNodeBegin( ( wstring( _T( "w10:" ) ) + wstring( name ) ).c_str(), true );
 		m_pXmlWriter->WriteAttribute( _T( "type" ), getBorderType( brc->brcType ).c_str() );
 		m_pXmlWriter->WriteAttribute( _T( "width" ), FormatUtils::IntToWideString( brc->dptLineWidth ).c_str() );
-		m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
+		m_pXmlWriter->WriteNodeEnd	( _T( "" ), true );
 	}
 
 	/// Copies the picture from the binary stream to the zip archive 

ASCOfficeDocFile/DocDocxConverter/VMLPictureMapping.h

@@ -24,6 +24,7 @@ namespace DocFileFormat
 	private:
 		/// Writes a border element
 		void writePictureBorder (const wchar_t* name, const BorderCode* brc);
+		void appendStyleProperty( wstring* b, const wstring& propName, const wstring& propValue ) const;
 
 	protected:
 		/// Copies the picture from the binary stream to the zip archive 

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -21,9 +21,11 @@
 #include "OfficeDrawing/GroupShapeBooleanProperties.h"
 #include "OfficeDrawing/ProtectionBooleanProperties.h"
 
+#include "../../DesktopEditor/common/String.h"
+
 namespace DocFileFormat
 {
-	VMLShapeMapping::VMLShapeMapping (XmlUtils::CXmlWriter* pWriter, Spa* pSpa, PictureDescriptor* pPicture, ConversionContext* pConv, IMapping* pCaller, bool bullet) : PropertiesMapping(pWriter)
+	VMLShapeMapping::VMLShapeMapping (ConversionContext* pConv, XmlUtils::CXmlWriter* pWriter, Spa* pSpa, PictureDescriptor* pPicture, IMapping* pCaller, bool bullet) : PropertiesMapping(pWriter)
 	{		
 		m_bBullet			=	bullet;
 
@@ -126,7 +128,7 @@ namespace DocFileFormat
 						ShapeContainer* pChildShape	= static_cast<ShapeContainer*>(container->Children[i]);
 						if (pChildShape)
 						{
-							VMLShapeMapping vmlShapeMapping(m_pXmlWriter, m_pSpa, NULL, m_ctx, m_pCaller);
+							VMLShapeMapping vmlShapeMapping(m_ctx, m_pXmlWriter, m_pSpa, NULL,  m_pCaller);
 							pChildShape->Convert(&vmlShapeMapping);
 						}
 					}
@@ -148,7 +150,7 @@ namespace DocFileFormat
 				{
 					m_pXmlWriter->WriteNodeBegin( _T( "w10:wrap" ), TRUE );
 					m_pXmlWriter->WriteAttribute( _T( "type" ), wrap.c_str() );
-					m_pXmlWriter->WriteNodeEnd( _T( "w10:wrap" ), TRUE );
+					m_pXmlWriter->WriteNodeEnd	( _T( "w10:wrap" ), TRUE );
 				}
 			}
 
@@ -221,17 +223,16 @@ namespace DocFileFormat
 				int	nAdjValues			=	0;
 				int	nLTxID				=	-1;
 				
-				std::wstring adjValues[8];
-				ShadowStyleBooleanProperties shadowBoolean(0);
-				std::vector<CString> arrInscribe;
+				std::wstring					adjValues[8];
+				ShadowStyleBooleanProperties	shadowBoolean(0);
+				std::vector<CString>			arrInscribe;
 
 				std::list<OptionEntry>::const_iterator end = options.end();
 				for (std::list<OptionEntry>::const_iterator iter = options.begin(); iter != end; ++iter)
 				{
 					switch (iter->pid)
 					{
-						//BOOLEANS
-
+			//BOOLEANS
 					case geometryBooleans:
 						{
 							GeometryBooleanProperties booleans(iter->op);
@@ -676,61 +677,65 @@ namespace DocFileFormat
 					case dyTextTop:{ndyTextTop = (int)iter->op;break;}
 					case dxTextRight:{ndxTextRight = (int)iter->op;break;}
 					case dyTextBottom:{ndyTextBottom = (int)iter->op;break;}
-									  /*// TEXT PATH (Word Art)
-
-									  case ShapeOptions.PropertyId.gtextUNICODE:
-									  String text = Encoding.Unicode.GetString(entry.opComplex);
-									  text = text.Replace("\n", "");
-									  text = text.Replace("\0", "");
-									  appendValueAttribute(_textpath, "", "string", text, "");
-									  break;
-
-									  case ShapeOptions.PropertyId.gtextFont:
-									  String font = Encoding.Unicode.GetString(entry.opComplex);
-									  font = font.Replace("\0", "");
-									  appendStyleProperty(_textPathStyle, "font-family", "\""+font+"\"");
-									  break;
-
-									  case ShapeOptions.PropertyId.GeometryTextBooleanProperties:
-									  GeometryTextBooleanProperties props = new GeometryTextBooleanProperties(entry.op);
-									  if (props.fUsegtextFBestFit && props.gtextFBestFit)
-									  {
-									  appendValueAttribute(_textpath, "", "fitshape", "t", "");
-									  }
-									  if (props.fUsegtextFShrinkFit && props.gtextFShrinkFit)
-									  {
-									  appendValueAttribute(_textpath, "", "trim", "t", "");
-									  }
-									  if (props.fUsegtextFVertical && props.gtextFVertical)
-									  {
-									  appendStyleProperty(_textPathStyle, "v-rotate-letters", "t");
-									  //_twistDimension = true;
-									  }
-									  if (props.fUsegtextFKern && props.gtextFKern)
-									  {
-									  appendStyleProperty(_textPathStyle, "v-text-kern", "t");
-									  }
-									  if (props.fUsegtextFItalic && props.gtextFItalic)
-									  {
-									  appendStyleProperty(_textPathStyle, "font-style", "italic");
-									  }
-									  if (props.fUsegtextFBold && props.gtextFBold)
-									  {
-									  appendStyleProperty(_textPathStyle, "font-weight", "bold");
-									  }
-									  break;*/
-
-									  // PATH
-					case shapePath :
-						{
-							bHavePath			=	true;
+	
+	// TEXT PATH (Word Art)
 
-							std::wstring path	=	ParsePath(options);
+					case gtextUNICODE:
+					{
+						std::wstring text = NSString::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex, (iter->op-2)/2);
+
+						text = FormatUtils::XmlEncode(text);
+						text = ReplaceString(text, _T("\n"), _T("&#xA;"));
+						appendValueAttribute(&m_textpath, L"string", text.c_str());
+					}break;
 
-							if (false == path.empty())
-								m_pXmlWriter->WriteAttribute (_T( "path" ), path.c_str());
+					case gtextFont:
+					{
+						std::wstring font = NSString::CConverter::GetUnicodeFromUTF16((unsigned short*)iter->opComplex, (iter->op-8)/2);
+						font = std::wstring(_T("\"")) + font + std::wstring(_T("\""));
+						appendStyleProperty(&m_textPathStyle, L"font-family", font);
+					}break;
+
+					case geometryTextBooleanProperties:
+					{
+						GeometryTextBooleanProperties props(iter->op);
+						if (props.fUsegtextFBestFit && props.gtextFBestFit)
+						{
+							appendValueAttribute(&m_textpath, L"fitshape", _T("t"));
 						}
-						break;
+						if (props.fUsegtextFShrinkFit && props.gtextFShrinkFit)
+						{
+							appendValueAttribute(&m_textpath, L"trim", _T("t"));
+						}
+						if (props.fUsegtextFVertical && props.gtextFVertical)
+						{
+							appendStyleProperty(&m_textPathStyle, L"v-rotate-letters", L"t");
+							//_twistDimension = true;
+						}
+						if (props.fUsegtextFKern && props.gtextFKern)
+						{
+							appendStyleProperty(&m_textPathStyle, L"v-text-kern", L"t");
+						}
+						if (props.fUsegtextFItalic && props.gtextFItalic)
+						{
+							appendStyleProperty(&m_textPathStyle, L"font-style", L"italic");
+						}
+						if (props.fUsegtextFBold && props.gtextFBold)
+						{
+							appendStyleProperty(&m_textPathStyle, L"font-weight", L"bold");
+						}
+					}break;
+
+		  // PATH
+					case shapePath :
+					{
+						bHavePath			=	true;
+
+						std::wstring path	=	ParsePath(options);
+
+						if (false == path.empty())
+							m_pXmlWriter->WriteAttribute (_T( "path" ), path.c_str());
+					}break;
 					}
 				}
 
@@ -912,7 +917,7 @@ namespace DocFileFormat
 					{
 						m_pXmlWriter->WriteNodeBegin( _T( "w10:wrap" ), TRUE );
 						m_pXmlWriter->WriteAttribute( _T( "type" ), wrap.c_str() );
-						m_pXmlWriter->WriteNodeEnd( _T( "w10:wrap" ), TRUE );
+						m_pXmlWriter->WriteNodeEnd	( _T( "w10:wrap" ), TRUE );
 					}
 				}
 
@@ -931,7 +936,7 @@ namespace DocFileFormat
 				// text path
 				if (m_textpath.GetAttributeCount())
 				{
-					appendValueAttribute(&m_textpath, _T( "style" ), m_textPathStyle.c_str());
+					appendValueAttribute(&m_textpath, _T( "style" ), FormatUtils::XmlEncode(m_textPathStyle).c_str());
 					m_pXmlWriter->WriteString(m_textpath.GetXMLString().c_str());
 				}
 
@@ -992,6 +997,13 @@ namespace DocFileFormat
 				}
 
 				WriteEndShapeNode(pShape);
+
+				//ShapeType 
+				if (NULL != pShape->GetShapeType() && !m_bBullet)
+				{
+					VMLShapeTypeMapping oXmlMapper(m_pXmlWriter);
+					pShape->GetShapeType()->Convert(&oXmlMapper);
+				}
 			}
 		}
 	}
@@ -1023,13 +1035,6 @@ namespace DocFileFormat
 			}
 			else
 			{
-				//SHAPE
-				if (NULL != pShape->GetShapeType() && !m_bBullet)
-				{
-					VMLShapeTypeMapping oXmlMapper(m_pXmlWriter);
-					pShape->GetShapeType()->Convert(&oXmlMapper);
-				}
-
 				m_pXmlWriter->WriteNodeBegin(_T( "v:shape" ), TRUE);
 			}
 		}

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.h

@@ -28,7 +28,7 @@ namespace DocFileFormat
 	{
 	public:
 
-		VMLShapeMapping (XmlUtils::CXmlWriter* writer, Spa* pSpa, PictureDescriptor* pict, ConversionContext* ctx , IMapping* caller, bool bullet = false);
+		VMLShapeMapping (ConversionContext* ctx ,XmlUtils::CXmlWriter* writer, Spa* pSpa, PictureDescriptor* pict,  IMapping* caller, bool bullet = false);
 		virtual ~VMLShapeMapping();
 		virtual void Apply(IVisitable* visited);
 

ASCOfficeDocFile/DocDocxConverter/VMLShapeTypeMapping.cpp

@@ -39,9 +39,10 @@ namespace DocFileFormat
 				m_pXmlWriter->WriteAttribute( _T("adj"), pShape->AdjustmentValues.c_str() );
 
 			// Path
-			if (pShape->Path.length())
+			if (!pShape->Path.empty())
 				m_pXmlWriter->WriteAttribute( _T("path"), pShape->Path.c_str() );
 
+
 			//Default fill / stroke
 			if ( !pShape->Filled )
 			{
@@ -58,8 +59,15 @@ namespace DocFileFormat
 				m_pXmlWriter->WriteAttribute( _T( "o:preferrelative" ), _T( "t" ) );  
 			}
 
-			m_pXmlWriter->WriteNodeEnd( _T( "" ), true, false );
+			m_pXmlWriter->WriteNodeEnd( _T( "" ), true, false );//закрытие атрибутов
 
+			//Textpath
+			if (!pShape->Textpath.empty())
+			{
+				m_pXmlWriter->WriteNodeBegin( _T( "v:textpath" ), true );
+				m_pXmlWriter->WriteString( pShape->Textpath.c_str() );
+				m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
+			}
 			// Stroke
 			m_pXmlWriter->WriteNodeBegin( _T( "v:stroke" ), true );
 			m_pXmlWriter->WriteAttribute( _T( "joinstyle" ), FormatUtils::MapValueToWideString( pShape->Joins, &JoinStyleMap[0][0], 3, 6 ).c_str() );

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcproj

@@ -359,10 +359,6 @@
 		<Filter
 			Name="DOC_2_DOCX"
 			>
-			<File
-				RelativePath="..\..\DocDocxConverter\AbstractOpenXmlMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\AnnotationOwnerList.h"
 				>
@@ -391,14 +387,6 @@
 				RelativePath="..\..\DocDocxConverter\ByteStructure.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\CharacterPropertiesMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\CharacterPropertiesMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\CharacterPropertyExceptions.h"
 				>
@@ -407,10 +395,6 @@
 				RelativePath="..\..\DocDocxConverter\CharacterRange.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\CommentsMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\ContentTypes.h"
 				>
@@ -431,14 +415,6 @@
 				RelativePath="..\..\DocDocxConverter\DateAndTime.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\DocumentMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\DocumentMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\DocumentProperties.cpp"
 				>
@@ -463,10 +439,6 @@
 				RelativePath="..\..\DocDocxConverter\EndnoteDescriptor.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\EndnotesMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\FieldCharacter.h"
 				>
@@ -487,30 +459,10 @@
 				RelativePath="..\..\DocDocxConverter\FontFamilyName.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\FontTableMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\FontTableMapping.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\FooterMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\FooterMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\FootnoteDescriptor.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\FootnotesMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\FormattedDiskPage.h"
 				>
@@ -543,14 +495,6 @@
 				RelativePath="..\..\DocDocxConverter\HeaderAndFooterTable.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\HeaderMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\HeaderMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\IBinaryReader.h"
 				>
@@ -567,14 +511,6 @@
 				RelativePath="..\..\DocDocxConverter\LanguageId.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\LanguageIdMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\LanguageIdMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\LineSpacingDescriptor.h"
 				>
@@ -615,26 +551,10 @@
 				RelativePath="..\..\DocDocxConverter\ListTable.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\MainDocumentMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\MainDocumentMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\MemoryStream.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\NumberingMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\NumberingMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\OfficeArtContent.h"
 				>
@@ -643,10 +563,6 @@
 				RelativePath="..\..\DocDocxConverter\OleObject.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\OleObjectMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\OpenXmlPackage.cpp"
 				>
@@ -663,14 +579,6 @@
 				RelativePath="..\..\DocDocxConverter\ParagraphHeight.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\ParagraphPropertiesMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\ParagraphPropertiesMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\ParagraphPropertyExceptions.cpp"
 				>
@@ -703,14 +611,6 @@
 				RelativePath="..\..\DocDocxConverter\Plex.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\PropertiesMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\PropertiesMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\PropertyExceptions.cpp"
 				>
@@ -735,26 +635,10 @@
 				RelativePath="..\..\DocDocxConverter\SectionDescriptor.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\SectionPropertiesMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\SectionPropertiesMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\SectionPropertyExceptions.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\SettingsMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\SettingsMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\ShadingDescriptor.h"
 				>
@@ -807,70 +691,22 @@
 				RelativePath="..\..\DocDocxConverter\StyleSheetInformation.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\StyleSheetMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\StyleSheetMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\TabDescriptor.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\TableCellPropertiesMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\TableCellPropertiesMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\TableInfo.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\TableMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\TableMapping.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\TablePropertiesMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\TablePropertiesMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\TablePropertyExceptions.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\TableRowPropertiesMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\TableRowPropertiesMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\Tbkd.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\TextboxMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\TextboxMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\TwipsValue.h"
 				>
@@ -879,30 +715,6 @@
 				RelativePath="..\..\DocDocxConverter\VirtualStreamReader.h"
 				>
 			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\VMLPictureMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\VMLPictureMapping.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\VMLShapeMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\VMLShapeMapping.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\VMLShapeTypeMapping.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DocDocxConverter\VMLShapeTypeMapping.h"
-				>
-			</File>
 			<File
 				RelativePath="..\..\DocDocxConverter\WideString.h"
 				>
@@ -1217,8 +1029,204 @@
 						RelativePath="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\TrapezoidType.h"
 						>
 					</File>
+					<File
+						RelativePath="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\WordArtText.h"
+						>
+					</File>
 				</Filter>
 			</Filter>
+			<Filter
+				Name="Mapping"
+				>
+				<File
+					RelativePath="..\..\DocDocxConverter\AbstractOpenXmlMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\CharacterPropertiesMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\CharacterPropertiesMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\CommentsMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\DocumentMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\DocumentMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\EndnotesMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\FontTableMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\FontTableMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\FooterMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\FooterMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\FootnotesMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\HeaderMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\HeaderMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\LanguageIdMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\LanguageIdMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\MainDocumentMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\MainDocumentMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\NumberingMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\NumberingMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\OleObjectMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\ParagraphPropertiesMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\ParagraphPropertiesMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\PropertiesMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\PropertiesMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\SectionPropertiesMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\SectionPropertiesMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\SettingsMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\SettingsMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\StyleSheetMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\StyleSheetMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\TableCellPropertiesMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\TableCellPropertiesMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\TableMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\TableMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\TablePropertiesMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\TablePropertiesMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\TableRowPropertiesMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\TableRowPropertiesMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\TextboxMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\TextboxMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\VMLPictureMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\VMLPictureMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\VMLShapeMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\VMLShapeMapping.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\VMLShapeTypeMapping.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\DocDocxConverter\VMLShapeTypeMapping.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<File
 			RelativePath="..\DocFormatLib.cpp"

ASCOfficeDocFile/DocFormatLib/Win32/DocFormatLib.vcxproj

@@ -268,6 +268,7 @@
     <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\SunType.h" />
     <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\TextboxType.h" />
     <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\TrapezoidType.h" />
+    <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\Shapetypes\WordArtText.h" />
     <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\SplitMenuColorContainer.h" />
     <ClInclude Include="..\..\DocDocxConverter\OfficeDrawing\UnknownRecord.h" />
     <ClInclude Include="..\..\DocDocxConverter\OleObject.h" />