wordarts конвертация градиентной заливки

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

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -533,6 +533,11 @@ namespace DocFileFormat
 							appendValueAttribute(&m_fill, _T( "opacity" ), ( FormatUtils::IntToWideString( iter->op ) + _T( "f" ) ).c_str());
 						}
 						break;
+					case fillBackOpacity:
+						{
+							appendValueAttribute(&m_fill, _T("opacity2"), (FormatUtils::IntToWideString(iter->op) + _T("f")).c_str());
+						}
+						break;
 
 						// SHADOW
 
@@ -712,6 +717,11 @@ namespace DocFileFormat
 						std::wstring fontSize = FormatUtils::IntToWideString(iter->op/65535);
 						appendStyleProperty(&m_textPathStyle, L"font-size", fontSize + L"pt");
 					}break;
+					case gtextSpacing:
+					{
+						std::wstring spacing = FormatUtils::IntToWideString(iter->op);
+						appendStyleProperty(&m_textPathStyle, L"v-text-spacing", spacing + L"f");
+					}break;
 					case geometryTextBooleanProperties:
 					{
 						GeometryTextBooleanProperties props(iter->op);

Common/DocxFormat/Source/MathEquation/Types.h

@@ -2,7 +2,7 @@
 #define _MATH_EQUATION_TYPES_H
 
 #include <map>
-#include "../../../DesktopEditor/common/Types.h"
+#include "../../../../DesktopEditor/common/Types.h"
 
 namespace MathEquation
 {