Skip to content

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

..... забытое 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59966 954022d7-b5bf-4e40-9824-e11837661b57
parent e7379f63
Hide whitespace changes
Inline Side-by-side
Showing with 690 additions and 15 deletions
ASCOfficeOdfFileW/ASCOfficeOdfFileW.h
View file @ 7d4e5c86
......@@ -3,18 +3,18 @@
/* this ALWAYS GENERATED file contains the definitions for the interfaces */
/* File created by MIDL compiler version 7.00.0555 */
/* at Sun Oct 05 15:10:56 2014
/* File created by MIDL compiler version 7.00.0500 */
/* at Mon Dec 01 19:58:58 2014
*/
/* Compiler settings for .\ASCOfficeOdfFileW.idl:
Oicf, W1, Zp8, env=Win32 (32b run), target_arch=X86 7.00.0555
Oicf, W1, Zp8, env=Win32 (32b run)
protocol : dce , ms_ext, c_ext
error checks: allocation ref bounds_check enum stub_data
VC __declspec() decoration level:
__declspec(uuid()), __declspec(selectany), __declspec(novtable)
DECLSPEC_UUID(), MIDL_INTERFACE()
*/
/* @@MIDL_FILE_HEADING( ) */
//@@MIDL_FILE_HEADING( )
#pragma warning( disable: 4049 ) /* more than 64k source lines */
......
ASCOfficeOdfFileW/ASCOfficeOdfFileW.sln
View file @ 7d4e5c86
......@@ -10,6 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Oox2OdfConverter", "source\
ProjectSection(ProjectDependencies) = postProject
{E5A67556-44DA-4481-8F87-0A3AEDBD20DD} = {E5A67556-44DA-4481-8F87-0A3AEDBD20DD}
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileWTest", "ASCOfficeOdfFileWTest\ASCOfficeOdfFileWTest.vcproj", "{FBA8446A-150F-4A10-B4DA-1022048D6473}"
......@@ -20,10 +21,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\Doc
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdfFileW", "ASCOfficeOdfFileW.vcproj", "{6258296E-ABCE-4BC6-9F4A-8522CD615603}"
ProjectSection(ProjectDependencies) = postProject
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
{BEE01B53-244A-44E6-8947-ED9342D9247E} = {BEE01B53-244A-44E6-8947-ED9342D9247E}
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\..\branches\Docx2DoctConverter\ServerComponents\Common\DocxFormat\Source\XML\libxml2\win_build\libxml2.vcproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeUtilsLib", "..\..\..\branches\Docx2DoctConverter\ServerComponents\ASCOfficeUtils\ASCOfficeUtilsLib\Win\ASCOfficeUtilsLib.vcproj", "{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
......@@ -80,6 +86,22 @@ Global
{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseASC|Win32.Build.0 = Release|Win32
{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
{6258296E-ABCE-4BC6-9F4A-8522CD615603}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.ActiveCfg = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.Build.0 = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|Win32.ActiveCfg = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|Win32.Build.0 = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.ActiveCfg = Debug|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.Build.0 = Debug|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.ActiveCfg = Release|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.Build.0 = Release|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseASC|Win32.ActiveCfg = Release|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseASC|Win32.Build.0 = Release|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
ASCOfficeOdfFileW/ASCOfficeOdfFileW.vcproj
View file @ 7d4e5c86
......@@ -53,7 +53,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\ASCOfficeOdfFile\include"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=1"
PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;LIBXML_READER_ENABLED;_USE_XMLLITE_READER_;USE_XMLLITE_READER;_USE_LIBXML2_READER_;STANDALONE_USE=1"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
......@@ -149,7 +149,7 @@
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories="..\ASCOfficeOdfFile\include"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;STANDALONE_USE=0"
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;LIBXML_READER_ENABLED;_USE_XMLLITE_READER_;USE_XMLLITE_READER;_USE_LIBXML2_READER_;STANDALONE_USE=0"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
......
ASCOfficeOdfFileW/source/OdfFormat/Shapes/oox_shapeWordArt.h 0 → 100644
View file @ 7d4e5c86
#include "..\oox_shape_defines.h"
namespace cpdoccore
{
class oox_shape_textPlain : public oox_shape
{
public:
oox_shape_textPlain()
{
odf_type_name =L"fontwork-plain-text";
modifiers = L"10800";
enhanced_path = L"M ?f3 0 L ?f5 0 N M ?f6 21600 L ?f7 21600 N";
text_areas = L"0 0 21600 21600";
view_box = L"0 0 21600 21600";
add(L"f0", L"$0 -10800");
add(L"f1", L"?f0 *2");
add(L"f2", L"abs(?f1 )");
add(L"f3", L"if(?f1 ,0,?f2 )");
add(L"f4", L"21600-?f2 ");
add(L"f5", L"if(?f1 ,?f4 ,21600)");
add(L"f6", L"if(?f1 ,?f2 ,0)");
add(L"f7", L"if(?f1 ,21600,?f4 )");
}
};
class oox_shape_textCirclePour : public oox_shape
{
public:
oox_shape_textCirclePour ()
{
odf_type_name =L"fontwork-circle-pour";
modifiers = L"-179 5400";
enhanced_path = L"W 0 0 21600 21600 ?f2 ?f3 ?f2 ?f4 N W ?f5 ?f5 ?f11 ?f11 ?f8 ?f9 ?f8 ?f10 N";
text_areas = L"0 0 21600 21600";
view_box = L"0 0 21600 21600";
add(L"f0", L"10800*cos($0 *(pi/180))");
add(L"f1", L"10800*sin($0 *(pi/180))");
add(L"f2", L"?f0 +10800");
add(L"f3", L"?f1 +10800");
add(L"f4", L"21600-?f3 ");
add(L"f5", L"10800-$1 ");
add(L"f6", L"?f5 *cos($0 *(pi/180))");
add(L"f7", L"?f5 *sin($0 *(pi/180))");
add(L"f8", L"?f6 +10800");
add(L"f9", L"?f7 +10800");
add(L"f10", L"21600-?f9 ");
add(L"f11", L"21600-?f5 ");
add(L"f12", L"21600");
//<draw:handle draw:handle-position="$1 $0" draw:handle-polar="10800 10800" draw:handle-radius-range-minimum="0" draw:handle-radius-range-maximum="10800");
}
};
class oox_shape_textSlantUp : public oox_shape
{
public:
oox_shape_textSlantUp()
{
odf_type_name =L"fontwork-slant-up";
modifiers = L"50000";
enhanced_path = L"M ?f20 ?f2 L ?f21 ?f2 N M ?f22 ?f3 L ?f23 ?f3 N";
text_areas = L"?f24 ?f26 ?f25 ?f27";
view_box = L"0 0 21600 21600";
add(L"f0", L"left");
add(L"f1", L"right");
add(L"f2", L"top");
add(L"f3", L"bottom");
add(L"f4", L"?f3 - ?f2");
add(L"f5", L"?f1 - ?f0");
add(L"f6", L"?f5 / 2");
add(L"f7", L"?f0 + ?f6");
add(L"f8", L"?f5 / 21600");
add(L"f9", L"?f4 / 21600");
add(L"f10", L"$0");
add(L"f11", L"?f10 * ?f5 / 100000");
add(L"f12", L"?f11 - ?f7");
add(L"f13", L"?f11 - ?f0");
add(L"f14", L"?f1 - ?f11");
add(L"f15", L"?f13 * 2");
add(L"f16", L"?f14 * 2");
add(L"f17", L"if(?f12, ?f16, ?f15)");
add(L"f18", L"?f0 + ?f17");
add(L"f19", L"?f1 - ?f17");
add(L"f20", L"if(?f12, ?f0, ?f19)");
add(L"f21", L"if(?f12, ?f18, ?f1)");
add(L"f22", L"if(?f12, ?f19, ?f0)");
add(L"f23", L"if(?f12, ?f1, ?f18)");
add(L"f24", L"0 / ?f8");
add(L"f25", L"21600 / ?f8");
add(L"f26", L"0 / ?f9");
add(L"f27", L"21600 / ?f9");
}
};
}
\ No newline at end of file
ASCOfficeOdfFileW/source/Oox2OdfConverter.vcproj
View file @ 7d4e5c86
......@@ -40,8 +40,8 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\ASCOfficeOdfFile\src\odf\datatypes;.\OdfFormat;.\Oox2OdfConverter;..\..\Common\DocxFormat\Source;..\..\Common\DocxFormat\Source\XML;..\..\ASCOfficeOdfFile\include;..\..\ASCOfficeOdfFile\3dparty\utf8cpp\include;..\..\ASCOfficePPTXFile\PPTXFormat\"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;USE_LITE_READER;_USE_XMLLITE_READER_;_DOCWRAPPER_"
AdditionalIncludeDirectories="../../ASCOfficeOdfFile/src/odf/datatypes;./OdfFormat;./Oox2OdfConverter;../../Common/DocxFormat/Source;../../Common/DocxFormat/Source/XML;../../ASCOfficeOdfFile\include;../../ASCOfficeOdfFile/3dparty/utf8cpp/include;../../ASCOfficePPTXFile/PPTXFormat/;../Common/DocxFormat/Source/XML/libxml2/XML/include;../"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LIBXML_READER_ENABLED;_USE_XMLLITE_READER_;USE_XMLLITE_READER;_USE_LIBXML2_READER_;_DOCWRAPPER_"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
......@@ -103,8 +103,8 @@
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\ASCOfficeOdfFile\src\odf\datatypes;.\OdfFormat;.\Oox2OdfConverter;..\..\Common\DocxFormat\Source;..\..\Common\DocxFormat\Source\XML;..\..\ASCOfficeOdfFile\include;..\..\ASCOfficeOdfFile\3dparty\utf8cpp\include;..\..\ASCOfficePPTXFile\PPTXFormat\"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_USE_XMLLITE_READER_;USE_LITE_READER"
AdditionalIncludeDirectories="../../ASCOfficeOdfFile/src/odf/datatypes;./OdfFormat;./Oox2OdfConverter;../../Common/DocxFormat/Source;../../Common/DocxFormat/Source/XML;../../ASCOfficeOdfFile\include;../../ASCOfficeOdfFile/3dparty/utf8cpp/include;../../ASCOfficePPTXFile/PPTXFormat/;../Common/DocxFormat/Source/XML/libxml2/XML/include;../"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LIBXML_READER_ENABLED;_USE_XMLLITE_READER_;USE_XMLLITE_READER;_USE_LIBXML2_READER_"
RuntimeLibrary="2"
UsePrecompiledHeader="2"
WarningLevel="3"
......@@ -168,6 +168,26 @@
RelativePath=".\Oox2OdfConverter\DocxConverter.cpp"
>
</File>
<File
RelativePath="..\..\Common\DocxFormat\Source\XML\libxml2\libxml2.cpp"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath=".\Oox2OdfConverter\stdafx.cpp"
>
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDiagram.cpp 0 → 100644
View file @ 7d4e5c86
#include "stdAfx.h"
#include "Converter.h"
#include "../utils.h"
#include <DocxFormat\Diagram\DiagramDrawing.h>
#include "odf_conversion_context.h"
#include "odf_text_context.h"
#include "odf_drawing_context.h"
namespace Oox2Odf
{
void OoxConverter::convert(OOX::Diagram::CShapeTree *oox_shape_tree)
{
if (oox_shape_tree == NULL) return;
odf_context()->drawing_context()->start_group();
cpdoccore::_CP_OPT(double) x, y , ch_x , ch_y ;
odf_context()->drawing_context()->set_group_position(x, y, ch_x, ch_y);
for (long i=0 ;i < oox_shape_tree->m_arrItems.size(); i++)
{
convert(oox_shape_tree->m_arrItems[i]);
}
odf_context()->drawing_context()->end_group();
}
void OoxConverter::convert(OOX::Diagram::CShape *oox_shape)
{
if (oox_shape == NULL) return;
if (!oox_shape->m_oSpPr.IsInit()) return;
odf_context()->drawing_context()->start_drawing();
int type = -1;
if (oox_shape->m_oSpPr->m_oPrstGeom.IsInit())
{
OOX::Drawing::CPresetGeometry2D * geometry = oox_shape->m_oSpPr->m_oPrstGeom.GetPointer();
type =(geometry->m_oPrst.GetValue());
}
if (type < 0 && oox_shape->m_oSpPr->m_oCustGeom.IsInit())
{
type = 1000;//6??? - poligon, path
}
//if (oox_shape->m_oNvSpPr.IsInit() && oox_shape->m_oNvSpPr->m_oCNvSpPr.IsInit() && ?????
// oox_shape->m_oNvSpPr->m_oCNvSpPr->m_otxBox.GetValue() == 1) type = 2000; //textBox
if (type == SimpleTypes::shapetypeRect && oox_shape->m_oTxBody.IsInit()) type = 2000;
if (type == 2000 && oox_shape->m_oTxBody->m_oBodyPr.IsInit() && oox_shape->m_oTxBody->m_oBodyPr->m_oFromWordArt.ToBool())
{
int wordart_type = convert(oox_shape->m_oTxBody->m_oBodyPr->m_oPrstTxWrap.GetPointer());
if (wordart_type >0)type = wordart_type;
}
if (type < 0)return;
/////////////////////////////////////////////////////////////////////////////////
odf_context()->drawing_context()->start_shape(type);
convert(oox_shape->m_oSpPr.GetPointer(), oox_shape->m_oShapeStyle.GetPointer());
//, , ...
//if (oox_shape->m_oNvSpPr.IsInit())
// convert(oox_shape->m_oNvSpPr->m_oCNvPr.GetPointer());
if ( oox_shape->m_oTxBody.IsInit() && oox_shape->m_oTxBody->m_arrItems.size() >0)
{
odf_context()->start_text_context();
for (long i=0 ; i < oox_shape->m_oTxBody->m_arrItems.size();i++)
{
convert(oox_shape->m_oTxBody->m_arrItems[i]);
}
odf_context()->drawing_context()->set_text( odf_context()->text_context());
//
convert(oox_shape->m_oTxBody->m_oBodyPr.GetPointer());
if (oox_shape->m_oShapeStyle.IsInit() && oox_shape->m_oShapeStyle->m_oFontRef.getType() == OOX::et_a_fontRef)
{
convert(&oox_shape->m_oShapeStyle->m_oFontRef);
}
odf_context()->end_text_context();
}
odf_context()->drawing_context()->end_shape();
odf_context()->drawing_context()->end_drawing();
}
}
ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.h
View file @ 7d4e5c86
#pragma once
#include <boost_filesystem_version.h>
#include <boost/lexical_cast.hpp>
#include <cpdoccore/CPOptional.h>
#include <atlcoll.h>
#include "..\..\..\Common\boost_filesystem_version.h"
#include "..\progressCallback.h"
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/VmlShapeTypes2Oox.h 0 → 100644
View file @ 7d4e5c86
#pragma once
#include <Common\SimpleTypes_Drawing.h>
namespace OOX
{
namespace Vml
{
enum SptType
{
sptMin = 0,
sptNotPrimitive = sptMin,
sptRectangle = 1,
sptRoundRectangle = 2,
sptEllipse = 3,
sptDiamond = 4,
sptIsocelesTriangle = 5,
sptRightTriangle = 6,
sptParallelogram = 7,
sptTrapezoid = 8,
sptHexagon = 9,
sptOctagon = 10,
sptPlus = 11,
sptStar = 12,
sptArrow = 13,
sptThickArrow = 14,
sptHomePlate = 15,
sptCube = 16,
sptBalloon = 17,
sptSeal = 18,
sptArc = 19,
sptLine = 20,
sptPlaque = 21,
sptCan = 22,
sptDonut = 23,
sptTextSimple = 24,
sptTextOctagon = 25,
sptTextHexagon = 26,
sptTextCurve = 27,
sptTextWave = 28,
sptTextRing = 29,
sptTextOnCurve = 30,
sptTextOnRing = 31,
sptStraightConnector1 = 32,
sptBentConnector2 = 33,
sptBentConnector3 = 34,
sptBentConnector4 = 35,
sptBentConnector5 = 36,
sptCurvedConnector2 = 37,
sptCurvedConnector3 = 38,
sptCurvedConnector4 = 39,
sptCurvedConnector5 = 40,
sptCallout1 = 41,
sptCallout2 = 42,
sptCallout3 = 43,
sptAccentCallout1 = 44,
sptAccentCallout2 = 45,
sptAccentCallout3 = 46,
sptBorderCallout1 = 47,
sptBorderCallout2 = 48,
sptBorderCallout3 = 49,
sptAccentBorderCallout1 = 50,
sptAccentBorderCallout2 = 51,
sptAccentBorderCallout3 = 52,
sptRibbon = 53,
sptRibbon2 = 54,
sptChevron = 55,
sptPentagon = 56,
sptNoSmoking = 57,
sptSeal8 = 58,
sptSeal16 = 59,
sptSeal32 = 60,
sptWedgeRectCallout = 61,
sptWedgeRRectCallout = 62,
sptWedgeEllipseCallout = 63,
sptWave = 64,
sptFoldedCorner = 65,
sptLeftArrow = 66,
sptDownArrow = 67,
sptUpArrow = 68,
sptLeftRightArrow = 69,
sptUpDownArrow = 70,
sptIrregularSeal1 = 71,
sptIrregularSeal2 = 72,
sptLightningBolt = 73,
sptHeart = 74,
sptPictureFrame = 75,
sptQuadArrow = 76,
sptLeftArrowCallout = 77,
sptRightArrowCallout = 78,
sptUpArrowCallout = 79,
sptDownArrowCallout = 80,
sptLeftRightArrowCallout = 81,
sptUpDownArrowCallout = 82,
sptQuadArrowCallout = 83,
sptBevel = 84,
sptLeftBracket = 85,
sptRightBracket = 86,
sptLeftBrace = 87,
sptRightBrace = 88,
sptLeftUpArrow = 89,
sptBentUpArrow = 90,
sptBentArrow = 91,
sptSeal24 = 92,
sptStripedRightArrow = 93,
sptNotchedRightArrow = 94,
sptBlockArc = 95,
sptSmileyFace = 96,
sptVerticalScroll = 97,
sptHorizontalScroll = 98,
sptCircularArrow = 99,
sptNotchedCircularArrow = 100,
sptUturnArrow = 101,
sptCurvedRightArrow = 102,
sptCurvedLeftArrow = 103,
sptCurvedUpArrow = 104,
sptCurvedDownArrow = 105,
sptCloudCallout = 106,
sptEllipseRibbon = 107,
sptEllipseRibbon2 = 108,
sptFlowChartProcess = 109,
sptFlowChartDecision = 110,
sptFlowChartInputOutput = 111,
sptFlowChartPredefinedProcess = 112,
sptFlowChartInternalStorage = 113,
sptFlowChartDocument = 114,
sptFlowChartMultidocument = 115,
sptFlowChartTerminator = 116,
sptFlowChartPreparation = 117,
sptFlowChartManualInput = 118,
sptFlowChartManualOperation = 119,
sptFlowChartConnector = 120,
sptFlowChartPunchedCard = 121,
sptFlowChartPunchedTape = 122,
sptFlowChartSummingJunction = 123,
sptFlowChartOr = 124,
sptFlowChartCollate = 125,
sptFlowChartSort = 126,
sptFlowChartExtract = 127,
sptFlowChartMerge = 128,
sptFlowChartOfflineStorage = 129,
sptFlowChartOnlineStorage = 130,
sptFlowChartMagneticTape = 131,
sptFlowChartMagneticDisk = 132,
sptFlowChartMagneticDrum = 133,
sptFlowChartDisplay = 134,
sptFlowChartDelay = 135,
sptTextPlainText = 136,
sptTextStop = 137,
sptTextTriangle = 138,
sptTextTriangleInverted = 139,
sptTextChevron = 140,
sptTextChevronInverted = 141,
sptTextRingInside = 142,
sptTextRingOutside = 143,
sptTextArchUpCurve = 144,
sptTextArchDownCurve = 145,
sptTextCircleCurve = 146,
sptTextButtonCurve = 147,
sptTextArchUpPour = 148,
sptTextArchDownPour = 149,
sptTextCirclePour = 150,
sptTextButtonPour = 151,
sptTextCurveUp = 152,
sptTextCurveDown = 153,
sptTextCascadeUp = 154,
sptTextCascadeDown = 155,
sptTextWave1 = 156,
sptTextWave2 = 157,
sptTextWave3 = 158,
sptTextWave4 = 159,
sptTextInflate = 160,
sptTextDeflate = 161,
sptTextInflateBottom = 162,
sptTextDeflateBottom = 163,
sptTextInflateTop = 164,
sptTextDeflateTop = 165,
sptTextDeflateInflate = 166,
sptTextDeflateInflateDeflate = 167,
sptTextFadeRight = 168,
sptTextFadeLeft = 169,
sptTextFadeUp = 170,
sptTextFadeDown = 171,
sptTextSlantUp = 172,
sptTextSlantDown = 173,
sptTextCanUp = 174,
sptTextCanDown = 175,
sptFlowChartAlternateProcess = 176,
sptFlowChartOffpageConnector = 177,
sptCallout90 = 178,
sptAccentCallout90 = 179,
sptBorderCallout90 = 180,
sptAccentBorderCallout90 = 181,
sptLeftRightUpArrow = 182,
sptSun = 183,
sptMoon = 184,
sptBracketPair = 185,
sptBracePair = 186,
sptSeal4 = 187,
sptDoubleWave = 188,
sptActionButtonBlank = 189,
sptActionButtonHome = 190,
sptActionButtonHelp = 191,
sptActionButtonInformation = 192,
sptActionButtonForwardNext = 193,
sptActionButtonBackPrevious = 194,
sptActionButtonEnd = 195,
sptActionButtonBeginning = 196,
sptActionButtonReturn = 197,
sptActionButtonDocument = 198,
sptActionButtonSound = 199,
sptActionButtonMovie = 200,
sptHostControl = 201,
sptTextBox = 202,
sptMax,
sptNil = 0x0FFF
};
}
int static Spt2ShapeType(Vml::SptType type)
{
switch(type)
{
//case Vml::sptMin = 0,
//case Vml::sptNotPrimitive = case Vml::sptMin,
case Vml::sptRectangle : return SimpleTypes::shapetypeRect ;
case Vml::sptRoundRectangle : return SimpleTypes::shapetypeRoundRect ;
case Vml::sptEllipse : return SimpleTypes::shapetypeEllipse ;
case Vml::sptDiamond : return SimpleTypes::shapetypeDiamond ;
case Vml::sptIsocelesTriangle : return SimpleTypes::shapetypeTriangle ;
case Vml::sptRightTriangle : return SimpleTypes::shapetypeRtTriangle ;
case Vml::sptParallelogram : return SimpleTypes::shapetypeParallelogram ;
case Vml::sptTrapezoid : return SimpleTypes::shapetypeTrapezoid ;
case Vml::sptHexagon : return SimpleTypes::shapetypeHexagon ;
case Vml::sptOctagon : return SimpleTypes::shapetypeOctagon ;
case Vml::sptPlus : return SimpleTypes::shapetypePlus ;
case Vml::sptStar : return SimpleTypes::shapetypeStar5 ;
case Vml::sptArrow : return SimpleTypes::shapetypeRightArrow ; //???
case Vml::sptThickArrow : return SimpleTypes::shapetypeThickArrow ;
case Vml::sptHomePlate : return SimpleTypes::shapetypeHomePlate ;
case Vml::sptCube : return SimpleTypes::shapetypeCube ;
case Vml::sptBalloon : return SimpleTypes::shapetypeBallon ;
case Vml::sptSeal : return SimpleTypes::shapetypeIrregularSeal1 ;
case Vml::sptArc : return SimpleTypes::shapetypeArc ;
case Vml::sptLine : return SimpleTypes::shapetypeLine ;
case Vml::sptPlaque : return SimpleTypes::shapetypePlaque ;
case Vml::sptCan : return SimpleTypes::shapetypeCan ;
case Vml::sptDonut : return SimpleTypes::shapetypeDonut ;
//case Vml::sptTextSimple : return SimpleTypes::shapetypeTextSimple ;
//case Vml::sptTextOctagon : return SimpleTypes::shapetypeTextOctagon ;
//case Vml::sptTextHexagon : return SimpleTypes::shapetypeTextHexagon ;
//case Vml::sptTextCurve : return SimpleTypes::shapetypeTextCurve ;
//case Vml::sptTextWave : return SimpleTypes::shapetypeTextWave ;
//case Vml::sptTextRing : return SimpleTypes::shapetypeTextRing ;
//case Vml::sptTextOnCurve : return SimpleTypes::shapetypeTextOnCurve ;
//case Vml::sptTextOnRing : return SimpleTypes::shapetypeTextOnRing ;
case Vml::sptStraightConnector1 : return SimpleTypes::shapetypeStraightConnector1 ;
case Vml::sptBentConnector2 : return SimpleTypes::shapetypeBentConnector2 ;
case Vml::sptBentConnector3 : return SimpleTypes::shapetypeBentConnector3 ;
case Vml::sptBentConnector4 : return SimpleTypes::shapetypeBentConnector4 ;
case Vml::sptBentConnector5 : return SimpleTypes::shapetypeBentConnector5 ;
case Vml::sptCurvedConnector2 : return SimpleTypes::shapetypeCurvedConnector2 ;
case Vml::sptCurvedConnector3 : return SimpleTypes::shapetypeCurvedConnector3 ;
case Vml::sptCurvedConnector4 : return SimpleTypes::shapetypeCurvedConnector4 ;
case Vml::sptCurvedConnector5 : return SimpleTypes::shapetypeCurvedConnector5 ;
case Vml::sptCallout1 : return SimpleTypes::shapetypeCallout1 ;
case Vml::sptCallout2 : return SimpleTypes::shapetypeCallout2 ;
case Vml::sptCallout3 : return SimpleTypes::shapetypeCallout3 ;
case Vml::sptAccentCallout1 : return SimpleTypes::shapetypeAccentCallout1 ;
case Vml::sptAccentCallout2 : return SimpleTypes::shapetypeAccentCallout2 ;
case Vml::sptAccentCallout3 : return SimpleTypes::shapetypeAccentCallout3 ;
case Vml::sptBorderCallout1 : return SimpleTypes::shapetypeAccentCallout1 ;
case Vml::sptBorderCallout2 : return SimpleTypes::shapetypeAccentCallout2 ;
case Vml::sptBorderCallout3 : return SimpleTypes::shapetypeAccentCallout3 ;
case Vml::sptAccentBorderCallout1 : return SimpleTypes::shapetypeAccentBorderCallout1 ;
case Vml::sptAccentBorderCallout2 : return SimpleTypes::shapetypeAccentBorderCallout2 ;
case Vml::sptAccentBorderCallout3 : return SimpleTypes::shapetypeAccentBorderCallout3 ;
case Vml::sptRibbon : return SimpleTypes::shapetypeRibbon ;
case Vml::sptRibbon2 : return SimpleTypes::shapetypeRibbon2 ;
case Vml::sptChevron : return SimpleTypes::shapetypeChevron ;
case Vml::sptPentagon : return SimpleTypes::shapetypePentagon ;
case Vml::sptNoSmoking : return SimpleTypes::shapetypeNoSmoking ;
case Vml::sptSeal8 : return SimpleTypes::shapetypeStar8 ;
case Vml::sptSeal16 : return SimpleTypes::shapetypeStar16 ;
case Vml::sptSeal32 : return SimpleTypes::shapetypeStar32 ;
case Vml::sptWedgeRectCallout : return SimpleTypes::shapetypeWedgeRectCallout ;
case Vml::sptWedgeRRectCallout : return SimpleTypes::shapetypeWedgeRoundRectCallout ;
case Vml::sptWedgeEllipseCallout : return SimpleTypes::shapetypeWedgeEllipseCallout ;
case Vml::sptWave : return SimpleTypes::shapetypeWave ;
case Vml::sptFoldedCorner : return SimpleTypes::shapetypeFoldedCorner ;
case Vml::sptLeftArrow : return SimpleTypes::shapetypeLeftArrow ;
case Vml::sptDownArrow : return SimpleTypes::shapetypeDownArrow ;
case Vml::sptUpArrow : return SimpleTypes::shapetypeUpArrow ;
case Vml::sptLeftRightArrow : return SimpleTypes::shapetypeLeftRightArrow ;
case Vml::sptUpDownArrow : return SimpleTypes::shapetypeUpDownArrow ;
case Vml::sptIrregularSeal1 : return SimpleTypes::shapetypeIrregularSeal1 ;
case Vml::sptIrregularSeal2 : return SimpleTypes::shapetypeIrregularSeal2 ;
case Vml::sptLightningBolt : return SimpleTypes::shapetypeLightningBolt ;
case Vml::sptHeart : return SimpleTypes::shapetypeHeart ;
case Vml::sptPictureFrame : return 3000;//SimpleTypes::shapetypeFrame ; SimpleTypes::shapetypeRect ;//
case Vml::sptQuadArrow : return SimpleTypes::shapetypeQuadArrow ;
case Vml::sptLeftArrowCallout : return SimpleTypes::shapetypeLeftArrowCallout ;
case Vml::sptRightArrowCallout : return SimpleTypes::shapetypeRightArrowCallout ;
case Vml::sptUpArrowCallout : return SimpleTypes::shapetypeUpArrowCallout ;
case Vml::sptDownArrowCallout : return SimpleTypes::shapetypeDownArrowCallout ;
case Vml::sptLeftRightArrowCallout : return SimpleTypes::shapetypeLeftRightArrowCallout ;
case Vml::sptUpDownArrowCallout : return SimpleTypes::shapetypeUpDownArrowCallout ;
case Vml::sptQuadArrowCallout : return SimpleTypes::shapetypeQuadArrowCallout ;
case Vml::sptBevel : return SimpleTypes::shapetypeBevel ;
case Vml::sptLeftBracket : return SimpleTypes::shapetypeLeftBracket ;
case Vml::sptRightBracket : return SimpleTypes::shapetypeRightBracket ;
case Vml::sptLeftBrace : return SimpleTypes::shapetypeLeftBrace ;
case Vml::sptRightBrace : return SimpleTypes::shapetypeRightBrace ;
case Vml::sptLeftUpArrow : return SimpleTypes::shapetypeLeftUpArrow ;
case Vml::sptBentUpArrow : return SimpleTypes::shapetypeBentUpArrow ;
case Vml::sptBentArrow : return SimpleTypes::shapetypeBentArrow ;
case Vml::sptSeal24 : return SimpleTypes::shapetypeStar24 ;
case Vml::sptStripedRightArrow : return SimpleTypes::shapetypeStripedRightArrow ;
case Vml::sptNotchedRightArrow : return SimpleTypes::shapetypeNotchedRightArrow ;
case Vml::sptBlockArc : return SimpleTypes::shapetypeBlockArc ;
case Vml::sptSmileyFace : return SimpleTypes::shapetypeSmileyFace ;
case Vml::sptVerticalScroll : return SimpleTypes::shapetypeVerticalScroll ;
case Vml::sptHorizontalScroll : return SimpleTypes::shapetypeHorizontalScroll ;
case Vml::sptCircularArrow : return SimpleTypes::shapetypeCircularArrow ;
//case Vml::sptNotchedCircularArrow : return SimpleTypes::shapetypeNotchedCircularArrow ;
case Vml::sptUturnArrow : return SimpleTypes::shapetypeUturnArrow ;
case Vml::sptCurvedRightArrow : return SimpleTypes::shapetypeCurvedRightArrow ;
case Vml::sptCurvedLeftArrow : return SimpleTypes::shapetypeCurvedLeftArrow ;
case Vml::sptCurvedUpArrow : return SimpleTypes::shapetypeCurvedUpArrow ;
case Vml::sptCurvedDownArrow : return SimpleTypes::shapetypeCurvedDownArrow ;
case Vml::sptCloudCallout : return SimpleTypes::shapetypeCloudCallout ;
case Vml::sptEllipseRibbon : return SimpleTypes::shapetypeEllipseRibbon ;
case Vml::sptEllipseRibbon2 : return SimpleTypes::shapetypeEllipseRibbon2 ;
case Vml::sptFlowChartProcess : return SimpleTypes::shapetypeFlowChartProcess ;
case Vml::sptFlowChartDecision : return SimpleTypes::shapetypeFlowChartDecision ;
case Vml::sptFlowChartInputOutput : return SimpleTypes::shapetypeFlowChartInputOutput ;
case Vml::sptFlowChartPredefinedProcess:return SimpleTypes::shapetypeFlowChartPredefinedProcess ;
case Vml::sptFlowChartInternalStorage : return SimpleTypes::shapetypeFlowChartInternalStorage ;
case Vml::sptFlowChartDocument : return SimpleTypes::shapetypeFlowChartDocument ;
case Vml::sptFlowChartMultidocument : return SimpleTypes::shapetypeFlowChartMultidocument ;
case Vml::sptFlowChartTerminator : return SimpleTypes::shapetypeFlowChartTerminator ;
case Vml::sptFlowChartPreparation : return SimpleTypes::shapetypeFlowChartPreparation ;
case Vml::sptFlowChartManualInput : return SimpleTypes::shapetypeFlowChartManualInput ;
case Vml::sptFlowChartManualOperation : return SimpleTypes::shapetypeFlowChartManualOperation ;
case Vml::sptFlowChartConnector : return SimpleTypes::shapetypeFlowChartConnector ;
case Vml::sptFlowChartPunchedCard : return SimpleTypes::shapetypeFlowChartPunchedCard ;
case Vml::sptFlowChartPunchedTape : return SimpleTypes::shapetypeFlowChartPunchedTape ;
case Vml::sptFlowChartSummingJunction : return SimpleTypes::shapetypeFlowChartSummingJunction ;
case Vml::sptFlowChartOr : return SimpleTypes::shapetypeFlowChartOr ;
case Vml::sptFlowChartCollate : return SimpleTypes::shapetypeFlowChartCollate ;
case Vml::sptFlowChartSort : return SimpleTypes::shapetypeFlowChartSort ;
case Vml::sptFlowChartExtract : return SimpleTypes::shapetypeFlowChartExtract ;
case Vml::sptFlowChartMerge : return SimpleTypes::shapetypeFlowChartMerge ;
//case Vml::sptFlowChartOfflineStorage : return SimpleTypes::shapetypeChartOfflineStorage ;
case Vml::sptFlowChartOnlineStorage : return SimpleTypes::shapetypeFlowChartOnlineStorage ;
case Vml::sptFlowChartMagneticTape : return SimpleTypes::shapetypeFlowChartMagneticTape ;
case Vml::sptFlowChartMagneticDisk : return SimpleTypes::shapetypeFlowChartMagneticDisk ;
case Vml::sptFlowChartMagneticDrum : return SimpleTypes::shapetypeFlowChartMagneticDrum ;
case Vml::sptFlowChartDisplay : return SimpleTypes::shapetypeFlowChartDisplay ;
case Vml::sptFlowChartDelay : return SimpleTypes::shapetypeFlowChartDelay ;
//////////////////////////////////////////////////////////////////////////////
case Vml::sptTextPlainText : return SimpleTypes::textshapetypeTextPlain +2001;
case Vml::sptTextStop : return SimpleTypes::textshapetypeTextStop +2001;
case Vml::sptTextTriangle : return SimpleTypes::textshapetypeTextTriangle +2001;
case Vml::sptTextTriangleInverted : return SimpleTypes::textshapetypeTextTriangleInverted+2001;
case Vml::sptTextChevron : return SimpleTypes::textshapetypeTextChevron +2001;
case Vml::sptTextChevronInverted : return SimpleTypes::textshapetypeTextChevronInverted+2001;
case Vml::sptTextRingInside : return SimpleTypes::textshapetypeTextRingInside +2001;
case Vml::sptTextRingOutside : return SimpleTypes::textshapetypeTextRingOutside +2001;
case Vml::sptTextArchUpCurve : return SimpleTypes::textshapetypeTextArchUp +2001;
case Vml::sptTextArchDownCurve : return SimpleTypes::textshapetypeTextArchDown +2001;
case Vml::sptTextCircleCurve : return SimpleTypes::textshapetypeTextCircle +2001;
case Vml::sptTextButtonCurve : return SimpleTypes::textshapetypeTextButton +2001;
case Vml::sptTextArchUpPour : return SimpleTypes::textshapetypeTextArchUpPour +2001;
case Vml::sptTextArchDownPour : return SimpleTypes::textshapetypeTextArchDownPour +2001;
case Vml::sptTextCirclePour : return SimpleTypes::textshapetypeTextCirclePour +2001;
case Vml::sptTextButtonPour : return SimpleTypes::textshapetypeTextButtonPour +2001;
case Vml::sptTextCurveUp : return SimpleTypes::textshapetypeTextCurveUp +2001;
case Vml::sptTextCurveDown : return SimpleTypes::textshapetypeTextCurveDown +2001;
case Vml::sptTextCascadeUp : return SimpleTypes::textshapetypeTextCascadeUp +2001;
case Vml::sptTextCascadeDown : return SimpleTypes::textshapetypeTextCascadeDown +2001;
case Vml::sptTextWave1 : return SimpleTypes::textshapetypeTextWave1 +2001;
case Vml::sptTextWave2 : return SimpleTypes::textshapetypeTextWave2 +2001;
//case Vml::sptTextWave3 : return SimpleTypes::shapetypeTextWave3 ;
case Vml::sptTextWave4 : return SimpleTypes::textshapetypeTextWave4 +2001;
case Vml::sptTextInflate : return SimpleTypes::textshapetypeTextInflate +2001;
case Vml::sptTextDeflate : return SimpleTypes::textshapetypeTextDeflate +2001;
//case Vml::sptTextInflateBottom : return SimpleTypes::shapetypeTextInflateBottom ;
//case Vml::sptTextDeflateBottom : return SimpleTypes::shapetypeTextDeflateBottom ;
//case Vml::sptTextInflateTop : return SimpleTypes::shapetypeTextInflateTop ;
//case Vml::sptTextDeflateTop : return SimpleTypes::shapetypeTextDeflateTop ;
//case Vml::sptTextDeflateInflate : return SimpleTypes::shapetypeTextDeflateInflate ;
//case Vml::sptTextDeflateInflateDeflate :return SimpleTypes::shapetypeTextDeflateInflateDeflat ;
//case Vml::sptTextFadeRight : return SimpleTypes::shapetypeTextFadeRight ;
//case Vml::sptTextFadeLeft : return SimpleTypes::shapetypeTextFadeLeft ;
//case Vml::sptTextFadeUp : return SimpleTypes::shapetypeTextFadeUp ;
//case Vml::sptTextFadeDown : return SimpleTypes::shapetypeTextFadeDown ;
case Vml::sptTextSlantUp : return SimpleTypes::textshapetypeTextSlantUp +2001;
case Vml::sptTextSlantDown : return SimpleTypes::textshapetypeTextSlantDown +2001;
case Vml::sptTextCanUp : return SimpleTypes::textshapetypeTextCanUp +2001;
case Vml::sptTextCanDown : return SimpleTypes::textshapetypeTextCanDown +2001;
case Vml::sptFlowChartAlternateProcess :return SimpleTypes::shapetypeFlowChartAlternateProcess ;
case Vml::sptFlowChartOffpageConnector :return SimpleTypes::shapetypeFlowChartOffpageConnector ;
case Vml::sptCallout90 : return SimpleTypes::shapetypeCallout1 ;
case Vml::sptAccentCallout90 : return SimpleTypes::shapetypeAccentCallout1 ;
case Vml::sptBorderCallout90 : return SimpleTypes::shapetypeBorderCallout1;
case Vml::sptAccentBorderCallout90 : return SimpleTypes::shapetypeAccentBorderCallout1 ;
case Vml::sptLeftRightUpArrow : return SimpleTypes::shapetypeLeftRightUpArrow ;
case Vml::sptSun : return SimpleTypes::shapetypeSun ;
case Vml::sptMoon : return SimpleTypes::shapetypeMoon ;
case Vml::sptBracketPair : return SimpleTypes::shapetypeBracketPair ;
case Vml::sptBracePair : return SimpleTypes::shapetypeBracePair ;
case Vml::sptSeal4 : return SimpleTypes::shapetypeStar4 ;
case Vml::sptDoubleWave : return SimpleTypes::shapetypeDoubleWave ;
case Vml::sptActionButtonBlank : return SimpleTypes::shapetypeActionButtonBlank ;
case Vml::sptActionButtonHome : return SimpleTypes::shapetypeActionButtonHome ;
case Vml::sptActionButtonHelp : return SimpleTypes::shapetypeActionButtonHelp ;
case Vml::sptActionButtonInformation : return SimpleTypes::shapetypeActionButtonInformation ;
case Vml::sptActionButtonForwardNext : return SimpleTypes::shapetypeActionButtonForwardNext ;
case Vml::sptActionButtonBackPrevious : return SimpleTypes::shapetypeActionButtonBackPrevious ;
case Vml::sptActionButtonEnd : return SimpleTypes::shapetypeActionButtonEnd ;
case Vml::sptActionButtonBeginning : return SimpleTypes::shapetypeActionButtonBeginning ;
case Vml::sptActionButtonReturn : return SimpleTypes::shapetypeActionButtonReturn ;
case Vml::sptActionButtonDocument : return SimpleTypes::shapetypeActionButtonDocument ;
case Vml::sptActionButtonSound : return SimpleTypes::shapetypeActionButtonSound ;
case Vml::sptActionButtonMovie : return SimpleTypes::shapetypeActionButtonMovie ;
//case Vml::sptHostControl : return SimpleTypes::shapetype ;
case Vml::sptTextBox : return 2000;
default:
return SimpleTypes::shapetypeRect;
}
}
}
\ No newline at end of file
ASCOfficeOdfFileW/version.h
View file @ 7d4e5c86
......@@ -2,6 +2,6 @@
//1
//2
//0
//174
#define INTVER 1,2,0,174
#define STRVER "1,2,0,174\0"
//176
#define INTVER 1,2,0,176
#define STRVER "1,2,0,176\0"
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