Skip to content

O
onlyoffice_core
Commit 02ce0535 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

XlsFormat - переобернут в неймспейсы 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68426 954022d7-b5bf-4e40-9824-e11837661b57
parent a757aac2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 630 additions and 271 deletions
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/CRN.h
View file @ 02ce0535
......@@ -28,14 +28,6 @@ public:
BIFF_BYTE colFirst;
BIFF_WORD row;
BiffStructurePtrVector crnOper;
public:
//BO_ATTRIB_MARKUP_BEGIN
//BO_ATTRIB_MARKUP_ATTRIB(colLast)
//BO_ATTRIB_MARKUP_ATTRIB(colFirst)
//BO_ATTRIB_MARKUP_ATTRIB(row)
////BO_ATTRIB_MARKUP_VECTOR_COMPLEX(crnOper, SerAr) // Temporarily commented to avoid compilation errors
//BO_ATTRIB_MARKUP_END
};
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ColInfo.h
View file @ 02ce0535
......@@ -23,10 +23,10 @@ public:
static const ElementType type = typeColInfo;
//-----------------------------
Col256U colFirst;
Col256U colLast;
BIFF_WORD coldx;
IXFCell ixfe;
Col256U colFirst;
Col256U colLast;
BIFF_WORD coldx;
IXFCell ixfe;
bool fHidden;
bool fUserSet;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp
View file @ 02ce0535
......@@ -265,7 +265,7 @@ int Font::serialize_rPr(std::wostream & stream, bool rtl, bool defRPr, std::wstr
}
int Font::serialize_properties(std::wostream & stream, bool rPr)
int Font::serialize_properties(std::wostream & stream, bool isRPr)
{
CP_XML_WRITER(stream)
{
......@@ -347,7 +347,7 @@ int Font::serialize_properties(std::wostream & stream, bool rPr)
if (!fontName.value().empty())
{
if (rPr)
if (isRPr)
{
CP_XML_NODE(L"rFont")
{
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TxO.cpp
View file @ 02ce0535
......@@ -113,6 +113,7 @@ int TxO::serialize (std::wostream & _stream)
CP_XML_NODE(namespace_ + L"r")
{
Fmt = run->formatRun.ifnt;
serialize_rPr(CP_XML_STREAM(), Fmt, namespace_);
CP_XML_NODE(namespace_ + L"t")
......@@ -145,7 +146,20 @@ int TxO::serialize_rPr (std::wostream & _stream, int iFmt, std::wstring namespac
Font * font = dynamic_cast<Font*>(pGlobalWorkbookInfoPtr->m_arFonts->at(iFmt-1).get());
if (font) font->serialize_rPr(_stream, false, false, namespace_);
if (!font) return 0;
if (namespace_.empty())
{
CP_XML_WRITER(_stream)
{
CP_XML_NODE( L"rPr")
{
font->serialize_properties(CP_XML_STREAM(), true);
}
}
}
else
font->serialize_rPr(_stream, false, false, namespace_);
return 0;
}
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h
View file @ 02ce0535
......@@ -16,8 +16,6 @@ namespace XLS
{
typedef BiffAttributeSimple<_UINT32> RwLongU;
typedef BiffAttributeSimple<unsigned short> ColU;
typedef BiffAttributeSimple<unsigned short> Col256U;
typedef BiffAttributeSimple<unsigned short> IXFCell;
typedef BiffAttributeSimple<unsigned short> Rw;
typedef BiffAttributeSimple<unsigned short> Col;
......@@ -28,6 +26,8 @@ typedef BiffAttributeSimple<_INT16> Col_NegativeOne;
typedef BiffAttributeSimple<unsigned short> R_RwU; // Special version for use as a record attribute
typedef BiffAttributeSimple<unsigned short> IFmt;
typedef BiffAttributeSimple<unsigned short> CrtLayout12Mode;
typedef BiffAttributeSimple<unsigned short> ColU;
typedef unsigned short Col256U;
typedef unsigned short RwU;
typedef unsigned short Ilel;
typedef unsigned char DColunByteU;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.cpp
View file @ 02ce0535
......@@ -118,12 +118,9 @@ void OfficeArtClientAnchorSheet::loadFields(XLS::CFRecord& record)
}
else
_dyB = dyB * kfRow * global_info->defaultRowHeight;
//----------------------------------------------------------------------------------------------------
column = (std::min)(colL, colR);
row = (std::min)(rwT, rwB);
//----------------------------------------------------------------------------------------------------
for (int i = 1 ; i < colL; i++)
//----------------------------------------------------------------------------------------------------
for (int i = 0 ; i < colL; i++)
{
if (global_info->customColumnsWidth.find(i) != global_info->customColumnsWidth.end())
_x += 256 * kfCol * global_info->customColumnsWidth[i];
......@@ -141,7 +138,7 @@ void OfficeArtClientAnchorSheet::loadFields(XLS::CFRecord& record)
}
_cx += _dxR;
for (int i = 1 ; i < rwT; i++)
for (int i = 0 ; i < rwT; i++)
{
if (global_info->customRowsHeight.find(i) != global_info->customRowsHeight.end())
{
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtClientAnchorSheet.h
View file @ 02ce0535
......@@ -38,9 +38,6 @@ public:
XLS::RwU rwB;
short dyB;
int column;
int row;
_UINT32 _dxL;
_UINT32 _dyT;
_UINT32 _dxR;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp
View file @ 02ce0535
......@@ -7,47 +7,47 @@
namespace ODRAW
{
static int GetCountPoints2(NSGuidesVML::RulesType eRuler, int lRepeatCount)
static int GetCountPoints2(NSCustomShapesConvert::RulesType eRuler, int lRepeatCount)
{
switch (eRuler)
{
case NSGuidesVML::rtMoveTo:
case NSGuidesVML::rtRMoveTo:
case NSCustomShapesConvert::rtMoveTo:
case NSCustomShapesConvert::rtRMoveTo:
{ return 1; }
case NSGuidesVML::rtLineTo:
case NSGuidesVML::rtRLineTo:
case NSCustomShapesConvert::rtLineTo:
case NSCustomShapesConvert::rtRLineTo:
{ return lRepeatCount; }
case NSGuidesVML::rtCurveTo:
case NSGuidesVML::rtRCurveTo:
case NSCustomShapesConvert::rtCurveTo:
case NSCustomShapesConvert::rtRCurveTo:
{ return 3 * lRepeatCount; }
case NSGuidesVML::rtNoFill:
case NSGuidesVML::rtNoStroke:
case NSGuidesVML::rtClose:
case NSGuidesVML::rtEnd:
case NSCustomShapesConvert::rtNoFill:
case NSCustomShapesConvert::rtNoStroke:
case NSCustomShapesConvert::rtClose:
case NSCustomShapesConvert::rtEnd:
{ return 0; }
case NSGuidesVML::rtAngleEllipseTo:
case NSGuidesVML::rtAngleEllipse:
case NSCustomShapesConvert::rtAngleEllipseTo:
case NSCustomShapesConvert::rtAngleEllipse:
{ return lRepeatCount; }
case NSGuidesVML::rtArc:
case NSGuidesVML::rtArcTo:
case NSCustomShapesConvert::rtArc:
case NSCustomShapesConvert::rtArcTo:
case NSGuidesVML::rtClockwiseArcTo:
case NSGuidesVML::rtClockwiseArc:
case NSCustomShapesConvert::rtClockwiseArcTo:
case NSCustomShapesConvert::rtClockwiseArc:
{ return lRepeatCount; }
case NSGuidesVML::rtEllipticalQuadrX:
case NSGuidesVML::rtEllipticalQuadrY:
case NSCustomShapesConvert::rtEllipticalQuadrX:
case NSCustomShapesConvert::rtEllipticalQuadrY:
{ return 1 * lRepeatCount; }
case NSGuidesVML::rtQuadrBesier:
case NSCustomShapesConvert::rtQuadrBesier:
{ return /*2 * */lRepeatCount; }
case NSGuidesVML::rtFillColor:
case NSGuidesVML::rtLineColor:
case NSCustomShapesConvert::rtFillColor:
case NSCustomShapesConvert::rtLineColor:
{
return 1;
}
......@@ -680,7 +680,7 @@ void MSOPATHINFO::load(XLS::CFRecord& record)
if (type <= 4)
{
m_eRuler = (NSGuidesVML::RulesType)type;
m_eRuler = (NSCustomShapesConvert::RulesType)type;
m_nCount = (mem & 0x1FFF);
m_nCount = (_UINT16)GetCountPoints2(m_eRuler, m_nCount);
return;
......@@ -693,68 +693,68 @@ void MSOPATHINFO::load(XLS::CFRecord& record)
{
case 0x00:
{
m_eRuler = NSGuidesVML::rtLineTo;
m_eRuler = NSCustomShapesConvert::rtLineTo;
break;
}
case 0x01:
{
m_eRuler = NSGuidesVML::rtAngleEllipseTo;
m_eRuler = NSCustomShapesConvert::rtAngleEllipseTo;
break;
}
case 0x02:
{
m_eRuler = NSGuidesVML::rtAngleEllipse;
m_eRuler = NSCustomShapesConvert::rtAngleEllipse;
break;
}
case 0x03:
{
m_eRuler = NSGuidesVML::rtArcTo;
m_eRuler = NSCustomShapesConvert::rtArcTo;
break;
}
case 0x04:
{
m_eRuler = NSGuidesVML::rtArc;
m_eRuler = NSCustomShapesConvert::rtArc;
break;
}
case 0x05:
{
m_eRuler = NSGuidesVML::rtClockwiseArcTo;
m_eRuler = NSCustomShapesConvert::rtClockwiseArcTo;
break;
}
case 0x06:
{
m_eRuler = NSGuidesVML::rtClockwiseArc;
m_eRuler = NSCustomShapesConvert::rtClockwiseArc;
break;
}
case 0x07:
{
m_eRuler = NSGuidesVML::rtEllipticalQuadrX;
m_eRuler = NSCustomShapesConvert::rtEllipticalQuadrX;
break;
}
case 0x08:
{
m_eRuler = NSGuidesVML::rtEllipticalQuadrY;
m_eRuler = NSCustomShapesConvert::rtEllipticalQuadrY;
break;
}
case 0x09:
{
m_eRuler = NSGuidesVML::rtQuadrBesier;
m_eRuler = NSCustomShapesConvert::rtQuadrBesier;
break;
}
case 0x0A:
{
m_eRuler = NSGuidesVML::rtNoFill;
m_eRuler = NSCustomShapesConvert::rtNoFill;
break;
}
case 0x0B:
{
m_eRuler = NSGuidesVML::rtNoStroke;
m_eRuler = NSCustomShapesConvert::rtNoStroke;
break;
}
case 0x0C:
case 0x10:
{
m_eRuler = NSGuidesVML::rtLineTo;
m_eRuler = NSCustomShapesConvert::rtLineTo;
break;
}
case 0x0D:
......@@ -765,22 +765,22 @@ void MSOPATHINFO::load(XLS::CFRecord& record)
case 0x13:
case 0x14:
{
m_eRuler = NSGuidesVML::rtCurveTo;
m_eRuler = NSCustomShapesConvert::rtCurveTo;
break;
}
case 0x15:
{
m_eRuler = NSGuidesVML::rtFillColor;
m_eRuler = NSCustomShapesConvert::rtFillColor;
break;
}
case 0x16:
{
m_eRuler = NSGuidesVML::rtLineColor;
m_eRuler = NSCustomShapesConvert::rtLineColor;
break;
}
default:
{
m_eRuler = NSGuidesVML::rtCurveTo;
m_eRuler = NSCustomShapesConvert::rtCurveTo;
}
};
......@@ -810,7 +810,7 @@ void MSOSG::load(XLS::CFRecord& record)
_UINT16 ftType;
record >> ftType;
m_eType = NSGuidesVML::FormulaType(ftType & 0x1FFF);
m_eType = NSCustomShapesConvert::FormulaType(ftType & 0x1FFF);
m_param_type1 = (unsigned char)(ftType & 0x04);
m_param_type2 = (unsigned char)(ftType & 0x02);
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.h
View file @ 02ce0535
......@@ -558,7 +558,7 @@ class MSOPATHINFO : public XLS::BiffStructure
static const XLS::ElementType type = XLS::typeOfficeArtRecord;
NSGuidesVML::RulesType m_eRuler;
NSCustomShapesConvert::RulesType m_eRuler;
_UINT16 m_nCount;
int cbElement;
......@@ -577,7 +577,7 @@ class MSOSG : public XLS::BiffStructure
static const XLS::ElementType type = XLS::typeOfficeArtRecord;
NSGuidesVML::FormulaType m_eType;
NSCustomShapesConvert::FormulaType m_eType;
unsigned char m_param_type1;
unsigned char m_param_type2;
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/COLUMNS.cpp
View file @ 02ce0535
......@@ -77,11 +77,8 @@ int COLUMNS::serialize(std::wostream & stream)
CP_XML_ATTR(L"customWidth", true);
}
if (column_info->colFirst.value())
CP_XML_ATTR(L"min", column_info->colFirst + 1);/// from 0
if (column_info->colLast.value())
CP_XML_ATTR(L"max", column_info->colLast + 1);
CP_XML_ATTR(L"min", column_info->colFirst + 1);/// from 0
CP_XML_ATTR(L"max", column_info->colLast + 1);
if ((column_info->ixfe.value()) && (column_info->ixfe > global_info_->cellStyleXfs_count))
{
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/BaseShape.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "PathShape.h"
#include "../../../Common/DocxFormat/Source/Common/SimpleTypes_Base.h"
namespace NSCustomShapesConvert
{
class CHandle_
{
......@@ -34,9 +36,7 @@ public:
return (*this);
}
};
//
namespace NSGuidesVML
{
class CBaseShape
{
public:
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomGeomShape.h
View file @ 02ce0535
......@@ -7,10 +7,8 @@
#include "../../../../Common/DocxFormat/Source/SystemUtility/File.h"
namespace NSCustomVML
namespace NSCustomShapesConvert
{
using namespace NSGuidesVML;
class CSegment
{
public:
......@@ -97,7 +95,7 @@ namespace NSCustomVML
return *this;
}
void SetToFormula(NSGuidesVML::CFormula& oFormula)
void SetToFormula(NSCustomShapesConvert::CFormula& oFormula)
{
oFormula.m_eFormulaType = m_eType;
......@@ -255,7 +253,7 @@ namespace NSCustomVML
m_pAdjustValues = pList;
}
void ToCustomShape(CBaseShape* pShape, NSGuidesVML::CFormulasManager& oManager)
void ToCustomShape(CBaseShape* pShape, NSCustomShapesConvert::CFormulasManager& oManager)
{
if ((NULL == pShape) || (!IsCustom()))
return;
......@@ -264,7 +262,7 @@ namespace NSCustomVML
//
for (size_t nIndex = 0; nIndex < m_arGuides.size(); ++nIndex)
{
NSGuidesVML::CFormula oF;
NSCustomShapesConvert::CFormula oF;
m_arGuides[nIndex].SetToFormula(oF);
oManager.AddFormula(oF);
}
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.cpp
View file @ 02ce0535
......@@ -12,6 +12,8 @@ const double EMU_MM = 36000;
using namespace NSOfficeDrawing;
namespace NSCustomShapesConvert
{
CCustomShape* CCustomShape::CreateByType(oox::MSOSPT type)
{
CCustomShape* pShape = NULL;
......@@ -260,3 +262,4 @@ CCustomShape* CCustomShape::CreateByType(oox::MSOSPT type)
return pShape;
}
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShape.h
View file @ 02ce0535
......@@ -5,16 +5,19 @@
#include "../ShapeType.h"
#include "../../../ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Enums.h"
class CCustomShape : public NSGuidesVML::CBaseShape
namespace NSCustomShapesConvert
{
class CCustomShape : public NSCustomShapesConvert::CBaseShape
{
public:
oox::MSOSPT m_eType;
NSGuidesVML::CFormulasManager m_oManager;
oox::MSOSPT m_eType;
NSCustomShapesConvert::CFormulasManager m_oManager;
NSCustomVML::CCustomVML m_oCustomVML;
NSCustomShapesConvert::CCustomVML m_oCustomVML;
std::wstring m_strPathLimoX;
std::wstring m_strPathLimoY;
std::wstring m_strPathLimoX;
std::wstring m_strPathLimoY;
std::vector<std::wstring> m_arStringTextRects;
public:
......@@ -37,32 +40,6 @@ public:
return true;
}
//void LoadAHList(XmlUtils::CXmlNode& oNode)
//{
// m_arHandles.clear();
// XmlUtils::CXmlNodes oNodes;
// if (oNode.GetNodes(_T("v:h"), oNodes))
// {
// int nCount = oNodes.GetCount();
// for (int i = 0; i < nCount; ++i)
// {
// XmlUtils::CXmlNode oNodeH;
// oNodes.GetAt(i, oNodeH);
// CHandle_ oH;
// oH.polar = oNodeH.GetAttribute(_T("polar"));
// oH.position = oNodeH.GetAttribute(_T("position"));
// oH.radiusrange = oNodeH.GetAttribute(_T("radiusrange"));
// oH.switchHandle = oNodeH.GetAttribute(_T("switch"));
// oH.xrange = oNodeH.GetAttribute(_T("xrange"));
// oH.yrange = oNodeH.GetAttribute(_T("yrange"));
// m_arHandles.push_back(oH);
// }
// }
//}
virtual bool LoadConnectorsList(const std::wstring& xml)
{
return true;
......@@ -150,39 +127,5 @@ public:
m_eType = oox::msosptNotPrimitive;
return false;
}
//protected:
//
// bool GetPos(std::wstring str, LONG& lValue)
// {
// if (str.GetLength() == 0)
// return false;
//
// TCHAR mem = str.GetAt(0);
//
// bool bFormula = false;
// if ('@' == mem)
// {
// bFormula = true;
// str.Delete(0);
// }
//
// if (!NSStringUtils::IsNumber(str))
// return false;
//
// lValue = 0;
// lValue = _ttoi(str);
//
// if (bFormula)
// {
// if (lValue >= 0 || lValue < m_oManager.m_arResults.size())
// {
// lValue = m_oManager.m_arResults[lValue];
// return true;
// }
// return false;
// }
//
// return true;
// }
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/CustomShapeConvert.h
View file @ 02ce0535
......@@ -5,7 +5,7 @@
#include "XmlWriter.h"
namespace NSGuidesVML
namespace NSCustomShapesConvert
{
static int __wstrlen(const wchar_t* str)
{
......@@ -201,7 +201,7 @@ namespace NSGuidesVML
m_lMaxAdjUse = -1;
}
void ConvertCoef(NSGuidesVML::CFormParam pCoef)
void ConvertCoef(NSCustomShapesConvert::CFormParam pCoef)
{
if (pCoef.m_eType == ptValue)
ConvertVal(pCoef.m_lParam, pCoef.m_eType, false, m_oCoef);
......@@ -214,7 +214,7 @@ namespace NSGuidesVML
m_oParam.m_eType = ptFormula;
m_oParam.m_lCoef = pCoef.m_lCoef;
}
void ConvertCoef2(NSGuidesVML::CFormParam pCoef)
void ConvertCoef2(NSCustomShapesConvert::CFormParam pCoef)
{
if (pCoef.m_eType == ptValue)
ConvertVal(pCoef.m_lParam, pCoef.m_eType, false, m_oGuidsRes);
......@@ -890,12 +890,12 @@ namespace NSGuidesVML
if ('#' == strParam2[0])
{
LONG lRes = (LONG)NSGuidesVML::GetInteger(strParam2.substr(1));
LONG lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam2.substr(1));
GetValue(lRes, ptAdjust, false, oWriter);
}
else if ('@' == strParam2[0])
{
LONG lRes = (LONG)NSGuidesVML::GetInteger(strParam2.substr(1));
LONG lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam2.substr(1));
GetValue(lRes, ptFormula, false, oWriter);
}
else
......@@ -925,7 +925,7 @@ namespace NSGuidesVML
for (int nIndex = 0; nIndex < oArray.size(); ++nIndex)
{
std::wstring str = oArray[nIndex];
lValue = NSGuidesVML::GetValue(oArray[nIndex], eParamType, bRes);
lValue = NSCustomShapesConvert::GetValue(oArray[nIndex], eParamType, bRes);
if (bRes)
{
if (0 != m_arSlicesPath.size())
......@@ -1053,17 +1053,17 @@ namespace NSGuidesVML
if ('#' == strParam[0])
{
lRes = (LONG)NSGuidesVML::GetInteger(strParam.substr(1));
lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1));
strFrmla = GetValue2(lRes, ptAdjust, false) + L" " + strSize;
}
else if ('&' == strParam[0])
{
lRes = (LONG)NSGuidesVML::GetInteger(strParam.substr(1));
lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1));
strFrmla = GetValue2(lRes, ptFormula, true) + L" " + strSize;
}
else if ('@' == strParam[0])
{
lRes = (LONG)NSGuidesVML::GetInteger(strParam.substr(1));
lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1));
strFrmla = GetValue2(lRes, ptFormula, false) + L" " + strSize;
}
else if (!NSStringUtils::IsNumber(strParam))
......@@ -1077,7 +1077,7 @@ namespace NSGuidesVML
}
else
{
lRes = (LONG)NSGuidesVML::GetInteger(strParam.c_str());
lRes = (LONG)NSCustomShapesConvert::GetInteger(strParam.c_str());
strFrmla = GetValue2(lRes, ptValue, false) + strSize;
}
......@@ -1105,12 +1105,12 @@ namespace NSGuidesVML
if ('#' == strParam[0])
{
ptType = ptAdjust;
return (LONG)NSGuidesVML::GetInteger(strParam.substr(1).c_str());
return (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1).c_str());
}
else if ('@' == strParam[0])
{
ptType = ptFormula;
return (LONG)NSGuidesVML::GetInteger(strParam.substr(1).c_str());
return (LONG)NSCustomShapesConvert::GetInteger(strParam.substr(1).c_str());
}
else if (!NSStringUtils::IsNumber(strParam))
{
......@@ -1125,7 +1125,7 @@ namespace NSGuidesVML
else
{
ptType = ptValue;
return (LONG)NSGuidesVML::GetInteger(strParam.c_str());
return (LONG)NSCustomShapesConvert::GetInteger(strParam.c_str());
}
}
void ConvertQuadrX(Aggplus::POINT pPoint, SPointType pPointType)
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.cpp
View file @ 02ce0535
......@@ -2,7 +2,7 @@
#include "FormulaShape.h"
LONG NSGuidesVML::CFormula::CalculateFormula(NSGuidesVML::CFormulasManager* pManager)
LONG NSCustomShapesConvert::CFormula::CalculateFormula(NSCustomShapesConvert::CFormulasManager* pManager)
{
if ((0 > m_lIndex) || (m_lIndex >= pManager->m_arResults.size()))
return 0;
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.h
View file @ 02ce0535
......@@ -11,7 +11,7 @@
#include "../../../../DesktopEditor/graphics/aggplustypes.h"
namespace NSGuidesVML
namespace NSCustomShapesConvert
{
enum FormulaType
{
......@@ -161,10 +161,7 @@ namespace NSGuidesVML
return ftVal;
}
}
namespace NSGuidesVML
{
struct SPointType
{
ParamType x;
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/GraphicsPath.h
View file @ 02ce0535
......@@ -5,14 +5,11 @@
#include "../../../../DesktopEditor/graphics/GraphicsPath.h"
//#include "../../Metric.h"
//#include "../../Attributes.h"
#define _USE_MATH_DEFINES
#include <math.h>//M_PI
#include <vector>
namespace NSGuidesVML
namespace NSCustomShapesConvert
{
const double c_dMasterUnitsToInchKoef = 1.0 / 576;
const double c_dInchToMillimetreKoef = 25.4;
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/PathShape.h
View file @ 02ce0535
......@@ -3,7 +3,7 @@
#include "GraphicsPath.h"
#include "FormulaShape.h"
namespace NSGuidesVML
namespace NSCustomShapesConvert
{
static std::wstring GetRulerVML(RulesType eRuler)
{
......@@ -504,7 +504,7 @@ namespace NSGuidesVML
width = ShapeSizeVML;
height = ShapeSizeVML; //43200?
}
void FromXML(std::wstring strPath, NSGuidesVML::CFormulasManager& pManager)
void FromXML(std::wstring strPath, NSCustomShapesConvert::CFormulasManager& pManager)
{
NSStringUtils::CheckPathOn_Fill_Stroke(strPath, m_bFill, m_bStroke);
std::vector<std::wstring> oArray;
......@@ -577,7 +577,7 @@ namespace NSGuidesVML
public:
std::vector<CPartPath> m_arParts;
void FromXML(std::wstring strPath, NSGuidesVML::CFormulasManager& pManager)
void FromXML(std::wstring strPath, NSCustomShapesConvert::CFormulasManager& pManager)
{
m_arParts.clear();
std::vector<std::wstring> oArray;
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/XmlWriter.h
View file @ 02ce0535
......@@ -3,7 +3,7 @@
//#include "../../../Common/DocxFormat/Source/Base/Nullable.h"
#include "../../../DesktopEditor/common/File.h"
namespace NSGuidesVML
namespace NSCustomShapesConvert
{
static int GetInteger (const std::wstring& string)
{
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentBorderCallout2Type.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 51
namespace NSCustomShapesConvert
{
class CAccentBorderCallout2Type : public CCustomShape
{
public:
......@@ -42,4 +45,5 @@ public:
oHandle3.position = _T("#4,#5");
m_arHandles.push_back(oHandle3);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout1Type.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 44
namespace NSCustomShapesConvert
{
class CAccentCallout1Type : public CCustomShape
{
public:
......@@ -33,4 +36,5 @@ public:
oHandle2.position = _T("#2,#3");
m_arHandles.push_back(oHandle2);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout2Type.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 45
namespace NSCustomShapesConvert
{
class CAccentCallout2Type : public CCustomShape
{
public:
......@@ -41,4 +44,5 @@ public:
oHandle3.position = _T("#4,#5");
m_arHandles.push_back(oHandle3);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout3Type.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 46
namespace NSCustomShapesConvert
{
class CAccentCallout3Type : public CCustomShape
{
public:
......@@ -50,4 +53,5 @@ public:
oHandle4.position = _T("#6,#7");
m_arHandles.push_back(oHandle4);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/AccentCallout90Type.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 179
namespace NSCustomShapesConvert
{
class CAccentCallout90Type : public CCustomShape
{
public:
......@@ -34,4 +36,5 @@ public:
oHandle2.position = _T("#2,#3");
m_arHandles.push_back(oHandle2);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBack.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 194
namespace NSCustomShapesConvert
{
class CActionButtonBackType : public CCustomShape
{
public:
......@@ -45,4 +48,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBeginning.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 196
namespace NSCustomShapesConvert
{
class CActionButtonBeginType : public CCustomShape
{
public:
......@@ -52,4 +55,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonBlank.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 189
namespace NSCustomShapesConvert
{
class CActionButtonBlankType : public CCustomShape
{
public:
......@@ -36,4 +39,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonDocument.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 198
namespace NSCustomShapesConvert
{
class CActionButtonDocType : public CCustomShape
{
public:
......@@ -49,4 +52,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonEnd.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 195
namespace NSCustomShapesConvert
{
class CActionButtonEndType : public CCustomShape
{
public:
......@@ -52,4 +55,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHelp.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 191
namespace NSCustomShapesConvert
{
class CActionButtonHelpType : public CCustomShape
{
public:
......@@ -89,4 +92,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonHome.h
View file @ 02ce0535
......@@ -2,6 +2,9 @@
#include "../CustomShape.h"
// 190
namespace NSCustomShapesConvert
{
class CActionButtonHomeType : public CCustomShape
{
public:
......@@ -77,4 +80,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonInfo.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 192
namespace NSCustomShapesConvert
{
class CActionButtonInfoType : public CCustomShape
{
public:
......@@ -84,4 +86,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonMovie.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 200
namespace NSCustomShapesConvert
{
class CActionButtonMovieType : public CCustomShape
{
public:
......@@ -98,4 +100,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonNext.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 193
namespace NSCustomShapesConvert
{
class CActionButtonNextType : public CCustomShape
{
public:
......@@ -45,4 +47,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonReturn.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 197
namespace NSCustomShapesConvert
{
class CActionButtonReturnType : public CCustomShape
{
public:
......@@ -67,4 +69,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ActionButtonSound.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 199
namespace NSCustomShapesConvert
{
class CActionButtonSoundType : public CCustomShape
{
public:
......@@ -66,4 +68,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentArrowType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 91
namespace NSCustomShapesConvert
{
class CBentArrowType : public CCustomShape
{
public:
......@@ -40,3 +42,4 @@ public:
m_arHandles.push_back(oHandle1);
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentConnector.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 34
namespace NSCustomShapesConvert
{
class CBentConnectorType : public CCustomShape
{
public:
......@@ -20,4 +22,5 @@ public:
LoadConnectorsList(_T("0,0;21600,21600"));
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BentUpArrowType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 90
namespace NSCustomShapesConvert
{
class CBentUpArrowType : public CCustomShape
{
public:
......@@ -57,3 +59,4 @@ public:
m_arHandles.push_back(oHandle2);
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BevelType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 84
namespace NSCustomShapesConvert
{
class CBevelType : public CCustomShape
{
public:
......@@ -41,4 +43,5 @@ public:
m_lLimoX = 10800;
m_lLimoY = 10800;
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BlockArcType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 95
namespace NSCustomShapesConvert
{
class CBlockArcType : public CCustomShape
{
public:
......@@ -72,3 +74,4 @@ public:
m_arHandles.push_back(oHandle1);
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout1Type.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 47
namespace NSCustomShapesConvert
{
class CBorderCallout1Type : public CCustomShape
{
public:
......@@ -34,4 +36,5 @@ public:
oHandle2.position = _T("#2,#3");
m_arHandles.push_back(oHandle2);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout2Type.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 48
namespace NSCustomShapesConvert
{
class CBorderCallout2Type : public CCustomShape
{
public:
......@@ -42,4 +44,5 @@ public:
oHandle3.position = _T("#4,#5");
m_arHandles.push_back(oHandle3);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout3Type.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 49
namespace NSCustomShapesConvert
{
class CBorderCallout3Type : public CCustomShape
{
public:
......@@ -50,4 +52,5 @@ public:
oHandle4.position = _T("#6,#7");
m_arHandles.push_back(oHandle4);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BorderCallout90Type.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 180
namespace NSCustomShapesConvert
{
class CBorderCallout90Type : public CCustomShape
{
public:
......@@ -34,4 +36,5 @@ public:
oHandle2.position = _T("#2,#3");
m_arHandles.push_back(oHandle2);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracePairType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 186
namespace NSCustomShapesConvert
{
class CBracePairType : public CCustomShape
{
public:
......@@ -45,3 +47,4 @@ public:
m_lLimoY = 10800;
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/BracketPairType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 185
namespace NSCustomShapesConvert
{
class CBracketPairType : public CCustomShape
{
public:
......@@ -40,3 +42,4 @@ public:
m_lLimoY = 10800;
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout1Type.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 41
namespace NSCustomShapesConvert
{
class CCallout1Type : public CCustomShape
{
public:
......@@ -34,4 +36,5 @@ public:
oHandle2.position = _T("#2,#3");
m_arHandles.push_back(oHandle2);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout2Type.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 42
namespace NSCustomShapesConvert
{
class CCallout2Type : public CCustomShape
{
public:
......@@ -42,4 +44,5 @@ public:
oHandle3.position = _T("#4,#5");
m_arHandles.push_back(oHandle3);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout3Type.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 43
namespace NSCustomShapesConvert
{
class CCallout3Type : public CCustomShape
{
public:
......@@ -50,4 +52,5 @@ public:
oHandle4.position = _T("#6,#7");
m_arHandles.push_back(oHandle4);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/Callout90Type.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 178
namespace NSCustomShapesConvert
{
class CCallout90Type : public CCustomShape
{
public:
......@@ -34,4 +36,5 @@ public:
oHandle2.position = _T("#2,#3");
m_arHandles.push_back(oHandle2);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CanType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 22
namespace NSCustomShapesConvert
{
class CCanType : public CCustomShape
{
public:
......@@ -32,4 +34,5 @@ public:
oHandle1.yrange = _T("0,10800");
m_arHandles.push_back(oHandle1);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/ChevronType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 55
namespace NSCustomShapesConvert
{
class CChevronType : public CCustomShape
{
public:
......@@ -33,3 +35,4 @@ public:
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CircularArrowType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 99
namespace NSCustomShapesConvert
{
class CCircularArrowType : public CCustomShape
{
public:
......@@ -81,5 +83,4 @@ public:
m_arHandles.push_back(oHandle2);
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CloudCalloutType.h
View file @ 02ce0535
#pragma once
#include "../CustomShape.h"
// 106
namespace NSCustomShapesConvert
{
class CCloudCalloutType : public CCustomShape
{
public:
......@@ -64,4 +67,5 @@ public:
oHandle1.position = _T("#0,#1");
m_arHandles.push_back(oHandle1);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CubeType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 16
namespace NSCustomShapesConvert
{
class CCubeType : public CCustomShape
{
public:
......@@ -44,3 +46,4 @@ public:
m_lLimoY = 10800;
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedConnector.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 38
namespace NSCustomShapesConvert
{
class CCurvedConnectorType : public CCustomShape
{
public:
......@@ -24,4 +26,5 @@ public:
LoadConnectorsList(_T("0,0;21600,21600"));
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedDownArrowType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 105
namespace NSCustomShapesConvert
{
class CCurvedDownArrowType : public CCustomShape
{
public:
......@@ -92,3 +94,4 @@ public:
m_arHandles.push_back(oHandle3);
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedLeftArrowType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 103
namespace NSCustomShapesConvert
{
class CCurvedLeftArrowType : public CCustomShape
{
public:
......@@ -88,3 +90,4 @@ public:
m_arHandles.push_back(oHandle3);
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedRightArrowType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 102
namespace NSCustomShapesConvert
{
class CCurvedRightArrowType : public CCustomShape
{
public:
......@@ -92,3 +94,4 @@ public:
m_arHandles.push_back(oHandle3);
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/CurvedUpArrowType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
//104
namespace NSCustomShapesConvert
{
class CCurvedUpArrowType : public CCustomShape
{
public:
......@@ -88,3 +90,4 @@ public:
m_arHandles.push_back(oHandle3);
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DiamondType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 4
namespace NSCustomShapesConvert
{
class CDiamondType : public CCustomShape
{
public:
......@@ -17,4 +19,5 @@ public:
LoadTextRect(_T("5400,5400,16200,16200"));
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DonutType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 23
namespace NSCustomShapesConvert
{
class CDonutType : public CCustomShape
{
public:
......@@ -29,3 +31,4 @@ public:
m_arHandles.push_back(oHandle1);
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowCalloutType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 80
namespace NSCustomShapesConvert
{
class CDownArrowCalloutType : public CCustomShape
{
public:
......@@ -53,5 +55,5 @@ public:
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/DownArrowType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 67
namespace NSCustomShapesConvert
{
class CDownArrowType : public CCustomShape
{
public:
......@@ -40,3 +42,4 @@ public:
m_arHandles.push_back(oHandle1);
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbon2Type.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 108
namespace NSCustomShapesConvert
{
class CEllipceRibbon2Type : public CCustomShape
{
public:
......@@ -87,3 +89,4 @@ public:
m_arHandles.push_back(oHandle3);
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseRibbonType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 107
namespace NSCustomShapesConvert
{
class CEllipceRibbonType : public CCustomShape
{
public:
......@@ -90,4 +92,5 @@ public:
oHandle3.yrange = _T("@27,@45");
m_arHandles.push_back(oHandle3);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/EllipseType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 3
namespace NSCustomShapesConvert
{
class CEllipseType : public CCustomShape
{
public:
......@@ -13,4 +15,5 @@ public:
m_strPath = _T("m,10800qy10800,,21600,10800,10800,21600,,10800xe");
LoadTextRect(_T("3233,3233,18367,18367"));
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartAlternateProcessType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 176
namespace NSCustomShapesConvert
{
class CFlowChartAlternateProcessType : public CCustomShape
{
public:
......@@ -33,3 +35,4 @@ public:
m_lLimoY = 10800;
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartCollateType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 125
namespace NSCustomShapesConvert
{
class CFlowChartCollateType : public CCustomShape
{
public:
......@@ -16,4 +18,4 @@ public:
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartConnectorType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 120
namespace NSCustomShapesConvert
{
class CFlowChartConnectorType : public CCustomShape
{
public:
......@@ -18,3 +20,4 @@ public:
LoadTextRect(_T("3163,3163,18437,18437"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDecisionType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 110
namespace NSCustomShapesConvert
{
class CFlowChartDecisionType : public CCustomShape
{
public:
......@@ -18,3 +20,4 @@ public:
LoadTextRect(_T("5400,5400,16200,16200"));
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDelayType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 135
namespace NSCustomShapesConvert
{
class CFlowChartDelayType : public CCustomShape
{
public:
......@@ -15,5 +17,5 @@ public:
LoadTextRect(_T("0,3163,18437,18437"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDisplayType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 134
namespace NSCustomShapesConvert
{
class CFlowChartDisplayType : public CCustomShape
{
public:
......@@ -15,5 +17,5 @@ public:
LoadTextRect(_T("3567,0,17955,21600"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartDocumentType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
//114
namespace NSCustomShapesConvert
{
class CFlowChartDocumentType : public CCustomShape
{
public:
......@@ -17,3 +19,4 @@ public:
LoadTextRect(_T("0,0,21600,17322"));
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartExtractType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 127
namespace NSCustomShapesConvert
{
class CFlowChartExtractType : public CCustomShape
{
public:
......@@ -15,5 +17,4 @@ public:
LoadTextRect(_T("5400,10800,16200,21600"));
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInputOutputType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 111
namespace NSCustomShapesConvert
{
class CFlowChartInputOutputType : public CCustomShape
{
public:
......@@ -18,3 +20,4 @@ public:
LoadTextRect(_T("4321,0,17204,21600"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartInternalStorageType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 113
namespace NSCustomShapesConvert
{
class CFlowChartInternalStorageType : public CCustomShape
{
public:
......@@ -18,3 +20,4 @@ public:
LoadTextRect(_T("4236,4236,21600,21600"));
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDiskType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 132
namespace NSCustomShapesConvert
{
class CFlowChartMagneticDiskType : public CCustomShape
{
public:
......@@ -22,5 +24,5 @@ public:
LoadTextRect(_T("0,6782,21600,18209"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticDrumType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 133
namespace NSCustomShapesConvert
{
class CFlowChartMagneticDrumType : public CCustomShape
{
public:
......@@ -22,5 +24,6 @@ public:
LoadTextRect(_T("3581,0,14438,21600"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMagneticTapeType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 131
namespace NSCustomShapesConvert
{
class CFlowChartMagneticTapeType : public CCustomShape
{
public:
......@@ -15,5 +17,6 @@ public:
LoadTextRect(_T("3163,3163,18437,18437"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualInputType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 118
namespace NSCustomShapesConvert
{
class CFlowChartManualInputType : public CCustomShape
{
public:
......@@ -17,4 +19,5 @@ public:
LoadTextRect(_T("0,4291,21600,21600"));
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartManualOperationType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 119
namespace NSCustomShapesConvert
{
class CFlowChartManualOperationType : public CCustomShape
{
public:
......@@ -17,3 +19,4 @@ public:
LoadTextRect(_T("4321,0,17204,21600"));
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMergeType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 128
namespace NSCustomShapesConvert
{
class CFlowChartMergeType : public CCustomShape
{
public:
......@@ -15,5 +17,6 @@ public:
LoadTextRect(_T("5400,0,16200,10800"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartMultidocumentType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 115
namespace NSCustomShapesConvert
{
class CFlowChartMultidocumentType : public CCustomShape
{
public:
......@@ -17,3 +19,4 @@ public:
LoadTextRect(_T("0,3675,18595,18022"));
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOffpageConnectorType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 177
namespace NSCustomShapesConvert
{
class CFlowChartOffpageConnectorType : public CCustomShape
{
public:
......@@ -16,3 +18,4 @@ public:
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOnlineStorageType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 130
namespace NSCustomShapesConvert
{
class CFlowChartOnlineStorageType : public CCustomShape
{
public:
......@@ -15,5 +17,5 @@ public:
LoadTextRect(_T("3600,0,17997,21600"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartOrType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 124
namespace NSCustomShapesConvert
{
class CFlowChartOrType : public CCustomShape
{
public:
......@@ -17,3 +19,4 @@ public:
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPredefinedProcessType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 112
namespace NSCustomShapesConvert
{
class CFlowChartPredefinedProcessType : public CCustomShape
{
public:
......@@ -17,3 +19,4 @@ public:
LoadTextRect(_T("2610,0,18990,21600"));
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPreparationType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 117
namespace NSCustomShapesConvert
{
class CFlowChartPreparationType : public CCustomShape
{
public:
......@@ -16,4 +18,5 @@ public:
LoadConnectorsList(_T("Rectangle"));
LoadTextRect(_T("4353,0,17214,21600"));
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartProcessType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 109
namespace NSCustomShapesConvert
{
class CFlowChartProcessType : public CCustomShape
{
public:
......@@ -15,3 +17,4 @@ public:
LoadConnectorsList(_T("Rectangle"));
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedCardType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 121
namespace NSCustomShapesConvert
{
class CFlowChartPunchedCardType : public CCustomShape
{
public:
......@@ -16,4 +18,4 @@ public:
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartPunchedTapeType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 122
namespace NSCustomShapesConvert
{
class CFlowChartPunchedTapeType : public CCustomShape
{
public:
......@@ -15,5 +17,5 @@ public:
LoadTextRect(_T("0,4337,21600,17260"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSortType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 126
namespace NSCustomShapesConvert
{
class CFlowChartSortType : public CCustomShape
{
public:
......@@ -15,5 +17,5 @@ public:
LoadTextRect(_T("5400,5400,16200,16200"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartSummingJunctionType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 123
namespace NSCustomShapesConvert
{
class CFlowChartSummingJunctionType : public CCustomShape
{
public:
......@@ -15,5 +17,5 @@ public:
LoadTextRect(_T("3163,3163,18437,18437"));
}
};
}
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FlowChartTerminatorType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 116
namespace NSCustomShapesConvert
{
class CFlowChartTerminatorType : public CCustomShape
{
public:
......@@ -17,3 +19,4 @@ public:
LoadTextRect(_T("1018,3163,20582,18437"));
}
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/FoldedCornerType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 65
namespace NSCustomShapesConvert
{
class CFoldedCornerType : public CCustomShape
{
public:
......@@ -39,4 +41,5 @@ public:
m_arHandles.push_back(oHandle1);
}
};
\ No newline at end of file
};
}
\ No newline at end of file
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HeartType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 74
namespace NSCustomShapesConvert
{
class CHeartType : public CCustomShape
{
public:
......@@ -22,7 +24,7 @@ public:
LoadTextRect(_T("5037,2277,16557,13677"));
}
};
}
......
ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/oldAutoShapes/HexagonType.h
View file @ 02ce0535
......@@ -2,6 +2,8 @@
#include "../CustomShape.h"
// 9
namespace NSCustomShapesConvert
{
class CHexagonType : public CCustomShape
{
public:
......@@ -32,3 +34,4 @@ public:
}
};
}
\ No newline at end of file
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