Skip to content

O
onlyoffice_core
Commit 5465c123 authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

DocFormat - small refactoring

parent 06513ab6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3217 additions and 3225 deletions
ASCOfficeDocFile/Common/FormatUtils.h
View file @ 5465c123
...@@ -48,10 +48,8 @@ ...@@ -48,10 +48,8 @@
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
#include <windows.h> #include <windows.h>
#include <tchar.h>
#else #else
//#include "../../DesktopEditor/common/ASCVariant.h" #include <string.h>
//#include "../../Common/DocxFormat/Source/Base/ASCString.h"
#endif #endif
#include "../../DesktopEditor/common/Types.h" #include "../../DesktopEditor/common/Types.h"
...@@ -131,11 +129,11 @@ namespace DocFormatUtils ...@@ -131,11 +129,11 @@ namespace DocFormatUtils
{ {
switch(data[pos]) switch(data[pos])
{ {
case '&': buffer.append(_T("&amp;")); break; case '&': buffer.append(L"&amp;"); break;
case '\"': buffer.append(_T("&quot;")); break; case '\"': buffer.append(L"&quot;"); break;
case '\'': buffer.append(_T("&apos;")); break; case '\'': buffer.append(L"&apos;"); break;
case '<': buffer.append(_T("&lt;")); break; case '<': buffer.append(L"&lt;"); break;
case '>': buffer.append(_T("&gt;")); break; case '>': buffer.append(L"&gt;"); break;
default: default:
{ {
if ( false == IsUnicodeSymbol( data[pos] ) ) if ( false == IsUnicodeSymbol( data[pos] ) )
...@@ -163,11 +161,11 @@ namespace DocFormatUtils ...@@ -163,11 +161,11 @@ namespace DocFormatUtils
{ {
switch(data[pos]) switch(data[pos])
{ {
case '&': buffer.append(_T("&amp;")); break; case '&': buffer.append(L"&amp;"); break;
case '\"': buffer.append(_T("&quot;")); break; case '\"': buffer.append(L"&quot;"); break;
case '\'': buffer.append(_T("&apos;")); break; case '\'': buffer.append(L"&apos;"); break;
case '<': buffer.append(_T("&lt;")); break; case '<': buffer.append(L"&lt;"); break;
case '>': buffer.append(_T("&gt;")); break; case '>': buffer.append(L"&gt;"); break;
default: buffer.append(&data[pos], 1); break; default: buffer.append(&data[pos], 1); break;
} }
} }
...@@ -285,33 +283,33 @@ namespace DocFormatUtils ...@@ -285,33 +283,33 @@ namespace DocFormatUtils
switch ( c ) switch ( c )
{ {
case _T( '&' ): case L'&':
{ {
result = std::wstring( _T( "&amp;" ) ); result = std::wstring( L"&amp;" );
} }
break; break;
case _T( '<' ): case L'<':
{ {
result = std::wstring( _T( "&lt;" ) ); result = std::wstring( L"&lt;" );
} }
break; break;
case _T( '>' ): case L'>':
{ {
result = std::wstring( _T( "&gt;" ) ); result = std::wstring( L"&gt;" );
} }
break; break;
case _T( '\"' ): case L'\"':
{ {
result = std::wstring( _T( "&quot;" ) ); result = std::wstring( L"&quot;" );
} }
break; break;
case _T( '\'' ): case L'\'':
{ {
result = std::wstring( _T( "&apos;" ) ); result = std::wstring( L"&apos;" );
} }
break; break;
...@@ -768,11 +766,13 @@ namespace DocFormatUtils ...@@ -768,11 +766,13 @@ namespace DocFormatUtils
static inline std::wstring IntToWideString(int value) static inline std::wstring IntToWideString(int value)
{ {
wchar_t sVal[32]={}; #if defined(_WIN32) || defined (_WIN64)
_itow(value, sVal, 10); wchar_t buff[33] ={};
std::wstring strValue; _itow(value, buff, 10);
return std::wstring(buff);
return std::wstring(sVal); #else
return (std::to_wstring(value));
#endif
} }
static inline std::wstring DoubleToWideString(double value) static inline std::wstring DoubleToWideString(double value)
{ {
...@@ -783,17 +783,6 @@ namespace DocFormatUtils ...@@ -783,17 +783,6 @@ namespace DocFormatUtils
return std::wstring(src.str()); return std::wstring(src.str());
} }
static inline std::string IntToString(int value, int radix = 10)
{
const int size = 33;
char strValue[size];
itoa(value, strValue, radix);
return std::string(strValue);
}
static inline std::string DoubleToString(double value) static inline std::string DoubleToString(double value)
{ {
std::stringstream src; std::stringstream src;
...@@ -808,7 +797,7 @@ namespace DocFormatUtils ...@@ -808,7 +797,7 @@ namespace DocFormatUtils
std::wstring out; std::wstring out;
if ( mapArray == NULL ) if ( mapArray == NULL )
{ {
out = std::wstring( _T( "" ) ); out = std::wstring( L"" );
} }
if ( value < size1 ) if ( value < size1 )
...@@ -826,7 +815,7 @@ namespace DocFormatUtils ...@@ -826,7 +815,7 @@ namespace DocFormatUtils
{ {
// const int size = 33; // const int size = 33;
// wchar_t strValue[size] = _T( "\0" ); // wchar_t strValue[size] = L"\0";
if ( format == NULL ) return L""; if ( format == NULL ) return L"";
// swprintf_s( strValue, size, format, value ); // swprintf_s( strValue, size, format, value );
......
ASCOfficeDocFile/Common/XmlTools.h
View file @ 5465c123
...@@ -34,14 +34,9 @@ ...@@ -34,14 +34,9 @@
#include <string> #include <string>
#include <map> #include <map>
#include <list> #include <list>
//
//#if defined(_WIN32) || defined(_WIN64)
//#else
// #include "../../DesktopEditor/common/ASCVariant.h"
// #include "../../Common/DocxFormat/Source/Base/ASCString.h"
//#endif
#include "../../DesktopEditor/Common/File.h"
#include "../../DesktopEditor/common/File.h"
inline static std::wstring ReplaceString(std::wstring subject, const std::wstring& search, const std::wstring& replace) inline static std::wstring ReplaceString(std::wstring subject, const std::wstring& search, const std::wstring& replace)
{ {
...@@ -448,14 +443,21 @@ namespace XMLTools ...@@ -448,14 +443,21 @@ namespace XMLTools
{ {
m_str += strValue; m_str += strValue;
} }
void WriteInteger(int Value, int Base = 10) void WriteInteger(int Value, int Base = 10)
{ {
wchar_t str[33]={}; #if defined(_WIN32) || defined (_WIN64)
_itow(Value, str, Base); wchar_t buff[33] ={};
m_str += str; _itow(Value, buff, Base);
m_str += std::wstring(buff);
#else
m_str += std::to_wstring(Value);
#endif
} }
void WriteDouble(double Value) void WriteDouble(double Value)
{ {
#if defined(_WIN32) || defined (_WIN64)
int *dec = NULL, *sign = NULL; int *dec = NULL, *sign = NULL;
char *str = _fcvt( Value , 4, dec, sign); char *str = _fcvt( Value , 4, dec, sign);
...@@ -469,6 +471,9 @@ namespace XMLTools ...@@ -469,6 +471,9 @@ namespace XMLTools
{ {
m_str += L"0"; m_str += L"0";
} }
#else
m_str += std::to_wstring(Value);
#endif
} }
void WriteBoolean(bool Value) void WriteBoolean(bool Value)
{ {
......
ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.h
View file @ 5465c123
...@@ -61,7 +61,7 @@ namespace DocFileFormat ...@@ -61,7 +61,7 @@ namespace DocFileFormat
return m_BookmarkId; return m_BookmarkId;
} }
AnnotationReferenceDescriptor() : m_UserInitials( _T( "" ) ), m_AuthorIndex(0), m_BookmarkId(0) AnnotationReferenceDescriptor() : m_AuthorIndex(0), m_BookmarkId(0)
{ {
} }
......
ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.h
View file @ 5465c123
...@@ -46,9 +46,9 @@ namespace DocFileFormat ...@@ -46,9 +46,9 @@ namespace DocFileFormat
{ {
static const wchar_t SuperscriptIndex[3][12] = static const wchar_t SuperscriptIndex[3][12] =
{ {
_T( "baseline" ), L"baseline",
_T( "superscript" ), L"superscript",
_T( "subscript" ) L"subscript"
}; };
class CharacterPropertiesMapping: public PropertiesMapping, public IMapping class CharacterPropertiesMapping: public PropertiesMapping, public IMapping
......
ASCOfficeDocFile/DocDocxConverter/DocumentTypographyInfo.h
View file @ 5465c123
...@@ -76,16 +76,14 @@ namespace DocFileFormat ...@@ -76,16 +76,14 @@ namespace DocFileFormat
DocumentTypographyInfo(): DocumentTypographyInfo():
fKerningPunct(false), iJustification(0), iLevelOfKinsoku(0), f2on1(false), fOldDefineLineBaseOnGrid(false), fKerningPunct(false), iJustification(0), iLevelOfKinsoku(0), f2on1(false), fOldDefineLineBaseOnGrid(false),
iCustomKsu(0), fJapaneseUseLevel2(false), cchFollowingPunct(0), cchLeadingPunct(0), rgxchFPunct( _T( "" ) ), iCustomKsu(0), fJapaneseUseLevel2(false), cchFollowingPunct(0), cchLeadingPunct(0)
rgxchLPunct( _T( "" ) )
{ {
} }
/// Parses the bytes to retrieve a DocumentTypographyInfo /// Parses the bytes to retrieve a DocumentTypographyInfo
DocumentTypographyInfo( unsigned char* bytes, int size ): DocumentTypographyInfo( unsigned char* bytes, int size ):
fKerningPunct(false), iJustification(0), iLevelOfKinsoku(0), f2on1(false), fOldDefineLineBaseOnGrid(false), fKerningPunct(false), iJustification(0), iLevelOfKinsoku(0), f2on1(false), fOldDefineLineBaseOnGrid(false),
iCustomKsu(0), fJapaneseUseLevel2(false), cchFollowingPunct(0), cchLeadingPunct(0), rgxchFPunct( _T( "" ) ), iCustomKsu(0), fJapaneseUseLevel2(false), cchFollowingPunct(0), cchLeadingPunct(0)
rgxchLPunct( _T( "" ) )
{ {
if ( size == 310 ) if ( size == 310 )
{ {
......
ASCOfficeDocFile/DocDocxConverter/FontFamilyName.cpp
View file @ 5465c123
...@@ -110,13 +110,13 @@ namespace DocFileFormat ...@@ -110,13 +110,13 @@ namespace DocFileFormat
{ {
if ((int) newObject->xszFtn.at(0) < 31) //DDToneWebService.doc if ((int) newObject->xszFtn.at(0) < 31) //DDToneWebService.doc
{ {
newObject->xszFtn = _T(""); newObject->xszFtn = L"";
} }
} }
if (newObject->xszFtn.length() < 2 && szAlt < 1)//programo.doc if (newObject->xszFtn.length() < 2 && szAlt < 1)//programo.doc
{ {
newObject->xszFtn = _T("font"); newObject->xszFtn = L"font";
} }
RELEASEARRAYOBJECTS( bytes ); RELEASEARRAYOBJECTS( bytes );
......
ASCOfficeDocFile/DocDocxConverter/Global.h
View file @ 5465c123
...@@ -37,164 +37,164 @@ namespace Global ...@@ -37,164 +37,164 @@ namespace Global
{ {
static const wchar_t ColorIdentifier[17][12] = static const wchar_t ColorIdentifier[17][12] =
{ {
_T( "auto" ), L"auto",
_T( "black" ), L"black",
_T( "blue" ), L"blue",
_T( "cyan" ), L"cyan",
_T( "green" ), L"green",
_T( "magenta" ), L"magenta",
_T( "red" ), L"red",
_T( "yellow" ), L"yellow",
_T( "white" ), L"white",
_T( "darkBlue" ), L"darkBlue",
_T( "darkCyan" ), L"darkCyan",
_T( "darkGreen" ), L"darkGreen",
_T( "darkMagenta" ), L"darkMagenta",
_T( "darkRed" ), L"darkRed",
_T( "darkYellow" ), L"darkYellow",
_T( "darkGray" ), L"darkGray",
_T( "lightGray" ) L"lightGray"
}; };
static const wchar_t UnderlineCode[56][16] = static const wchar_t UnderlineCode[56][16] =
{ {
_T( "none" ), L"none",
_T( "single" ), L"single",
_T( "words" ), L"words",
_T( "double" ), L"double",
_T( "dotted" ), L"dotted",
_T( "notUsed1" ), L"notUsed1",
_T( "thick" ), L"thick",
_T( "dash" ), L"dash",
_T( "notUsed2" ), L"notUsed2",
_T( "dotDash" ), L"dotDash",
_T( "dotDotDash" ), L"dotDotDash",
_T( "wave" ), L"wave",
_T( "notUsed3" ), L"notUsed3",
_T( "notUsed4" ), L"notUsed4",
_T( "notUsed5" ), L"notUsed5",
_T( "notUsed6" ), L"notUsed6",
_T( "notUsed7" ), L"notUsed7",
_T( "notUsed8" ), L"notUsed8",
_T( "notUsed9" ), L"notUsed9",
_T( "notUsed10" ), L"notUsed10",
_T( "dottedHeavy" ), L"dottedHeavy",
_T( "notUsed11" ), L"notUsed11",
_T( "notUsed12" ), L"notUsed12",
_T( "dashedHeavy" ), L"dashedHeavy",
_T( "notUsed13" ), L"notUsed13",
_T( "dashDotHeavy" ), L"dashDotHeavy",
_T( "dashDotDotHeavy" ), L"dashDotDotHeavy",
_T( "wavyHeavy" ), L"wavyHeavy",
_T( "notUsed14" ), L"notUsed14",
_T( "notUsed15" ), L"notUsed15",
_T( "notUsed16" ), L"notUsed16",
_T( "notUsed17" ), L"notUsed17",
_T( "notUsed18" ), L"notUsed18",
_T( "notUsed19" ), L"notUsed19",
_T( "notUsed20" ), L"notUsed20",
_T( "notUsed21" ), L"notUsed21",
_T( "notUsed22" ), L"notUsed22",
_T( "notUsed23" ), L"notUsed23",
_T( "notUsed24" ), L"notUsed24",
_T( "dashLong" ), L"dashLong",
_T( "notUsed25" ), L"notUsed25",
_T( "notUsed26" ), L"notUsed26",
_T( "notUsed27" ), L"notUsed27",
_T( "wavyDouble" ), L"wavyDouble",
_T( "notUsed28" ), L"notUsed28",
_T( "notUsed29" ), L"notUsed29",
_T( "notUsed30" ), L"notUsed30",
_T( "notUsed31" ), L"notUsed31",
_T( "notUsed32" ), L"notUsed32",
_T( "notUsed33" ), L"notUsed33",
_T( "notUsed34" ), L"notUsed34",
_T( "notUsed35" ), L"notUsed35",
_T( "notUsed36" ), L"notUsed36",
_T( "notUsed37" ), L"notUsed37",
_T( "notUsed38" ), L"notUsed38",
_T( "dashLongHeavy" ) L"dashLongHeavy"
}; };
static const wchar_t TabLeader[8][11] = static const wchar_t TabLeader[8][11] =
{ {
_T( "none" ), L"none",
_T( "dot" ), L"dot",
_T( "hyphen" ), L"hyphen",
_T( "underscore" ), L"underscore",
_T( "heavy" ), L"heavy",
_T( "middleDot" ), L"middleDot",
_T( "none" ), L"none",
_T( "none" ) L"none"
}; };
static const wchar_t TabStop[7][8] = static const wchar_t TabStop[7][8] =
{ {
_T( "left" ), L"left",
_T( "center"), L"center",
_T( "right" ), L"right",
_T( "decimal" ), L"decimal",
_T( "bar" ), L"bar",
_T( "clear" ), L"clear",
_T( "num" ) L"num"
}; };
static const wchar_t TextAnimation[7][16] = static const wchar_t TextAnimation[7][16] =
{ {
_T( "none" ), L"none",
_T( "lights" ), L"lights",
_T( "blinkBackground" ), L"blinkBackground",
_T( "sparkle" ), L"sparkle",
_T( "antsBlack" ), L"antsBlack",
_T( "antsRed" ), L"antsRed",
_T( "shimmer" ) L"shimmer"
}; };
static const wchar_t JustificationCode[10][15] = static const wchar_t JustificationCode[10][15] =
{ {
_T( "start" ), L"start",
_T( "center" ), L"center",
_T( "end" ), L"end",
_T( "both" ), L"both",
_T( "distribute" ), L"distribute",
_T( "mediumKashida" ), L"mediumKashida",
_T( "numTab" ), L"numTab",
_T( "highKashida" ), L"highKashida",
_T( "lowKashida" ), L"lowKashida",
_T( "thaiDistribute" ) L"thaiDistribute"
}; };
static const wchar_t VerticalPositionCode[4][7] = static const wchar_t VerticalPositionCode[4][7] =
{ {
_T( "margin" ), L"margin",
_T( "page" ), L"page",
_T( "text" ), L"text",
_T( "none" ) L"none"
}; };
static const wchar_t HorizontalPositionCode[4][7] = static const wchar_t HorizontalPositionCode[4][7] =
{ {
_T( "text" ), L"text",
_T( "margin" ), L"margin",
_T( "page" ), L"page",
_T( "none" ) L"none"
}; };
static const wchar_t TextFrameWrapping[6][10] = static const wchar_t TextFrameWrapping[6][10] =
{ {
_T( "auto" ), L"auto",
_T( "notBeside" ), L"notBeside",
_T( "around" ), L"around",
_T( "none" ), L"none",
_T( "tight" ), L"tight",
_T( "through" ) L"through"
}; };
static const wchar_t TextFrameDropCapLocation[3][7] = static const wchar_t TextFrameDropCapLocation[3][7] =
{ {
_T( "none" ), L"none",
_T( "drop" ), L"drop",
_T( "margin" ) L"margin"
}; };
typedef enum _DashStyle typedef enum _DashStyle
...@@ -214,17 +214,17 @@ namespace Global ...@@ -214,17 +214,17 @@ namespace Global
static const wchar_t DashStyleMap[11][16] = static const wchar_t DashStyleMap[11][16] =
{ {
_T( "solid" ), L"solid",
_T( "shortdash" ), L"shortdash",
_T( "shortdot" ), L"shortdot",
_T( "shortdashdot" ), L"shortdashdot",
_T( "shortdashdotdot" ), L"shortdashdotdot",
_T( "dot" ), L"dot",
_T( "dash" ), L"dash",
_T( "longdash" ), L"longdash",
_T( "dashdot" ), L"dashdot",
_T( "longdashdot" ), L"longdashdot",
_T( "longdashdotdot" ) L"longdashdotdot"
}; };
typedef enum _TextFlow typedef enum _TextFlow
...@@ -238,12 +238,12 @@ namespace Global ...@@ -238,12 +238,12 @@ namespace Global
static const wchar_t TextFlowMap[6][6] = static const wchar_t TextFlowMap[6][6] =
{ {
_T( "lrTb" ), L"lrTb",
_T( "tbRl" ), L"tbRl",
_T( "lrTb" ),//его на самом деле нету (2.9.323 TextFlow) L"lrTb",//его на самом деле нету (2.9.323 TextFlow)
_T( "btLr" ), L"btLr",
_T( "lrTbV" ), L"lrTbV",
_T( "tbRlV" ), L"tbRlV",
}; };
typedef enum _VerticalMergeFlag typedef enum _VerticalMergeFlag
...@@ -262,9 +262,9 @@ namespace Global ...@@ -262,9 +262,9 @@ namespace Global
static const wchar_t VerticalAlignMap[3][7] = static const wchar_t VerticalAlignMap[3][7] =
{ {
_T( "top" ), L"top",
_T( "center" ), L"center",
_T( "bottom" ) L"bottom"
}; };
typedef enum _CellWidthType typedef enum _CellWidthType
...@@ -277,10 +277,10 @@ namespace Global ...@@ -277,10 +277,10 @@ namespace Global
static const wchar_t CellWidthTypeMap[4][5] = static const wchar_t CellWidthTypeMap[4][5] =
{ {
_T( "nil" ), L"nil",
_T( "auto" ), L"auto",
_T( "pct" ), L"pct",
_T( "dxa" ) L"dxa"
}; };
typedef enum _BlipUsage typedef enum _BlipUsage
......
ASCOfficeDocFile/DocDocxConverter/LanguageIdMapping.cpp
View file @ 5465c123
...@@ -65,25 +65,25 @@ namespace DocFileFormat ...@@ -65,25 +65,25 @@ namespace DocFileFormat
{ {
case Default: case Default:
{ {
att = new XMLTools::XMLAttribute<wchar_t>( _T( "w:val" ), langcode.c_str() ); att = new XMLTools::XMLAttribute<wchar_t>( L"w:val", langcode.c_str() );
} }
break; break;
case EastAsian: case EastAsian:
{ {
att = new XMLTools::XMLAttribute<wchar_t>( _T( "w:eastAsia" ), langcode.c_str() ); att = new XMLTools::XMLAttribute<wchar_t>( L"w:eastAsia", langcode.c_str() );
} }
break; break;
case Complex: case Complex:
{ {
att = new XMLTools::XMLAttribute<wchar_t>( _T( "w:bidi" ), langcode.c_str() ); att = new XMLTools::XMLAttribute<wchar_t>( L"w:bidi", langcode.c_str() );
} }
break; break;
default: default:
{ {
att = new XMLTools::XMLAttribute<wchar_t>( _T( "w:val" ), langcode.c_str() ); att = new XMLTools::XMLAttribute<wchar_t>( L"w:val", langcode.c_str() );
} }
break; break;
} }
......
ASCOfficeDocFile/DocDocxConverter/ListLevel.h
View file @ 5465c123
...@@ -46,9 +46,9 @@ namespace DocFileFormat ...@@ -46,9 +46,9 @@ namespace DocFileFormat
static const wchar_t FollowingCharMap[3][8] = static const wchar_t FollowingCharMap[3][8] =
{ {
_T( "tab" ), L"tab" ,
_T( "space" ), L"space" ,
_T( "nothing" ) L"nothing"
}; };
class ListLevel class ListLevel
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/ShapeType.h
View file @ 5465c123
...@@ -256,9 +256,9 @@ namespace DocFileFormat ...@@ -256,9 +256,9 @@ namespace DocFileFormat
static const wchar_t JoinStyleMap[3][6] = static const wchar_t JoinStyleMap[3][6] =
{ {
_T( "miter" ), L"miter" ,
_T( "round" ), L"round" ,
_T( "bevel" ) L"bevel"
}; };
class Handle class Handle
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/ArcType.h
View file @ 5465c123
...@@ -42,23 +42,23 @@ namespace DocFileFormat ...@@ -42,23 +42,23 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = round; Joins = round;
Path = _T( "wr-21600,,21600,43200,,,21600,21600nfewr-21600,,21600,43200,,,21600,21600l,21600nsxe" ); Path = L"wr-21600,,21600,43200,,,21600,21600nfewr-21600,,21600,43200,,,21600,21600l,21600nsxe";
Formulas.push_back( _T( "val #2" ) ); Formulas.push_back( L"val #2");
Formulas.push_back( _T( "val #3" ) ); Formulas.push_back( L"val #3");
Formulas.push_back( _T( "val #4" ) ); Formulas.push_back( L"val #4");
AdjustmentValues = _T( "-5898240,,,21600,21600" ); AdjustmentValues = L"-5898240,,,21600,21600";
ConnectorLocations = _T( "0,0;21600,21600;0,21600" ); ConnectorLocations = L"0,0;21600,21600;0,21600";
Handle HandleOne; Handle HandleOne;
HandleOne.position = _T( "@2,#0" ); HandleOne.position = L"@2,#0";
HandleOne.polar = _T( "@0,@1" ); HandleOne.polar = L"@0,@1";
Handles.push_back( HandleOne ); Handles.push_back( HandleOne );
Handle HandleTwo; Handle HandleTwo;
HandleOne.position = _T( "@2,#1" ); HandleOne.position = L"@2,#1";
HandleOne.polar = _T( "@0,@1" ); HandleOne.polar = L"@0,@1";
Handles.push_back( HandleTwo ); Handles.push_back( HandleTwo );
} }
}; };
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/BevelType.h
View file @ 5465c123
...@@ -42,28 +42,28 @@ namespace DocFileFormat ...@@ -42,28 +42,28 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0e"); Path = (L"m,l,21600r21600,l21600,xem@0@0nfl@0@2@1@2@1@0xem,nfl@0@0em,21600nfl@0@2em21600,21600nfl@1@2em21600,nfl@1@0e");
Formulas.push_back(_T("val #0")); Formulas.push_back((L"val #0"));
Formulas.push_back(_T("sum width 0 #0")); Formulas.push_back((L"sum width 0 #0"));
Formulas.push_back(_T("sum height 0 #0")); Formulas.push_back((L"sum height 0 #0"));
Formulas.push_back(_T("prod width 1 2")); Formulas.push_back((L"prod width 1 2"));
Formulas.push_back(_T("prod height 1 2")); Formulas.push_back((L"prod height 1 2"));
Formulas.push_back(_T("prod #0 1 2")); Formulas.push_back((L"prod #0 1 2"));
Formulas.push_back(_T("prod #0 3 2")); Formulas.push_back((L"prod #0 3 2"));
Formulas.push_back(_T("sum @1 @5 0")); Formulas.push_back((L"sum @1 @5 0"));
Formulas.push_back(_T("sum @2 @5 0")); Formulas.push_back((L"sum @2 @5 0"));
AdjustmentValues = _T("2700"); AdjustmentValues = (L"2700");
ConnectorLocations = _T("0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0"); ConnectorLocations = (L"0,@4;@0,@4;@3,21600;@3,@2;21600,@4;@1,@4;@3,0;@3,@0");
TextBoxRectangle = _T("@0,@0,@1,@2"); TextBoxRectangle = (L"@0,@0,@1,@2");
Handle one; Handle one;
one.position = _T("#0,topLeft"); one.position = (L"#0,topLeft");
one.xrange = _T("0,10800"); one.xrange = (L"0,10800");
Handles.push_back (one); Handles.push_back (one);
Limo = _T("10800,10800"); Limo = (L"10800,10800");
} }
}; };
} }
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/BlockArcType.h
View file @ 5465c123
...@@ -42,60 +42,60 @@ namespace DocFileFormat ...@@ -42,60 +42,60 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = false; ShapeConcentricFill = false;
Joins = miter; Joins = miter;
Path = _T("al10800,10800@0@0@2@14,10800,10800,10800,10800@3@15xe"); Path = (L"al10800,10800@0@0@2@14,10800,10800,10800,10800@3@15xe");
Formulas.push_back(_T("val #1")); Formulas.push_back((L"val #1"));
Formulas.push_back(_T("val #0")); Formulas.push_back((L"val #0"));
Formulas.push_back(_T("sum 0 0 #0")); Formulas.push_back((L"sum 0 0 #0"));
Formulas.push_back(_T("sumangle #0 0 180")); Formulas.push_back((L"sumangle #0 0 180"));
Formulas.push_back(_T("sumangle #0 0 90")); Formulas.push_back((L"sumangle #0 0 90"));
Formulas.push_back(_T("prod @4 2 1")); Formulas.push_back((L"prod @4 2 1"));
Formulas.push_back(_T("sumangle #0 90 0")); Formulas.push_back((L"sumangle #0 90 0"));
Formulas.push_back(_T("prod @6 2 1")); Formulas.push_back((L"prod @6 2 1"));
Formulas.push_back(_T("abs #0")); Formulas.push_back((L"abs #0"));
Formulas.push_back(_T("sumangle @8 0 90")); Formulas.push_back((L"sumangle @8 0 90"));
Formulas.push_back(_T("if @9 @7 @5")); Formulas.push_back((L"if @9 @7 @5"));
Formulas.push_back(_T("sumangle @10 0 360")); Formulas.push_back((L"sumangle @10 0 360"));
Formulas.push_back(_T("if @10 @11 @10")); Formulas.push_back((L"if @10 @11 @10"));
Formulas.push_back(_T("sumangle @12 0 360")); Formulas.push_back((L"sumangle @12 0 360"));
Formulas.push_back(_T("if @12 @13 @12")); Formulas.push_back((L"if @12 @13 @12"));
Formulas.push_back(_T("sum 0 0 @14")); Formulas.push_back((L"sum 0 0 @14"));
Formulas.push_back(_T("val 10800")); Formulas.push_back((L"val 10800"));
Formulas.push_back(_T("sum 10800 0 #1")); Formulas.push_back((L"sum 10800 0 #1"));
Formulas.push_back(_T("prod #1 1 2")); Formulas.push_back((L"prod #1 1 2"));
Formulas.push_back(_T("sum @18 5400 0")); Formulas.push_back((L"sum @18 5400 0"));
Formulas.push_back(_T("cos @19 #0")); Formulas.push_back((L"cos @19 #0"));
Formulas.push_back(_T("sin @19 #0")); Formulas.push_back((L"sin @19 #0"));
Formulas.push_back(_T("sum @20 10800 0")); Formulas.push_back((L"sum @20 10800 0"));
Formulas.push_back(_T("sum @21 10800 0")); Formulas.push_back((L"sum @21 10800 0"));
Formulas.push_back(_T("sum 10800 0 @20")); Formulas.push_back((L"sum 10800 0 @20"));
Formulas.push_back(_T("sum #1 10800 0")); Formulas.push_back((L"sum #1 10800 0"));
Formulas.push_back(_T("if @9 @17 @25")); Formulas.push_back((L"if @9 @17 @25"));
Formulas.push_back(_T("if @9 0 21600")); Formulas.push_back((L"if @9 0 21600"));
Formulas.push_back(_T("cos 10800 #0")); Formulas.push_back((L"cos 10800 #0"));
Formulas.push_back(_T("sin 10800 #0")); Formulas.push_back((L"sin 10800 #0"));
Formulas.push_back(_T("sin #1 #0")); Formulas.push_back((L"sin #1 #0"));
Formulas.push_back(_T("sum @28 10800 0")); Formulas.push_back((L"sum @28 10800 0"));
Formulas.push_back(_T("sum @29 10800 0")); Formulas.push_back((L"sum @29 10800 0"));
Formulas.push_back(_T("sum @30 10800 0")); Formulas.push_back((L"sum @30 10800 0"));
Formulas.push_back(_T("if @4 0 @31")); Formulas.push_back((L"if @4 0 @31"));
Formulas.push_back(_T("if #0 @34 0")); Formulas.push_back((L"if #0 @34 0"));
Formulas.push_back(_T("if @6 @35 @31")); Formulas.push_back((L"if @6 @35 @31"));
Formulas.push_back(_T("sum 21600 0 @36")); Formulas.push_back((L"sum 21600 0 @36"));
Formulas.push_back(_T("if @4 0 @33")); Formulas.push_back((L"if @4 0 @33"));
Formulas.push_back(_T("if #0 @38 @32")); Formulas.push_back((L"if #0 @38 @32"));
Formulas.push_back(_T("if @6 @39 0")); Formulas.push_back((L"if @6 @39 0"));
Formulas.push_back(_T("if @4 @32 21600")); Formulas.push_back((L"if @4 @32 21600"));
Formulas.push_back(_T("if @6 @41 @33")); Formulas.push_back((L"if @6 @41 @33"));
AdjustmentValues = _T("11796480,5400"); AdjustmentValues = (L"11796480,5400");
ConnectorLocations = _T("10800,@27;@22,@23;10800,@26;@24,@23"); ConnectorLocations = (L"10800,@27;@22,@23;10800,@26;@24,@23");
TextBoxRectangle = _T("@36,@40,@37,@42"); TextBoxRectangle = (L"@36,@40,@37,@42");
Handle one; Handle one;
one.position = _T("#1,#0"); one.position = (L"#1,#0");
one.polar = _T("10800,10800"); one.polar = (L"10800,10800");
one.radiusrange = _T("0,10800"); one.radiusrange = (L"0,10800");
Handles.push_back (one); Handles.push_back (one);
} }
}; };
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/CanType.h
View file @ 5465c123
...@@ -45,23 +45,23 @@ namespace DocFileFormat ...@@ -45,23 +45,23 @@ namespace DocFileFormat
this->Joins = round; this->Joins = round;
this->Path = _T( "m10800,qx0@1l0@2qy10800,21600,21600@2l21600@1qy10800,xem0@1qy10800@0,21600@1nfe" ); this->Path = L"m10800,qx0@1l0@2qy10800,21600,21600@2l21600@1qy10800,xem0@1qy10800@0,21600@1nfe";
this->Formulas.push_back( _T( "val #0" ) ); this->Formulas.push_back( L"val #0" );
this->Formulas.push_back( _T( "prod #0 1 2" ) ); this->Formulas.push_back( L"prod #0 1 2" );
this->Formulas.push_back( _T( "sum height 0 @1" ) ); this->Formulas.push_back( L"sum height 0 @1" );
this->AdjustmentValues = _T( "5400" ); this->AdjustmentValues = L"5400";
this->ConnectorLocations = _T( "10800,@0;10800,0;0,10800;10800,21600;21600,10800" ); this->ConnectorLocations = L"10800,@0;10800,0;0,10800;10800,21600;21600,10800";
this->ConnectorAngles = _T( "270,270,180,90,0" ); this->ConnectorAngles = L"270,270,180,90,0";
this->TextBoxRectangle = _T( "0,@0,21600,@2" ); this->TextBoxRectangle = L"0,@0,21600,@2";
Handle HandleOne; Handle HandleOne;
HandleOne.position = _T( "center,#0" ); HandleOne.position = L"center,#0";
HandleOne.yrange = _T( "0,10800" ); HandleOne.yrange = L"0,10800";
this->Handles.push_back( HandleOne ); this->Handles.push_back( HandleOne );
} }
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/Connector.h
View file @ 5465c123
...@@ -42,8 +42,8 @@ namespace DocFileFormat ...@@ -42,8 +42,8 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,l21600,r,21600e"); Path = L"m,l21600,r,21600e";
//AdjustmentValues = _T("10800"); //AdjustmentValues = L"10800";
Filled = true; Filled = true;
} }
...@@ -56,15 +56,15 @@ namespace DocFileFormat ...@@ -56,15 +56,15 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,l@0,0@0,21600,21600,21600e"); Path = L"m,l@0,0@0,21600,21600,21600e";
AdjustmentValues = _T("10800"); AdjustmentValues = L"10800";
Filled = true; Filled = true;
Formulas.push_back(_T("val #0")); Formulas.push_back(L"val #0");
Handle one; Handle one;
one.position = _T("#0,center"); one.position = L"#0,center";
Handles.push_back (one); Handles.push_back (one);
} }
}; };
...@@ -76,15 +76,15 @@ namespace DocFileFormat ...@@ -76,15 +76,15 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,l@0,0@0,21600,21600,21600e"); Path = L"m,l@0,0@0,21600,21600,21600e";
AdjustmentValues = _T("10800"); AdjustmentValues = L"10800";
Filled = true; Filled = true;
Formulas.push_back(_T("val #0")); Formulas.push_back(L"val #0");
Handle one; Handle one;
one.position = _T("#0,center"); one.position = L"#0,center";
Handles.push_back (one); Handles.push_back (one);
} }
}; };
...@@ -96,15 +96,15 @@ namespace DocFileFormat ...@@ -96,15 +96,15 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,l@0,0@0,21600,21600,21600e"); Path = L"m,l@0,0@0,21600,21600,21600e";
AdjustmentValues = _T("10800"); AdjustmentValues = L"10800";
Filled = true; Filled = true;
Formulas.push_back(_T("val #0")); Formulas.push_back(L"val #0");
Handle one; Handle one;
one.position = _T("#0,center"); one.position = L"#0,center";
Handles.push_back (one); Handles.push_back (one);
} }
}; };
...@@ -117,16 +117,16 @@ namespace DocFileFormat ...@@ -117,16 +117,16 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,c@0,0@1,5400@1,10800@1,16200@2,21600,21600,21600e"); Path = L"m,c@0,0@1,5400@1,10800@1,16200@2,21600,21600,21600e";
Filled = true; Filled = true;
Formulas.push_back(_T("mid #0 0")); Formulas.push_back(L"mid #0 0");
Formulas.push_back(_T("val #0")); Formulas.push_back(L"val #0");
Formulas.push_back(_T("mid #0 21600")); Formulas.push_back(L"mid #0 21600");
Handle one; Handle one;
one.position = _T("#0,center"); one.position = L"#0,center";
Handles.push_back (one); Handles.push_back (one);
} }
}; };
...@@ -137,16 +137,16 @@ namespace DocFileFormat ...@@ -137,16 +137,16 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,c@0,0@1,5400@1,10800@1,16200@2,21600,21600,21600e"); Path = L"m,c@0,0@1,5400@1,10800@1,16200@2,21600,21600,21600e";
Filled = true; Filled = true;
Formulas.push_back(_T("mid #0 0")); Formulas.push_back(L"mid #0 0");
Formulas.push_back(_T("val #0")); Formulas.push_back(L"val #0");
Formulas.push_back(_T("mid #0 21600")); Formulas.push_back(L"mid #0 21600");
Handle one; Handle one;
one.position = _T("#0,center"); one.position = L"#0,center";
Handles.push_back (one); Handles.push_back (one);
} }
}; };
...@@ -157,16 +157,16 @@ namespace DocFileFormat ...@@ -157,16 +157,16 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,c@0,0@1,5400@1,10800@1,16200@2,21600,21600,21600e"); Path = L"m,c@0,0@1,5400@1,10800@1,16200@2,21600,21600,21600e";
Filled = true; Filled = true;
Formulas.push_back(_T("mid #0 0")); Formulas.push_back(L"mid #0 0");
Formulas.push_back(_T("val #0")); Formulas.push_back(L"val #0");
Formulas.push_back(_T("mid #0 21600")); Formulas.push_back(L"mid #0 21600");
Handle one; Handle one;
one.position = _T("#0,center"); one.position = L"#0,center";
Handles.push_back (one); Handles.push_back (one);
} }
}; };
...@@ -177,16 +177,16 @@ namespace DocFileFormat ...@@ -177,16 +177,16 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,c@0,0@1,5400@1,10800@1,16200@2,21600,21600,21600e"); Path = L"m,c@0,0@1,5400@1,10800@1,16200@2,21600,21600,21600e";
Filled = true; Filled = true;
Formulas.push_back(_T("mid #0 0")); Formulas.push_back(L"mid #0 0");
Formulas.push_back(_T("val #0")); Formulas.push_back(L"val #0");
Formulas.push_back(_T("mid #0 21600")); Formulas.push_back(L"mid #0 21600");
Handle one; Handle one;
one.position = _T("#0,center"); one.position = L"#0,center";
Handles.push_back (one); Handles.push_back (one);
} }
}; };
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/CubeType.h
View file @ 5465c123
...@@ -45,31 +45,31 @@ namespace DocFileFormat ...@@ -45,31 +45,31 @@ namespace DocFileFormat
this->Joins = miter; this->Joins = miter;
this->Path = _T( "m@0,l0@0,,21600@1,21600,21600@2,21600,xem0@0nfl@1@0,21600,em@1@0nfl@1,21600e" ); this->Path = L"m@0,l0@0,,21600@1,21600,21600@2,21600,xem0@0nfl@1@0,21600,em@1@0nfl@1,21600e";
this->Formulas.push_back( _T( "val #0" ) ); this->Formulas.push_back( L"val #0");
this->Formulas.push_back( _T( "sum width 0 #0" ) ); this->Formulas.push_back( L"sum width 0 #0");
this->Formulas.push_back( _T( "sum height 0 #0" ) ); this->Formulas.push_back( L"sum height 0 #0");
this->Formulas.push_back( _T( "mid height #0" ) ); this->Formulas.push_back( L"mid height #0");
this->Formulas.push_back( _T( "prod @1 1 2" ) ); this->Formulas.push_back( L"prod @1 1 2");
this->Formulas.push_back( _T( "prod @2 1 2" ) ); this->Formulas.push_back( L"prod @2 1 2");
this->Formulas.push_back( _T( "mid width #0" ) ); this->Formulas.push_back( L"mid width #0");
this->AdjustmentValues = _T( "5400" ); this->AdjustmentValues = L"5400";
this->ConnectorLocations = _T( "@6,0;@4,@0;0,@3;@4,21600;@1,@3;21600,@5" ); this->ConnectorLocations = L"@6,0;@4,@0;0,@3;@4,21600;@1,@3;21600,@5";
this->ConnectorAngles = _T( "270,270,180,90,0,0" ); this->ConnectorAngles = L"270,270,180,90,0,0";
this->TextBoxRectangle = _T( "0,@0,@1,21600" ); this->TextBoxRectangle = L"0,@0,@1,21600";
Handle HandleOne; Handle HandleOne;
HandleOne.position = _T( "topLeft,#0" ); HandleOne.position = L"topLeft,#0";
HandleOne.switchHandle = _T( "true" ); HandleOne.switchHandle = L"true";
HandleOne.yrange = _T( "0,21600" ); HandleOne.yrange = L"0,21600";
this->Handles.push_back( HandleOne ); this->Handles.push_back( HandleOne );
this->Limo = _T( "10800,10800" ); this->Limo = L"10800,10800";
} }
virtual ~CubeType() virtual ~CubeType()
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/DiamondType.h
View file @ 5465c123
...@@ -45,11 +45,11 @@ namespace DocFileFormat ...@@ -45,11 +45,11 @@ namespace DocFileFormat
this->Joins = miter; this->Joins = miter;
this->Path = _T( "m10800,l,10800,10800,21600,21600,10800xe" ); this->Path = L"m10800,l,10800,10800,21600,21600,10800xe";
this->ConnectorLocations = _T( "Rectangle" ); this->ConnectorLocations = L"Rectangle";
this->TextBoxRectangle = _T( "5400,5400,16200,16200" ); this->TextBoxRectangle = L"5400,5400,16200,16200";
} }
virtual ~DiamondType() virtual ~DiamondType()
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/DonutType.h
View file @ 5465c123
...@@ -42,22 +42,22 @@ namespace DocFileFormat ...@@ -42,22 +42,22 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = false; ShapeConcentricFill = false;
Joins = round; Joins = round;
Path = _T("m,10800qy10800,,21600,10800,10800,21600,,10800xm@0,10800qy10800@2@1,10800,10800@0@0,10800xe"); Path = L"m,10800qy10800,,21600,10800,10800,21600,,10800xm@0,10800qy10800@2@1,10800,10800@0@0,10800xe";
Formulas.push_back(_T("val #0" ) ); Formulas.push_back(L"val #0" ) ;
Formulas.push_back(_T("sum width 0 #0" ) ); Formulas.push_back(L"sum width 0 #0" ) ;
Formulas.push_back(_T("sum height 0 #0" ) ); Formulas.push_back(L"sum height 0 #0" );
Formulas.push_back(_T("prod @0 2929 10000" ) ); Formulas.push_back(L"prod @0 2929 10000" );
Formulas.push_back(_T("sum width 0 @3" ) ); Formulas.push_back(L"sum width 0 @3" ) ;
Formulas.push_back(_T("sum height 0 @3" ) ); Formulas.push_back(L"sum height 0 @3" );
AdjustmentValues = _T("5400"); AdjustmentValues = L"5400";
ConnectorLocations = _T("10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163"); ConnectorLocations = L"10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163";
TextBoxRectangle = _T("3163,3163,18437,18437"); TextBoxRectangle = L"3163,3163,18437,18437";
Handle HandleOne; Handle HandleOne;
HandleOne.position = _T("#0,center"); HandleOne.position = L"#0,center";
HandleOne.xrange = _T("0,10800"); HandleOne.xrange = L"0,10800";
Handles.push_back(HandleOne); Handles.push_back(HandleOne);
} }
}; };
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/FoldedCornerlType.h
View file @ 5465c123
...@@ -42,29 +42,29 @@ namespace DocFileFormat ...@@ -42,29 +42,29 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T( "m,l,21600@0,21600,21600@0,21600,xem@0,21600nfl@3@5c@7@9@11@13,21600@0e" ); Path = L"m,l,21600@0,21600,21600@0,21600,xem@0,21600nfl@3@5c@7@9@11@13,21600@0e";
Formulas.push_back(_T( "val #0" )); Formulas.push_back(L"val #0");
Formulas.push_back(_T( "sum 21600 0 @0" )); Formulas.push_back(L"sum 21600 0 @0");
Formulas.push_back(_T( "prod @1 8481 32768" )); Formulas.push_back(L"prod @1 8481 32768");
Formulas.push_back(_T( "sum @2 @0 0" )); Formulas.push_back(L"sum @2 @0 0");
Formulas.push_back(_T( "prod @1 1117 32768" )); Formulas.push_back(L"prod @1 1117 32768");
Formulas.push_back(_T( "sum @4 @0 0" )); Formulas.push_back(L"sum @4 @0 0");
Formulas.push_back(_T( "prod @1 11764 32768" )); Formulas.push_back(L"prod @1 11764 32768");
Formulas.push_back(_T( "sum @6 @0 0" )); Formulas.push_back(L"sum @6 @0 0");
Formulas.push_back(_T( "prod @1 6144 32768" )); Formulas.push_back(L"prod @1 6144 32768");
Formulas.push_back(_T( "sum @8 @0 0" )); Formulas.push_back(L"sum @8 @0 0");
Formulas.push_back(_T( "prod @1 20480 32768" )); Formulas.push_back(L"prod @1 20480 32768");
Formulas.push_back(_T( "sum @10 @0 0" )); Formulas.push_back(L"sum @10 @0 0");
Formulas.push_back(_T( "prod @1 6144 32768" )); Formulas.push_back(L"prod @1 6144 32768");
Formulas.push_back(_T( "sum @12 @0 0" )); Formulas.push_back(L"sum @12 @0 0");
AdjustmentValues = _T( "18900" ); AdjustmentValues = L"18900";
TextBoxRectangle = _T( "0,0,21600,@13" ); TextBoxRectangle = L"0,0,21600,@13";
Handle one; Handle one;
one.position = _T("#0,bottomRight"); one.position = L"#0,bottomRight";
one.xrange = _T("10800,21600"); one.xrange = L"10800,21600";
Handles.push_back (one); Handles.push_back (one);
} }
}; };
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/HeartType.h
View file @ 5465c123
...@@ -42,12 +42,12 @@ namespace DocFileFormat ...@@ -42,12 +42,12 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T( "m10860,2187c10451,1746,9529,1018,9015,730,7865,152,6685,,5415,,4175,152,2995,575,1967,1305,1150,2187,575,3222,242,4220,,5410,242,6560,575,7597l10860,21600,20995,7597v485,-1037,605,-2187,485,-3377c21115,3222,20420,2187,19632,1305,18575,575,17425,152,16275,,15005,,13735,152,12705,730v-529,288,-1451,1016,-1845,1457xe" ); Path = (L"m10860,2187c10451,1746,9529,1018,9015,730,7865,152,6685,,5415,,4175,152,2995,575,1967,1305,1150,2187,575,3222,242,4220,,5410,242,6560,575,7597l10860,21600,20995,7597v485,-1037,605,-2187,485,-3377c21115,3222,20420,2187,19632,1305,18575,575,17425,152,16275,,15005,,13735,152,12705,730v-529,288,-1451,1016,-1845,1457xe" );
AdjustmentValues = _T( "21600" ); AdjustmentValues = (L"21600" );
ConnectorLocations = _T( "10860,2187;2928,10800;10860,21600;18672,10800" ); ConnectorLocations = (L"10860,2187;2928,10800;10860,21600;18672,10800" );
ConnectorAngles = _T( "270,180,90,0" ); ConnectorAngles = (L"270,180,90,0" );
TextBoxRectangle = _T( "5037,2277,16557,13677" ); TextBoxRectangle = (L"5037,2277,16557,13677" );
} }
}; };
} }
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/HexagonType.h
View file @ 5465c123
...@@ -45,24 +45,24 @@ namespace DocFileFormat ...@@ -45,24 +45,24 @@ namespace DocFileFormat
this->Joins = miter; this->Joins = miter;
this->Path = _T( "m@0,l,10800@0,21600@1,21600,21600,10800@1,xe" ); this->Path = L"m@0,l,10800@0,21600@1,21600,21600,10800@1,xe";
this->Formulas.push_back( _T( "val #0" ) ); this->Formulas.push_back( L"val #0");
this->Formulas.push_back( _T( "sum width 0 #0" ) ); this->Formulas.push_back( L"sum width 0 #0");
this->Formulas.push_back( _T( "sum height 0 #0" ) ); this->Formulas.push_back( L"sum height 0 #0");
this->Formulas.push_back( _T( "prod @0 2929 10000" ) ); this->Formulas.push_back( L"prod @0 2929 10000");
this->Formulas.push_back( _T( "sum width 0 @3" ) ); this->Formulas.push_back( L"sum width 0 @3");
this->Formulas.push_back( _T( "sum height 0 @3" ) ); this->Formulas.push_back( L"sum height 0 @3");
this->AdjustmentValues = _T( "5400" ); this->AdjustmentValues = L"5400";
this->ConnectorLocations = _T( "Rectangle" ); this->ConnectorLocations = L"Rectangle";
this->TextBoxRectangle = _T( "1800,1800,19800,19800;3600,3600,18000,18000;6300,6300,15300,15300" ); this->TextBoxRectangle = L"1800,1800,19800,19800;3600,3600,18000,18000;6300,6300,15300,15300";
Handle HandleOne; Handle HandleOne;
HandleOne.position = _T( "#0,topLeft" ); HandleOne.position = L"#0,topLeft";
HandleOne.xrange = _T( "0,10800" ); HandleOne.xrange = L"0,10800";
Handles.push_back( HandleOne ); Handles.push_back( HandleOne );
} }
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/IsoscelesTriangleType.h
View file @ 5465c123
...@@ -44,21 +44,21 @@ namespace DocFileFormat ...@@ -44,21 +44,21 @@ namespace DocFileFormat
this->ShapeConcentricFill = true; this->ShapeConcentricFill = true;
this->Joins = miter; this->Joins = miter;
this->Path = _T( "m@0,l,21600r21600,xe" ); this->Path = L"m@0,l,21600r21600,xe" ;
this->Formulas.push_back( _T( "val #0" ) ); this->Formulas.push_back( L"val #0" );
this->Formulas.push_back( _T( "prod #0 1 2" ) ); this->Formulas.push_back( L"prod #0 1 2" );
this->Formulas.push_back( _T( "sum @1 10800 0") ); this->Formulas.push_back( L"sum @1 10800 0");
this->AdjustmentValues = _T( "10800" ); this->AdjustmentValues = L"10800" ;
this->ConnectorLocations = _T( "@0,0;@1,10800;0,21600;10800,21600;21600,21600;@2,10800" ); this->ConnectorLocations = L"@0,0;@1,10800;0,21600;10800,21600;21600,21600;@2,10800";
this->TextBoxRectangle = _T( "0,10800,10800,18000;5400,10800,16200,18000;10800,10800,21600,18000;0,7200,7200,21600;7200,7200,14400,21600;14400,7200,21600,21600" ); this->TextBoxRectangle = L"0,10800,10800,18000;5400,10800,16200,18000;10800,10800,21600,18000;0,7200,7200,21600;7200,7200,14400,21600;14400,7200,21600,21600";
Handle HandleOne; Handle HandleOne;
HandleOne.position = _T( "#0,topLeft" ); HandleOne.position = L"#0,topLeft";
HandleOne.xrange = _T( "0,21600" ); HandleOne.xrange = L"0,21600";
this->Handles.push_back( HandleOne ); this->Handles.push_back( HandleOne );
} }
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/LightningBoltType.h
View file @ 5465c123
...@@ -42,12 +42,12 @@ namespace DocFileFormat ...@@ -42,12 +42,12 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m8472,l,3890,7602,8382,5022,9705r7200,4192l10012,14915r11588,6685l14767,12877r1810,-870l11050,6797r1810,-717xe"); Path = L"m8472,l,3890,7602,8382,5022,9705r7200,4192l10012,14915r11588,6685l14767,12877r1810,-870l11050,6797r1810,-717xe";
//AdjustmentValues = _T("2700" ); //AdjustmentValues = L"2700" );
ConnectorLocations = _T("8472,0;0,3890;5022,9705;10012,14915;21600,21600;16577,12007;12860,6080"); ConnectorLocations = L"8472,0;0,3890;5022,9705;10012,14915;21600,21600;16577,12007;12860,6080";
ConnectorAngles = _T("270,270,180,180,90,0,0"); ConnectorAngles = L"270,270,180,180,90,0,0";
TextBoxRectangle = _T("8757,7437,13917,14277"); TextBoxRectangle = L"8757,7437,13917,14277";
} }
}; };
} }
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/MoonType.h
View file @ 5465c123
...@@ -42,34 +42,34 @@ namespace DocFileFormat ...@@ -42,34 +42,34 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m21600,qx,10800,21600,21600wa@0@10@6@11,21600,21600,21600,xe"); Path = (L"m21600,qx,10800,21600,21600wa@0@10@6@11,21600,21600,21600,xe");
Formulas.push_back(_T("val #0")); Formulas.push_back((L"val #0"));
Formulas.push_back(_T("sum 21600 0 #0")); Formulas.push_back((L"sum 21600 0 #0"));
Formulas.push_back(_T("prod #0 #0 @1")); Formulas.push_back((L"prod #0 #0 @1"));
Formulas.push_back(_T("prod 21600 21600 @1")); Formulas.push_back((L"prod 21600 21600 @1"));
Formulas.push_back(_T("prod @3 2 1")); Formulas.push_back((L"prod @3 2 1"));
Formulas.push_back(_T("sum @4 0 @2")); Formulas.push_back((L"sum @4 0 @2"));
Formulas.push_back(_T("sum @5 0 #0")); Formulas.push_back((L"sum @5 0 #0"));
Formulas.push_back(_T("prod @5 1 2")); Formulas.push_back((L"prod @5 1 2"));
Formulas.push_back(_T("sum @7 0 #0")); Formulas.push_back((L"sum @7 0 #0"));
Formulas.push_back(_T("prod @8 1 2")); Formulas.push_back((L"prod @8 1 2"));
Formulas.push_back(_T("sum 10800 0 @9")); Formulas.push_back((L"sum 10800 0 @9"));
Formulas.push_back(_T("sum @9 10800 0")); Formulas.push_back((L"sum @9 10800 0"));
Formulas.push_back(_T("prod #0 9598 32768")); Formulas.push_back((L"prod #0 9598 32768"));
Formulas.push_back(_T("sum 21600 0 @12")); Formulas.push_back((L"sum 21600 0 @12"));
Formulas.push_back(_T("ellipse @13 21600 10800")); Formulas.push_back((L"ellipse @13 21600 10800"));
Formulas.push_back(_T("sum 10800 0 @14")); Formulas.push_back((L"sum 10800 0 @14"));
Formulas.push_back(_T("sum @14 10800 0")); Formulas.push_back((L"sum @14 10800 0"));
AdjustmentValues = _T("10800"); AdjustmentValues = (L"10800");
ConnectorLocations = _T("21600,0;0,10800;21600,21600;@0,10800"); ConnectorLocations = (L"21600,0;0,10800;21600,21600;@0,10800");
ConnectorAngles = _T("270,180,90,0"); ConnectorAngles = (L"270,180,90,0");
TextBoxRectangle = _T("@12,@15,@0,@16"); TextBoxRectangle = (L"@12,@15,@0,@16");
Handle one; Handle one;
one.position = _T("#0,center"); one.position = (L"#0,center");
one.xrange = _T("0,18900"); one.xrange = (L"0,18900");
Handles.push_back (one); Handles.push_back (one);
} }
}; };
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/NoSmokingType.h
View file @ 5465c123
...@@ -42,33 +42,33 @@ namespace DocFileFormat ...@@ -42,33 +42,33 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,10800qy10800,,21600,10800,10800,21600,,10800xar@0@0@16@16@12@14@15@13xar@0@0@16@16@13@15@14@12xe"); Path = (L"m,10800qy10800,,21600,10800,10800,21600,,10800xar@0@0@16@16@12@14@15@13xar@0@0@16@16@13@15@14@12xe");
Formulas.push_back(_T( "val #0" )); Formulas.push_back((L"val #0" ));
Formulas.push_back(_T( "prod @0 2 1" )); Formulas.push_back((L"prod @0 2 1" ));
Formulas.push_back(_T( "sum 21600 0 @1" )); Formulas.push_back((L"sum 21600 0 @1" ));
Formulas.push_back(_T( "prod @2 @2 1" )); Formulas.push_back((L"prod @2 @2 1" ));
Formulas.push_back(_T( "prod @0 @0 1" )); Formulas.push_back((L"prod @0 @0 1" ));
Formulas.push_back(_T( "sum @3 0 @4" )); Formulas.push_back((L"sum @3 0 @4" ));
Formulas.push_back(_T( "prod @5 1 8" )); Formulas.push_back((L"prod @5 1 8" ));
Formulas.push_back(_T( "sqrt @6" )); Formulas.push_back((L"sqrt @6" ));
Formulas.push_back(_T( "prod @4 1 8" )); Formulas.push_back((L"prod @4 1 8" ));
Formulas.push_back(_T( "sqrt @8" )); Formulas.push_back((L"sqrt @8" ));
Formulas.push_back(_T( "sum @7 @9 0" )); Formulas.push_back((L"sum @7 @9 0" ));
Formulas.push_back(_T( "sum @7 0 @9" )); Formulas.push_back((L"sum @7 0 @9" ));
Formulas.push_back(_T( "sum @10 10800 0" )); Formulas.push_back((L"sum @10 10800 0" ));
Formulas.push_back(_T( "sum 10800 0 @10" )); Formulas.push_back((L"sum 10800 0 @10" ));
Formulas.push_back(_T( "sum @11 10800 0" )); Formulas.push_back((L"sum @11 10800 0" ));
Formulas.push_back(_T( "sum 10800 0 @11" )); Formulas.push_back((L"sum 10800 0 @11" ));
Formulas.push_back(_T( "sum 21600 0 @0" )); Formulas.push_back((L"sum 21600 0 @0" ));
AdjustmentValues = _T( "2700" ); AdjustmentValues = (L"2700" );
ConnectorLocations = _T( "10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163" ); ConnectorLocations = (L"10800,0;3163,3163;0,10800;3163,18437;10800,21600;18437,18437;21600,10800;18437,3163" );
TextBoxRectangle = _T( "3163,3163,18437,18437" ); TextBoxRectangle = (L"3163,3163,18437,18437" );
Handle one; Handle one;
one.position = _T("#0,center"); one.position = L"#0,center";
one.xrange = _T("0,7200"); one.xrange = L"0,7200";
Handles.push_back (one); Handles.push_back (one);
} }
}; };
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/OctagonType.h
View file @ 5465c123
...@@ -45,32 +45,32 @@ namespace DocFileFormat ...@@ -45,32 +45,32 @@ namespace DocFileFormat
this->Joins = miter; this->Joins = miter;
this->Path = _T( "m@0,l0@0,0@2@0,21600@1,21600,21600@2,21600@0@1,xe" ); this->Path = L"m@0,l0@0,0@2@0,21600@1,21600,21600@2,21600@0@1,xe";
this->Formulas.push_back( _T( "val #0" ) ); this->Formulas.push_back( L"val #0");
this->Formulas.push_back( _T( "sum width 0 #0" ) ); this->Formulas.push_back( L"sum width 0 #0");
this->Formulas.push_back( _T( "sum height 0 #0" ) ); this->Formulas.push_back( L"sum height 0 #0");
this->Formulas.push_back( _T( "prod @0 2929 10000" ) ); this->Formulas.push_back( L"prod @0 2929 10000");
this->Formulas.push_back( _T( "sum width 0 @3" ) ); this->Formulas.push_back( L"sum width 0 @3");
this->Formulas.push_back( _T( "sum height 0 @3" ) ); this->Formulas.push_back( L"sum height 0 @3");
this->Formulas.push_back( _T( "val width" ) ); this->Formulas.push_back( L"val width");
this->Formulas.push_back( _T( "val height" ) ); this->Formulas.push_back( L"val height");
this->Formulas.push_back( _T( "prod width 1 2" ) ); this->Formulas.push_back( L"prod width 1 2");
this->Formulas.push_back( _T( "prod height 1 2" ) ); this->Formulas.push_back( L"prod height 1 2");
this->AdjustmentValues = _T( "6326" ); this->AdjustmentValues = L"6326";
this->ConnectorLocations = _T( "@8,0;0,@9;@8,@7;@6,@9" ); this->ConnectorLocations = L"@8,0;0,@9;@8,@7;@6,@9";
this->TextBoxRectangle = _T( "0,0,21600,21600;2700,2700,18900,18900;5400,5400,16200,16200" ); this->TextBoxRectangle = L"0,0,21600,21600;2700,2700,18900,18900;5400,5400,16200,16200";
Handle HandleOne; Handle HandleOne;
HandleOne.position = _T( "#0,topLeft" ); HandleOne.position = L"#0,topLeft";
HandleOne.switchHandle = _T( "true" ); HandleOne.switchHandle = L"true";
HandleOne.xrange = _T( "0,10800" ); HandleOne.xrange = L"0,10800";
this->Handles.push_back( HandleOne ); this->Handles.push_back( HandleOne );
this->Limo = _T( "10800,10800" ); this->Limo = L"10800,10800";
} }
virtual ~OctagonType() virtual ~OctagonType()
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/ParallelogramType.h
View file @ 5465c123
...@@ -45,31 +45,31 @@ namespace DocFileFormat ...@@ -45,31 +45,31 @@ namespace DocFileFormat
this->Joins = miter; this->Joins = miter;
this->Path = _T( "m@0,l,21600@1,21600,21600,xe" ); this->Path = L"m@0,l,21600@1,21600,21600,xe";
this->Formulas.push_back( _T( "val #0" ) ); this->Formulas.push_back( L"val #0");
this->Formulas.push_back( _T( "sum width 0 #0" ) ); this->Formulas.push_back( L"sum width 0 #0");
this->Formulas.push_back( _T( "prod #0 1 2" ) ); this->Formulas.push_back( L"prod #0 1 2");
this->Formulas.push_back( _T( "sum width 0 @2" ) ); this->Formulas.push_back( L"sum width 0 @2");
this->Formulas.push_back( _T( "mid #0 width" ) ); this->Formulas.push_back( L"mid #0 width");
this->Formulas.push_back( _T( "mid @1 0" ) ); this->Formulas.push_back( L"mid @1 0");
this->Formulas.push_back( _T( "prod height width #0" ) ); this->Formulas.push_back( L"prod height width #0");
this->Formulas.push_back( _T( "prod @6 1 2" ) ); this->Formulas.push_back( L"prod @6 1 2");
this->Formulas.push_back( _T( "sum height 0 @7" ) ); this->Formulas.push_back( L"sum height 0 @7");
this->Formulas.push_back( _T( "prod width 1 2" ) ); this->Formulas.push_back( L"prod width 1 2");
this->Formulas.push_back( _T( "sum #0 0 @9" ) ); this->Formulas.push_back( L"sum #0 0 @9");
this->Formulas.push_back( _T( "if @10 @8 0") ); this->Formulas.push_back( L"if @10 @8 0");
this->Formulas.push_back( _T( "if @10 @7 height" ) ); this->Formulas.push_back( L"if @10 @7 height");
this->AdjustmentValues = _T( "5400" ); this->AdjustmentValues = L"5400";
this->ConnectorLocations = _T( "@4,0;10800,@11;@3,10800;@5,21600;10800,@12;@2,10800" ); this->ConnectorLocations = L"@4,0;10800,@11;@3,10800;@5,21600;10800,@12;@2,10800";
this->TextBoxRectangle = _T( "1800,1800,19800,19800;8100,8100,13500,13500;10800,10800,10800,10800" ); this->TextBoxRectangle = L"1800,1800,19800,19800;8100,8100,13500,13500;10800,10800,10800,10800";
Handle HandleOne; Handle HandleOne;
HandleOne.position = _T( "#0,topLeft" ); HandleOne.position = L"#0,topLeft";
HandleOne.xrange = _T( "0,21600" ); HandleOne.xrange = L"0,21600";
this->Handles.push_back( HandleOne ); this->Handles.push_back( HandleOne );
} }
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/PentagonType.h
View file @ 5465c123
...@@ -42,11 +42,11 @@ namespace DocFileFormat ...@@ -42,11 +42,11 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m10800,l,8259,4200,21600r13200,l21600,8259xe"); Path = L"m10800,l,8259,4200,21600r13200,l21600,8259xe";
ConnectorLocations = _T( "10800,0;0,8259;4200,21600;10800,21600;17400,21600;21600,8259" ); ConnectorLocations = L"10800,0;0,8259;4200,21600;10800,21600;17400,21600;21600,8259";
ConnectorAngles = _T( "270,180,90,90,90,0" ); ConnectorAngles = L"270,180,90,90,90,0" ;
TextBoxRectangle = _T( "4200,5077,17400,21600" ); TextBoxRectangle = L"4200,5077,17400,21600";
} }
virtual ~PentagonType() virtual ~PentagonType()
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/PlaqueType.h
View file @ 5465c123
...@@ -43,29 +43,29 @@ namespace DocFileFormat ...@@ -43,29 +43,29 @@ namespace DocFileFormat
{ {
this->ShapeConcentricFill = true; this->ShapeConcentricFill = true;
this->Joins = miter; this->Joins = miter;
this->Path = _T( "m@0,qy0@0l0@2qx@0,21600l@1,21600qy21600@2l21600@0qx@1,xe" ); this->Path = L"m@0,qy0@0l0@2qx@0,21600l@1,21600qy21600@2l21600@0qx@1,xe";
this->Formulas.push_back( _T( "val #0" ) ); this->Formulas.push_back( L"val #0");
this->Formulas.push_back( _T( "sum width 0 #0" ) ); this->Formulas.push_back( L"sum width 0 #0");
this->Formulas.push_back( _T( "sum height 0 #0" ) ); this->Formulas.push_back( L"sum height 0 #0");
this->Formulas.push_back( _T( "prod @0 7071 10000" ) ); this->Formulas.push_back( L"prod @0 7071 10000");
this->Formulas.push_back( _T( "sum width 0 @3" ) ); this->Formulas.push_back( L"sum width 0 @3");
this->Formulas.push_back( _T( "sum height 0 @3" ) ); this->Formulas.push_back( L"sum height 0 @3");
this->Formulas.push_back( _T( "val width" ) ); this->Formulas.push_back( L"val width");
this->Formulas.push_back( _T( "val height" ) ); this->Formulas.push_back( L"val height");
this->Formulas.push_back( _T( "prod width 1 2" ) ); this->Formulas.push_back( L"prod width 1 2");
this->Formulas.push_back( _T( "prod height 1 2" ) ); this->Formulas.push_back( L"prod height 1 2");
this->AdjustmentValues = _T( "3600" ); this->AdjustmentValues = L"3600";
this->ConnectorLocations = _T( "@8,0;0,@9;@8,@7;@6,@9" ); this->ConnectorLocations = L"@8,0;0,@9;@8,@7;@6,@9";
this->TextBoxRectangle = _T( "@3,@3,@4,@5" ); this->TextBoxRectangle = L"@3,@3,@4,@5";
Handle HandleOne; Handle HandleOne;
HandleOne.position = _T( "#0,topLeft" ); HandleOne.position = L"#0,topLeft";
HandleOne.switchHandle = _T( "true" ); HandleOne.switchHandle = L"true";
HandleOne.xrange = _T( "0,10800" ); HandleOne.xrange = L"0,10800";
this->Handles.push_back( HandleOne ); this->Handles.push_back( HandleOne );
this->Limo = _T( "10800,10800" ); this->Limo = L"10800,10800";
} }
virtual ~PlaqueType() virtual ~PlaqueType()
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/PlusType.h
View file @ 5465c123
...@@ -45,32 +45,32 @@ namespace DocFileFormat ...@@ -45,32 +45,32 @@ namespace DocFileFormat
this->Joins = miter; this->Joins = miter;
this->Path = _T( "m@0,l@0@0,0@0,0@2@0@2@0,21600@1,21600@1@2,21600@2,21600@0@1@0@1,xe" ); this->Path = L"m@0,l@0@0,0@0,0@2@0@2@0,21600@1,21600@1@2,21600@2,21600@0@1@0@1,xe";
this->Formulas.push_back( _T( "val #0" ) ); this->Formulas.push_back( L"val #0" );
this->Formulas.push_back( _T( "sum width 0 #0" ) ); this->Formulas.push_back( L"sum width 0 #0" );
this->Formulas.push_back( _T( "sum height 0 #0" ) ); this->Formulas.push_back( L"sum height 0 #0" );
this->Formulas.push_back( _T( "prod @0 2929 10000" ) ); this->Formulas.push_back( L"prod @0 2929 10000" );
this->Formulas.push_back( _T( "sum width 0 @3" ) ); this->Formulas.push_back( L"sum width 0 @3" );
this->Formulas.push_back( _T( "sum height 0 @3" ) ); this->Formulas.push_back( L"sum height 0 @3" );
this->Formulas.push_back( _T( "val width" ) ); this->Formulas.push_back( L"val width" );
this->Formulas.push_back( _T( "val height" ) ); this->Formulas.push_back( L"val height" );
this->Formulas.push_back( _T( "prod width 1 2" ) ); this->Formulas.push_back( L"prod width 1 2" );
this->Formulas.push_back( _T( "prod height 1 2" ) ); this->Formulas.push_back( L"prod height 1 2" );
this->AdjustmentValues = _T( "5400" ); this->AdjustmentValues = L"5400";
this->ConnectorLocations = _T( "@8,0;0,@9;@8,@7;@6,@9" ); this->ConnectorLocations = L"@8,0;0,@9;@8,@7;@6,@9";
this->TextBoxRectangle = _T( "0,0,21600,21600;5400,5400,16200,16200;10800,10800,10800,10800" ); this->TextBoxRectangle = L"0,0,21600,21600;5400,5400,16200,16200;10800,10800,10800,10800";
Handle HandleOne; Handle HandleOne;
HandleOne.position = _T( "#0,topLeft" ); HandleOne.position = L"#0,topLeft";
HandleOne.switchHandle = _T( "true" ); HandleOne.switchHandle = L"true";
HandleOne.xrange = _T( "0,10800" ); HandleOne.xrange = L"0,10800";
this->Handles.push_back( HandleOne ); this->Handles.push_back( HandleOne );
this->Limo = _T( "10800,10800" ); this->Limo = L"10800,10800";
} }
virtual ~PlusType() virtual ~PlusType()
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/RectangleType.h
View file @ 5465c123
...@@ -45,7 +45,7 @@ namespace DocFileFormat ...@@ -45,7 +45,7 @@ namespace DocFileFormat
this->Joins = miter; this->Joins = miter;
this->Path = _T( "m,l,21600r21600,l21600,xe" ); this->Path = L"m,l,21600r21600,l21600,xe";
} }
virtual ~RectangleType() virtual ~RectangleType()
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/RightTriangleType.h
View file @ 5465c123
...@@ -45,11 +45,11 @@ namespace DocFileFormat ...@@ -45,11 +45,11 @@ namespace DocFileFormat
this->Joins = miter; this->Joins = miter;
this->Path = _T( "m,l,21600r21600,xe" ); this->Path = L"m,l,21600r21600,xe";
this->ConnectorLocations = _T( "0,0;0,10800;0,21600;10800,21600;21600,21600;10800,10800" ); this->ConnectorLocations = L"0,0;0,10800;0,21600;10800,21600;21600,21600;10800,10800";
this->TextBoxRectangle = _T( "1800,12600,12600,19800" ); this->TextBoxRectangle = L"1800,12600,12600,19800";
} }
virtual ~RightTriangleType() virtual ~RightTriangleType()
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/RoundedRectangleType.h
View file @ 5465c123
...@@ -42,7 +42,7 @@ namespace DocFileFormat ...@@ -42,7 +42,7 @@ namespace DocFileFormat
{ {
TypeCode = msosptRoundRectangle; TypeCode = msosptRoundRectangle;
Joins = round; Joins = round;
AdjustmentValues = _T( "5400" ); AdjustmentValues = L"5400";
} }
virtual ~RoundedRectangleType() virtual ~RoundedRectangleType()
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/Shapetypes/TextboxType.h
View file @ 5465c123
...@@ -42,7 +42,7 @@ namespace DocFileFormat ...@@ -42,7 +42,7 @@ namespace DocFileFormat
{ {
ShapeConcentricFill = true; ShapeConcentricFill = true;
Joins = miter; Joins = miter;
Path = _T("m,l,21600r21600,l21600,xe"); Path = L"m,l,21600r21600,l21600,xe";
} }
......
DesktopEditor/common/Directory.h
View file @ 5465c123
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7