From 99e419e183e1b0312693e36cc86032293e5edce4 Mon Sep 17 00:00:00 2001 From: "Elen.Subbotina" Date: Wed, 20 May 2015 08:24:50 +0000 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=B5=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D1=83=D0=B5=D0=BC=D0=BE=D0=B3=D0=BE.=20=D0=92=D0=BC?= =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=BE=20=D0=BD=D0=B5=D0=B3=D0=BE=20OdfFile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62652 954022d7-b5bf-4e40-9824-e11837661b57 --- .gitignore | 7 - ASCOfficeOdpFile/ASCOfficeOdpFile.cpp | 12 - ASCOfficeOdpFile/ASCOfficeOdpFile.rc | 101 - ASCOfficeOdpFile/ASCOfficeOdpFile.rgs | 11 - ASCOfficeOdpFile/ASCOfficeOdpFile.sln | 46 - ASCOfficeOdpFile/ASCOfficeOdpFile.vcproj | 294 -- ASCOfficeOdpFile/ODPFormat/ODPFormat.vcproj | 2655 ----------------- .../Content/Animation/AnimationElement.cpp | 45 - .../Content/Animation/AnimationElement.h | 34 - .../Source/Content/Animation/Par.cpp | 82 - .../ODPFormat/Source/Content/Animation/Par.h | 58 - .../Content/Animation/TransitionFilter.cpp | 93 - .../Content/Animation/TransitionFilter.h | 66 - .../ODPFormat/Source/Content/Body.cpp | 42 - .../ODPFormat/Source/Content/Body.h | 29 - .../ODPFormat/Source/Content/CustomShape.cpp | 84 - .../ODPFormat/Source/Content/CustomShape.h | 47 - .../Source/Content/DrawingElement.cpp | 52 - .../ODPFormat/Source/Content/DrawingElement.h | 33 - .../Source/Content/EnhancedGeometry.cpp | 70 - .../Source/Content/EnhancedGeometry.h | 46 - .../ODPFormat/Source/Content/File.cpp | 81 - .../ODPFormat/Source/Content/File.h | 38 - .../ODPFormat/Source/Content/Frame.cpp | 94 - .../ODPFormat/Source/Content/Frame.h | 53 - .../ODPFormat/Source/Content/Group.cpp | 40 - .../ODPFormat/Source/Content/Group.h | 29 - .../ODPFormat/Source/Content/Image.cpp | 49 - .../ODPFormat/Source/Content/Image.h | 37 - .../ODPFormat/Source/Content/Line.cpp | 71 - .../ODPFormat/Source/Content/Line.h | 42 - .../ODPFormat/Source/Content/OleObject.cpp | 47 - .../ODPFormat/Source/Content/OleObject.h | 34 - .../ODPFormat/Source/Content/Rect.cpp | 80 - .../ODPFormat/Source/Content/Rect.h | 44 - .../ODPFormat/Source/Content/Slide.cpp | 53 - .../ODPFormat/Source/Content/Slide.h | 38 - .../ODPFormat/Source/Content/TextBox.cpp | 40 - .../ODPFormat/Source/Content/TextBox.h | 29 - ASCOfficeOdpFile/ODPFormat/Source/Folder.cpp | 165 - ASCOfficeOdpFile/ODPFormat/Source/Folder.h | 111 - .../ODPFormat/Source/Limit/Accumulate.cpp | 18 - .../ODPFormat/Source/Limit/Accumulate.h | 23 - .../ODPFormat/Source/Limit/Additive.cpp | 18 - .../ODPFormat/Source/Limit/Additive.h | 23 - .../ODPFormat/Source/Limit/AnimDirection.cpp | 18 - .../ODPFormat/Source/Limit/AnimDirection.h | 23 - .../ODPFormat/Source/Limit/AnimSubItem.cpp | 19 - .../ODPFormat/Source/Limit/AnimSubItem.h | 23 - .../ODPFormat/Source/Limit/CalcMode.cpp | 20 - .../ODPFormat/Source/Limit/CalcMode.h | 23 - .../ODPFormat/Source/Limit/NodeType.cpp | 23 - .../ODPFormat/Source/Limit/NodeType.h | 23 - .../ODPFormat/Source/Limit/PresetClass.cpp | 23 - .../ODPFormat/Source/Limit/PresetClass.h | 23 - .../ODPFormat/Source/Limit/Restart.cpp | 20 - .../ODPFormat/Source/Limit/Restart.h | 23 - .../ODPFormat/Source/Limit/RestartDefault.cpp | 20 - .../ODPFormat/Source/Limit/RestartDefault.h | 23 - .../ODPFormat/Source/Limit/SmilFill.cpp | 22 - .../ODPFormat/Source/Limit/SmilFill.h | 23 - .../Source/Limit/SmilFillDefault.cpp | 22 - .../ODPFormat/Source/Limit/SmilFillDefault.h | 23 - .../ODPFormat/Source/Limit/SmilMode.cpp | 18 - .../ODPFormat/Source/Limit/SmilMode.h | 23 - .../ODPFormat/Source/Manifest/File.cpp | 101 - .../ODPFormat/Source/Manifest/File.h | 37 - .../ODPFormat/Source/Meta/File.cpp | 61 - ASCOfficeOdpFile/ODPFormat/Source/Meta/File.h | 41 - .../ODPFormat/Source/Meta/Statistic.cpp | 52 - .../ODPFormat/Source/Meta/Statistic.h | 37 - .../ODPFormat/Source/Meta/UserDefined.cpp | 41 - .../ODPFormat/Source/Meta/UserDefined.h | 31 - .../ODPFormat/Source/MimeType/File.cpp | 65 - .../ODPFormat/Source/MimeType/File.h | 28 - ASCOfficeOdpFile/ODPFormat/Source/Odp.h | 23 - .../ODPFormat/Source/Styles/File.cpp | 105 - .../ODPFormat/Source/Styles/File.h | 63 - .../ODPFormat/Source/Styles/FillImage.cpp | 50 - .../ODPFormat/Source/Styles/FillImage.h | 39 - .../ODPFormat/Source/Styles/FillImages.cpp | 59 - .../ODPFormat/Source/Styles/FillImages.h | 33 - .../ODPFormat/Source/Styles/Gradient.cpp | 64 - .../ODPFormat/Source/Styles/Gradient.h | 44 - .../ODPFormat/Source/Styles/Gradients.cpp | 59 - .../ODPFormat/Source/Styles/Gradients.h | 33 - .../ODPFormat/Source/Styles/Marker.cpp | 47 - .../ODPFormat/Source/Styles/Marker.h | 32 - .../ODPFormat/Source/Styles/Markers.cpp | 59 - .../ODPFormat/Source/Styles/Markers.h | 33 - .../ODPFormat/Source/Styles/MasterPage.cpp | 47 - .../ODPFormat/Source/Styles/MasterPage.h | 36 - .../ODPFormat/Source/Styles/MasterPages.cpp | 59 - .../ODPFormat/Source/Styles/MasterPages.h | 33 - .../ODPFormat/Source/Styles/PageLayout.cpp | 42 - .../ODPFormat/Source/Styles/PageLayout.h | 33 - .../Source/Styles/PageLayoutProperties.cpp | 57 - .../Source/Styles/PageLayoutProperties.h | 43 - .../ODPFormat/Source/Styles/PageLayouts.cpp | 59 - .../ODPFormat/Source/Styles/PageLayouts.h | 33 - .../ODPFormat/Source/Styles/Placeholder.cpp | 49 - .../ODPFormat/Source/Styles/Placeholder.h | 35 - .../ODPFormat/Source/Styles/TableTemplate.cpp | 60 - .../ODPFormat/Source/Styles/TableTemplate.h | 38 - .../Source/Styles/TableTemplates.cpp | 59 - .../ODPFormat/Source/Styles/TableTemplates.h | 33 - ASCOfficeOdpFile/Odp2DrawingXML/Converter.cpp | 78 - ASCOfficeOdpFile/Odp2DrawingXML/Converter.h | 79 - .../Odp2DrawingXML/Odp2DrawingXML.vcproj | 299 -- .../Source/CustomShapeConvert.cpp | 55 - .../Odp2DrawingXML/Source/FillPenBrush.cpp | 129 - .../Odp2DrawingXML/Source/FrameConvert.cpp | 119 - .../Odp2DrawingXML/Source/LineConvert.cpp | 62 - .../Odp2DrawingXML/Source/RectConvert.cpp | 72 - .../Odp2DrawingXML/Source/SlideConvert.cpp | 104 - .../Odp2DrawingXML/Source/TableConvert.cpp | 163 - .../Odp2DrawingXML/Source/TextAlign.cpp | 17 - .../Odp2DrawingXML/Source/TextAnchor.cpp | 13 - .../Odp2DrawingXML/Source/TextConvert.cpp | 213 -- .../Source/TransitionConvert.cpp | 209 -- ASCOfficeOdpFile/Odp2DrawingXML/stdafx.cpp | 8 - ASCOfficeOdpFile/Odp2DrawingXML/stdafx.h | 52 - ASCOfficeOdpFile/OfficeOdpFile.h | 250 -- ASCOfficeOdpFile/resource.h | 19 - ASCOfficeOdpFile/stdafx.cpp | 5 - ASCOfficeOdpFile/stdafx.h | 54 - ASCOfficeOdpFile/version.h | 7 - 127 files changed, 9559 deletions(-) delete mode 100644 ASCOfficeOdpFile/ASCOfficeOdpFile.cpp delete mode 100644 ASCOfficeOdpFile/ASCOfficeOdpFile.rc delete mode 100644 ASCOfficeOdpFile/ASCOfficeOdpFile.rgs delete mode 100644 ASCOfficeOdpFile/ASCOfficeOdpFile.sln delete mode 100644 ASCOfficeOdpFile/ASCOfficeOdpFile.vcproj delete mode 100644 ASCOfficeOdpFile/ODPFormat/ODPFormat.vcproj delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/AnimationElement.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/AnimationElement.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/Par.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/Par.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/TransitionFilter.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/TransitionFilter.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Body.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Body.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/CustomShape.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/CustomShape.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/DrawingElement.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/DrawingElement.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/EnhancedGeometry.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/EnhancedGeometry.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/File.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/File.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Frame.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Frame.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Group.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Group.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Image.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Image.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Line.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Line.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/OleObject.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/OleObject.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Rect.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Rect.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Slide.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/Slide.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/TextBox.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Content/TextBox.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Folder.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Folder.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/Accumulate.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/Accumulate.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/Additive.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/Additive.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimDirection.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimDirection.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimSubItem.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimSubItem.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/CalcMode.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/CalcMode.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/NodeType.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/NodeType.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/PresetClass.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/PresetClass.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/Restart.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/Restart.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/RestartDefault.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/RestartDefault.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFill.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFill.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFillDefault.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFillDefault.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilMode.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilMode.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Manifest/File.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Manifest/File.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Meta/File.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Meta/File.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Meta/Statistic.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Meta/Statistic.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Meta/UserDefined.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Meta/UserDefined.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/MimeType/File.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/MimeType/File.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Odp.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/File.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/File.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImage.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImage.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImages.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImages.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradient.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradient.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradients.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradients.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/Marker.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/Marker.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/Markers.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/Markers.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPage.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPage.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPages.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPages.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayout.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayout.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayoutProperties.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayoutProperties.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayouts.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayouts.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/Placeholder.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/Placeholder.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplate.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplate.h delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplates.cpp delete mode 100644 ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplates.h delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Converter.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Converter.h delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Odp2DrawingXML.vcproj delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/CustomShapeConvert.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/FillPenBrush.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/FrameConvert.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/LineConvert.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/RectConvert.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/SlideConvert.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/TableConvert.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/TextAlign.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/TextAnchor.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/TextConvert.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/Source/TransitionConvert.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/stdafx.cpp delete mode 100644 ASCOfficeOdpFile/Odp2DrawingXML/stdafx.h delete mode 100644 ASCOfficeOdpFile/OfficeOdpFile.h delete mode 100644 ASCOfficeOdpFile/resource.h delete mode 100644 ASCOfficeOdpFile/stdafx.cpp delete mode 100644 ASCOfficeOdpFile/stdafx.h delete mode 100644 ASCOfficeOdpFile/version.h diff --git a/.gitignore b/.gitignore index eaa04fc33c..3d66efd29f 100644 --- a/.gitignore +++ b/.gitignore @@ -70,13 +70,6 @@ ASCOfficeDocxFile2/debug ASCOfficeDocxFile2/msxml3.tlh ASCOfficeDocxFile2/msxml3.tli ASCOfficeDocxFile2/release -ASCOfficeOdpFile/* -ASCOfficeOdpFile/ODPFormat/Debug -ASCOfficeOdpFile/ODPFormat/ODPFormat.vcproj.AVSMEDIA.Viktor.Logunov.user -ASCOfficeOdpFile/ODPFormat/ReadMe.txt -ASCOfficeOdpFile/ODPFormat/Release -ASCOfficeOdpFile/Odp2DrawingXML/Debug -ASCOfficeOdpFile/Odp2DrawingXML/Release ASCOfficeOdtFile/Projects/* ASCOfficePPTXFile/*.suo ASCOfficePPTXFile/Debug diff --git a/ASCOfficeOdpFile/ASCOfficeOdpFile.cpp b/ASCOfficeOdpFile/ASCOfficeOdpFile.cpp deleted file mode 100644 index ec07a4bdad..0000000000 --- a/ASCOfficeOdpFile/ASCOfficeOdpFile.cpp +++ /dev/null @@ -1,12 +0,0 @@ -// ASCOfficeOdpFile.cpp : Implementation of DLL Exports. -#include "stdafx.h" -#include "resource.h" - -#include "OfficeODPFile.h" -// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you -[ module(dll, uuid = "{FA56A4F4-FCEA-47f8-BE80-B37C7FA95BBF}", - name = "ASCOfficeOdpFile", - helpstring = "ASCOfficeOdpFile 1.0 Type Library", - resource_name = "IDR_ASCOFFICEODPFILE") ]; - - diff --git a/ASCOfficeOdpFile/ASCOfficeOdpFile.rc b/ASCOfficeOdpFile/ASCOfficeOdpFile.rc deleted file mode 100644 index ecb1ede028..0000000000 --- a/ASCOfficeOdpFile/ASCOfficeOdpFile.rc +++ /dev/null @@ -1,101 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" -#define COMPONENT_NAME "OfficeOdpFile" -#include "../Common/FileInfo.h" -#include "version.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "winres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE 9, 1 -#pragma code_page(1251) -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""winres.h""\r\n" - "\0" -END - - -#endif // APSTUDIO_INVOKED - -#ifndef _MAC -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION INTVER - PRODUCTVERSION INTVER - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904B0" - BEGIN - VALUE "CompanyName", COMPANY_NAME - VALUE "FileDescription", FILE_DESCRIPTION_ACTIVEX - VALUE "FileVersion", STRVER - VALUE "InternalName", COMPONENT_FILE_NAME_DLL - VALUE "LegalCopyright", LEGAL_COPYRIGHT - VALUE "OriginalFilename", COMPONENT_FILE_NAME_DLL - VALUE "ProductName", FILE_DESCRIPTION_ACTIVEX - VALUE "ProductVersion", STRVER - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - -#endif // !_MAC - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDS_PROJNAME "ASCOfficeOdpFile" -END - -IDR_ASCOFFICEODPFILE REGISTRY "ASCOfficeOdpFile.rgs" -//////////////////////////////////////////////////////////////////////////// - - -#endif - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/ASCOfficeOdpFile/ASCOfficeOdpFile.rgs b/ASCOfficeOdpFile/ASCOfficeOdpFile.rgs deleted file mode 100644 index 3029de403f..0000000000 --- a/ASCOfficeOdpFile/ASCOfficeOdpFile.rgs +++ /dev/null @@ -1,11 +0,0 @@ -HKCR -{ - NoRemove AppID - { - '%APPID%' = s 'ASCOfficeOdpFile' - 'ASCOfficeOdpFile.DLL' - { - val AppID = s '%APPID%' - } - } -} diff --git a/ASCOfficeOdpFile/ASCOfficeOdpFile.sln b/ASCOfficeOdpFile/ASCOfficeOdpFile.sln deleted file mode 100644 index 3a9eaedf62..0000000000 --- a/ASCOfficeOdpFile/ASCOfficeOdpFile.sln +++ /dev/null @@ -1,46 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeOdpFile", "ASCOfficeOdpFile.vcproj", "{C1E5043D-4844-4893-980D-BD79CDCD05C1}" - ProjectSection(ProjectDependencies) = postProject - {69C5894A-4EFC-4D2C-BA4F-506DFE98F32B} = {69C5894A-4EFC-4D2C-BA4F-506DFE98F32B} - {FCF298F6-A7B5-4F35-9497-C4007C754E3C} = {FCF298F6-A7B5-4F35-9497-C4007C754E3C} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ODPFormat", "ODPFormat\ODPFormat.vcproj", "{69C5894A-4EFC-4D2C-BA4F-506DFE98F32B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Odp2DrawingXML", "Odp2DrawingXML\Odp2DrawingXML.vcproj", "{FCF298F6-A7B5-4F35-9497-C4007C754E3C}" - ProjectSection(ProjectDependencies) = postProject - {69C5894A-4EFC-4D2C-BA4F-506DFE98F32B} = {69C5894A-4EFC-4D2C-BA4F-506DFE98F32B} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - ReleaseASC|Win32 = ReleaseASC|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C1E5043D-4844-4893-980D-BD79CDCD05C1}.Debug|Win32.ActiveCfg = Debug|Win32 - {C1E5043D-4844-4893-980D-BD79CDCD05C1}.Debug|Win32.Build.0 = Debug|Win32 - {C1E5043D-4844-4893-980D-BD79CDCD05C1}.Release|Win32.ActiveCfg = Release|Win32 - {C1E5043D-4844-4893-980D-BD79CDCD05C1}.Release|Win32.Build.0 = Release|Win32 - {C1E5043D-4844-4893-980D-BD79CDCD05C1}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32 - {C1E5043D-4844-4893-980D-BD79CDCD05C1}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32 - {69C5894A-4EFC-4D2C-BA4F-506DFE98F32B}.Debug|Win32.ActiveCfg = Debug|Win32 - {69C5894A-4EFC-4D2C-BA4F-506DFE98F32B}.Release|Win32.ActiveCfg = Release|Win32 - {69C5894A-4EFC-4D2C-BA4F-506DFE98F32B}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32 - {69C5894A-4EFC-4D2C-BA4F-506DFE98F32B}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32 - {FCF298F6-A7B5-4F35-9497-C4007C754E3C}.Debug|Win32.ActiveCfg = Debug|Win32 - {FCF298F6-A7B5-4F35-9497-C4007C754E3C}.Debug|Win32.Build.0 = Debug|Win32 - {FCF298F6-A7B5-4F35-9497-C4007C754E3C}.Release|Win32.ActiveCfg = Release|Win32 - {FCF298F6-A7B5-4F35-9497-C4007C754E3C}.Release|Win32.Build.0 = Release|Win32 - {FCF298F6-A7B5-4F35-9497-C4007C754E3C}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32 - {FCF298F6-A7B5-4F35-9497-C4007C754E3C}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(DPCodeReviewSolutionGUID) = preSolution - DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} - EndGlobalSection -EndGlobal diff --git a/ASCOfficeOdpFile/ASCOfficeOdpFile.vcproj b/ASCOfficeOdpFile/ASCOfficeOdpFile.vcproj deleted file mode 100644 index 11e669f20c..0000000000 --- a/ASCOfficeOdpFile/ASCOfficeOdpFile.vcproj +++ /dev/null @@ -1,294 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ASCOfficeOdpFile/ODPFormat/ODPFormat.vcproj b/ASCOfficeOdpFile/ODPFormat/ODPFormat.vcproj deleted file mode 100644 index edfda0a936..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/ODPFormat.vcproj +++ /dev/null @@ -1,2655 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/AnimationElement.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/AnimationElement.cpp deleted file mode 100644 index c0006b7d72..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/AnimationElement.cpp +++ /dev/null @@ -1,45 +0,0 @@ -#include "AnimationElement.h" -#include "Par.h" -#include "TransitionFilter.h" - -namespace Odp -{ - namespace Content - { - AnimationElement::AnimationElement() - { - } - - AnimationElement::~AnimationElement() - { - } - - AnimationElement::AnimationElement(const XML::XNode& node) - { - fromXML(node); - } - - const AnimationElement& AnimationElement::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void AnimationElement::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - std::string name = element.XName->Name; - - if(name == "par") - m_item.reset(new Par(node)); - else if(name == "transitionFilter") - m_item.reset(new TransitionFilter(node)); - else m_item.reset(); - } - - const XML::XNode AnimationElement::toXML() const - { - return XML::Write(m_item); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/AnimationElement.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/AnimationElement.h deleted file mode 100644 index f1eb14c9ee..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/AnimationElement.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_ANIMATION_ELEMENT_INCLUDE_H_ -#define ODP_CONTENT_ANIMATION_ELEMENT_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include - -namespace Odp -{ - namespace Content - { - class AnimationElement : public Odt::WritingElement - { - public: - AnimationElement(); - virtual ~AnimationElement(); - explicit AnimationElement(const XML::XNode& node); - const AnimationElement& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - template const bool is() const { return (m_item == 0)?false:(typeid(*m_item) == typeid(T));} - template T& as() {return static_cast(*m_item);} - template const T& as() const {return static_cast(*m_item);} - - private: - boost::shared_ptr m_item; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_ANIMATION_ELEMENT_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/Par.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/Par.cpp deleted file mode 100644 index 54817bb17b..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/Par.cpp +++ /dev/null @@ -1,82 +0,0 @@ -#include "Par.h" - -namespace Odp -{ - namespace Content - { - Par::Par() - { - } - - Par::~Par() - { - } - - Par::Par(const XML::XNode& node) - { - fromXML(node); - } - - const Par& Par::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Par::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - - AnimId = element.attribute(ns.anim + "id").value();//anim:id - GroupId = element.attribute("group-id").value();//presentation:group-id - MasterElement = element.attribute("master-element").value();//presentation:master-element - NodeType = element.attribute("node-type").value();//presentation:node-type - PresetClass = element.attribute("preset-class").value();//presentation:preset-class - PresetId = element.attribute("preset-id").value();//presentation:preset-id - PresetSubType = element.attribute("preset-sub-type").value();//presentation:preset-sub-type - Accelerate = element.attribute("accelerate").value();//smil:accelerate - AutoReverse = element.attribute("autoReverse").value();//smil:autoReverse - Begin = element.attribute("begin").value();//smil:begin - Decelerate = element.attribute("decelerate").value();//smil:decelerate - Dur = element.attribute("dur").value();//smil:dur - End = element.attribute("end").value();//smil:end - EndSync = element.attribute("endsync").value();//smil:endsync - Fill = element.attribute("fill").value();//smil:fill - FillDefault = element.attribute("fillDefault").value();//smil:fillDefault - RepeatCount = element.attribute("repeatCount").value();//smil:repeatCount - RepeatDur = element.attribute("repeatDur").value();//smil:repeatDur - Restart = element.attribute("restart").value();//smil:restart - RestartDefault = element.attribute("restartDefault").value();//smil:restartDefault - - XML::Fill(Childs, element, "par", "transitionFilter"); - } - - const XML::XNode Par::toXML() const - { - return - XML::XElement(ns.anim + "par", - XML::XAttribute(ns.anim + "id", AnimId) + - XML::XAttribute(ns.presentation + "group-id", GroupId) + - XML::XAttribute(ns.presentation + "master-element", MasterElement) + - XML::XAttribute(ns.presentation + "node-type", NodeType) + - XML::XAttribute(ns.presentation + "preset-class", PresetClass) + - XML::XAttribute(ns.presentation + "preset-id", PresetId) + - XML::XAttribute(ns.presentation + "preset-sub-type", PresetSubType) + - XML::XAttribute(ns.smil + "accelerate", Accelerate) + - XML::XAttribute(ns.smil + "autoReverse", AutoReverse) + - XML::XAttribute(ns.smil + "begin", Begin) + - XML::XAttribute(ns.smil + "decelerate", Decelerate) + - XML::XAttribute(ns.smil + "dur", Dur) + - XML::XAttribute(ns.smil + "end", End) + - XML::XAttribute(ns.smil + "endsync", EndSync) + - XML::XAttribute(ns.smil + "fill", Fill) + - XML::XAttribute(ns.smil + "fillDefault", FillDefault) + - XML::XAttribute(ns.smil + "repeatCount", RepeatCount) + - XML::XAttribute(ns.smil + "repeatDur", RepeatDur) + - XML::XAttribute(ns.smil + "restart", Restart) + - XML::XAttribute(ns.smil + "restartDefault", RestartDefault) + - XML::Write(Childs) - ); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/Par.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/Par.h deleted file mode 100644 index f1f29975f6..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/Par.h +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_PAR_INCLUDE_H_ -#define ODP_CONTENT_PAR_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "../../Limit/NodeType.h" -#include "../../Limit/PresetClass.h" -#include "../../Limit/SmilFill.h" -#include "../../Limit/SmilFillDefault.h" -#include "../../Limit/Restart.h" -#include "../../Limit/RestartDefault.h" -#include -#include "AnimationElement.h" - -namespace Odp -{ - namespace Content - { - class Par : public Odt::WritingElement - { - public: - Par(); - virtual ~Par(); - explicit Par(const XML::XNode& node); - const Par& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - nullable_property AnimId;//anim:id - nullable_property GroupId;//presentation:group-id - nullable_property MasterElement;//presentation:master-element - nullable_property NodeType;//presentation:node-type - nullable_property PresetClass;//presentation:preset-class - nullable_property PresetId;//presentation:preset-id - nullable_property PresetSubType;//presentation:preset-sub-type - nullable_property Accelerate;//smil:accelerate - nullable_property AutoReverse;//smil:autoReverse - nullable_property Begin;//smil:begin - nullable_property Decelerate;//smil:decelerate - nullable_property Dur;//smil:dur - nullable_property End;//smil:end - nullable_property EndSync;//smil:endsync - nullable_property Fill;//smil:fill - nullable_property FillDefault;//smil:fillDefault - nullable_property RepeatCount;//smil:repeatCount - nullable_property RepeatDur;//smil:repeatDur - nullable_property Restart;//smil:restart - nullable_property RestartDefault;//smil:restartDefault - //nullable_property XmlId;//xml:id - - property > Childs; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_PAR_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/TransitionFilter.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/TransitionFilter.cpp deleted file mode 100644 index 1b5ead3d97..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/TransitionFilter.cpp +++ /dev/null @@ -1,93 +0,0 @@ -#include "TransitionFilter.h" - -namespace Odp -{ - namespace Content - { - TransitionFilter::TransitionFilter() - { - } - - TransitionFilter::~TransitionFilter() - { - } - - TransitionFilter::TransitionFilter(const XML::XNode& node) - { - fromXML(node); - } - - const TransitionFilter& TransitionFilter::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void TransitionFilter::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - - Formula = element.attribute("formula").value();//anim:formula - SubItem = element.attribute("sub-item").value();//anim:sub-item - Accelerate = element.attribute("accelerate").value();//smil:accelerate - Accumulate = element.attribute("accumulate").value();//smil:accumulate - Additive = element.attribute("additive").value();//smil:additive - AutoReverse = element.attribute("autoReverse").value();//smil:autoReverse - Begin = element.attribute("begin").value();//smil:begin - By = element.attribute("by").value();//smil:by - CalcMode = element.attribute("calcMode").value();//smil:calcMode - Decelerate = element.attribute("decelerate").value();//smil:decelerate - Direction = element.attribute("direction").value();//smil:direction - Dur = element.attribute("dur").value();//smil:dur - End = element.attribute("end").value();//smil:end - FadeColor = element.attribute("fadeColor").value();//smil:fadeColor - Fill = element.attribute("fill").value();//smil:fill - FillDefault = element.attribute("fillDefault").value();//smil:fillDefault - From = element.attribute("from").value();//smil:from - Mode = element.attribute("mode").value();//smil:mode - RepeatCount = element.attribute("repeatCount").value();//smil:repeatCount - RepeatDur = element.attribute("repeatDur").value();//smil:repeatDur - Restart = element.attribute("restart").value();//smil:restart - RestartDefault = element.attribute("restartDefault").value();//smil:restartDefault - SubType = element.attribute("subtype").value();//smil:subtype - TargetElement = element.attribute("targetElement").value();//smil:targetElement - To = element.attribute("to").value();//smil:to - Type = element.attribute("type").value();//smil:type - Values = element.attribute("values").value();//smil:values - } - - const XML::XNode TransitionFilter::toXML() const - { - return - XML::XElement(ns.anim + "transitionFilter", - XML::XAttribute(ns.anim + "formula", Formula) + - XML::XAttribute(ns.anim + "sub-item", SubItem) + - XML::XAttribute(ns.smil + "accelerate", Accelerate) + - XML::XAttribute(ns.smil + "accumulate", Accumulate) + - XML::XAttribute(ns.smil + "additive", Additive) + - XML::XAttribute(ns.smil + "autoReverse", AutoReverse) + - XML::XAttribute(ns.smil + "begin", Begin) + - XML::XAttribute(ns.smil + "by", By) + - XML::XAttribute(ns.smil + "calcMode", CalcMode) + - XML::XAttribute(ns.smil + "decelerate", Decelerate) + - XML::XAttribute(ns.smil + "direction", Direction) + - XML::XAttribute(ns.smil + "dur", Dur) + - XML::XAttribute(ns.smil + "end", End) + - XML::XAttribute(ns.smil + "fadeColor", FadeColor) + - XML::XAttribute(ns.smil + "fill", Fill) + - XML::XAttribute(ns.smil + "fillDefault", FillDefault) + - XML::XAttribute(ns.smil + "from", From) + - XML::XAttribute(ns.smil + "mode", Mode) + - XML::XAttribute(ns.smil + "repeatCount", RepeatCount) + - XML::XAttribute(ns.smil + "repeatDur", RepeatDur) + - XML::XAttribute(ns.smil + "restart", Restart) + - XML::XAttribute(ns.smil + "restartDefault", RestartDefault) + - XML::XAttribute(ns.smil + "subtype", SubType) + - XML::XAttribute(ns.smil + "targetElement", TargetElement) + - XML::XAttribute(ns.smil + "to", To) + - XML::XAttribute(ns.smil + "type", Type) + - XML::XAttribute(ns.smil + "values", Values) - ); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/TransitionFilter.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/TransitionFilter.h deleted file mode 100644 index a358d0a329..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Animation/TransitionFilter.h +++ /dev/null @@ -1,66 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_TRANSITIONFILTER_INCLUDE_H_ -#define ODP_CONTENT_TRANSITIONFILTER_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "../../Limit/AnimSubItem.h" -#include "../../Limit/Accumulate.h" -#include "../../Limit/Additive.h" -#include "../../Limit/CalcMode.h" -#include "../../Limit/AnimDirection.h" -#include "OdtFormat/Logic/Color.h" -#include "../../Limit/SmilFill.h" -#include "../../Limit/SmilFillDefault.h" -#include "../../Limit/SmilMode.h" -#include "../../Limit/Restart.h" -#include "../../Limit/RestartDefault.h" -#include "OdtFormat/Limit/SmilType.h" - -namespace Odp -{ - namespace Content - { - class TransitionFilter : public Odt::WritingElement - { - public: - TransitionFilter(); - virtual ~TransitionFilter(); - explicit TransitionFilter(const XML::XNode& node); - const TransitionFilter& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - nullable_property Formula;//anim:formula - nullable_property SubItem;//anim:sub-item - nullable_property Accelerate;//smil:accelerate - nullable_property Accumulate;//smil:accumulate - nullable_property Additive;//smil:additive - nullable_property AutoReverse;//smil:autoReverse - nullable_property Begin;//smil:begin - nullable_property By;//smil:by - nullable_property CalcMode;//smil:calcMode - nullable_property Decelerate;//smil:decelerate - nullable_property Direction;//smil:direction - nullable_property Dur;//smil:dur - nullable_property End;//smil:end - nullable_property FadeColor;//smil:fadeColor - nullable_property Fill;//smil:fill - nullable_property FillDefault;//smil:fillDefault - nullable_property From;//smil:from - nullable_property Mode;//smil:mode - nullable_property RepeatCount;//smil:repeatCount - nullable_property RepeatDur;//smil:repeatDur - nullable_property Restart;//smil:restart - nullable_property RestartDefault;//smil:restartDefault - nullable_property SubType;//smil:subtype - nullable_property TargetElement;//smil:targetElement - nullable_property To;//smil:to - nullable_property Type;//smil:type - nullable_property Values;//smil:values - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_TRANSITIONFILTER_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Body.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/Body.cpp deleted file mode 100644 index 21347c48a0..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Body.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "Body.h" - -namespace Odp -{ - namespace Content - { - Body::Body() - { - } - - Body::~Body() - { - } - - Body::Body(const XML::XNode& node) - { - fromXML(node); - } - - const Body& Body::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Body::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - XML::Fill(Slides, element.element("presentation"), "page"); - } - - const XML::XNode Body::toXML() const - { - return - XML::XElement(ns.office + "body", - XML::XElement(ns.office + "presentation", - XML::Write(Slides) - ) - ); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Body.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/Body.h deleted file mode 100644 index 8b06062917..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Body.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_BODY_INCLUDE_H_ -#define ODP_CONTENT_BODY_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "Slide.h" - -namespace Odp -{ - namespace Content - { - class Body : public Odt::WritingElement - { - public: - Body(); - virtual ~Body(); - explicit Body(const XML::XNode& node); - const Body& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - property > Slides; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_BODY_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/CustomShape.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/CustomShape.cpp deleted file mode 100644 index a7fd58c83f..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/CustomShape.cpp +++ /dev/null @@ -1,84 +0,0 @@ -#include "CustomShape.h" - -namespace Odp -{ - namespace Content - { - CustomShape::CustomShape() - { - } - - CustomShape::~CustomShape() - { - } - - CustomShape::CustomShape(const XML::XNode& node) - { - fromXML(node); - } - - const CustomShape& CustomShape::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void CustomShape::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - name = element.attribute("name").value(); - style_name = element.attribute("style-name").value(); - text_style_name = element.attribute("text-style-name").value(); - layer = element.attribute("layer").value(); - height = element.attribute("height").value().ToString(); - width = element.attribute("width").value().ToString(); - if(element.attribute("x").exist()) - x = element.attribute("x").value().ToString(); - if(element.attribute("y").exist()) - y = element.attribute("y").value().ToString(); - transform = element.attribute("transform").value(); - id = element.attribute("id").value(); - - XML::Fill(text, element, "p", "list"); - geometry = element.element("enhanced-geometry"); - } - - const XML::XNode CustomShape::toXML() const - { - return - XML::XElement(ns.draw + "custom-shape", - XML::XAttribute(ns.draw + "name", name) + - XML::XAttribute(ns.draw + "style-name", style_name) + - XML::XAttribute(ns.draw + "text-style-name", text_style_name) + - XML::XAttribute(ns.draw + "layer", layer) + - XML::XAttribute(ns.svg + "width", width) + - XML::XAttribute(ns.svg + "height", height) + - XML::XAttribute(ns.svg + "x", x) + - XML::XAttribute(ns.svg + "y", y) + - XML::XAttribute(ns.draw + "transform", transform) + - XML::XAttribute(ns.draw + "id", id) + - XML::Write(text) + - XML::Write(geometry) - ); - } - - void CustomShape::GetMmRect(RECT& rect)const - { - rect.top = 0; - rect.left = 0; - rect.right = 0; - rect.bottom = 0; - - if(y.is_init()) - rect.top = (long)(y->value(UniversalUnit::Mm)); - - if(x.is_init()) - rect.left = (long)(x->value(UniversalUnit::Mm)); - - rect.right = (long)(width->value(UniversalUnit::Mm)); - rect.right = rect.right + rect.left; - rect.bottom = (long)(height->value(UniversalUnit::Mm)); - rect.bottom = rect.bottom + rect.top; - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/CustomShape.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/CustomShape.h deleted file mode 100644 index d2d74acb0d..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/CustomShape.h +++ /dev/null @@ -1,47 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_CUSTOMSHAPE_INCLUDE_H_ -#define ODP_CONTENT_CUSTOMSHAPE_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "OdtFormat/Content/Text.h" -#include "EnhancedGeometry.h" -#include "Utility.h" -#include -#include - -namespace Odp -{ - namespace Content - { - class CustomShape : public Odt::WritingElement - { - public: - CustomShape(); - virtual ~CustomShape(); - explicit CustomShape(const XML::XNode& node); - const CustomShape& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - nullable_property name; - nullable_property style_name; - nullable_property text_style_name; - property layer; - property height; - property width; - nullable_property x; - nullable_property y; - nullable_property transform; - nullable_property id; - - property geometry; - property > text; - public: - void GetMmRect(RECT& rect)const; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_CustomShape_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/DrawingElement.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/DrawingElement.cpp deleted file mode 100644 index 7e48479283..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/DrawingElement.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#include "DrawingElement.h" -#include "Frame.h" -#include "CustomShape.h" -#include "Group.h" -#include "Line.h" -#include "Rect.h" - -namespace Odp -{ - namespace Content - { - DrawingElement::DrawingElement() - { - } - - DrawingElement::~DrawingElement() - { - } - - DrawingElement::DrawingElement(const XML::XNode& node) - { - fromXML(node); - } - - const DrawingElement& DrawingElement::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void DrawingElement::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - if (element->XName == "frame") - m_item.reset(new Frame(node)); - else if (element->XName == "custom-shape") - m_item.reset(new CustomShape(node)); - else if(element->XName == "g") - m_item.reset(new Group(node)); - else if(element->XName == "line") - m_item.reset(new Line(node)); - else if(element->XName == "rect") - m_item.reset(new Rect(node)); - else m_item.reset(); - } - - const XML::XNode DrawingElement::toXML() const - { - return XML::Write(m_item); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/DrawingElement.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/DrawingElement.h deleted file mode 100644 index 2bf5d04346..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/DrawingElement.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_DRAWINGELEMENT_INCLUDE_H_ -#define ODP_CONTENT_DRAWINGELEMENT_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include - -namespace Odp -{ - namespace Content - { - class DrawingElement : public Odt::WritingElement - { - public: - DrawingElement(); - virtual ~DrawingElement(); - explicit DrawingElement(const XML::XNode& node); - const DrawingElement& operator =(const XML::XNode& node); - virtual bool is_init() const {return (m_item != 0);} - - template const bool is() const { return (m_item == 0)?false:(typeid(*m_item) == typeid(T));} - template T& as() {return static_cast(*m_item);} - template const T& as() const {return static_cast(*m_item);} - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - private: - boost::shared_ptr m_item; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_DRAWINGELEMENT_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/EnhancedGeometry.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/EnhancedGeometry.cpp deleted file mode 100644 index dae71321d8..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/EnhancedGeometry.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "EnhancedGeometry.h" - -namespace Odp -{ - namespace Content - { - EnhancedGeometry::EnhancedGeometry() - { - } - - EnhancedGeometry::~EnhancedGeometry() - { - } - - EnhancedGeometry::EnhancedGeometry(const XML::XNode& node) - { - fromXML(node); - } - - const EnhancedGeometry& EnhancedGeometry::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void EnhancedGeometry::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - ViewBox = element.attribute("viewBox").value(); - Type = element.attribute("type").value(); - if((Type.get() == "ellipse") && (!element.attribute("enhanced-path").exist())) - EnhancedPath = "M 0 10800 Y 10800 0 21600 10800 10800 21600 0 10800 Z N"; - else - EnhancedPath = element.attribute("enhanced-path").value(); - TextAreas = element.attribute("text-areas").value(); - Modifiers = element.attribute("modifiers").value(); - MirrorHorizontal = element.attribute("mirror-horizontal").value(); - MirrorVertical = element.attribute("mirror-vertical").value(); - GluePoints = element.attribute("glue-points").value(); - XML::Fill(Equations, element, "equation"); - XML::Fill(Handles, element, "handle"); - } - - const XML::XNode EnhancedGeometry::toXML() const - { - return - XML::XElement(ns.draw + "enhanced-geometry", - XML::XAttribute(ns.svg + "viewBox", ViewBox) + - XML::XAttribute(ns.draw + "mirror-horizontal", MirrorHorizontal) + - XML::XAttribute(ns.draw + "mirror-vertical", MirrorVertical) + - XML::XAttribute(ns.draw + "text-areas", TextAreas) + - XML::XAttribute(ns.draw + "type", Type) + - XML::XAttribute(ns.draw + "modifiers", Modifiers) + - XML::XAttribute(ns.draw + "glue-points", GluePoints) + - XML::XAttribute(ns.draw + "enhanced-path", EnhancedPath) + - XML::Write(Equations) + - XML::Write(Handles) - ); - } - - const std::string EnhancedGeometry::GetODString()const - { - XML::XElement element(toXML()); - element.Add(ns.svg); - element.Add(ns.draw); - return element.ToString(); - } - - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/EnhancedGeometry.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/EnhancedGeometry.h deleted file mode 100644 index 160dabcba4..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/EnhancedGeometry.h +++ /dev/null @@ -1,46 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_ENHANCED_GEOMETRY_INCLUDE_H_ -#define ODP_CONTENT_ENHANCED_GEOMETRY_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "property.h" -#include -#include -#include "OdtFormat/Content/Handle.h" -#include "OdtFormat/Content/Equation.h" -#include "OdtFormat/Limit/ShapeType.h" - -namespace Odp -{ - namespace Content - { - class EnhancedGeometry : public Odt::WritingElement - { - public: - EnhancedGeometry(); - virtual ~EnhancedGeometry(); - explicit EnhancedGeometry(const XML::XNode& node); - const EnhancedGeometry& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - - public: - nullable_property ViewBox; - property Type; - property EnhancedPath; - nullable_property TextAreas; - nullable_property Modifiers; - property > Equations; - property > Handles; - nullable_property MirrorHorizontal; - nullable_property MirrorVertical; - nullable_property GluePoints; - public: - const std::string GetODString() const; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_ENHANCED_GEOMETRY_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/File.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/File.cpp deleted file mode 100644 index ab012c4808..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/File.cpp +++ /dev/null @@ -1,81 +0,0 @@ -#include "File.h" -#include "XML.h" - -namespace Odp -{ - namespace Content - { - static const boost::filesystem::wpath s_filename = L"content.xml"; - - File::File() - { - } - - File::~File() - { - } - - const bool File::exist(const boost::filesystem::wpath& path) - { - return boost::filesystem::exists(path/s_filename); - } - - void File::read(const boost::filesystem::wpath& path) - { - const XML::XDocument document(path/s_filename); - version = document.Root.attribute("version").value(); - NamedStyles = document.Root.element("automatic-styles"); - ListStyles = document.Root.element("automatic-styles"); - body = document.Root.element("body"); - } - - void File::write(const boost::filesystem::wpath& path) const - { - XML::XElement(ns.office + "document-content", - XML::XNamespace(ns.office) + - XML::XNamespace(ns.style) + - XML::XNamespace(ns.text) + - XML::XNamespace(ns.table) + - XML::XNamespace(ns.draw) + - XML::XNamespace(ns.fo) + - XML::XNamespace(ns.xlink) + - XML::XNamespace(ns.dc) + - XML::XNamespace(ns.meta) + - XML::XNamespace(ns.number) + - XML::XNamespace(ns.presentation) + - XML::XNamespace(ns.svg) + - XML::XNamespace(ns.chart) + - XML::XNamespace(ns.dr3d) + - XML::XNamespace(ns.math) + - XML::XNamespace(ns.form) + - XML::XNamespace(ns.script) + - XML::XNamespace(ns.ooo) + - XML::XNamespace(ns.ooow) + - XML::XNamespace(ns.oooc) + - XML::XNamespace(ns.dom) + - XML::XNamespace(ns.xforms) + - XML::XNamespace(ns.xsd) + - XML::XNamespace(ns.xsi) + - XML::XNamespace(ns.smil) + - XML::XNamespace(ns.anim) + - XML::XNamespace(ns.rpt) + - XML::XNamespace(ns.of) + - XML::XNamespace(ns.rdfa) + - XML::XNamespace(ns.field) + - XML::XNamespace(ns.formx) + - XML::XAttribute(ns.office + "version", version) + - XML::XElement(ns.office + "scripts") + - XML::XElement(ns.office + "automatic-styles", - XML::Write(NamedStyles) + - XML::Write(ListStyles) - ) + - XML::Write(body) - ).Save(path/s_filename); - } - - const bool File::isValid(const boost::filesystem::wpath& path) const - { - return true;//contain(path/s_filename); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/File.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/File.h deleted file mode 100644 index ac49f4abd5..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/File.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_FILE_INCLUDE_H_ -#define ODP_CONTENT_FILE_INCLUDE_H_ - -#include "OdtFormat/File.h" -#include "OdtFormat/Logic/NamedStyles.h" -#include "OdtFormat/Logic/ListStyles.h" -#include "Body.h" -#include "property.h" - -namespace Odp -{ - namespace Content - { - class File : public Odt::File - { - public: - File(); - virtual ~File(); - - public: - virtual void read(const boost::filesystem::wpath& path); - virtual void write(const boost::filesystem::wpath& path) const; - virtual const bool isValid(const boost::filesystem::wpath& path) const; - - public: - static const bool exist(const boost::filesystem::wpath& path); - - public: - property version; - property NamedStyles; - property ListStyles; - property body; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_FILE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Frame.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/Frame.cpp deleted file mode 100644 index 1f63fd65ee..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Frame.cpp +++ /dev/null @@ -1,94 +0,0 @@ -#include "Frame.h" - -namespace Odp -{ - namespace Content - { - Frame::Frame() - { - } - - Frame::~Frame() - { - } - - Frame::Frame(const XML::XNode& node) - { - fromXML(node); - } - - const Frame& Frame::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Frame::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - draw_style_name = element.attribute(ns.draw + "style-name").value(); - presentation_style_name = element.attribute(ns.presentation + "style-name").value(); - text_style_name = element.attribute("text-style-name").value(); - layer = element.attribute("layer").value(); - height = element.attribute("height").value().ToString(); - width = element.attribute("width").value().ToString(); - if(element.attribute("x").exist()) - x = element.attribute("x").value().ToString(); - if(element.attribute("y").exist()) - y = element.attribute("y").value().ToString(); - Class = element.attribute("class").value(); - placeholder = element.attribute("placeholder").value(); - id = element.attribute("id").value(); - - if(element.element("object").exist()) - object = element.element("object"); - else - object = element.element("object-ole"); - - image = element.element("image"); - text_box = element.element("text-box"); - Table = element.element("table"); - } - - const XML::XNode Frame::toXML() const - { - return - XML::XElement(ns.draw + "frame", - XML::XAttribute(ns.draw + "style-name", draw_style_name) + - XML::XAttribute(ns.presentation + "style-name", presentation_style_name) + - XML::XAttribute(ns.draw + "text-style-name", text_style_name) + - XML::XAttribute(ns.draw + "layer", layer) + - XML::XAttribute(ns.svg + "width", width) + - XML::XAttribute(ns.svg + "height", height) + - XML::XAttribute(ns.svg + "x", x) + - XML::XAttribute(ns.svg + "y", y) + - XML::XAttribute(ns.presentation + "class", Class) + - XML::XAttribute(ns.presentation + "placeholder", placeholder) + - XML::XAttribute(ns.draw + "id", id) + - XML::Write(object) + - XML::Write(Table) + - XML::Write(image) + - XML::Write(text_box) - ); - } - - void Frame::GetMmRect(RECT& rect)const - { - rect.top = 0; - rect.left = 0; - rect.right = 0; - rect.bottom = 0; - - if(y.is_init()) - rect.top = (long)(y->value(UniversalUnit::Mm)); - - if(x.is_init()) - rect.left = (long)(x->value(UniversalUnit::Mm)); - - rect.right = (long)(width->value(UniversalUnit::Mm)); - rect.right = rect.right + rect.left; - rect.bottom = (long)(height->value(UniversalUnit::Mm)); - rect.bottom = rect.bottom + rect.top; - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Frame.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/Frame.h deleted file mode 100644 index 85eb33158d..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Frame.h +++ /dev/null @@ -1,53 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_FRAME_INCLUDE_H_ -#define ODP_CONTENT_FRAME_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "Utility.h" -#include "OleObject.h" -#include "Image.h" -#include "TextBox.h" -#include "OdtFormat/Limit/Class.h" -#include -#include -#include "OdtFormat/Content/Table.h" - -namespace Odp -{ - namespace Content - { - class Frame : public Odt::WritingElement - { - public: - Frame(); - virtual ~Frame(); - explicit Frame(const XML::XNode& node); - const Frame& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - nullable_property draw_style_name; - nullable_property presentation_style_name; - nullable_property text_style_name; - nullable_property Class; - nullable_property placeholder; - property layer; - property height; - property width; - nullable_property x; - nullable_property y; - nullable_property id; - - nullable_property object; - nullable_property image; - nullable_property text_box; - nullable_property Table; - public: - void GetMmRect(RECT& rect)const; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_FRAME_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Group.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/Group.cpp deleted file mode 100644 index 6f1b6550a3..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Group.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "Group.h" - -namespace Odp -{ - namespace Content - { - Group::Group() - { - } - - Group::~Group() - { - } - - Group::Group(const XML::XNode& node) - { - fromXML(node); - } - - const Group& Group::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Group::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - XML::Fill(Elements, element, "frame", "custom-shape", "g", "line", "rect"); - } - - const XML::XNode Group::toXML() const - { - return - XML::XElement(ns.draw + "g", - XML::Write(Elements) - ); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Group.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/Group.h deleted file mode 100644 index 1383be39e6..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Group.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_GROUP_INCLUDE_H_ -#define ODP_CONTENT_GROUP_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "DrawingElement.h" - -namespace Odp -{ - namespace Content - { - class Group : public Odt::WritingElement - { - public: - Group(); - virtual ~Group(); - explicit Group(const XML::XNode& node); - const Group& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - property > Elements; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_GROUP_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Image.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/Image.cpp deleted file mode 100644 index cf2dffaf98..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Image.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "Image.h" - -namespace Odp -{ - namespace Content - { - Image::Image() - { - } - - Image::~Image() - { - } - - Image::Image(const XML::XNode& node) - { - fromXML(node); - } - - const Image& Image::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Image::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - href = element.attribute("href").value(); - type = element.attribute("type").value(); - show = element.attribute("show").value(); - actuate = element.attribute("actuate").value(); - - XML::Fill(Items, element, "p", "list"); - } - - const XML::XNode Image::toXML() const - { - return - XML::XElement(ns.draw + "image", - XML::XAttribute(ns.xlink + "href", href) + - XML::XAttribute(ns.xlink + "type", type) + - XML::XAttribute(ns.xlink + "show", show) + - XML::XAttribute(ns.xlink + "actuate", actuate) + - XML::Write(Items) - ); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Image.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/Image.h deleted file mode 100644 index c29a21a48c..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Image.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_IMAGE_INCLUDE_H_ -#define ODP_CONTENT_IMAGE_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "OdtFormat/Limit/Actuate.h" -#include "OdtFormat/Limit/HrefType.h" -#include "OdtFormat/Limit/Show.h" -#include "OdtFormat/Content/Text.h" - -namespace Odp -{ - namespace Content - { - class Image : public Odt::WritingElement - { - public: - Image(); - virtual ~Image(); - explicit Image(const XML::XNode& node); - const Image& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - property href; - property type; - property show; - property actuate; - - property > Items; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_IMAGE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Line.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/Line.cpp deleted file mode 100644 index 7e1ede050e..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Line.cpp +++ /dev/null @@ -1,71 +0,0 @@ -#include "Line.h" - -namespace Odp -{ - namespace Content - { - Line::Line() - { - } - - Line::~Line() - { - } - - Line::Line(const XML::XNode& node) - { - fromXML(node); - } - - const Line& Line::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Line::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - StyleName = element.attribute("style-name").value(); - TextStyleName = element.attribute("text-style-name").value(); - layer = element.attribute("layer").value(); - - x1 = element.attribute("x1").value().ToString(); - y1 = element.attribute("y1").value().ToString(); - x2 = element.attribute("x2").value().ToString(); - y2 = element.attribute("y2").value().ToString(); - - XML::Fill(Text, element, "p", "list"); - } - - const XML::XNode Line::toXML() const - { - return - XML::XElement(ns.draw + "line", - XML::XAttribute(ns.draw + "style-name", StyleName) + - XML::XAttribute(ns.draw + "text-style-name", TextStyleName) + - XML::XAttribute(ns.draw + "layer", layer) + - XML::XAttribute(ns.svg + "x1", x1) + - XML::XAttribute(ns.svg + "y1", y1) + - XML::XAttribute(ns.svg + "x2", x2) + - XML::XAttribute(ns.svg + "y2", y2) + - XML::Write(Text) - ); - } - - void Line::GetMmRect(RECT& rect)const - { - rect.top = 0; - rect.left = 0; - rect.right = 0; - rect.bottom = 0; - - rect.left = (long)(x1->value(UniversalUnit::Mm)); - rect.top = (long)(y1->value(UniversalUnit::Mm)); - - rect.right = (long)(x2->value(UniversalUnit::Mm)); - rect.bottom = (long)(y2->value(UniversalUnit::Mm)); - } - - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Line.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/Line.h deleted file mode 100644 index 9321663749..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Line.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_LINE_INCLUDE_H_ -#define ODP_CONTENT_LINE_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "Utility.h" -#include -#include "OdtFormat/Content/Text.h" - -namespace Odp -{ - namespace Content - { - class Line : public Odt::WritingElement - { - public: - Line(); - virtual ~Line(); - explicit Line(const XML::XNode& node); - const Line& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - property StyleName; - nullable_property TextStyleName; - property layer; - - property x1; - property y1; - property x2; - property y2; - - property > Text; - public: - void GetMmRect(RECT& rect)const; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_LINE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/OleObject.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/OleObject.cpp deleted file mode 100644 index 5557c5483c..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/OleObject.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "OleObject.h" - -namespace Odp -{ - namespace Content - { - - OleObject::OleObject() - { - } - - OleObject::~OleObject() - { - } - - OleObject::OleObject(const XML::XNode& node) - { - fromXML(node); - } - - const OleObject& OleObject::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void OleObject::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - href = element.attribute("href").value(); - type = element.attribute("type").value(); - show = element.attribute("show").value(); - actuate = element.attribute("actuate").value(); - } - - const XML::XNode OleObject::toXML() const - { - return - XML::XElement(ns.draw + "object", - XML::XAttribute(ns.xlink + "href", href) + - XML::XAttribute(ns.xlink + "type", type) + - XML::XAttribute(ns.xlink + "show", show) + - XML::XAttribute(ns.xlink + "actuate", actuate) - ); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/OleObject.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/OleObject.h deleted file mode 100644 index 89e46cf765..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/OleObject.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_OLEOBJECT_INCLUDE_H_ -#define ODP_CONTENT_OLEOBJECT_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "OdtFormat/Limit/Actuate.h" -#include "OdtFormat/Limit/HrefType.h" -#include "OdtFormat/Limit/Show.h" - -namespace Odp -{ - namespace Content - { - class OleObject : public Odt::WritingElement - { - public: - OleObject(); - virtual ~OleObject(); - explicit OleObject(const XML::XNode& node); - const OleObject& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - property href; - property type; - property show; - property actuate; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_OLEOBJECT_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Rect.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/Rect.cpp deleted file mode 100644 index ac096a1a70..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Rect.cpp +++ /dev/null @@ -1,80 +0,0 @@ -#include "Rect.h" - -namespace Odp -{ - namespace Content - { - Rect::Rect() - { - } - - Rect::~Rect() - { - } - - Rect::Rect(const XML::XNode& node) - { - fromXML(node); - } - - const Rect& Rect::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Rect::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - PresentationStyleName = element.attribute(ns.presentation + "style-name").value(); - DrawStyleName = element.attribute(ns.draw + "style-name").value(); - TextStyleName = element.attribute("text-style-name").value(); - Id = element.attribute("id").value(); - layer = element.attribute("layer").value(); - height = element.attribute("height").value().ToString(); - width = element.attribute("width").value().ToString(); - if(element.attribute("x").exist()) - x = element.attribute("x").value().ToString(); - else - x = "0"; - if(element.attribute("y").exist()) - y = element.attribute("y").value().ToString(); - else - y = "0"; - XML::Fill(Text, element, "p", "list"); - } - - const XML::XNode Rect::toXML() const - { - return - XML::XElement(ns.draw + "rect", - XML::XAttribute(ns.presentation + "style-name", PresentationStyleName) + - XML::XAttribute(ns.draw + "style-name", DrawStyleName) + - XML::XAttribute(ns.draw + "text-style-name", TextStyleName) + - XML::XAttribute(ns.draw + "id", Id) + - XML::XAttribute(ns.draw + "layer", layer) + - XML::XAttribute(ns.svg + "width", width) + - XML::XAttribute(ns.svg + "height", height) + - XML::XAttribute(ns.svg + "x", x) + - XML::XAttribute(ns.svg + "y", y) + - XML::Write(Text) - ); - } - - void Rect::GetMmRect(RECT& rect)const - { - rect.top = 0; - rect.left = 0; - rect.right = 0; - rect.bottom = 0; - - rect.top = (long)(y->value(UniversalUnit::Mm)); - rect.left = (long)(x->value(UniversalUnit::Mm)); - - rect.right = (long)(width->value(UniversalUnit::Mm)); - rect.right = rect.right + rect.left; - rect.bottom = (long)(height->value(UniversalUnit::Mm)); - rect.bottom = rect.bottom + rect.top; - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Rect.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/Rect.h deleted file mode 100644 index 1607f8340d..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Rect.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_RECT_INCLUDE_H_ -#define ODP_CONTENT_RECT_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "Utility.h" -#include -#include -#include "OdtFormat/Content/Text.h" - -namespace Odp -{ - namespace Content - { - class Rect : public Odt::WritingElement - { - public: - Rect(); - virtual ~Rect(); - explicit Rect(const XML::XNode& node); - const Rect& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - nullable_property PresentationStyleName; - nullable_property DrawStyleName; - nullable_property TextStyleName; - nullable_property Id; - property layer; - property height; - property width; - property x; - property y; - - property > Text; - public: - void GetMmRect(RECT& rect)const; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_RECT_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Slide.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/Slide.cpp deleted file mode 100644 index 6d82b94524..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Slide.cpp +++ /dev/null @@ -1,53 +0,0 @@ -#include "Slide.h" - -namespace Odp -{ - namespace Content - { - Slide::Slide() - { - } - - Slide::~Slide() - { - } - - Slide::Slide(const XML::XNode& node) - { - fromXML(node); - } - - const Slide& Slide::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Slide::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - Name = element.attribute("name").value(); - StyleName = element.attribute("style-name").value(); - MasterPageName = element.attribute("master-page-name").value(); - Id = element.attribute("id").value(); - - Forms = element.element("forms"); - XML::Fill(Elements, element, "frame", "custom-shape", "g", "line", "rect"); - Animation = element.element("par"); - } - - const XML::XNode Slide::toXML() const - { - return - XML::XElement(ns.draw + "page", - XML::XAttribute(ns.draw + "name", Name) + - XML::XAttribute(ns.draw + "style-name", StyleName) + - XML::XAttribute(ns.draw + "master-page-name", MasterPageName) + - XML::XAttribute(ns.draw + "id", Id) + - XML::Write(Forms) + - XML::Write(Elements) + - XML::Write(Animation) - ); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/Slide.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/Slide.h deleted file mode 100644 index a829de4b65..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/Slide.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_SLIDE_INCLUDE_H_ -#define ODP_CONTENT_SLIDE_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "OdtFormat/Content/Forms.h" -#include "DrawingElement.h" -#include "Animation/Par.h" - -namespace Odp -{ - namespace Content - { - class Slide : public Odt::WritingElement - { - public: - Slide(); - virtual ~Slide(); - explicit Slide(const XML::XNode& node); - const Slide& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - property Name; - property StyleName; - property MasterPageName; - nullable_property Id; - - nullable_property Forms; - property > Elements; - nullable_property Animation; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_SLIDE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/TextBox.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Content/TextBox.cpp deleted file mode 100644 index a3c9ddb8cb..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/TextBox.cpp +++ /dev/null @@ -1,40 +0,0 @@ -#include "TextBox.h" - -namespace Odp -{ - namespace Content - { - TextBox::TextBox() - { - } - - TextBox::~TextBox() - { - } - - TextBox::TextBox(const XML::XNode& node) - { - fromXML(node); - } - - const TextBox& TextBox::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void TextBox::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - XML::Fill(Items, element, "p", "list"); - } - - const XML::XNode TextBox::toXML() const - { - return - XML::XElement(ns.draw + "text-box", - XML::Write(Items) - ); - } - } // namespace Content -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Content/TextBox.h b/ASCOfficeOdpFile/ODPFormat/Source/Content/TextBox.h deleted file mode 100644 index a84501399b..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Content/TextBox.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once -#ifndef ODP_CONTENT_TEXTBOX_INCLUDE_H_ -#define ODP_CONTENT_TEXTBOX_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "OdtFormat/Content/Text.h" - -namespace Odp -{ - namespace Content - { - class TextBox : public Odt::WritingElement - { - public: - TextBox(); - virtual ~TextBox(); - explicit TextBox(const XML::XNode& node); - const TextBox& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - property > Items; - }; - } // namespace Content -} // namespace Odp - -#endif // ODP_CONTENT_TEXTBOX_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Folder.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Folder.cpp deleted file mode 100644 index 69402fba25..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Folder.cpp +++ /dev/null @@ -1,165 +0,0 @@ -#include "Folder.h" -#include "OdtFormat/FormatError.h" -#include -#include "Log.h" -#include - -namespace Odp -{ - Folder::Folder() - { - } - - const std::wstring Folder::GetPath()const - { - return m_path.string(); - } - - void Folder::read(const boost::filesystem::wpath& path) - { - m_path = path; - //read(Configurations2, path); - //read(Settings, path); - //read(Meta, path); - read(Mimetype, path); - read(Styles, path); - read(Content, path); - read(Manifest, path); - //read(Thumbnails, path); - } - - void Folder::write(const boost::filesystem::wpath& path) const - { - if (!boost::filesystem::exists(path)) - boost::filesystem::create_directories(path); - - //write(Configurations2, path); - write(Mimetype, path); - //write(Meta, path); - //write(Settings, path); - write(Styles, path); - write(Content, path); - //write(Thumbnails, path); - write(Manifest, path); - } - - const bool Folder::isValid(const boost::filesystem::wpath& path) const - { - //TODO не всегда присутствуют внутренние папки в Configurations2, разобраться - //if (!isValid(Configurations2, path)) - // return false; - //else - if (!isValid(Mimetype, path)) - return false; - //else if (!isValid(Settings, path)) - // return false; - //else if (!isValid(Meta, path)) - // return false; - else if (!isValid(Styles, path)) - return false; - else if (!isValid(Content, path)) - return false; - - //TODO не всегда присутствуют внутренние папки в Configurations2, разобраться - //else if (!isValid(Manifest, path)) - // return false; - //TODO не всегда присутствует Thumbnails, разобраться - //else if (!isValid(Thumbnails, path)) - // return false; - return true; - } - - const Odp::Styles::MasterPage& Folder::GetMasterPage(const std::string& str)const - { - return Styles->MasterPages->find(str); - } - - const Odp::Styles::PageLayout& Folder::GetPageLayout(const std::string& str)const - { - return Styles->PageLayouts->find(str); - } - - const Odt::Logic::ListStyle Folder::GetListStyle(const std::string& styleName, bool master)const - { - Odt::Logic::ListStyle style; - if(master) - { - if(Styles->ListStyles->exist(styleName)) - return Styles->ListStyles->find(styleName); - } - else - { - if(Content->ListStyles->exist(styleName)) - return Content->ListStyles->find(styleName); - } - return style; - } - - const Odt::Logic::Properties Folder::GetPropertiesFromStyle(const std::string& styleName, bool master)const - { - Odt::Logic::Properties properties; - std::string family = ""; - std::string parent = ""; - std::string tmpStyleName = styleName; - bool exist; - do - { - exist = false; - if(!master) - { - exist = Content->NamedStyles->exist(tmpStyleName); - if(exist) - { - family = Content->NamedStyles->find(tmpStyleName).Family.get(); - parent = Content->NamedStyles->find(tmpStyleName).ParentName.get_value_or(""); - properties = Odt::Logic::Properties::merge(Content->NamedStyles->find(tmpStyleName).Properties.get(), properties); - } - } - else - { - exist = Styles->AutomaticStyles->exist(tmpStyleName); - if(exist) - { - family = Styles->AutomaticStyles->find(tmpStyleName).Family.get(); - parent = Styles->AutomaticStyles->find(tmpStyleName).ParentName.get_value_or(""); - properties = Odt::Logic::Properties::merge(Styles->AutomaticStyles->find(tmpStyleName).Properties.get(), properties); - } - } - if(exist) - tmpStyleName = parent; - } - while((exist) && (parent != "")); - - do - { - if(Styles->Styles->exist(tmpStyleName)) - { - family = Styles->Styles->find(tmpStyleName).Family.get(); - parent = Styles->Styles->find(tmpStyleName).ParentName.get_value_or(""); - properties = Odt::Logic::Properties::merge(Styles->Styles->find(tmpStyleName).Properties.get(), properties); - } - tmpStyleName = parent; - } - while(parent != ""); - - if(Styles->DefaultStyles->exist(family)) - properties = Odt::Logic::Properties::merge(Styles->DefaultStyles->find(family).Properties.get(), properties); - - return properties; - } - - const Odt::Logic::Properties Folder::GetPropertiesFromListStyle(const std::string& styleName, const int level)const - { - Odt::Logic::Properties properties; - if(Content->ListStyles->exist(styleName)) - properties = Content->ListStyles->find(styleName).listLevelStyleProperties(level);//Items->at(level).getProperties(); - else if(Styles->Styles->exist(styleName)) - properties = Styles->ListStyles->find(styleName).listLevelStyleProperties(level);//Items->at(level).getProperties(); - return properties; - } - - const Odp::Styles::TableTemplate& Folder::GetTableTemplate(const std::string& name)const - { - return Styles->TableTemplates->find(name); - } -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Folder.h b/ASCOfficeOdpFile/ODPFormat/Source/Folder.h deleted file mode 100644 index 6a6ea3717f..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Folder.h +++ /dev/null @@ -1,111 +0,0 @@ -#pragma once -#ifndef ODP_FOLDER_INCLUDE_H_ -#define ODP_FOLDER_INCLUDE_H_ - -#include -#include -#include "property.h" - -#include "Manifest/File.h" -//#include "OdtFormat/Configurations2/File.h" -//#include "OdtFormat/Settings/File.h" -//#include "Meta/File.h" -#include "MimeType/File.h" -#include "Styles/File.h" -#include "Content/File.h" -//#include "OdtFormat/Thumbnails/File.h" -#include "OdtFormat/Logic/Properties.h" - -#include - - -namespace Odp -{ - class Folder : private boost::noncopyable - { - public: - Folder(); - private: - boost::filesystem::wpath m_path; - public: - const std::wstring GetPath()const; - - public: - void read(const boost::filesystem::wpath& path); - void write(const boost::filesystem::wpath& path) const; - const bool isValid(const boost::filesystem::wpath& path) const; - - const Odp::Styles::MasterPage& GetMasterPage(const std::string& str)const; - const Odp::Styles::PageLayout& GetPageLayout(const std::string& str)const; - const Odt::Logic::ListStyle GetListStyle(const std::string& styleName, bool master)const; - const Odt::Logic::Properties GetPropertiesFromStyle(const std::string& styleName, bool master)const; - const Odt::Logic::Properties GetPropertiesFromListStyle(const std::string& styleName, const int level)const; - const Odp::Styles::TableTemplate& GetTableTemplate(const std::string& name)const; - - public: - property Manifest; -// property Configurations2; - //property Settings; - property Mimetype; -// property Meta; - property Styles; - property Content; -// property Thumbnails; - - private: - template void read(nullable_property& file, const boost::filesystem::wpath& path); - template void read(property& file, const boost::filesystem::wpath& path); - - template void write(const nullable_property& file, const boost::filesystem::wpath& path) const; - template void write(const property& file, const boost::filesystem::wpath& path) const; - - template const bool isValid(const nullable_property& file, const boost::filesystem::wpath& path) const; - template const bool isValid(const property& file, const boost::filesystem::wpath& path) const; - }; - - - template - void Folder::read(nullable_property& file, const boost::filesystem::wpath& path) - { - if (T::exist(path)) - { - if (!file.is_init()) - file = T(); - file->read(path); - } - } - - template - void Folder::read(property& file, const boost::filesystem::wpath& path) - { - file->read(path); - } - - template - void Folder::write(const nullable_property& file, const boost::filesystem::wpath& path) const - { - if (file.is_init()) - file->write(path); - } - - template - void Folder::write(const property& file, const boost::filesystem::wpath& path) const - { - file->write(path); - } - - template - const bool Folder::isValid(const nullable_property& file, const boost::filesystem::wpath& path) const - { - if (file.is_init()) - return file->isValid(path); - return true; - } - - template - const bool Folder::isValid(const property& file, const boost::filesystem::wpath& path) const - { - return file->isValid(path); - } -} // namespace Odp -#endif // ODP_FOLDER_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Accumulate.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/Accumulate.cpp deleted file mode 100644 index eb4d763958..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Accumulate.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Accumulate.h" - -namespace Odp -{ - namespace Limit - { - Accumulate::Accumulate() - { - add("sum"); - add("none"); - } - - const std::string Accumulate::no_find() const - { - return "none"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Accumulate.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/Accumulate.h deleted file mode 100644 index 6be87e5f0b..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Accumulate.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_ACCUMULATE_INCLUDE_H_ -#define ODP_LIMIT_ACCUMULATE_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class Accumulate : public setter::from - { - public: - Accumulate(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_ACCUMULATE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Additive.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/Additive.cpp deleted file mode 100644 index f370975039..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Additive.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "Additive.h" - -namespace Odp -{ - namespace Limit - { - Additive::Additive() - { - add("sum"); - add("replace"); - } - - const std::string Additive::no_find() const - { - return "replace"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Additive.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/Additive.h deleted file mode 100644 index 8b4dc397ae..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Additive.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_ADDITIVE_INCLUDE_H_ -#define ODP_LIMIT_ADDITIVE_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class Additive : public setter::from - { - public: - Additive(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_ADDITIVE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimDirection.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimDirection.cpp deleted file mode 100644 index 7502bfa189..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimDirection.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "AnimDirection.h" - -namespace Odp -{ - namespace Limit - { - AnimDirection::AnimDirection() - { - add("forward"); - add("reverse"); - } - - const std::string AnimDirection::no_find() const - { - return "forward"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimDirection.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimDirection.h deleted file mode 100644 index 69e88f4c0a..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimDirection.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_DIRECTION_INCLUDE_H_ -#define ODP_LIMIT_DIRECTION_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class AnimDirection : public setter::from - { - public: - AnimDirection(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_DIRECTION_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimSubItem.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimSubItem.cpp deleted file mode 100644 index 236837dd19..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimSubItem.cpp +++ /dev/null @@ -1,19 +0,0 @@ -#include "AnimSubItem.h" - -namespace Odp -{ - namespace Limit - { - AnimSubItem::AnimSubItem() - { - add("background"); - add("text"); - add("whole"); - } - - const std::string AnimSubItem::no_find() const - { - return "whole"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimSubItem.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimSubItem.h deleted file mode 100644 index 58a4d11468..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/AnimSubItem.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_SUBITEM_INCLUDE_H_ -#define ODP_LIMIT_SUBITEM_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class AnimSubItem : public setter::from - { - public: - AnimSubItem(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_SUBITEM_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/CalcMode.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/CalcMode.cpp deleted file mode 100644 index 31a81b78e9..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/CalcMode.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "CalcMode.h" - -namespace Odp -{ - namespace Limit - { - CalcMode::CalcMode() - { - add("discrete"); - add("linear"); - add("paced"); - add("spline"); - } - - const std::string CalcMode::no_find() const - { - return "discrete"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/CalcMode.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/CalcMode.h deleted file mode 100644 index cfe0d60f08..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/CalcMode.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_CALCMODE_INCLUDE_H_ -#define ODP_LIMIT_CALCMODE_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class CalcMode : public setter::from - { - public: - CalcMode(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_CALCMODE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/NodeType.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/NodeType.cpp deleted file mode 100644 index c6b8650098..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/NodeType.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "NodeType.h" - -namespace Odp -{ - namespace Limit - { - NodeType::NodeType() - { - add("timing-root"); - add("main-sequence"); - add("on-click"); - add("after-previous"); - add("default"); - add("interactive-sequence"); - add("with-previous"); - } - - const std::string NodeType::no_find() const - { - return "default"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/NodeType.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/NodeType.h deleted file mode 100644 index 46dcdc9344..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/NodeType.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_NODE_TYPE_INCLUDE_H_ -#define ODP_LIMIT_NODE_TYPE_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class NodeType : public setter::from - { - public: - NodeType(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_NODE_TYPE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/PresetClass.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/PresetClass.cpp deleted file mode 100644 index 5990a0b289..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/PresetClass.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "PresetClass.h" - -namespace Odp -{ - namespace Limit - { - PresetClass::PresetClass() - { - add("custom"); - add("entrance"); - add("exit"); - add("emphasis"); - add("motion-path"); - add("ole-action"); - add("media-call"); - } - - const std::string PresetClass::no_find() const - { - return "custom"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/PresetClass.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/PresetClass.h deleted file mode 100644 index 4636f7ff33..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/PresetClass.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_PRESET_CLASS_INCLUDE_H_ -#define ODP_LIMIT_PRESET_CLASS_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class PresetClass : public setter::from - { - public: - PresetClass(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_PRESET_CLASS_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Restart.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/Restart.cpp deleted file mode 100644 index 6caf883735..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Restart.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "Restart.h" - -namespace Odp -{ - namespace Limit - { - Restart::Restart() - { - add("never"); - add("always"); - add("whenNotActive"); - add("default"); - } - - const std::string Restart::no_find() const - { - return "default"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Restart.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/Restart.h deleted file mode 100644 index d46b174037..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/Restart.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_RESTART_INCLUDE_H_ -#define ODP_LIMIT_RESTART_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class Restart : public setter::from - { - public: - Restart(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_RESTART_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/RestartDefault.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/RestartDefault.cpp deleted file mode 100644 index 9c46905ac6..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/RestartDefault.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "RestartDefault.h" - -namespace Odp -{ - namespace Limit - { - RestartDefault::RestartDefault() - { - add("never"); - add("always"); - add("whenNotActive"); - add("inherit"); - } - - const std::string RestartDefault::no_find() const - { - return "inherit"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/RestartDefault.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/RestartDefault.h deleted file mode 100644 index 041b1710d7..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/RestartDefault.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_RESTART_DEFAULT_INCLUDE_H_ -#define ODP_LIMIT_RESTART_DEFAULT_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class RestartDefault : public setter::from - { - public: - RestartDefault(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_RESTART_DEFAULT_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFill.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFill.cpp deleted file mode 100644 index 8ef6f42393..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFill.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "SmilFill.h" - -namespace Odp -{ - namespace Limit - { - SmilFill::SmilFill() - { - add("remove"); - add("freeze"); - add("hold"); - add("auto"); - add("default"); - add("transition"); - } - - const std::string SmilFill::no_find() const - { - return "default"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFill.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFill.h deleted file mode 100644 index 178e4c0bf1..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFill.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_SMIL_FILL_INCLUDE_H_ -#define ODP_LIMIT_SMIL_FILL_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class SmilFill : public setter::from - { - public: - SmilFill(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_SMIL_FILL_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFillDefault.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFillDefault.cpp deleted file mode 100644 index 10dcd5d9f7..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFillDefault.cpp +++ /dev/null @@ -1,22 +0,0 @@ -#include "SmilFillDefault.h" - -namespace Odp -{ - namespace Limit - { - SmilFillDefault::SmilFillDefault() - { - add("remove"); - add("freeze"); - add("hold"); - add("transition"); - add("auto"); - add("inherit"); - } - - const std::string SmilFillDefault::no_find() const - { - return "inherit"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFillDefault.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFillDefault.h deleted file mode 100644 index ba13f22c63..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilFillDefault.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_SMIL_FILL_DEFAULT_INCLUDE_H_ -#define ODP_LIMIT_SMIL_FILL_DEFAULT_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class SmilFillDefault : public setter::from - { - public: - SmilFillDefault(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_SMIL_FILL_DEFAULT_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilMode.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilMode.cpp deleted file mode 100644 index 992ba76e12..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilMode.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "SmilMode.h" - -namespace Odp -{ - namespace Limit - { - SmilMode::SmilMode() - { - add("in"); - add("out"); - } - - const std::string SmilMode::no_find() const - { - return "out"; - } - } // namespace Limit -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilMode.h b/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilMode.h deleted file mode 100644 index 2445ce3fc3..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Limit/SmilMode.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_LIMIT_SMIL_MODE_INCLUDE_H_ -#define ODP_LIMIT_SMIL_MODE_INCLUDE_H_ - -#include "setter.h" -#include - -namespace Odp -{ - namespace Limit - { - class SmilMode : public setter::from - { - public: - SmilMode(); - - private: - virtual const std::string no_find() const; - }; - } // namespace Limit -} // namespace Odp - -#endif // ODP_LIMIT_SMIL_MODE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Manifest/File.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Manifest/File.cpp deleted file mode 100644 index 165ea44e4f..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Manifest/File.cpp +++ /dev/null @@ -1,101 +0,0 @@ -#include "File.h" -#include "OdtFormat/Manifest/XmlTable.h" -#include "Log.h" - -namespace Odp -{ - namespace Manifest - { - static const boost::filesystem::wpath s_directory = L"META-INF"; - static const boost::filesystem::wpath s_filename = L"META-INF/manifest.xml"; - - File::File() - { - } - - File::~File() - { - } - - void File::read(const boost::filesystem::wpath& path) - { - m_picture.clear(); - const XML::XDocument document(path/s_filename); - - for (XML::const_element_iterator i = document.Root.Elements.begin(); i != document.Root.Elements.end(); ++i) - { - const XML::XElement element(*i); - const boost::filesystem::wpath filename = element.attribute("full-path").value(); - - if (filename.extension() != L".xml" && filename.extension() != L"." && !filename.extension().empty()) - { - m_picture.push_back(Odt::Manifest::PictureItem(path/filename)); - } - } - } - - void File::write(const boost::filesystem::wpath& path) const - { - boost::filesystem::create_directories(path/s_directory); - Odt::Manifest::XmlTable xmlTable; - xmlTable.add(path, L"Pictures/"); - xmlTable.add(path, L"ObjectReplacements/"); - xmlTable.add(path, L"content.xml"); - xmlTable.add(path, L"styles.xml"); - xmlTable.add(path, L"meta.xml"); - xmlTable.add(path, L"settings.xml"); - - XML::XElement(ns.manifest + "manifest", - XML::XElement(ns.manifest + "file-entry", - XML::XAttribute(ns.manifest + "media-type", "application/vnd.oasis.opendocument.presentation") + - XML::XAttribute(ns.manifest + "version", "1.2") + - XML::XAttribute(ns.manifest + "full-path", "/") - ) + - XML::Write(xmlTable) + - XML::Write(m_picture, path) - ).Save(path/s_filename); - } - - const bool File::isValid(const boost::filesystem::wpath& path) const - { - if (!boost::filesystem::exists(path/s_filename)) - { - Log::warning(L"not exist " + (path/s_filename).string()); - return false; - } - - const XML::XDocument document(path/s_filename); - for (XML::const_element_iterator i = document.Root.Elements.begin(); i != document.Root.Elements.end(); ++i) - { - boost::filesystem::wpath file = XML::XElement(*i)->attribute("full-path").value(); - if (!boost::filesystem::exists(path/file)) - { - Log::warning(L"not exist " + (path/file).string()); - return false; - } - } - - return - document.Root.element("full-path", "/").exist() && - document.Root.element("full-path", "content.xml").exist() && - document.Root.element("full-path", "styles.xml").exist() && - document.Root.element("full-path", "meta.xml").exist() && - document.Root.element("full-path", "settings.xml").exist(); - } - - const boost::filesystem::wpath File::picture(const boost::filesystem::wpath& filename) const - { - return m_picture.picture(filename); - } - - const boost::filesystem::wpath File::addPicture(const boost::filesystem::wpath& filename) - { - return m_picture.addPicture(filename); - } - - void File::extractPictures(const boost::filesystem::wpath& path) const - { - m_picture.copy(path); - } - } // namespace Manifest -} // namespace Odp diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Manifest/File.h b/ASCOfficeOdpFile/ODPFormat/Source/Manifest/File.h deleted file mode 100644 index ec09cf05cb..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Manifest/File.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once -#ifndef ODP_MANIFEST_FILE_INCLUDE_H_ -#define ODP_MANIFEST_FILE_INCLUDE_H_ - -#include "OdtFormat/File.h" -#include "OdtFormat/Manifest/PictureTable.h" -#include - -namespace Odp -{ - namespace Manifest - { - class File : public Odt::File - { - public: - File(); - virtual ~File(); - - public: - virtual void read(const boost::filesystem::wpath& path); - virtual void write(const boost::filesystem::wpath& path) const; - virtual const bool isValid(const boost::filesystem::wpath& path) const; - - public: - const boost::filesystem::wpath picture(const boost::filesystem::wpath& filename) const; - const boost::filesystem::wpath addPicture(const boost::filesystem::wpath& filename); - - public: - void extractPictures(const boost::filesystem::wpath& path) const; - - private: - Odt::Manifest::PictureTable m_picture; - }; - } // namespace Manifest -} // namespace Odp - -#endif // ODP_MANIFEST_FILE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Meta/File.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Meta/File.cpp deleted file mode 100644 index 89027fe390..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Meta/File.cpp +++ /dev/null @@ -1,61 +0,0 @@ -#include "File.h" - -namespace Odp -{ - namespace Meta - { - static const boost::filesystem::wpath s_filename = L"meta.xml"; - - File::File() - { - } - - File::~File() - { - } - - const bool File::exist(const boost::filesystem::wpath& path) - { - return boost::filesystem::exists(path/s_filename); - } - - void File::read(const boost::filesystem::wpath& path) - { - const XML::XDocument document(path/s_filename); - version = document.Root.attribute("version").value(); - - creation_date = document.Root.element("meta").element("creation-date").text(); - editing_duration = document.Root.element("meta").element("editing-duration").text(); - editing_cycles = document.Root.element("meta").element("editing-cycles").text(); - date = document.Root.element("meta").element("date").text(); - generator = document.Root.element("meta").element("generator").text(); - - statistic = document.Root.element("meta").element("document-statistic"); - XML::Fill(user_defined, document.Root.element("meta"), "user-defined"); - } - - - void File::write(const boost::filesystem::wpath& path) const - { - XML::XElement(ns.office + "document-meta", - XML::XAttribute(ns.office + "version", version) + - XML::XElement(ns.office + "meta", - XML::XElement(ns.meta + "creation-date", XML::XText(creation_date)) + - XML::XElement(ns.meta + "editing-duration", XML::XText(editing_duration)) + - XML::XElement(ns.meta + "editing-cycles", XML::XText(editing_cycles)) + - XML::XElement(ns.dc + "date", XML::XText(date)) + - XML::XElement(ns.meta + "generator", XML::XText(generator)) + - XML::Write(statistic) + - XML::Write(user_defined) - ) - ).Save(path/s_filename); - } - - - const bool File::isValid(const boost::filesystem::wpath& path) const - { - return contain(path/s_filename); - } - - } // namespace Meta -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Meta/File.h b/ASCOfficeOdpFile/ODPFormat/Source/Meta/File.h deleted file mode 100644 index 35f7e725b7..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Meta/File.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once -#ifndef ODP_META_FILE_INCLUDE_H_ -#define ODP_META_FILE_INCLUDE_H_ - -#include "OdtFormat/File.h" -#include "Statistic.h" -#include "UserDefined.h" -#include "nullable_property.h" - -namespace Odp -{ - namespace Meta - { - class File : public Odt::File - { - public: - File(); - virtual ~File(); - - public: - virtual void read(const boost::filesystem::wpath& path); - virtual void write(const boost::filesystem::wpath& path) const; - virtual const bool isValid(const boost::filesystem::wpath& path) const; - - public: - static const bool exist(const boost::filesystem::wpath& path); - - public: - property version; - nullable_property creation_date; - nullable_property editing_duration; - nullable_property editing_cycles; - nullable_property date; - nullable_property generator; - nullable_property statistic; - property > user_defined; - }; - } // namespace Meta -} // namespace Odp - -#endif // ODP_META_FILE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Meta/Statistic.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Meta/Statistic.cpp deleted file mode 100644 index f1eed0f8b2..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Meta/Statistic.cpp +++ /dev/null @@ -1,52 +0,0 @@ -#include "Statistic.h" - -namespace Odp -{ - namespace Meta - { - Statistic::Statistic() - { - } - - Statistic::~Statistic() - { - } - - Statistic::Statistic(const XML::XNode& node) - { - fromXML(node); - } - - const Statistic& Statistic::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Statistic::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - TableCount = element.attribute("table-count").value(); - ImageCount = element.attribute("image-count").value(); - ObjectCount = element.attribute("object-count").value(); - PageCount = element.attribute("page-count").value(); - ParagraphCount = element.attribute("paragraph-count").value(); - WordCount = element.attribute("word-count").value(); - CharacterCount = element.attribute("character-count").value(); - } - - const XML::XNode Statistic::toXML() const - { - return - XML::XElement(ns.meta + "document-statistic", - XML::XAttribute(ns.meta + "table-count", TableCount) + - XML::XAttribute(ns.meta + "image-count", ImageCount) + - XML::XAttribute(ns.meta + "object-count", ObjectCount) + - XML::XAttribute(ns.meta + "page-count", PageCount) + - XML::XAttribute(ns.meta + "paragraph-count", ParagraphCount) + - XML::XAttribute(ns.meta + "word-count", WordCount) + - XML::XAttribute(ns.meta + "character-count", CharacterCount) - ); - } - } // namespace Meta -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Meta/Statistic.h b/ASCOfficeOdpFile/ODPFormat/Source/Meta/Statistic.h deleted file mode 100644 index 54334ddaf7..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Meta/Statistic.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once -#ifndef ODP_META_STATISTIC_INCLUDE_H_ -#define ODP_META_STATISTIC_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "nullable_property.h" - - -namespace Odp -{ - namespace Meta - { - class Statistic : public Odt::WritingElement - { - public: - Statistic(); - virtual ~Statistic(); - explicit Statistic(const XML::XNode& node); - const Statistic& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - - public: - nullable_property > TableCount; - nullable_property > ImageCount; - nullable_property > ObjectCount; - nullable_property > PageCount; - nullable_property > ParagraphCount; - nullable_property > WordCount; - nullable_property > CharacterCount; - }; - } // namespace Meta -} // namespace Odp - -#endif // ODP_META_STATISTIC_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Meta/UserDefined.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Meta/UserDefined.cpp deleted file mode 100644 index 0ecd6e725a..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Meta/UserDefined.cpp +++ /dev/null @@ -1,41 +0,0 @@ -#include "UserDefined.h" - -namespace Odp -{ - namespace Meta - { - UserDefined::UserDefined() - { - } - - UserDefined::~UserDefined() - { - } - - UserDefined::UserDefined(const XML::XNode& node) - { - fromXML(node); - } - - const UserDefined& UserDefined::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void UserDefined::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - name = element.attribute("name").value(); - } - - const XML::XNode UserDefined::toXML() const - { - return - XML::XElement(ns.meta + "user-defined", - XML::XAttribute(ns.meta + "name", name) - ); - } - - } // namespace Meta -} // namespace Odt \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Meta/UserDefined.h b/ASCOfficeOdpFile/ODPFormat/Source/Meta/UserDefined.h deleted file mode 100644 index f71b92fa30..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Meta/UserDefined.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once -#ifndef ODT_META_USERDEFINED_INCLUDE_H_ -#define ODT_META_USERDEFINED_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "property.h" - - -namespace Odp -{ - namespace Meta - { - class UserDefined : public Odt::WritingElement - { - public: - UserDefined(); - virtual ~UserDefined(); - explicit UserDefined(const XML::XNode& node); - const UserDefined& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - - public: - property name; - }; - } // namespace Meta -} // namespace Odp - -#endif // ODT_META_USERDEFINED_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/MimeType/File.cpp b/ASCOfficeOdpFile/ODPFormat/Source/MimeType/File.cpp deleted file mode 100644 index 87c2fef7f0..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/MimeType/File.cpp +++ /dev/null @@ -1,65 +0,0 @@ -#include "File.h" -#include -#include -#include "Log.h" -#include "Exception/log_runtime_error.h" - - -namespace Odp -{ - namespace MimeType - { - static const std::string s_content = "application/vnd.oasis.opendocument.presentation"; - static const boost::filesystem::wpath s_filename = L"mimetype"; - - File::File() - { - } - - File::~File() - { - } - - const bool File::exist(const boost::filesystem::wpath& path) - { - return boost::filesystem::exists(path/s_filename); - } - - void File::read(const boost::filesystem::wpath& path) - { - } - - void File::write(const boost::filesystem::wpath& path) const - { - std::ofstream file((path/s_filename).string().c_str()); - if (!file.bad()) - { - file << s_content; - file.close(); - } - else - throw log_runtime_error("can't create mimetype"); - } - - const bool File::isValid(const boost::filesystem::wpath& path) const - { - std::ifstream file((path/s_filename).string().c_str()); - if (file.bad()) - { - Log::warning(L"bad open mimetype file " + (path/s_filename).string()); - return false; - } - - std::string content; - file >> content; - file.close(); - - if (s_content == content) - return true; - - Log::warning(L"error content mimetype " + (path/s_filename).string()); - return false; - } - - } // namespace MimeType -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/MimeType/File.h b/ASCOfficeOdpFile/ODPFormat/Source/MimeType/File.h deleted file mode 100644 index 3ffe16c0e1..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/MimeType/File.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once -#ifndef ODP_MIMETYPE_FILE_INCLUDE_H_ -#define ODP_MIMETYPE_FILE_INCLUDE_H_ - -#include "OdtFormat/File.h" - -namespace Odp -{ - namespace MimeType - { - class File : public Odt::File - { - public: - File(); - virtual ~File(); - - public: - virtual void read(const boost::filesystem::wpath& path); - virtual void write(const boost::filesystem::wpath& path) const; - virtual const bool isValid(const boost::filesystem::wpath& path) const; - - public: - static const bool exist(const boost::filesystem::wpath& path); - }; - } // namespace MimeType -} // namespace Odp - -#endif // ODP_MIMETYPE_FILE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Odp.h b/ASCOfficeOdpFile/ODPFormat/Source/Odp.h deleted file mode 100644 index 80cebdca5a..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Odp.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#ifndef ODP_INCLUDE_H_ -#define ODP_INCLUDE_H_ - -#include "Folder.h" - -#include "Styles/MasterPage.h" -#include "Styles/PageLayout.h" -#include "Content/DrawingElement.h" -#include "Content/Group.h" -#include "Content/Frame.h" -#include "Content/Line.h" -#include "Content/Rect.h" -#include "Content/CustomShape.h" -#include "Content/TextBox.h" -#include "OdtFormat/Content/Text.h" -#include "OdtFormat/Content/Paragraph.h" -#include "OdtFormat/Logic/Properties.h" -#include "OdtFormat/Content/Table.h" -#include "OdtFormat/Content/TableCell.h" -#include "Content/Animation/TransitionFilter.h" - -#endif // ODP_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/File.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/File.cpp deleted file mode 100644 index adf34b750a..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/File.cpp +++ /dev/null @@ -1,105 +0,0 @@ -#include "File.h" - -namespace Odp -{ - namespace Styles - { - static const boost::filesystem::wpath s_filename = L"styles.xml"; - - File::File() - { - } - - File::~File() - { - } - - const bool File::exist(const boost::filesystem::wpath& path) - { - return boost::filesystem::exists(path/s_filename); - } - - void File::read(const boost::filesystem::wpath& path) - { - const XML::XDocument document(path/s_filename); - m_version = document.Root.attribute("version").value(); - - FillImages = document.Root.element("styles"); - Gradients = document.Root.element("styles"); - Markers = document.Root.element("styles"); - DefaultStyles = document.Root.element("styles"); - Styles = document.Root.element("styles"); - TableTemplates = document.Root.element("styles"); - //Layouts = document.Root.element("styles"); - - PageLayouts = document.Root.element("automatic-styles"); - AutomaticStyles = document.Root.element("automatic-styles"); - ListStyles = document.Root.element("automatic-styles"); - - //LayerSet = document.Root.element("master-styles").element("layer-set"); - //HandoutMaster = document.Root.element("master-styles").element("handout-master"); - MasterPages = document.Root.element("master-styles"); - } - - void File::write(const boost::filesystem::wpath& path) const - { - XML::XElement(ns.office + "document-styles", - XML::XNamespace(ns.style) + - XML::XNamespace(ns.text) + - XML::XNamespace(ns.table) + - XML::XNamespace(ns.draw) + - XML::XNamespace(ns.fo) + - XML::XNamespace(ns.xlink) + - XML::XNamespace(ns.dc) + - XML::XNamespace(ns.meta) + - XML::XNamespace(ns.number) + - XML::XNamespace(ns.presentation) + - XML::XNamespace(ns.svg) + - XML::XNamespace(ns.chart) + - XML::XNamespace(ns.dr3d) + - XML::XNamespace(ns.math) + - XML::XNamespace(ns.form) + - XML::XNamespace(ns.script) + - XML::XNamespace(ns.ooo) + - XML::XNamespace(ns.ooow) + - XML::XNamespace(ns.oooc) + - XML::XNamespace(ns.dom) + - XML::XNamespace(ns.xforms) + - XML::XNamespace(ns.xsd) + - XML::XNamespace(ns.xsi) + - XML::XNamespace(ns.smil) + - XML::XNamespace(ns.anim) + - XML::XNamespace(ns.rpt) + - XML::XNamespace(ns.of) + - XML::XNamespace(ns.rdfa) + - XML::XAttribute(ns.office + "version", m_version) + - XML::XElement(ns.office + "styles", - XML::Write(Gradients) + - XML::Write(FillImages) + - XML::Write(Markers) + - XML::Write(DefaultStyles) + - XML::Write(Styles) + - XML::Write(TableTemplates)// + - //XML::Write(Layouts) - ) + - XML::XElement(ns.office + "automatic-styles", - XML::Write(PageLayouts) + - XML::Write(AutomaticStyles) + - XML::Write(ListStyles) - ) + - XML::XElement(ns.office + "master-styles", - //XML::XElement(ns.draw + "layer-set", - // XML::Write(LayerSet) - //) + - //XML::Write(HandoutMaster) + - XML::Write(MasterPages) - ) - ).Save(path/s_filename); - } - - const bool File::isValid(const boost::filesystem::wpath& path) const - { - return true;//contain(path/s_filename); - } - } // namespace Styles -} // namespace Odt \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/File.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/File.h deleted file mode 100644 index 5187f935d0..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/File.h +++ /dev/null @@ -1,63 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_FILE_INCLUDE_H_ -#define ODP_STYLES_FILE_INCLUDE_H_ - -#include "OdtFormat/File.h" -#include "property.h" - -#include "Markers.h" -#include "FillImages.h" -#include "Gradients.h" -#include "OdtFormat/Logic/DefaultStyles.h" -#include "OdtFormat/Logic/NamedStyles.h" -#include "TableTemplates.h" -//#include "Layouts.h" - -#include "PageLayouts.h" -#include "OdtFormat/Logic/ListStyles.h" - -//#include "LayerSet.h" -//#include "HandoutMaster.h" -#include "MasterPages.h" -#include - -namespace Odp -{ - namespace Styles - { - class File : public Odt::File - { - public: - File(); - virtual ~File(); - - public: - virtual void read(const boost::filesystem::wpath& path); - virtual void write(const boost::filesystem::wpath& path) const; - virtual const bool isValid(const boost::filesystem::wpath& path) const; - - public: - static const bool exist(const boost::filesystem::wpath& path); - - public: - property m_version; - property FillImages; - property Gradients; - property Markers; - property DefaultStyles; - property Styles; - property TableTemplates; - //property Layouts; - - property PageLayouts; - property AutomaticStyles; - property ListStyles; - - //property LayerSet; - //property HandoutMaster; - property MasterPages; - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_FILE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImage.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImage.cpp deleted file mode 100644 index 901f49e3fc..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImage.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "FillImage.h" - -namespace Odp -{ - namespace Styles - { - FillImage::FillImage() - { - } - - FillImage::~FillImage() - { - } - - FillImage::FillImage(const XML::XNode& node) - { - fromXML(node); - } - - const FillImage& FillImage::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void FillImage::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - Name = element.attribute("name").value(); - DisplayName = element.attribute("display-name").value(); - Href = element.attribute("href").value(); - Type = element.attribute("type").value(); - Show = element.attribute("show").value(); - Actuate = element.attribute("actuate").value(); - } - - const XML::XNode FillImage::toXML() const - { - return - XML::XElement(ns.draw + "fill-image", - XML::XAttribute(ns.draw + "name", Name) + - XML::XAttribute(ns.draw + "display-name", DisplayName) + - XML::XAttribute(ns.xlink + "href", Href) + - XML::XAttribute(ns.xlink + "type", Type) + - XML::XAttribute(ns.xlink + "show", Show) + - XML::XAttribute(ns.xlink + "actuate", Actuate) - ); - } - } // namespace Styles; -} // namespace Odt \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImage.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImage.h deleted file mode 100644 index 4f22ddabfb..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImage.h +++ /dev/null @@ -1,39 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_FILL_IMAGE_INCLUDE_H_ -#define ODP_STYLES_FILL_IMAGE_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include -#include "property.h" -#include "OdtFormat/Limit/HrefType.h" -#include "OdtFormat/Limit/Show.h" -#include "OdtFormat/Limit/Actuate.h" - -namespace Odp -{ - namespace Styles - { - class FillImage : public Odt::WritingElement - { - public: - FillImage(); - virtual ~FillImage(); - explicit FillImage(const XML::XNode& node); - const FillImage& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - - public: - property Name; - property Href; - nullable_property DisplayName; - nullable_property Type; - nullable_property Show; - nullable_property Actuate; - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_FILL_IMAGE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImages.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImages.cpp deleted file mode 100644 index d685bf8afb..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImages.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "FillImages.h" -#include -#include - -namespace Odp -{ - namespace Styles - { - FillImages::FillImages() - { - } - - FillImages::~FillImages() - { - } - - FillImages::FillImages(const XML::XNode& node) - { - fromXML(node); - } - - const FillImages& FillImages::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void FillImages::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - XML::Fill(m_items, element, "fill-image"); - } - - const bool FillImages::exist(const std::string& name) const - { - return std::find_if(m_items.begin(), m_items.end(), boost::bind(&FillImage::Name, _1) == name) != m_items.end(); - } - - const FillImage& FillImages::operator[](const std::string& name) const - { - return find(name); - } - - FillImage& FillImages::operator[](const std::string& name) - { - return find(name); - } - - const FillImage& FillImages::find(const std::string& name) const - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&FillImage::Name, _1) == name); - } - - FillImage& FillImages::find(const std::string& name) - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&FillImage::Name, _1) == name); - } - } // namespace Styles -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImages.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImages.h deleted file mode 100644 index d0e93aad2b..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/FillImages.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_FILL_IMAGES_INCLUDE_H_ -#define ODP_STYLES_FILL_IMAGES_INCLUDE_H_ - -#include "OdtFormat/WritingVector.h" -#include "FillImage.h" - -namespace Odp -{ - namespace Styles - { - class FillImages : public Odt::WritingVector - { - public: - FillImages(); - virtual ~FillImages(); - explicit FillImages(const XML::XNode& node); - const FillImages& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - - public: - const bool exist(const std::string& name) const; - const FillImage& operator[](const std::string& name) const; - FillImage& operator[](const std::string& name); - const FillImage& find(const std::string& name) const; - FillImage& find(const std::string& name); - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_FILL_IMAGES_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradient.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradient.cpp deleted file mode 100644 index ba8093db08..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradient.cpp +++ /dev/null @@ -1,64 +0,0 @@ -#include "Gradient.h" - -namespace Odp -{ - namespace Styles - { - Gradient::Gradient() - { - } - - Gradient::~Gradient() - { - } - - Gradient::Gradient(const XML::XNode& node) - { - fromXML(node); - } - - const Gradient& Gradient::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Gradient::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - - Name = element.attribute("name").value(); - Style = element.attribute("style").value(); - DisplayName = element.attribute("display-name").value(); - StartColor = element.attribute("start-color").value(); - EndColor = element.attribute("end-color").value(); - StartIntensity = element.attribute("start-intensity").value().ToString(); - EndIntensity = element.attribute("end-intensity").value().ToString(); - Angle = element.attribute("angle").value(); - - if(element.attribute("cx").exist()) - cx = element.attribute("cx").value().ToString(); - if(element.attribute("cy").exist()) - cy = element.attribute("cy").value().ToString(); - Border = element.attribute("border").value().ToString(); - } - - const XML::XNode Gradient::toXML() const - { - return - XML::XElement(ns.draw + "gradient", - XML::XAttribute(ns.draw + "name", Name) + - XML::XAttribute(ns.draw + "display-name", DisplayName) + - XML::XAttribute(ns.draw + "style", Style) + - XML::XAttribute(ns.draw + "cx", cx) + - XML::XAttribute(ns.draw + "cy", cy) + - XML::XAttribute(ns.draw + "start-color", StartColor) + - XML::XAttribute(ns.draw + "end-color", EndColor) + - XML::XAttribute(ns.draw + "start-intensity", StartIntensity) + - XML::XAttribute(ns.draw + "end-intensity", EndIntensity) + - XML::XAttribute(ns.draw + "angle", Angle) + - XML::XAttribute(ns.draw + "border", Border) - ); - } - } // namespace Styles; -} // namespace Odt \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradient.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradient.h deleted file mode 100644 index 3d5f844254..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradient.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_GRADIENT_INCLUDE_H_ -#define ODP_STYLES_GRADIENT_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include -#include "property.h" -#include "OdtFormat/Limit/GradientStyle.h" -#include "OdtFormat/Logic/Color.h" -#include "Utility.h" - -namespace Odp -{ - namespace Styles - { - class Gradient : public Odt::WritingElement - { - public: - Gradient(); - virtual ~Gradient(); - explicit Gradient(const XML::XNode& node); - const Gradient& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - - public: - property Name; - property Style; - nullable_property DisplayName; - property StartColor; - property EndColor; - property StartIntensity; - property EndIntensity; - nullable_property cx; - nullable_property cy; - nullable_property Angle; - property Border; - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_GRADIENT_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradients.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradients.cpp deleted file mode 100644 index 03a673709e..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradients.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "Gradients.h" -#include -#include - -namespace Odp -{ - namespace Styles - { - Gradients::Gradients() - { - } - - Gradients::~Gradients() - { - } - - Gradients::Gradients(const XML::XNode& node) - { - fromXML(node); - } - - const Gradients& Gradients::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Gradients::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - XML::Fill(m_items, element, "gradient"); - } - - const bool Gradients::exist(const std::string& name) const - { - return std::find_if(m_items.begin(), m_items.end(), boost::bind(&Gradient::Name, _1) == name) != m_items.end(); - } - - const Gradient& Gradients::operator[](const std::string& name) const - { - return find(name); - } - - Gradient& Gradients::operator[](const std::string& name) - { - return find(name); - } - - const Gradient& Gradients::find(const std::string& name) const - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&Gradient::Name, _1) == name); - } - - Gradient& Gradients::find(const std::string& name) - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&Gradient::Name, _1) == name); - } - } // namespace Styles -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradients.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradients.h deleted file mode 100644 index e44e31e4c5..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Gradients.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_GRADIENTS_INCLUDE_H_ -#define ODP_STYLES_GRADIENTS_INCLUDE_H_ - -#include "OdtFormat/WritingVector.h" -#include "Gradient.h" - -namespace Odp -{ - namespace Styles - { - class Gradients : public Odt::WritingVector - { - public: - Gradients(); - virtual ~Gradients(); - explicit Gradients(const XML::XNode& node); - const Gradients& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - - public: - const bool exist(const std::string& name) const; - const Gradient& operator[](const std::string& name) const; - Gradient& operator[](const std::string& name); - const Gradient& find(const std::string& name) const; - Gradient& find(const std::string& name); - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_GRADIENTS_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Marker.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/Marker.cpp deleted file mode 100644 index 9e92d27f3c..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Marker.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "Marker.h" - -namespace Odp -{ - namespace Styles - { - - Marker::Marker() - { - } - - Marker::~Marker() - { - } - - Marker::Marker(const XML::XNode& node) - { - fromXML(node); - } - - const Marker& Marker::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Marker::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - Name = element.attribute("name").value(); - DisplayName = element.attribute("display-name").value(); - ViewBox = element.attribute("viewBox").value(); - d = element.attribute("d").value(); - } - - const XML::XNode Marker::toXML() const - { - return - XML::XElement(ns.draw + "marker", - XML::XAttribute(ns.draw + "name", Name) + - XML::XAttribute(ns.draw + "display-name", DisplayName) + - XML::XAttribute(ns.svg + "viewBox", ViewBox) + - XML::XAttribute(ns.svg + "d", d) - ); - } - } // namespace Styles -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Marker.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/Marker.h deleted file mode 100644 index 0a871daf7d..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Marker.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_MARKER_INCLUDE_H_ -#define ODP_STYLES_MARKER_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include - -namespace Odp -{ - namespace Styles - { - class Marker : public Odt::WritingElement - { - public: - Marker(); - virtual ~Marker(); - explicit Marker(const XML::XNode& node); - const Marker& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - property Name; - nullable_property DisplayName; - property ViewBox; - property d; - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_MARKER_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Markers.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/Markers.cpp deleted file mode 100644 index cd1553542f..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Markers.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "Markers.h" -#include -#include - -namespace Odp -{ - namespace Styles - { - Markers::Markers() - { - } - - Markers::~Markers() - { - } - - Markers::Markers(const XML::XNode& node) - { - fromXML(node); - } - - const Markers& Markers::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Markers::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - XML::Fill(m_items, element, "marker"); - } - - const bool Markers::exist(const std::string& name) const - { - return std::find_if(m_items.begin(), m_items.end(), boost::bind(&Marker::Name, _1) == name) != m_items.end(); - } - - const Marker& Markers::operator[](const std::string& name) const - { - return find(name); - } - - Marker& Markers::operator[](const std::string& name) - { - return find(name); - } - - const Marker& Markers::find(const std::string& name) const - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&Marker::Name, _1) == name); - } - - Marker& Markers::find(const std::string& name) - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&Marker::Name, _1) == name); - } - } // namespace Styles -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Markers.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/Markers.h deleted file mode 100644 index a9f283d91c..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Markers.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_MARKERS_INCLUDE_H_ -#define ODP_STYLES_MARKERS_INCLUDE_H_ - -#include "OdtFormat/WritingVector.h" -#include "Marker.h" - -namespace Odp -{ - namespace Styles - { - class Markers : public Odt::WritingVector - { - public: - Markers(); - virtual ~Markers(); - explicit Markers(const XML::XNode& node); - const Markers& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - - public: - const bool exist(const std::string& name) const; - const Marker& operator[](const std::string& name) const; - Marker& operator[](const std::string& name); - const Marker& find(const std::string& name) const; - Marker& find(const std::string& name); - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_MARKERS_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPage.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPage.cpp deleted file mode 100644 index e5383f9105..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPage.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "MasterPage.h" - -namespace Odp -{ - namespace Styles - { - MasterPage::MasterPage() - { - } - - MasterPage::~MasterPage() - { - } - - MasterPage::MasterPage(const XML::XNode& node) - { - fromXML(node); - } - - const MasterPage& MasterPage::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void MasterPage::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - Name = element.attribute("name").value(); - Layout = element.attribute("page-layout-name").value(); - StyleName = element.attribute("style-name").value(); - - XML::Fill(Elements, element, "frame", "custom-shape", "g", "line", "rect"); - } - - const XML::XNode MasterPage::toXML() const - { - return - XML::XElement(ns.style + "master-page", - XML::XAttribute(ns.style + "name", Name) + - XML::XAttribute(ns.style + "page-layout-name", Layout) + - XML::XAttribute(ns.draw + "style-name", StyleName) + - XML::Write(Elements) - ); - } - } // namespace Styles; -} // namespace Odt \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPage.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPage.h deleted file mode 100644 index 1bb2372bd2..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPage.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_MASTER_PAGE_INCLUDE_H_ -#define ODP_STYLES_MASTER_PAGE_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include -#include -#include "property.h" -#include "./../Content/DrawingElement.h" - -namespace Odp -{ - namespace Styles - { - class MasterPage : public Odt::WritingElement - { - public: - MasterPage(); - virtual ~MasterPage(); - explicit MasterPage(const XML::XNode& node); - const MasterPage& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - - public: - property Name; - property Layout; - property StyleName; - property > Elements; - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_MASTER_PAGE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPages.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPages.cpp deleted file mode 100644 index 1c2eb0aa9b..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPages.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "MasterPages.h" -#include -#include - -namespace Odp -{ - namespace Styles - { - MasterPages::MasterPages() - { - } - - MasterPages::~MasterPages() - { - } - - MasterPages::MasterPages(const XML::XNode& node) - { - fromXML(node); - } - - const MasterPages& MasterPages::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void MasterPages::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - XML::Fill(m_items, element, "master-page"); - } - - const bool MasterPages::exist(const std::string& name) const - { - return std::find_if(m_items.begin(), m_items.end(), boost::bind(&MasterPage::Name, _1) == name) != m_items.end(); - } - - const MasterPage& MasterPages::operator[](const std::string& name) const - { - return find(name); - } - - MasterPage& MasterPages::operator[](const std::string& name) - { - return find(name); - } - - const MasterPage& MasterPages::find(const std::string& name) const - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&MasterPage::Name, _1) == name); - } - - MasterPage& MasterPages::find(const std::string& name) - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&MasterPage::Name, _1) == name); - } - } // namespace Styles -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPages.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPages.h deleted file mode 100644 index 63e4a8e9db..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/MasterPages.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_MASTER_PAGES_INCLUDE_H_ -#define ODP_STYLES_MASTER_PAGES_INCLUDE_H_ - -#include "OdtFormat/WritingVector.h" -#include "MasterPage.h" - -namespace Odp -{ - namespace Styles - { - class MasterPages : public Odt::WritingVector - { - public: - MasterPages(); - virtual ~MasterPages(); - explicit MasterPages(const XML::XNode& node); - const MasterPages& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - - public: - const bool exist(const std::string& name) const; - const MasterPage& operator[](const std::string& name) const; - MasterPage& operator[](const std::string& name); - const MasterPage& find(const std::string& name) const; - MasterPage& find(const std::string& name); - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_MASTER_PAGES_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayout.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayout.cpp deleted file mode 100644 index 2def61bf1f..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayout.cpp +++ /dev/null @@ -1,42 +0,0 @@ -#include "PageLayout.h" - -namespace Odp -{ - namespace Styles - { - PageLayout::PageLayout() - { - } - - PageLayout::~PageLayout() - { - } - - PageLayout::PageLayout(const XML::XNode& node) - { - fromXML(node); - } - - const PageLayout& PageLayout::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void PageLayout::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - Name = element.attribute("name").value(); - Properties = element.element("page-layout-properties"); - } - - const XML::XNode PageLayout::toXML() const - { - return - XML::XElement(ns.style + "page-layout", - XML::XAttribute(ns.style + "name", Name) + - XML::Write(Properties) - ); - } - } // namespace Styles; -} // namespace Odt \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayout.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayout.h deleted file mode 100644 index 13f46dbea8..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayout.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_PAGE_LAYOUT_INCLUDE_H_ -#define ODP_STYLES_PAGE_LAYOUT_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include -#include "property.h" -#include "PageLayoutProperties.h" - -namespace Odp -{ - namespace Styles - { - class PageLayout : public Odt::WritingElement - { - public: - PageLayout(); - virtual ~PageLayout(); - explicit PageLayout(const XML::XNode& node); - const PageLayout& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - - public: - property Name; - property Properties; - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_PAGE_LAYOUT_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayoutProperties.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayoutProperties.cpp deleted file mode 100644 index 2a851f93bd..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayoutProperties.cpp +++ /dev/null @@ -1,57 +0,0 @@ -#include "PageLayoutProperties.h" - -namespace Odp -{ - namespace Styles - { - PageLayoutProperties::PageLayoutProperties() - { - } - - PageLayoutProperties::~PageLayoutProperties() - { - } - - PageLayoutProperties::PageLayoutProperties(const XML::XNode& node) - { - fromXML(node); - } - - const PageLayoutProperties& PageLayoutProperties::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void PageLayoutProperties::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - margin_top = element.attribute("margin-top").value().ToString(); - margin_left = element.attribute("margin-left").value().ToString(); - margin_right = element.attribute("margin-right").value().ToString(); - margin_bottom = element.attribute("margin-bottom").value().ToString(); - page_height = element.attribute("page-height").value().ToString(); - page_width = element.attribute("page-width").value().ToString(); - print = element.attribute("print-orientation").value(); - } - - const XML::XNode PageLayoutProperties::toXML() const - { - return - XML::XElement(ns.style + "page-layout-properties", - XML::XAttribute(ns.fo + "margin-top", margin_top) + - XML::XAttribute(ns.fo + "margin-bottom", margin_bottom) + - XML::XAttribute(ns.fo + "margin-left", margin_left) + - XML::XAttribute(ns.fo + "margin-right", margin_right) + - XML::XAttribute(ns.fo + "page-width", page_width) + - XML::XAttribute(ns.fo + "page-height", page_height) + - XML::XAttribute(ns.style + "print-orientation", print) - ); - } - - const bool PageLayoutProperties::isSimple() const - { - return true; - } - } // namespace Styles -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayoutProperties.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayoutProperties.h deleted file mode 100644 index 0ac312038d..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayoutProperties.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_PAGELAYOUTPROPERTIES_INCLUDE_H_ -#define ODP_STYLES_PAGELAYOUTPROPERTIES_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include "nullable_property.h" -#include "Common.h" -#include "OdtFormat/Unit.h" -#include -#include "OdtFormat/Limit/Orientation.h" - -namespace Odp -{ - namespace Styles - { - class PageLayoutProperties : public Odt::WritingElement - { - public: - PageLayoutProperties(); - virtual ~PageLayoutProperties(); - explicit PageLayoutProperties(const XML::XNode& node); - const PageLayoutProperties& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - - public: - const bool isSimple() const; - - public: - property margin_top; - property margin_left; - property margin_right; - property margin_bottom; - property page_width; - property page_height; - property print; - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_PAGELAYOUTPROPERTIES_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayouts.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayouts.cpp deleted file mode 100644 index 38b3364b57..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayouts.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "PageLayouts.h" -#include -#include - -namespace Odp -{ - namespace Styles - { - PageLayouts::PageLayouts() - { - } - - PageLayouts::~PageLayouts() - { - } - - PageLayouts::PageLayouts(const XML::XNode& node) - { - fromXML(node); - } - - const PageLayouts& PageLayouts::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void PageLayouts::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - XML::Fill(m_items, element, "page-layout"); - } - - const bool PageLayouts::exist(const std::string& name) const - { - return std::find_if(m_items.begin(), m_items.end(), boost::bind(&PageLayout::Name, _1) == name) != m_items.end(); - } - - const PageLayout& PageLayouts::operator[](const std::string& name) const - { - return find(name); - } - - PageLayout& PageLayouts::operator[](const std::string& name) - { - return find(name); - } - - const PageLayout& PageLayouts::find(const std::string& name) const - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&PageLayout::Name, _1) == name); - } - - PageLayout& PageLayouts::find(const std::string& name) - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&PageLayout::Name, _1) == name); - } - } // namespace Styles -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayouts.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayouts.h deleted file mode 100644 index 155c43e934..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/PageLayouts.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_PAGE_LAYOUTS_INCLUDE_H_ -#define ODP_STYLES_PAGE_LAYOUTS_INCLUDE_H_ - -#include "OdtFormat/WritingVector.h" -#include "PageLayout.h" - -namespace Odp -{ - namespace Styles - { - class PageLayouts : public Odt::WritingVector - { - public: - PageLayouts(); - virtual ~PageLayouts(); - explicit PageLayouts(const XML::XNode& node); - const PageLayouts& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - - public: - const bool exist(const std::string& name) const; - const PageLayout& operator[](const std::string& name) const; - PageLayout& operator[](const std::string& name); - const PageLayout& find(const std::string& name) const; - PageLayout& find(const std::string& name); - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_PAGE_LAYOUTS_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Placeholder.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/Placeholder.cpp deleted file mode 100644 index 0d02f8db9f..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Placeholder.cpp +++ /dev/null @@ -1,49 +0,0 @@ -#include "Placeholder.h" - -namespace Odp -{ - namespace Styles - { - - Placeholder::Placeholder() - { - } - - Placeholder::~Placeholder() - { - } - - Placeholder::Placeholder(const XML::XNode& node) - { - fromXML(node); - } - - const Placeholder& Placeholder::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void Placeholder::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - object = element.attribute("object").value(); - x = element.attribute("x").value().ToString(); - y = element.attribute("y").value().ToString(); - width = element.attribute("width").value().ToString(); - height = element.attribute("height").value().ToString(); - } - - const XML::XNode Placeholder::toXML() const - { - return - XML::XElement(ns.presentation + "placeholder", - XML::XAttribute(ns.presentation + "object", object) + - XML::XAttribute(ns.svg + "x", x) + - XML::XAttribute(ns.svg + "y", y) + - XML::XAttribute(ns.svg + "width", width) + - XML::XAttribute(ns.svg + "height", height) - ); - } - } // namespace Styles -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Placeholder.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/Placeholder.h deleted file mode 100644 index 74db06cc2b..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/Placeholder.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_PLACEHOLDER_INCLUDE_H_ -#define ODP_STYLES_PLACEHOLDER_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include -#include "Common.h" -#include "OdtFormat/Unit.h" - -namespace Odp -{ - namespace Styles - { - class Placeholder : public Odt::WritingElement - { - public: - Placeholder(); - virtual ~Placeholder(); - explicit Placeholder(const XML::XNode& node); - const Placeholder& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - public: - property object;//TODO : Здесь можно сделать limit ("handout") - property x; - property y; - property width; - property height; - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_PLACEHOLDER_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplate.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplate.cpp deleted file mode 100644 index 8955727c2e..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplate.cpp +++ /dev/null @@ -1,60 +0,0 @@ -#include "TableTemplate.h" - -namespace Odp -{ - namespace Styles - { - TableTemplate::TableTemplate() - { - } - - TableTemplate::~TableTemplate() - { - } - - TableTemplate::TableTemplate(const XML::XNode& node) - { - fromXML(node); - } - - const TableTemplate& TableTemplate::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void TableTemplate::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - StyleName = element.attribute("style-name").value(); - if(element.element("first-row").exist()) - FirstRow = element.element("first-row").attribute("style-name").value(); - if(element.element("last-row").exist()) - LastRow = element.element("last-row").attribute("style-name").value(); - if(element.element("first-column").exist()) - FirstColumn = element.element("first-column").attribute("style-name").value(); - if(element.element("last-column").exist()) - LastColumn = element.element("last-column").attribute("style-name").value(); - if(element.element("odd-rows").exist()) - OddRows = element.element("odd-rows").attribute("style-name").value(); - if(element.element("odd-columns").exist()) - OddColumns = element.element("odd-columns").attribute("style-name").value(); - if(element.element("body").exist()) - Body = element.element("body").attribute("style-name").value(); - } - - const XML::XNode TableTemplate::toXML() const - { - return XML::XElement(ns.table + "table-template", - XML::XAttribute(ns.text + "style-name", StyleName) + - XML::WriteIf(XML::XElement(ns.table + "first-row", XML::XAttribute(ns.text + "style-name", FirstRow)), FirstRow.is_init()) + - XML::WriteIf(XML::XElement(ns.table + "last-row", XML::XAttribute(ns.text + "style-name", LastRow)), LastRow.is_init()) + - XML::WriteIf(XML::XElement(ns.table + "first-column", XML::XAttribute(ns.text + "style-name", FirstColumn)), FirstColumn.is_init()) + - XML::WriteIf(XML::XElement(ns.table + "last-column", XML::XAttribute(ns.text + "style-name", LastColumn)), LastColumn.is_init()) + - XML::WriteIf(XML::XElement(ns.table + "odd-rows", XML::XAttribute(ns.text + "style-name", OddRows)), OddRows.is_init()) + - XML::WriteIf(XML::XElement(ns.table + "odd-columns", XML::XAttribute(ns.text + "style-name", OddColumns)), OddColumns.is_init()) + - XML::WriteIf(XML::XElement(ns.table + "body", XML::XAttribute(ns.text + "style-name", Body)), Body.is_init()) - ); - } - } // namespace Styles; -} // namespace Odt \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplate.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplate.h deleted file mode 100644 index c3e0b39223..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplate.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_TABLE_TEMPLATE_INCLUDE_H_ -#define ODP_STYLES_TABLE_TEMPLATE_INCLUDE_H_ - -#include "OdtFormat/WritingElement.h" -#include -#include "property.h" - -namespace Odp -{ - namespace Styles - { - class TableTemplate : public Odt::WritingElement - { - public: - TableTemplate(); - virtual ~TableTemplate(); - explicit TableTemplate(const XML::XNode& node); - const TableTemplate& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - virtual const XML::XNode toXML() const; - - public: - property StyleName; - nullable_property FirstRow; - nullable_property LastRow; - nullable_property FirstColumn; - nullable_property LastColumn; - nullable_property OddRows; - nullable_property OddColumns; - nullable_property Body; - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_TABLE_TEMPLATE_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplates.cpp b/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplates.cpp deleted file mode 100644 index 8ab99bd9e6..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplates.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "TableTemplates.h" -#include -#include - -namespace Odp -{ - namespace Styles - { - TableTemplates::TableTemplates() - { - } - - TableTemplates::~TableTemplates() - { - } - - TableTemplates::TableTemplates(const XML::XNode& node) - { - fromXML(node); - } - - const TableTemplates& TableTemplates::operator =(const XML::XNode& node) - { - fromXML(node); - return *this; - } - - void TableTemplates::fromXML(const XML::XNode& node) - { - const XML::XElement element(node); - XML::Fill(m_items, element, "table-template"); - } - - const bool TableTemplates::exist(const std::string& name) const - { - return std::find_if(m_items.begin(), m_items.end(), boost::bind(&TableTemplate::StyleName, _1) == name) != m_items.end(); - } - - const TableTemplate& TableTemplates::operator[](const std::string& name) const - { - return find(name); - } - - TableTemplate& TableTemplates::operator[](const std::string& name) - { - return find(name); - } - - const TableTemplate& TableTemplates::find(const std::string& name) const - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&TableTemplate::StyleName, _1) == name); - } - - TableTemplate& TableTemplates::find(const std::string& name) - { - return *std::find_if(m_items.begin(), m_items.end(), boost::bind(&TableTemplate::StyleName, _1) == name); - } - } // namespace Styles -} // namespace Odp \ No newline at end of file diff --git a/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplates.h b/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplates.h deleted file mode 100644 index 84fec5c46f..0000000000 --- a/ASCOfficeOdpFile/ODPFormat/Source/Styles/TableTemplates.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once -#ifndef ODP_STYLES_TABLE_TEMPLATES_INCLUDE_H_ -#define ODP_STYLES_TABLE_TEMPLATES_INCLUDE_H_ - -#include "OdtFormat/WritingVector.h" -#include "TableTemplate.h" - -namespace Odp -{ - namespace Styles - { - class TableTemplates : public Odt::WritingVector - { - public: - TableTemplates(); - virtual ~TableTemplates(); - explicit TableTemplates(const XML::XNode& node); - const TableTemplates& operator =(const XML::XNode& node); - - public: - virtual void fromXML(const XML::XNode& node); - - public: - const bool exist(const std::string& name) const; - const TableTemplate& operator[](const std::string& name) const; - TableTemplate& operator[](const std::string& name); - const TableTemplate& find(const std::string& name) const; - TableTemplate& find(const std::string& name); - }; - } // namespace Styles -} // namespace Odp - -#endif // ODP_STYLES_TABLE_TEMPLATES_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Converter.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Converter.cpp deleted file mode 100644 index c07ac05916..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Converter.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include "stdafx.h" -#include "Converter.h" - -namespace Odp2DrawingXML -{ - Converter::Converter() - { - } - - Converter::~Converter() - { - } - - DWORD Converter::Convert(const Odp::Folder& pFolder, CDocument& lDocument) - { - lDocument.Clear(); - m_Folder = &pFolder; - - double dDuration = 0.0; - size_t i; - - lDocument.m_arThemes.Add(); - - CTheme* pTheme = &lDocument.m_arThemes[0]; - // fonts - pTheme->m_arFonts.Add(); - pTheme->m_arFonts[0].Name = _T("Arial"); - pTheme->m_arFonts.Add(); - pTheme->m_arFonts[1].Name = _T("Arial"); - - // colors - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - pTheme->m_arColorScheme.Add(CColor::CreateColor(0)); - - pTheme->m_bIsBackground = TRUE; - pTheme->m_oBackground.Type = c_BrushTypeSolid; - pTheme->m_oBackground.Color1 = 0xFFFFFFFF; - pTheme->m_oBackground.Alpha1 = 0xFF; - - // layouts - pTheme->m_arLayouts.Add(); - pTheme->m_arLayouts[0].m_bIsBackground = false; - pTheme->m_arLayouts[0].m_bShowMasterShapes = true; - pTheme->m_arLayouts[0].m_bUseThemeColorScheme = true; - - for(i = 0; i < pFolder.Content->body->Slides->size(); i++) - { - SlideConvert(i, &dDuration, lDocument); - TransitionConvert(i, lDocument); - } - - if (0 < lDocument.m_arSlides.GetCount()) - { - lDocument.m_oInfo.m_lMillimetresHor = lDocument.m_arSlides[0].m_lWidth; - lDocument.m_oInfo.m_lMillimetresVer = lDocument.m_arSlides[0].m_lHeight; - lDocument.m_oInfo.m_lUnitsHor = lDocument.m_oInfo.m_lMillimetresHor; - lDocument.m_oInfo.m_lUnitsVer = lDocument.m_oInfo.m_lMillimetresVer; - } - - lDocument.CalculateEditor(lDocument.m_oInfo); - return 1; - } -} // namespace Odp2DrawingXML \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Converter.h b/ASCOfficeOdpFile/Odp2DrawingXML/Converter.h deleted file mode 100644 index 385bbe3870..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Converter.h +++ /dev/null @@ -1,79 +0,0 @@ -#pragma once -#ifndef ODP2DRAWINGXML_CONVERTER_INCLUDE_H_ -#define ODP2DRAWINGXML_CONVERTER_INCLUDE_H_ - -#include "stdafx.h" -#include "Odp.h" -#include "../../ASCPresentationEditor/OfficeDrawing/Document.h" -#include "nullable_property.h" -#include "property.h" -#include -using namespace NSPresentationEditor; - -namespace Odp2DrawingXML -{ - class Converter - { - public: - Converter(); - ~Converter(); - public: - DWORD Convert(const Odp::Folder& pFolder, CDocument& lDocument); - private: - Odp::Folder const* m_Folder; - //static OOXMLShapes::ShapeType GetShapeTypeFromStr(const std::string& str); - - static WORD GetTextAlignFromStr(const std::string& str); - static WORD GetTextAnchorFromStr(const std::string& str); - //static WORD GetFontAlignFromStr(const std::string& str); - //static WORD GetPattFillValFromStr(const std::string& str); - //static BYTE GetTransitionSpeedFromStr(const std::string& str); - //static DWORD GetTLRestartFromStr(const std::string& str); - //static DWORD GetTLPresetClassFromStr(const std::string& str); - //static DWORD GetTLNodeTypeFromStr(const std::string& str); - //static DWORD GetTLCalcModeFromStr(const std::string& str); - //static DWORD GetTLValueTypeFromStr(const std::string& str); - - void FillPenBrush(const Odt::Logic::Properties& pProps, CShapeElement& pShape)const; - void FillBackground(const Odt::Logic::Properties& pProps, CBrush& pBrush)const; - //static void LnToPen(const nullable_property& Line, NSAttributes::CPen_& Pen); - //static void LnToPen(const property& Line, NSAttributes::CPen_& Pen); - //static void LnToPen(const OOX::Logic::Ln& Line, DWORD BGRA, NSAttributes::CPen_& Pen); - //static void FillToBrush(const OOX::Logic::UniFill& Fill, NSAttributes::CBrush_& Brush); - //static void FillToBrush(const OOX::Logic::UniFill& Fill, DWORD BGRA, NSAttributes::CBrush_& Brush); - - void SlideConvert(const DWORD SldNum, double* Duration, CDocument& pDocument)const; - void AddBackground(const std::string& MasterName, CSlide& pEContainer)const; - void DrawingElementConvert(const Odp::Content::DrawingElement& pDrawElem, CSlide& pEContainer, bool master)const; - void GroupConvert(const Odp::Content::Group& pGroup, CSlide& pEContainer, bool master)const; - void FrameConvert(const Odp::Content::Frame& pFrame, CSlide& pEContainer, bool master)const; - void LineConvert(const Odp::Content::Line& pLine, CSlide& pEContainer, bool master)const; - void RectConvert(const Odp::Content::Rect& pRect, CSlide& pEContainer, bool master)const; - void CustomShapeConvert(const Odp::Content::CustomShape& pCustShape, CSlide& pEContainer, bool master)const; - void TextVectorConvert(const std::vector& pTextBox, CTextAttributesEx& pText, const Odt::Logic::Properties& ParentProps, bool master)const; - void TextConvert(const Odt::Content::Text& pTextItem, CTextAttributesEx& pText, const Odt::Logic::Properties& ParentProps, const Odt::Logic::ListStyle listStyle, const int level, bool master)const; - void ParagraphConvert(const Odt::Content::Paragraph& pParagraph, CTextAttributesEx& pText, const Odt::Logic::Properties& ParentProps, const Odt::Logic::ListStyle listStyle, const int level, bool master)const; - void TableConvert(const Odt::Content::Table& pTable, CSlide& pEContainer, const Odt::Logic::Properties& ParentProps, long x, long y, bool master)const; - void TableCellConvert(const Odt::Content::TableCell& pTableCell, CSlide& pEContainer, const Odt::Logic::Properties& ParentProps, long x, long y, long w, long h, bool master)const; - //static void AddParentPics(OOX::Logic::SpTree& Group, CElementsContainer& pEContainer); - //static void GroupConvert(OOX::Logic::SpTree& Group, CElementsContainer& pEContainer); - //static void ShapeConvert(OOX::Logic::Shape& pShape, CElementsContainer& pEContainer); - //static void TextParse(const OOX::Logic::TxBody& pShapeText, CTextAttributesEx& pText, const OOX::Logic::ShapeProperties& TextProps, double AutoFit); - //static void PicConvert(const OOX::Logic::Pic& pPic, CElementsContainer& pEContainer); - //static void VideoElementConvert(const OOX::Logic::Pic& pPic, CElementsContainer& pEContainer); - //static void ConnectorConvert(const OOX::Logic::CxnSp& pCxn, CElementsContainer& pEContainer); - - void TransitionConvert(const DWORD SldNum, CDocument& pDocument)const; - void TransitionParse(const Odp::Content::TransitionFilter& pTransition, const DWORD SldNum, const std::string& SlideId, CDocument& pDocument)const; - //static void TimingConvert(const DWORD SLdNum, const OOX::Logic::Timing& pTiming, CDrawingDocument& pDocument); - //static void TimeNodeListConvert(const OOX::Logic::TnLst& tnLst, Animations::ODExtTimeNodeContainer& tnContainer); - //static void TimeNodeBaseConvert(const OOX::Logic::TimeNodeBase& timeNode, Animations::ODExtTimeNodeContainer& tnContainer); - //static void CTN2TimeNodeAtom(const OOX::Logic::CTn& cTn, Animations::ODExtTimeNodeContainer& container); - //static void AddCondLst(const OOX::Logic::CondLst condLst, Animations::ODExtTimeNodeContainer& container); - //static void CBhvr2TimeBehaviorContainer(const OOX::Logic::CBhvr& bhvr, Animations::ODTimeBehaviorContainer& container); - //static int ParseTLTime(const std::string& str); - }; - -} // namespace Odp2DrawingXML - -#endif //ODP2DRAWINGXML_CONVERTER_INCLUDE_H_ \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Odp2DrawingXML.vcproj b/ASCOfficeOdpFile/Odp2DrawingXML/Odp2DrawingXML.vcproj deleted file mode 100644 index 8bc5b89e9b..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Odp2DrawingXML.vcproj +++ /dev/null @@ -1,299 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/CustomShapeConvert.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/CustomShapeConvert.cpp deleted file mode 100644 index a14d5f5537..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/CustomShapeConvert.cpp +++ /dev/null @@ -1,55 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" - -namespace Odp2DrawingXML -{ - void Converter::CustomShapeConvert(const Odp::Content::CustomShape& pCustShape, CSlide& pEContainer, bool master)const - { - //CShapeElement* pShape = new CShapeElement(NSBaseShape::odp, (int)OdpShapes::sptCRect); - CShapeElement* pShape = new CShapeElement(CString(pCustShape.geometry->GetODString().c_str())); - - pShape->m_dStartTime = 0; - pShape->m_dEndTime = pEContainer.m_dDuration; - - pShape->m_oMetric.m_lUnitsHor = pEContainer.m_lOriginalWidth; - pShape->m_oMetric.m_lUnitsVer = pEContainer.m_lOriginalHeight; - pShape->m_oMetric.m_lMillimetresHor = pEContainer.m_lOriginalWidth; - pShape->m_oMetric.m_lMillimetresVer = pEContainer.m_lOriginalHeight; -/* - pShape->m_oShape.m_oBrush.m_Alpha1 = 255; - pShape->m_oShape.m_oBrush.m_Alpha2 = 255; - pShape->m_oShape.m_oPen.m_nAlpha = 255; -*/ - RECT rcBounds; - pCustShape.GetMmRect(rcBounds); - pShape->m_rcBoundsOriginal.left = rcBounds.left; - pShape->m_rcBoundsOriginal.top = rcBounds.top; - pShape->m_rcBoundsOriginal.right = rcBounds.right; - pShape->m_rcBoundsOriginal.bottom = rcBounds.bottom; - pShape->m_rcBounds = pShape->m_rcBoundsOriginal; - - Odt::Logic::Properties TextProps; - Odt::Logic::Properties GraphicProps; - if(pCustShape.text_style_name.is_init()) - { - std::string style = pCustShape.text_style_name.get(); - TextProps = m_Folder->GetPropertiesFromStyle(style, master); - } - if(pCustShape.style_name.is_init()) - { - std::string style = pCustShape.style_name.get(); - GraphicProps = m_Folder->GetPropertiesFromStyle(style, master); - } - Odt::Logic::Properties properties; - properties = Odt::Logic::Properties::merge(GraphicProps, TextProps); - FillPenBrush(properties, *pShape); - - TextVectorConvert(pCustShape.text.get(), pShape->m_oShape.m_oText, properties, master); -/* - double AutoFit = pShape.txBody->bodyPr->Fit.fontScale.get_value_or(100000)/100000.0; - TextParse(pShape.txBody.get(), lpShapeElement->m_oShape.m_oText, ShapeProps, AutoFit); -*/ - pShape->SetupProperties(&pEContainer, NULL, NULL); - pEContainer.m_arElements.Add(pShape); - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/FillPenBrush.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/FillPenBrush.cpp deleted file mode 100644 index 30a881ac77..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/FillPenBrush.cpp +++ /dev/null @@ -1,129 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" -#include "Styles/FillImage.h" -#include "Styles/Gradient.h" - -namespace Odp2DrawingXML -{ - void Converter::FillPenBrush(const Odt::Logic::Properties& pProps, CShapeElement& pShape)const - { - if(pProps.Graphic.is_init()) - { - std::string fill = pProps.Graphic->Fill.get_value_or("none"); - long opacity = 255; - if(pProps.Graphic->Opacity.is_init()) - opacity = (long)(255 * (100 - pProps.Graphic->Opacity->value())/100.0); - - if(fill == "none") - { - pShape.m_oShape.m_oBrush.Alpha1 = 0; - pShape.m_oShape.m_oBrush.Alpha2 = 0; - } - else if(fill == "solid") - { - pShape.m_oShape.m_oBrush.Type = (int)c_BrushTypeSolid; - if(pProps.Graphic->FillColor.is_init()) - { - pShape.m_oShape.m_oBrush.Color1.R = pProps.Graphic->FillColor->Red.get(); - pShape.m_oShape.m_oBrush.Color1.G = pProps.Graphic->FillColor->Green.get(); - pShape.m_oShape.m_oBrush.Color1.B = pProps.Graphic->FillColor->Blue.get(); - pShape.m_oShape.m_oBrush.Color2.R = pShape.m_oShape.m_oBrush.Color1.R; - pShape.m_oShape.m_oBrush.Color2.G = pShape.m_oShape.m_oBrush.Color1.G; - pShape.m_oShape.m_oBrush.Color2.B = pShape.m_oShape.m_oBrush.Color1.B; - } - else - { - pShape.m_oShape.m_oBrush.Color1.R = 255; - pShape.m_oShape.m_oBrush.Color1.G = 255; - pShape.m_oShape.m_oBrush.Color1.B = 255; - pShape.m_oShape.m_oBrush.Color2.R = 255; - pShape.m_oShape.m_oBrush.Color2.G = 255; - pShape.m_oShape.m_oBrush.Color2.B = 255; - } - pShape.m_oShape.m_oBrush.Alpha1 = pShape.m_oShape.m_oBrush.Alpha2 = opacity; - } - else if((fill == "gradient") && (pProps.Graphic->FillGradientName.is_init())) - { - pShape.m_oShape.m_oBrush.Type = (int)c_BrushTypeCenter;//TODO : изменить в заивсимости от типа - std::string gradient = pProps.Graphic->FillGradientName.get(); - Odp::Styles::Gradient Gradient = m_Folder->Styles->Gradients->find(gradient); - pShape.m_oShape.m_oBrush.Color1.R = Gradient.StartColor->Red.get(); - pShape.m_oShape.m_oBrush.Color1.G = Gradient.StartColor->Green.get(); - pShape.m_oShape.m_oBrush.Color1.B = Gradient.StartColor->Blue.get(); - pShape.m_oShape.m_oBrush.Color2.R = Gradient.EndColor->Red.get(); - pShape.m_oShape.m_oBrush.Color2.G = Gradient.EndColor->Green.get(); - pShape.m_oShape.m_oBrush.Color2.B = Gradient.EndColor->Blue.get(); - - pShape.m_oShape.m_oBrush.Alpha1 = pShape.m_oShape.m_oBrush.Alpha2 = opacity; - } - else if((fill == "bitmap") && (pProps.Graphic->FillImageName.is_init())) - { - pShape.m_oShape.m_oBrush.Type = (int)c_BrushTypeTexture; - std::string image = pProps.Graphic->FillImageName.get(); - Odp::Styles::FillImage FillImage = m_Folder->Styles->FillImages->find(image); - pShape.m_oShape.m_oBrush.TexturePath = CStringW(m_Folder->GetPath().c_str()) + CStringW(FillImage.Href.get().c_str()); - pShape.m_oShape.m_oBrush.TextureMode = (int)c_BrushTextureModeTile;//:(int)BrushTextureModeStretch; - } - - std::string stroke = pProps.Graphic->Stroke.get_value_or("none"); - if(stroke == "none") - { - pShape.m_oShape.m_oPen.Alpha = 0; - } - else if(stroke == "solid") - { - if(pProps.Graphic->StrokeColor.is_init()) - { - pShape.m_oShape.m_oPen.Color.R = pProps.Graphic->StrokeColor->Red.get(); - pShape.m_oShape.m_oPen.Color.G = pProps.Graphic->StrokeColor->Green.get(); - pShape.m_oShape.m_oPen.Color.B = pProps.Graphic->StrokeColor->Blue.get(); - } - else - { - pShape.m_oShape.m_oPen.Color.R = 0; - pShape.m_oShape.m_oPen.Color.G = 0; - pShape.m_oShape.m_oPen.Color.B = 0; - } - } - } - } - - void Converter::FillBackground(const Odt::Logic::Properties& pProps, CBrush& pBrush)const - { - std::string fill = pProps.DrawingPage->Fill.get_value_or("none"); - if(fill == "none") - { - pBrush.Alpha1 = 0; - pBrush.Alpha2 = 0; - } - else if((fill == "bitmap") && (pProps.DrawingPage->FillImageName.is_init())) - { - std::string image = pProps.DrawingPage->FillImageName.get(); - Odp::Styles::FillImage FillImage = m_Folder->Styles->FillImages->find(image); - pBrush.Type = (int)c_BrushTypeTexture; - pBrush.TexturePath = CStringW(m_Folder->GetPath().c_str()) + CStringW(FillImage.Href.get().c_str()); - } - else if(fill == "solid") - { - pBrush.Type = (int)c_BrushTypeSolid; - if(pProps.DrawingPage->FillColor.is_init()) - { - pBrush.Color1.R = pProps.DrawingPage->FillColor->Red.get(); - pBrush.Color1.G = pProps.DrawingPage->FillColor->Green.get(); - pBrush.Color1.B = pProps.DrawingPage->FillColor->Blue.get(); - pBrush.Color2.R = pBrush.Color1.R; - pBrush.Color2.G = pBrush.Color1.G; - pBrush.Color2.B = pBrush.Color1.B; - } - else - { - pBrush.Color1.R = 255; - pBrush.Color1.G = 255; - pBrush.Color1.B = 255; - pBrush.Color2.R = 255; - pBrush.Color2.G = 255; - pBrush.Color2.B = 255; - } - } - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/FrameConvert.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/FrameConvert.cpp deleted file mode 100644 index 0d2511197a..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/FrameConvert.cpp +++ /dev/null @@ -1,119 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" - -namespace Odp2DrawingXML -{ - void Converter::FrameConvert(const Odp::Content::Frame& pFrame, CSlide& pEContainer, bool master)const - { - if((pFrame.image.is_init()) && (!pFrame.object.is_init()) && (!pFrame.Table.is_init())) - { - CImageElement* lpImageElement = new CImageElement(); - - lpImageElement->m_oMetric.m_lUnitsHor = pEContainer.m_lOriginalWidth; - lpImageElement->m_oMetric.m_lUnitsVer = pEContainer.m_lOriginalHeight; - lpImageElement->m_oMetric.m_lMillimetresHor = pEContainer.m_lOriginalWidth; - lpImageElement->m_oMetric.m_lMillimetresVer = pEContainer.m_lOriginalHeight; - - lpImageElement->m_dStartTime = 0; - lpImageElement->m_dEndTime = pEContainer.m_dDuration; - - RECT rcBounds; - pFrame.GetMmRect(rcBounds); - lpImageElement->m_rcBoundsOriginal.left = rcBounds.left; - lpImageElement->m_rcBoundsOriginal.top = rcBounds.top; - lpImageElement->m_rcBoundsOriginal.right = rcBounds.right; - lpImageElement->m_rcBoundsOriginal.bottom = rcBounds.bottom; - - lpImageElement->m_rcBounds = lpImageElement->m_rcBoundsOriginal; - - lpImageElement->m_strFileName = CString(m_Folder->GetPath().c_str()) + CString(pFrame.image->href.get().c_str()); - - //lpImageElement->SetUpProperties(NULL, &pEContainer); - pEContainer.m_arElements.Add(lpImageElement); - return; - } - else if(pFrame.text_box.is_init()) - { - CShapeElement* pTextBox = new CShapeElement(NSBaseShape::odp, (int)OdpShapes::sptCRect); - pTextBox->m_dStartTime = 0; - pTextBox->m_dEndTime = pEContainer.m_dDuration; - - pTextBox->m_oMetric.m_lUnitsHor = pEContainer.m_lOriginalWidth; - pTextBox->m_oMetric.m_lUnitsVer = pEContainer.m_lOriginalHeight; - pTextBox->m_oMetric.m_lMillimetresHor = pEContainer.m_lOriginalWidth; - pTextBox->m_oMetric.m_lMillimetresVer = pEContainer.m_lOriginalHeight; - - pTextBox->m_oShape.m_oBrush.Alpha1 = 0; - pTextBox->m_oShape.m_oBrush.Alpha2 = 0; - pTextBox->m_oShape.m_oPen.Alpha = 0; - - RECT rcBounds; - pFrame.GetMmRect(rcBounds); - pTextBox->m_rcBoundsOriginal.left = rcBounds.left; - pTextBox->m_rcBoundsOriginal.top = rcBounds.top; - pTextBox->m_rcBoundsOriginal.right = rcBounds.right; - pTextBox->m_rcBoundsOriginal.bottom = rcBounds.bottom; - - pTextBox->m_rcBounds = pTextBox->m_rcBoundsOriginal; - - Odt::Logic::Properties TextProps; - Odt::Logic::Properties GraphicProps; - Odt::Logic::Properties PresProps; - if(pFrame.text_style_name.is_init()) - { - std::string style = pFrame.text_style_name.get(); - TextProps = m_Folder->GetPropertiesFromStyle(style, master); - } - if(pFrame.draw_style_name.is_init()) - { - std::string style = pFrame.draw_style_name.get(); - GraphicProps = m_Folder->GetPropertiesFromStyle(style, master); - } - if(pFrame.presentation_style_name.is_init()) - { - std::string style = pFrame.presentation_style_name.get(); - PresProps = m_Folder->GetPropertiesFromStyle(style, master); - } - - Odt::Logic::Properties properties; - properties = Odt::Logic::Properties::merge(GraphicProps, TextProps); - properties = Odt::Logic::Properties::merge(PresProps, properties); - TextVectorConvert(pFrame.text_box->Items.get(), pTextBox->m_oShape.m_oText, properties, master); -/* - double AutoFit = pShape.txBody->bodyPr->Fit.fontScale.get_value_or(100000)/100000.0; - TextParse(pShape.txBody.get(), lpShapeElement->m_oShape.m_oText, ShapeProps, AutoFit); -*/ - pEContainer.m_arElements.Add(pTextBox); - } - else if(pFrame.Table.is_init()) - { - RECT rect; - pFrame.GetMmRect(rect); - - Odt::Logic::Properties TextProps; - Odt::Logic::Properties GraphicProps; - Odt::Logic::Properties PresProps; - if(pFrame.text_style_name.is_init()) - { - std::string style = pFrame.text_style_name.get(); - TextProps = m_Folder->GetPropertiesFromStyle(style, master); - } - if(pFrame.draw_style_name.is_init()) - { - std::string style = pFrame.draw_style_name.get(); - GraphicProps = m_Folder->GetPropertiesFromStyle(style, master); - } - if(pFrame.presentation_style_name.is_init()) - { - std::string style = pFrame.presentation_style_name.get(); - PresProps = m_Folder->GetPropertiesFromStyle(style, master); - } - - Odt::Logic::Properties properties; - properties = Odt::Logic::Properties::merge(GraphicProps, TextProps); - properties = Odt::Logic::Properties::merge(PresProps, properties); - - TableConvert(pFrame.Table, pEContainer, properties, rect.left, rect.top, master); - } - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/LineConvert.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/LineConvert.cpp deleted file mode 100644 index 975a194504..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/LineConvert.cpp +++ /dev/null @@ -1,62 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" - -namespace Odp2DrawingXML -{ - void Converter::LineConvert(const Odp::Content::Line& pLine, CSlide& pEContainer, bool master)const - { - CShapeElement* pShape = new CShapeElement(NSBaseShape::odp, (int)OdpShapes::sptCLine); - pShape->m_dStartTime = 0; - pShape->m_dEndTime = pEContainer.m_dDuration; - - pShape->m_oMetric.m_lUnitsHor = pEContainer.m_lOriginalWidth; - pShape->m_oMetric.m_lUnitsVer = pEContainer.m_lOriginalHeight; - pShape->m_oMetric.m_lMillimetresHor = pEContainer.m_lOriginalWidth; - pShape->m_oMetric.m_lMillimetresVer = pEContainer.m_lOriginalHeight; - - std::string style = pLine.StyleName.get(); - Odt::Logic::Properties GraphicProps; - GraphicProps = m_Folder->GetPropertiesFromStyle(style, master); - - Odt::Logic::Properties TextProps; - if(pLine.TextStyleName.is_init()) - { - style = pLine.TextStyleName.get(); - TextProps = m_Folder->GetPropertiesFromStyle(style, master); - } - - Odt::Logic::Properties properties; - properties = Odt::Logic::Properties::merge(GraphicProps, TextProps); - FillPenBrush(properties, *pShape); - - RECT rcBounds; - pLine.GetMmRect(rcBounds); - pShape->m_rcBoundsOriginal.left = rcBounds.left; - pShape->m_rcBoundsOriginal.top = rcBounds.top; - pShape->m_rcBoundsOriginal.right = rcBounds.right; - pShape->m_rcBoundsOriginal.bottom = rcBounds.bottom; - - pShape->m_rcBounds = pShape->m_rcBoundsOriginal; - - pShape->m_oShape.m_pShape->SetAdjustment(4, pEContainer.m_lOriginalWidth); - pShape->m_oShape.m_pShape->SetAdjustment(5, pEContainer.m_lOriginalHeight); - - pShape->m_oShape.m_pShape->SetAdjustment(0, pShape->m_rcBoundsOriginal.left); - pShape->m_oShape.m_pShape->SetAdjustment(1, pShape->m_rcBoundsOriginal.top); - pShape->m_oShape.m_pShape->SetAdjustment(2, pShape->m_rcBoundsOriginal.right - pShape->m_rcBoundsOriginal.left); - pShape->m_oShape.m_pShape->SetAdjustment(3, pShape->m_rcBoundsOriginal.bottom - pShape->m_rcBoundsOriginal.top); - - pShape->m_rcBoundsOriginal.left = 0; - pShape->m_rcBoundsOriginal.top = 0; - pShape->m_rcBoundsOriginal.right = pEContainer.m_lOriginalWidth; - pShape->m_rcBoundsOriginal.bottom = pEContainer.m_lOriginalHeight; - pShape->m_rcBounds = pShape->m_rcBoundsOriginal; - - TextVectorConvert(pLine.Text.get(), pShape->m_oShape.m_oText, properties, master); -/* - double AutoFit = pShape.txBody->bodyPr->Fit.fontScale.get_value_or(100000)/100000.0; - TextParse(pShape.txBody.get(), lpShapeElement->m_oShape.m_oText, ShapeProps, AutoFit); -*/ - pEContainer.m_arElements.Add(pShape); - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/RectConvert.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/RectConvert.cpp deleted file mode 100644 index 45d242d6e5..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/RectConvert.cpp +++ /dev/null @@ -1,72 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" - -namespace Odp2DrawingXML -{ - void Converter::RectConvert(const Odp::Content::Rect& pRect, CSlide& pEContainer, bool master)const - { - CShapeElement* pShape = new CShapeElement(NSBaseShape::odp, (int)OdpShapes::sptCRect); - pShape->m_dStartTime = 0; - pShape->m_dEndTime = pEContainer.m_dDuration; - - pShape->m_oMetric.m_lUnitsHor = pEContainer.m_lOriginalWidth; - pShape->m_oMetric.m_lUnitsVer = pEContainer.m_lOriginalHeight; - pShape->m_oMetric.m_lMillimetresHor = pEContainer.m_lOriginalWidth; - pShape->m_oMetric.m_lMillimetresVer = pEContainer.m_lOriginalHeight; - - Odt::Logic::Properties TextProps; - Odt::Logic::Properties GraphicProps; - Odt::Logic::Properties PresProps; - if(pRect.TextStyleName.is_init()) - { - std::string style = pRect.TextStyleName.get(); - TextProps = m_Folder->GetPropertiesFromStyle(style, master); - } - if(pRect.DrawStyleName.is_init()) - { - std::string style = pRect.DrawStyleName.get(); - GraphicProps = m_Folder->GetPropertiesFromStyle(style, master); - } - if(pRect.PresentationStyleName.is_init()) - { - std::string style = pRect.PresentationStyleName.get(); - PresProps = m_Folder->GetPropertiesFromStyle(style, master); - } - - Odt::Logic::Properties properties; - properties = Odt::Logic::Properties::merge(GraphicProps, TextProps); - properties = Odt::Logic::Properties::merge(PresProps, properties); -/* - std::string style = pRect.StyleName.get(); - Odt::Logic::Properties GraphicProps; - GraphicProps = m_Folder->GetPropertiesFromStyle(style, master); - - Odt::Logic::Properties TextProps; - if(pRect.TextStyleName.is_init()) - { - style = pRect.TextStyleName.get(); - TextProps = m_Folder->GetPropertiesFromStyle(style, master); - } - - Odt::Logic::Properties properties; - properties = Odt::Logic::Properties::merge(GraphicProps, TextProps); -*/ - FillPenBrush(properties, *pShape); - - RECT rcBounds; - pRect.GetMmRect(rcBounds); - pShape->m_rcBoundsOriginal.left = rcBounds.left; - pShape->m_rcBoundsOriginal.top = rcBounds.top; - pShape->m_rcBoundsOriginal.right = rcBounds.right; - pShape->m_rcBoundsOriginal.bottom = rcBounds.bottom; - - pShape->m_rcBounds = pShape->m_rcBoundsOriginal; - - TextVectorConvert(pRect.Text.get(), pShape->m_oShape.m_oText, properties, master); -/* - double AutoFit = pShape.txBody->bodyPr->Fit.fontScale.get_value_or(100000)/100000.0; - TextParse(pShape.txBody.get(), lpShapeElement->m_oShape.m_oText, ShapeProps, AutoFit); -*/ - pEContainer.m_arElements.Add(pShape); - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/SlideConvert.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/SlideConvert.cpp deleted file mode 100644 index 0400a55fab..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/SlideConvert.cpp +++ /dev/null @@ -1,104 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" -#include "Utility.h" - -namespace Odp2DrawingXML -{ - void Converter::SlideConvert(const DWORD SldNum, double* Duration, CDocument& pDocument)const - { - std::string master = m_Folder->Content->body->Slides->at(SldNum).MasterPageName.get(); - const Odp::Styles::MasterPage& MasterPage = m_Folder->GetMasterPage(master); - std::string layout = MasterPage.Layout.get(); - const Odp::Styles::PageLayout& PageLayout = m_Folder->GetPageLayout(layout); - - CSlide lEContainer; - lEContainer.m_lOriginalWidth = (long)(PageLayout.Properties->page_width->value(UniversalUnit::Mm)); - lEContainer.m_lOriginalHeight = (long)(PageLayout.Properties->page_height->value(UniversalUnit::Mm)); - lEContainer.m_lWidth = lEContainer.m_lOriginalWidth; - lEContainer.m_lHeight = lEContainer.m_lOriginalHeight; - - lEContainer.m_dStartTime = *Duration; - lEContainer.m_dDuration = 30000.0; - *Duration += 30000.0; - lEContainer.m_dEndTime = *Duration; - - AddBackground(master, lEContainer); - - lEContainer.m_lThemeID = 0; - lEContainer.m_lLayoutID = 0; - - for(size_t i = 0; i < m_Folder->Content->body->Slides->at(SldNum).Elements->size(); i++) - { - DrawingElementConvert(m_Folder->Content->body->Slides->at(SldNum).Elements->at(i), lEContainer, false); - } - - pDocument.m_arSlides.Add(lEContainer); - } - - void Converter::AddBackground(const std::string& MasterName, CSlide& pEContainer)const - { - const Odp::Styles::MasterPage& MasterPage = m_Folder->GetMasterPage(MasterName); - - Odt::Logic::Properties properties = m_Folder->GetPropertiesFromStyle(MasterPage.StyleName.get(), true); - if((properties.DrawingPage.is_init()) && (properties.DrawingPage->Fill.get_value_or("none") != "none")) - { - pEContainer.m_bIsBackground = true; - FillBackground(properties, pEContainer.m_oBackground); - } - - for(size_t i = 0; i < MasterPage.Elements->size(); i++) - { - if(MasterPage.Elements->at(i).is()) - { - if(!MasterPage.Elements->at(i).as().Class.is_init()) - FrameConvert(MasterPage.Elements->at(i).as(), pEContainer, true); - } - else if(MasterPage.Elements->at(i).is()) - { - CustomShapeConvert(MasterPage.Elements->at(i).as(), pEContainer, true); - } - else if(MasterPage.Elements->at(i).is()) - { - GroupConvert(MasterPage.Elements->at(i).as(), pEContainer, true); - } - else if(MasterPage.Elements->at(i).is()) - { - LineConvert(MasterPage.Elements->at(i).as(), pEContainer, true); - } - else if(MasterPage.Elements->at(i).is()) - { - RectConvert(MasterPage.Elements->at(i).as(), pEContainer, true); - } - } - } - - void Converter::DrawingElementConvert(const Odp::Content::DrawingElement& pDrawElem, CSlide& pEContainer, bool master)const - { - if(pDrawElem.is()) - FrameConvert(pDrawElem.as(), pEContainer, master); - else if(pDrawElem.is()) - { - CustomShapeConvert(pDrawElem.as(), pEContainer, master); - } - else if(pDrawElem.is()) - { - GroupConvert(pDrawElem.as(), pEContainer, master); - } - else if(pDrawElem.is()) - { - LineConvert(pDrawElem.as(), pEContainer, master); - } - else if(pDrawElem.is()) - { - RectConvert(pDrawElem.as(), pEContainer, master); - } - } - - void Converter::GroupConvert(const Odp::Content::Group& pGroup, CSlide& pEContainer, bool master)const - { - for(size_t i = 0; i < pGroup.Elements->size(); i++) - { - DrawingElementConvert(pGroup.Elements->at(i), pEContainer, master); - } - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/TableConvert.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/TableConvert.cpp deleted file mode 100644 index ca1c5ea293..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/TableConvert.cpp +++ /dev/null @@ -1,163 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" -#include "nullable_property.h" -#include "OdtFormat/Content/CoveredTableCell.h" - -namespace Odp2DrawingXML -{ - void Converter::TableConvert(const Odt::Content::Table& pTable, CSlide& pEContainer, const Odt::Logic::Properties& ParentProps, long x, long y, bool master)const - { - long xt = x; - long yt = y; - - nullable_property TableStyle; - if(pTable.TemplateName.is_init()) - TableStyle = m_Folder->GetTableTemplate(pTable.TemplateName.get()); - - size_t size = pTable.Rows->size() * pTable.Columns->size(); - Odt::Logic::Properties* PropsTable = new Odt::Logic::Properties [size]; - for(size_t i = 0; i < pTable.Rows->size(); i++) - { - bool UseStyle = false; - Odt::Logic::Properties RowProps = m_Folder->GetPropertiesFromStyle(pTable.Rows->at(i).StyleName.get_value_or(""), master); - RowProps = Odt::Logic::Properties::merge(ParentProps, RowProps); - if(TableStyle.is_init()) - { - if((i == 0) && (TableStyle->FirstRow.is_init()) && (pTable.UseFirstRowStyles.get_value_or(false))) - { - Odt::Logic::Properties FirstRow = m_Folder->GetPropertiesFromStyle(TableStyle->FirstRow.get(), true); - RowProps = Odt::Logic::Properties::merge(RowProps, FirstRow); - UseStyle = true; - } - else if((i == pTable.Rows->size()-1) && (TableStyle->LastRow.is_init()) && (pTable.UseLastRowStyles.get_value_or(false))) - { - Odt::Logic::Properties LastRow = m_Folder->GetPropertiesFromStyle(TableStyle->LastRow.get(), true); - RowProps = Odt::Logic::Properties::merge(RowProps, LastRow); - UseStyle = true; - } - else if(((i % 2) == 1) && (TableStyle->OddRows.is_init()) && (pTable.UseBandingRowsStyles.get_value_or(false))) - { - Odt::Logic::Properties OddRow = m_Folder->GetPropertiesFromStyle(TableStyle->OddRows.get(), true); - RowProps = Odt::Logic::Properties::merge(RowProps, OddRow); - UseStyle = true; - } - //else if(TableStyle->Body.is_init()) - //{ - //} - } - - for(size_t j = 0; j < pTable.Columns->size(); j++) - { - Odt::Logic::Properties ColProps = m_Folder->GetPropertiesFromStyle(pTable.Columns->at(j).Style.get(), master); - ColProps = Odt::Logic::Properties::merge(RowProps, ColProps); - if((TableStyle.is_init()) && (!UseStyle)) - { - if((j == 0) && (TableStyle->FirstColumn.is_init()) && (pTable.UseFirstColumnStyles.get_value_or(false))) - { - Odt::Logic::Properties FirstColumn = m_Folder->GetPropertiesFromStyle(TableStyle->FirstColumn.get(), true); - ColProps = Odt::Logic::Properties::merge(ColProps, FirstColumn); - } - else if((j == pTable.Columns->size()-1) && (TableStyle->LastColumn.is_init()) && (pTable.UseLastColumnStyles.get_value_or(false))) - { - Odt::Logic::Properties LastColumn = m_Folder->GetPropertiesFromStyle(TableStyle->LastColumn.get(), true); - ColProps = Odt::Logic::Properties::merge(ColProps, LastColumn); - } - else if(((j % 2) == 1) && (TableStyle->OddColumns.is_init()) && (pTable.UseBandingColumnsStyles.get_value_or(false))) - { - Odt::Logic::Properties OddColumn = m_Folder->GetPropertiesFromStyle(TableStyle->OddColumns.get(), true); - ColProps = Odt::Logic::Properties::merge(ColProps, OddColumn); - } - else if(TableStyle->Body.is_init()) - { - Odt::Logic::Properties Body = m_Folder->GetPropertiesFromStyle(TableStyle->Body.get(), true); - ColProps = Odt::Logic::Properties::merge(ColProps, Body); - } - } - - PropsTable[i * pTable.Columns->size() + j] = ColProps; - } - } - - //Odt::Logic::Properties properties = ParentProps; - for(size_t i = 0; i < pTable.Rows->size(); i++) - { - for(size_t j = 0; j < pTable.Rows->at(i).Cells->size(); j++) - { - if(pTable.Rows->at(i).Cells->at(j).is()) - { - long numCol = pTable.Rows->at(i).Cells->at(j).getNumCol(); - Odt::Logic::Properties DefCellProps = m_Folder->GetPropertiesFromStyle(pTable.Rows->at(i).DefaultCellStyleName.get_value_or(""), master); - DefCellProps = Odt::Logic::Properties::merge(PropsTable[i * pTable.Columns->size() + numCol] , DefCellProps); - if(pTable.Rows->at(i).Cells->at(j).as().Style.is_init()) - { - Odt::Logic::Properties CellProps = m_Folder->GetPropertiesFromStyle(pTable.Rows->at(i).Cells->at(j).as().Style.get(), master); - DefCellProps = Odt::Logic::Properties::merge(DefCellProps, CellProps); - } - - long w = (long)(PropsTable[i * pTable.Columns->size() + numCol].TableColumn->Width->value() * 10); - long h = (long)(PropsTable[i * pTable.Columns->size() + numCol].TableRow->Height->value() * 10); - for(size_t k = 1; k < pTable.Rows->at(i).Cells->at(j).as().ColumnsSpanned.get_value_or(0); k++) - { - w += (long)(PropsTable[i * pTable.Columns->size() + numCol + k].TableColumn->Width->value() * 10); - } - for(size_t k = 1; k < pTable.Rows->at(i).Cells->at(j).as().RowsSpanned.get_value_or(0); k++) - { - h += (long)(PropsTable[(i + k) * pTable.Columns->size() + numCol].TableRow->Height->value() * 10); - } - - TableCellConvert(pTable.Rows->at(i).Cells->at(j).as(), pEContainer, DefCellProps, xt, yt, w, h, master); - xt += w; - } - else if(pTable.Rows->at(i).Cells->at(j).is()) - { - long numCol = pTable.Rows->at(i).Cells->at(j).getNumCol(); - - long w = (long)(PropsTable[i * pTable.Columns->size() + numCol].TableColumn->Width->value() * 10); - for(size_t k = 1; k < pTable.Rows->at(i).Cells->at(j).as().CountHMerge.get(); k++) - { - w += (long)(PropsTable[i * pTable.Columns->size() + numCol - k + 1].TableColumn->Width->value() * 10); - } - - xt += w; - } - } - xt = x; - yt += (long)(PropsTable[i * pTable.Columns->size()].TableRow->Height->value() * 10); - } - } - - void Converter::TableCellConvert(const Odt::Content::TableCell& pTableCell, CSlide& pEContainer, const Odt::Logic::Properties& ParentProps, long x, long y, long w, long h, bool master)const - { - CShapeElement* pShape = new CShapeElement(NSBaseShape::odp, (int)OdpShapes::sptCRect); - - pShape->m_dStartTime = 0; - pShape->m_dEndTime = pEContainer.m_dDuration; - - pShape->m_oMetric.m_lUnitsHor = pEContainer.m_lOriginalWidth; - pShape->m_oMetric.m_lUnitsVer = pEContainer.m_lOriginalHeight; - pShape->m_oMetric.m_lMillimetresHor = pEContainer.m_lOriginalWidth; - pShape->m_oMetric.m_lMillimetresVer = pEContainer.m_lOriginalHeight; -/* - pShape->m_oShape.m_oBrush.m_Alpha1 = 255; - pShape->m_oShape.m_oBrush.m_Alpha2 = 255; - pShape->m_oShape.m_oPen.m_nAlpha = 255; -*/ - pShape->m_rcBoundsOriginal.left = x; - pShape->m_rcBoundsOriginal.top = y; - pShape->m_rcBoundsOriginal.right = x + w;//(long)(ParentProps.TableColumn->Width->value() * 10); - //pShape->m_rcBoundsOriginal.right += pShape->m_rcBoundsOriginal.left; - pShape->m_rcBoundsOriginal.bottom = y + h;//(long)(ParentProps.TableRow->Height->value() * 10); - //pShape->m_rcBoundsOriginal.bottom += pShape->m_rcBoundsOriginal.top; - - pShape->m_rcBounds = pShape->m_rcBoundsOriginal; - - FillPenBrush(ParentProps, *pShape); - - TextVectorConvert(pTableCell.Texts.get(), pShape->m_oShape.m_oText, ParentProps, master); -/* - double AutoFit = pShape.txBody->bodyPr->Fit.fontScale.get_value_or(100000)/100000.0; - TextParse(pShape.txBody.get(), lpShapeElement->m_oShape.m_oText, ShapeProps, AutoFit); -*/ - pEContainer.m_arElements.Add(pShape); - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/TextAlign.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/TextAlign.cpp deleted file mode 100644 index 43cb4c9672..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/TextAlign.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" - -namespace Odp2DrawingXML -{ - WORD Converter::GetTextAlignFromStr(const std::string& str) - { - if((str == "left") || (str == "begin"))return 0; - if(str == "center") return 1; - if(str == "end") return 2; - if(str == "justify") return 3; -// if(str == "dist") return 4; -// if(str == "thaiDist") return 5; -// if(str == "justLow") return 6; - return 0; - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/TextAnchor.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/TextAnchor.cpp deleted file mode 100644 index 65d99f1be9..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/TextAnchor.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" - -namespace Odp2DrawingXML -{ - WORD Converter::GetTextAnchorFromStr(const std::string& str) - { - if(str == "top") return 0; - if((str == "center") || (str == "middle"))return 1; - if(str == "bottom") return 2; - return 0; - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/TextConvert.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/TextConvert.cpp deleted file mode 100644 index 6b37fe41ad..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/TextConvert.cpp +++ /dev/null @@ -1,213 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" -#include "OdtFormat/Content/List.h" -#include "OdtFormat/Content/Span.h" -#include "OdtFormat/Content/ParagraphItem.h" -#include "Utility.h" - -namespace Odp2DrawingXML -{ - void Converter::TextVectorConvert(const std::vector& pTextBox, CTextAttributesEx& pText, const Odt::Logic::Properties& ParentProps, bool master)const - { - pText.m_lTextType = 0; - pText.m_arParagraphs.RemoveAll(); - pText.m_oAttributes.m_nTextAlignVertical = - ParentProps.Graphic.is_init() ? GetTextAnchorFromStr(ParentProps.Graphic->TextareaVerticalAlign.get_value_or("top")) : GetTextAnchorFromStr("top"); - Odt::Logic::ListStyle listStyle; - for(size_t i = 0; i < pTextBox.size(); i++) - { - TextConvert(pTextBox.at(i), pText, ParentProps, listStyle, 0, master); - } - } - - void Converter::TextConvert(const Odt::Content::Text& pTextItem, CTextAttributesEx& pText, const Odt::Logic::Properties& ParentProps, const Odt::Logic::ListStyle listStyle , const int level, bool master)const - { - pText.m_lTextType = 0; - if(pTextItem.is()) - { - Odt::Logic::Properties properties; - if(pTextItem.as().Style.is_init()) - { - std::string style = pTextItem.as().Style.get(); - properties = m_Folder->GetPropertiesFromStyle(style, master); - } - properties = Odt::Logic::Properties::merge(ParentProps, properties); - ParagraphConvert(pTextItem.as(), pText, properties, listStyle, level, master); - } - else if(pTextItem.is()) - { - for(size_t items = 0; items < pTextItem.as().Items->size(); items++) - { - for(size_t i = 0; i < pTextItem.as().Items->at(items).Texts->size(); i++) - { - Odt::Logic::ListStyle lStyle = listStyle; - if(pTextItem.as().Style.is_init()) - { - std::string style = pTextItem.as().Style.get(); - lStyle = m_Folder->GetListStyle(style, master); - //properties = m_Folder->GetPropertiesFromListStyle(style, level + 1); - //ParentProps.ListLevel = properties.ListLevel; - } -// properties = Odt::Logic::Properties::merge(ParentProps, properties); - TextConvert(pTextItem.as().Items->at(items).Texts->at(i), pText, ParentProps, lStyle, level + 1, master); - } - } - } - } - - void Converter::ParagraphConvert(const Odt::Content::Paragraph& pParagraph, CTextAttributesEx& pText, const Odt::Logic::Properties& ParentProps, const Odt::Logic::ListStyle listStyle, const int level, bool master)const - { - CParagraph oParagraph; - oParagraph.m_lTextType = 0; - oParagraph.m_lTextLevel = level; - - CTextPFRun* pRunPF = &oParagraph.m_oPFRun; - - pRunPF->hasBullet = (BOOL)((level != 0) ? TRUE : FALSE); - pRunPF->leftMargin = (LONG)0; - - LONG lMinLabelOffset = 0; - if (pRunPF->hasBullet.get()) - { - pRunPF->bulletColor = CColor::CreateColor(0x00); - pRunPF->bulletSize = (WORD)100; - pRunPF->bulletChar = (WCHAR)'*'; - - try - { - if (listStyle.listLevelStyleProperties(level).ListLevel.is_init()) - { - pRunPF->leftMargin.get() += (LONG)(listStyle.listLevelStyleProperties(level).ListLevel->SpaceBefore.is_init()? - listStyle.listLevelStyleProperties(level).ListLevel->SpaceBefore->value(UniversalUnit::Mm):0); - - if (listStyle.listLevelStyleProperties(level).ListLevel->MinLabelWidth.is_init()) - lMinLabelOffset = (LONG)listStyle.listLevelStyleProperties(level).ListLevel->MinLabelWidth->value(UniversalUnit::Mm); - } - } - catch(...) - { - } - } - - if (ParentProps.Paragraph.is_init()) - { - pRunPF->textAlignment = GetTextAlignFromStr(ParentProps.Paragraph->Align.is_init()?ParentProps.Paragraph->Align->ToString():"left"); - - pRunPF->leftMargin.get() += (LONG)(ParentProps.Paragraph->MarginLeft.is_init()? (ParentProps.Paragraph->MarginLeft->value(UniversalUnit::Mm)) : 0); - //pfRun.leftMargin *= 10;// TODO : UniversalUnit !!! - - pRunPF->indent = (LONG)(ParentProps.Paragraph->TextIndent.is_init()? (ParentProps.Paragraph->TextIndent->value(UniversalUnit::Mm)) : 0); - //pfRun.indent *= 10;// TODO : UniversalUnit !!! - - if (0 == pRunPF->leftMargin.get() && 0 == pRunPF->indent.get()) - { - pRunPF->indent.get() = -lMinLabelOffset; - pRunPF->leftMargin.get() = lMinLabelOffset; - } - - //pfRun.defaultTabSize_ = true; - //pfRun.defaultTabSize = ParentProps.Paragraph->TabStopDistance.is_init()? (ParentProps.Paragraph->TabStopDistance->value() * 10) : 0; - //pfRun.defaultTabSize *= 10;// TODO : UniversalUnit !!! - - //paragraph.fontAlign_ = true; - //paragraph.fontAlign = GetFontAlignFromStr(TextProps.GetParagraphFontAlgn(level, *SpTextPar)); - // - //if(TextProps.GetParagraphLatinLnBrk(level, *SpTextPar)) - //{ - // paragraph.charWrap_ = true; - // paragraph.wordWrap_ = false; - // paragraph.wrapFlags &= 0xFD; - // paragraph.wrapFlags |= 0x01; - // - // paragraph.overflow_ = true; - //} - //else - //{ - pRunPF->wrapFlags = (WORD)0; - pRunPF->wrapFlags.get() &= 0xFE; - pRunPF->wrapFlags.get() |= 0x02; - //} - - //paragraph.textDirection_ = true; - //paragraph.textDirectional = (TextProps.GetParagraphRtl(level, *SpTextPar))?1:0; - - if (ParentProps.Paragraph->LineHeight.is_init()) - { - if (ParentProps.Paragraph->LineHeight->Type == UniversalUnit::Percent) - pRunPF->lineSpacing = (LONG)ParentProps.Paragraph->LineHeight->value(UniversalUnit::Percent); - else - //pfRun.lineSpacing = -ParentProps.Paragraph->LineHeight->value(UniversalUnit::Mm); - pRunPF->lineSpacing = 100; - } - - pRunPF->spaceBefore = (LONG)(ParentProps.Paragraph->MarginTop.is_init() ? (-ParentProps.Paragraph->MarginTop->value(UniversalUnit::Mm)) : 0); - pRunPF->spaceAfter = (LONG)(ParentProps.Paragraph->MarginBottom.is_init() ? (-ParentProps.Paragraph->MarginBottom->value(UniversalUnit::Mm)) : 0); - } - - for(size_t runs = 0; runs < pParagraph.Items->size(); runs++) - { - Odt::Logic::Properties properties; - if(pParagraph.Items->at(runs).is()) - { - if(pParagraph.Items->at(runs).as().Style.is_init()) - { - std::string style = pParagraph.Items->at(runs).as().Style.get(); - properties = m_Folder->GetPropertiesFromStyle(style, master); - } - } - properties = Odt::Logic::Properties::merge(ParentProps, properties); - - CSpan oSpan; - std::wstring text = Encoding::utf82unicode(pParagraph.Items->at(runs).toTxt()); - if (0 == text.length()) - text = L"\n"; - - oSpan.m_strText = (CString)text.c_str(); - CTextCFRun* pRunCF = &oSpan.m_oRun; - - if (properties.Text.is_init()) - { - if (properties.Text->FontSize.is_init()) - pRunCF->Size = (WORD)properties.Text->FontSize.get(); - else - pRunCF->Size = (WORD)12; - - pRunCF->FontBold = (BOOL)properties.Text->Bold.get_value_or(false); - pRunCF->FontItalic = (BOOL)properties.Text->Italic.get_value_or(false); - pRunCF->FontUnderline = (BOOL)((properties.Text->UnderlineType.get_value_or("none") == "none") ? FALSE : TRUE); - - CString strFontName = CString(properties.Text->FontName.get_value_or(properties.Text->FontFamily.get_value_or("Times New Roman")).c_str()); - int pos = strFontName.Find(L"'"); - while (pos >= 0) - { - strFontName.Delete(pos); - pos = strFontName.Find(L"'"); - } - pRunCF->FontProperties = new NSPresentationEditor::CFontProperties(); - pRunCF->FontProperties->strFontName = strFontName; - - pRunCF->Color = CColor::CreateColor(0x00); - if (properties.Text->FontColor.is_init()) - { - pRunCF->Color->R = (BYTE)properties.Text->FontColor->Red.get(); - pRunCF->Color->G = (BYTE)properties.Text->FontColor->Green.get(); - pRunCF->Color->B = (BYTE)properties.Text->FontColor->Blue.get(); - } - } - oParagraph.m_arSpans.Add(oSpan); - } - - //pText.m_sText += L"\n"; - //STextCFRun cfEnd; - //cfEnd.lCount = 1; - //pText.m_arCFs.Add(cfEnd); - //pfRun.lCount++; - if (((oParagraph.m_arSpans.GetCount() == 0) || - ((oParagraph.m_arSpans.GetCount() == 1) && oParagraph.m_arSpans[0].m_strText == _T(""))) && - (level == 1)) - { - pRunPF->hasBullet = (BOOL)FALSE; - } - pText.m_arParagraphs.Add(oParagraph); - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/Source/TransitionConvert.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/Source/TransitionConvert.cpp deleted file mode 100644 index c47e72b3c9..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/Source/TransitionConvert.cpp +++ /dev/null @@ -1,209 +0,0 @@ -#include "stdafx.h" -#include "./../Converter.h" -#include "../OdpFormat/Source/Content/Slide.h" -#include "../OdpFormat/Source/Content/Animation/Par.h" - -namespace Odp2DrawingXML -{ - void Converter::TransitionConvert(const DWORD SldNum, CDocument& pDocument)const - { - bool converted = false; - const Odp::Content::Slide& pSlide = m_Folder->Content->body->Slides->at(SldNum); - std::string SlideId = pSlide.Id.get_value_or(""); - if((SlideId != "") && (pSlide.Animation.is_init())) - { - for(size_t i = 0; i < pSlide.Animation->Childs->size(); i++) - { - if(pSlide.Animation->Childs->at(i).is()) - { - if(pSlide.Animation->Childs->at(i).as().Begin.get_value_or("") == SlideId + ".begin") - { - for(size_t j = 0; j < pSlide.Animation->Childs->at(i).as().Childs->size(); j++) - { - if(pSlide.Animation->Childs->at(i).as().Childs->at(j).is()) - { - TransitionParse(pSlide.Animation->Childs->at(i).as().Childs->at(j).as(), - SldNum, SlideId, pDocument); - converted = true; - break; - } - } - } - } - if(converted) - break; - } - } - } - - void Converter::TransitionParse(const Odp::Content::TransitionFilter& pTransition, const DWORD SldNum, const std::string& SlideId, CDocument& pDocument)const - { - std::string type = pTransition.Type.get_value_or(""); - if(type != "") - { - NSPresentationEditor::CTransition& lDestTransition = pDocument.m_arSlides[SldNum].m_oSlideShow.m_oTransition; - std::string subtype = pTransition.SubType.get_value_or(""); - std::string direction = pTransition.Direction.get_value_or("forward"); - if(type == "barWipe") - { - if(subtype == "fadeOverColor") - { - lDestTransition.m_nEffectType = 0; - lDestTransition.m_nEffectDirection = 1; - } - else - { - lDestTransition.m_nEffectType = 10; - if(subtype == "leftToRight") - lDestTransition.m_nEffectDirection = 0; - else - lDestTransition.m_nEffectDirection = 1; - if(direction == "reverse") - lDestTransition.m_nEffectDirection += 2; - } - } - else if(type == "pinWheelWipe") - { - lDestTransition.m_nEffectType = 26; - if(subtype == "oneBlade") - lDestTransition.m_nEffectDirection = 1; - else if(subtype == "twoBladeVertical") - lDestTransition.m_nEffectDirection = 2; - else if(subtype == "threeBlade") - lDestTransition.m_nEffectDirection = 3; - else if(subtype == "fourBlade") - lDestTransition.m_nEffectDirection = 4; - else if(subtype == "eightBlade") - lDestTransition.m_nEffectDirection = 8; - else lDestTransition.m_nEffectDirection = 2; - } - else if(type == "slideWipe") - { - if(direction == "reverse") - lDestTransition.m_nEffectType = 4; - else - lDestTransition.m_nEffectType = 7; - - if(subtype == "fromTop") - lDestTransition.m_nEffectDirection = 1; - else if(subtype == "fromRight") - lDestTransition.m_nEffectDirection = 2; - else if(subtype == "fromLeft") - lDestTransition.m_nEffectDirection = 0; - else if(subtype == "fromBottom") - lDestTransition.m_nEffectDirection = 3; - else if(subtype == "fromTopRight") - lDestTransition.m_nEffectDirection = 5; - else if(subtype == "fromBottomRight") - lDestTransition.m_nEffectDirection = 7; - else if(subtype == "fromTopLeft") - lDestTransition.m_nEffectDirection = 4; - else if(subtype == "fromBottomLeft") - lDestTransition.m_nEffectDirection = 6; - else lDestTransition.m_nEffectDirection = 0; - } - else if(type == "randomBarWipe") - { - lDestTransition.m_nEffectType = 8; - lDestTransition.m_nEffectDirection = (subtype == "vertical")? 1 : 0; - } - else if(type == "checkerBoardWipe") - { - lDestTransition.m_nEffectType = 3; - lDestTransition.m_nEffectDirection = (subtype == "down")? 1 : 0; - } - else if((type == "fourBoxWipe") && (subtype == "cornersOut")) - { - lDestTransition.m_nEffectType = 18; - lDestTransition.m_nEffectDirection = 0; - } - else if((type == "irisWipe") && (subtype == "diamond")) - { - lDestTransition.m_nEffectType = 17; - lDestTransition.m_nEffectDirection = 0; - } - else if((type == "ellipseWipe") && (subtype == "circle")) - { - lDestTransition.m_nEffectType = 27; - lDestTransition.m_nEffectDirection = 0; - } - else if((type == "irisWipe") && (subtype == "rectangle")) - { - lDestTransition.m_nEffectType = 13; - lDestTransition.m_nEffectDirection = (direction == "reverse")?1:0; - } - else if((type == "fanWipe") && (subtype == "centerTop")) - { - lDestTransition.m_nEffectType = 19; - lDestTransition.m_nEffectDirection = 0; - } - else if(type == "blindsWipe") - { - lDestTransition.m_nEffectType = 2; - lDestTransition.m_nEffectDirection = (subtype == "vertical")?1:0; - } - else if(type == "fade")// && (subtype == "fadeOverColor") - { - lDestTransition.m_nEffectType = 6; - lDestTransition.m_nEffectDirection = 0; - } - else if(type == "dissolve") - { - lDestTransition.m_nEffectType = 5; - lDestTransition.m_nEffectDirection = 0; - } - else if(type == "random") - { - lDestTransition.m_nEffectType = 1; - lDestTransition.m_nEffectDirection = 0; - } - else if(type == "pushWipe") - { - lDestTransition.m_nEffectType = 21; - lDestTransition.m_nEffectDirection = (subtype == "combVertical")?1:0; - if(subtype == "fromTop") - { - lDestTransition.m_nEffectType = 20; - lDestTransition.m_nEffectDirection = 1; - } - else if(subtype == "fromRight") - { - lDestTransition.m_nEffectType = 20; - lDestTransition.m_nEffectDirection = 2; - } - else if(subtype == "fromLeft") - { - lDestTransition.m_nEffectType = 20; - lDestTransition.m_nEffectDirection = 0; - } - else if(subtype == "fromBottom") - { - lDestTransition.m_nEffectType = 20; - lDestTransition.m_nEffectDirection = 3; - } - } - else if(type == "waterfallWipe") - { - lDestTransition.m_nEffectType = 9; - - if((subtype == "horizontalRight") && (direction == "reverse")) - lDestTransition.m_nEffectDirection = 4; - else if((subtype == "horizontalLeft") && (direction == "reverse")) - lDestTransition.m_nEffectDirection = 5; - else if(subtype == "horizontalLeft") - lDestTransition.m_nEffectDirection = 6; - else if(subtype == "horizontalRight") - lDestTransition.m_nEffectDirection = 7; - } - //else if(type == "barnDoorWipe")//subtype = "vertical"/"horizontal" + direction = "reverse"/"" - else - { - lDestTransition.m_nEffectType = 0; - lDestTransition.m_nEffectDirection = 0; - } - - - lDestTransition.m_dSpeed = 500;//1;//GetTransitionSpeedFromStr(pTransition.spd.get_value_or("fast")); - } - } -} \ No newline at end of file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/stdafx.cpp b/ASCOfficeOdpFile/Odp2DrawingXML/stdafx.cpp deleted file mode 100644 index 23006ace37..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/stdafx.cpp +++ /dev/null @@ -1,8 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// Odp2DrawingXML.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" - -// TODO: reference any additional headers you need in STDAFX.H -// and not in this file diff --git a/ASCOfficeOdpFile/Odp2DrawingXML/stdafx.h b/ASCOfficeOdpFile/Odp2DrawingXML/stdafx.h deleted file mode 100644 index 2a3be80933..0000000000 --- a/ASCOfficeOdpFile/Odp2DrawingXML/stdafx.h +++ /dev/null @@ -1,52 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// -#pragma once -#define _CRT_SECURE_NO_DEPRECATE 1 -#define _CRT_NONSTDC_NO_DEPRECATE 1 - -#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. -#ifndef WINVER // Allow use of features specific to Windows 95 and Windows NT 4 or later. -#define WINVER 0x0400 // Change this to the appropriate value to target Windows 98 and Windows 2000 or later. -#endif - -#ifndef _WIN32_WINNT // Allow use of features specific to Windows NT 4 or later. -#define _WIN32_WINNT 0x0500 // Change this to the appropriate value to target Windows 2000 or later. -#endif - -#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Allow use of features specific to IE 4.0 or later. -#define _WIN32_IE 0x0400 // Change this to the appropriate value to target IE 5.0 or later. -#endif - -#define _ATL_NO_AUTOMATIC_NAMESPACE - -#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit - -// turns off ATL's hiding of some common and often safely ignored warning messages -#define _ATL_ALL_WARNINGS - -#include -#include -#include -#include -#include -#include -#include -#define _USE_MATH_DEFINES -#include - -// TODO: reference additional headers your program requires here -using namespace ATL; -#define ODP_DEF -#define _USE_NULLABLE_PROPERTY_ - -#import "../../Redist/ASCMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT") -#import "../../Redist/ASCGraphics.dll" named_guids rename_namespace("ASCGraphics") diff --git a/ASCOfficeOdpFile/OfficeOdpFile.h b/ASCOfficeOdpFile/OfficeOdpFile.h deleted file mode 100644 index 6b7422c084..0000000000 --- a/ASCOfficeOdpFile/OfficeOdpFile.h +++ /dev/null @@ -1,250 +0,0 @@ -// OfficeODPFile3.h : Declaration of the CODPFile3 -#pragma once -#include "stdafx.h" -#include "resource.h" // main symbols - -#include "..\Common\OfficeFileTemplate.h" - -#include "Odp.h" -#include "Odp2DrawingXML/Converter.h" -#include "RSA\XMLEncoder.h" - -#include -#include -#include -#pragma comment( lib, "shell32.lib" ) // добавить shell32.lib - -// IAVSOfficeODPFile -[object, uuid("803CCF2C-1A65-4574-9C68-2242AE80EABE"), dual, pointer_default(unique)] -__interface IAVSOfficeODPFile: IAVSOfficeFileTemplate -{ - [id(100 + 0), propget] HRESULT DrawingXml( [out, retval] BSTR* pbstrXml ); - [id(100 + 1), propget] HRESULT TempDirectory( [out, retval] BSTR* pbstrDir ); - [id(100 + 1), propput] HRESULT TempDirectory( [in] BSTR bstrDir ); - - [id(1000 + 0)] HRESULT Is_ODPFile([in] BSTR fileName, [out, retval] VARIANT_BOOL* Result); - - [id(1000 + 1)] HRESULT GetDVDXml([out, retval] BSTR* bstrPTTXml); - [id(1000 + 2)] HRESULT GetBluRayXml([out, retval] BSTR* bstrDVDXml); - - [id(2000 + 0)] HRESULT SetAdditionalParam([in] BSTR ParamName, [in] VARIANT ParamValue); - [id(2001 + 1)] HRESULT GetAdditionalParam([in] BSTR ParamName, [out, retval] VARIANT* ParamValue); -}; - - -// _IAVSOfficeODPFileEvents -[dispinterface, uuid("3BE5A1B6-D05C-4e8e-9522-16647B9EE2E9")] -__interface _IAVSOfficeODPFileEvents -{ - [id(1)] HRESULT ProcessVideoFile([in] LONG ID, [in] LONG Percent, [in, out, ref] SHORT* Cancel); -}; - -// CAVSOfficeODPFile -[coclass, uuid("D36BCFE7-5AF8-4df1-BB71-9F9504E16A17"), event_source(com), threading(apartment), vi_progid("AVSOfficeOdpFile.OfficeOdpFile"), progid("AVSOfficeOdpFile.OfficeOdpFile.1"), version(1.0)] -class ATL_NO_VTABLE CAVSOfficeODPFile : - public IAVSOfficeODPFile//, -{ -public: - CAVSOfficeODPFile() - { - WCHAR buffer[4096]; - GetTempPathW(4096, buffer); - m_strTempDirectory = CStringW(buffer); - GetLongPathNameW(m_strTempDirectory.GetString(), buffer, 4096); - m_strTempDirectory = CStringW(buffer) + CStringW("_ODP\\"); - } - - __event __interface _IAVSOfficeODPFileEvents; - - DECLARE_PROTECT_FINAL_CONSTRUCT() - - HRESULT FinalConstruct() - { - Folder = NULL; - m_pOfficeUtils = NULL; - return CoCreateInstance( __uuidof(OfficeUtils::COfficeUtils), NULL, CLSCTX_INPROC_SERVER, __uuidof(OfficeUtils::IOfficeUtils), (void **)&(this->m_pOfficeUtils) ); - } - - void FinalRelease() - { - if ( this->m_pOfficeUtils != NULL ) - { - this->m_pOfficeUtils->Release(); - this->m_pOfficeUtils = NULL; - } - if ( this->Folder != NULL ) - { - delete Folder; - Folder = NULL; - } - } - -private: - Odp::Folder* Folder; - CStringW m_strTempDirectory; - OfficeUtils::IOfficeUtils* m_pOfficeUtils; - CXMLEncoder m_oEncoder; - - NSPresentationEditor::CDocument m_oDocument; -public: - STDMETHOD(get_DrawingXml)(BSTR* pbstrXml) - { - if(Folder == NULL) - return S_FALSE; - - return S_OK; - } - - STDMETHOD(get_TempDirectory)(BSTR* pbstrDir) - { - *pbstrDir = m_strTempDirectory.AllocSysString(); - return S_OK; - } - - STDMETHOD(put_TempDirectory)(BSTR bstrDir) - { - CStringW TempStr(bstrDir); - if(PathIsDirectoryW(TempStr.GetString())) - { - if(TempStr.Right(1) != L"\\") - TempStr += L"\\"; - m_strTempDirectory = TempStr; - return S_OK; - } - return S_FALSE; - } - - STDMETHOD(Is_ODPFile)(BSTR fileName, VARIANT_BOOL* Result) - { - return S_OK; - } - - STDMETHOD(LoadFromFile)(BSTR sSrcFileName, BSTR sDstPath, BSTR sXMLOptions) - { - CStringW localTempDir(sDstPath); - if((sDstPath != NULL) || (localTempDir != "")) - { - int res = SHCreateDirectoryExW(NULL, localTempDir.GetString(), NULL); - if((res != ERROR_SUCCESS) && (res != ERROR_ALREADY_EXISTS) && (res != ERROR_FILE_EXISTS)) - return S_FALSE; - put_TempDirectory(sDstPath); - } - else - { - int res = SHCreateDirectoryExW(NULL, m_strTempDirectory.GetString(), NULL); - if((res != ERROR_SUCCESS) && (res != ERROR_ALREADY_EXISTS) && (res != ERROR_FILE_EXISTS)) - return S_FALSE; - } - localTempDir = m_strTempDirectory; - - /* - SHFILEOPSTRUCTW shfos; - ZeroMemory(&shfos, sizeof(shfos)); - shfos.wFunc = FO_DELETE; - CStringW _local = localTempDir + CStringW(L"*.*"); - _local.AppendChar(0); - _local.AppendChar(0); - shfos.pFrom = _local.GetString(); - shfos.fFlags = FOF_SILENT + FOF_NOCONFIRMATION; - if(SHFileOperationW(&shfos) != 0) - return S_FALSE; - */ - - HRESULT hr = m_pOfficeUtils->ExtractToDirectory( sSrcFileName, localTempDir.AllocSysString(), NULL, 0); - if(hr!=S_OK) - return hr; - -//#ifdef NDEBUG -// try{ -//#endif - if(Folder != NULL) - delete Folder; - Folder = new Odp::Folder; - - if(!Folder->isValid(localTempDir.GetString())) - { - delete Folder; - Folder = NULL; - return S_FALSE; - } - Folder->read(localTempDir.GetString()); -//#ifdef NDEBUG -// } -// catch(...){ -// return S_FALSE; -// } -//#endif -/* -#ifndef NDEBUG - if(Folder == NULL) - return S_FALSE; - - Odp2DrawingXML::Converter Converter; - - CStringW xml; - Converter.Convert(*Folder, xml); - - HANDLE XMLFile = ::CreateFileW(L"C:\\VideoSourceODP.xml", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); - DWORD BytesWritten; - ::WriteFile(XMLFile, xml.GetString(), xml.GetLength()*sizeof(WCHAR), &BytesWritten, NULL); - ::CloseHandle(XMLFile); -#endif -*/ - Odp2DrawingXML::Converter Converter; - Converter.Convert(*Folder, m_oDocument); - return S_OK; - } - STDMETHOD(SaveToFile)(BSTR sDstFileName, BSTR sSrcPath, BSTR sXMLOptions) - { -//#ifdef NDEBUG -// try{ -//#endif - if(Folder == NULL) - return S_FALSE; - Folder->write(sSrcPath); -//#ifdef NDEBUG -// } -// catch(...){ -// return S_FALSE; -// } -//#endif - - return m_pOfficeUtils->CompressFileOrDirectory( sSrcPath, sDstFileName, -1 ); - } - - // для конвертации с поддержкой интерактива... - STDMETHOD(GetDVDXml)(BSTR* bstrDVDXml) - { - return S_OK; - } - STDMETHOD(GetBluRayXml)(BSTR* bstrBluRayXml) - { - return S_OK; - } -#pragma region -//-----------------------------AdditionalParams-------------------------------- - STDMETHOD(SetAdditionalParam)(BSTR ParamName, VARIANT ParamValue) - { - return S_OK; - } - - STDMETHOD(GetAdditionalParam)(BSTR ParamName, VARIANT* ParamValue) - { - if (NULL == ParamValue) - return S_FALSE; - - CString sParamName; sParamName = ParamName; - if (g_csBlowfishKeyParamName == sParamName) - { - ParamValue->punkVal = m_oEncoder.GetBlowfishKey(); - } - else if (_T("EditorXml") == sParamName) - { - CString xml = m_oDocument.ToXmlEditor2(); - ParamValue->bstrVal = xml.AllocSysString(); - } - return S_OK; - } -#pragma endregion -}; - diff --git a/ASCOfficeOdpFile/resource.h b/ASCOfficeOdpFile/resource.h deleted file mode 100644 index 621f6460f4..0000000000 --- a/ASCOfficeOdpFile/resource.h +++ /dev/null @@ -1,19 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by ASCOfficeOdpFile.rc -// -#define IDS_PROJNAME 100 -#define IDR_ASCOFFICEODPFILE 101 -#define IDB_COFFICEODPFILE 102 -#define IDB_OFFICEODPFILE 103 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 201 -#define _APS_NEXT_COMMAND_VALUE 32768 -#define _APS_NEXT_CONTROL_VALUE 201 -#define _APS_NEXT_SYMED_VALUE 104 -#endif -#endif diff --git a/ASCOfficeOdpFile/stdafx.cpp b/ASCOfficeOdpFile/stdafx.cpp deleted file mode 100644 index 3651145684..0000000000 --- a/ASCOfficeOdpFile/stdafx.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// stdafx.cpp : source file that includes just the standard includes -// AVSOfficeOdpFile.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information - -#include "stdafx.h" diff --git a/ASCOfficeOdpFile/stdafx.h b/ASCOfficeOdpFile/stdafx.h deleted file mode 100644 index 8344923391..0000000000 --- a/ASCOfficeOdpFile/stdafx.h +++ /dev/null @@ -1,54 +0,0 @@ -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, -// but are changed infrequently - -#pragma once - -#ifndef STRICT -#define STRICT -#endif - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. -#ifndef WINVER // Allow use of features specific to Windows XP or later. -#define WINVER 0x0501 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP or later. -#define _WIN32_WINNT 0x0501 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later. -#define _WIN32_IE 0x0600 // Change this to the appropriate value to target other versions of IE. -#endif - -#define _ATL_APARTMENT_THREADED -#define _ATL_NO_AUTOMATIC_NAMESPACE - -#define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit - -#define _CRT_SECURE_NO_DEPRECATE - -#ifndef _USE_MATH_DEFINES -#define _USE_MATH_DEFINES -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace ATL; - -#import "../Redist/ASCOfficeUtils.dll" named_guids raw_interfaces_only rename_namespace("OfficeUtils") -#import "../../Redist/ASCGraphics.dll" named_guids rename_namespace("ASCGraphics") \ No newline at end of file diff --git a/ASCOfficeOdpFile/version.h b/ASCOfficeOdpFile/version.h deleted file mode 100644 index a00b0780f8..0000000000 --- a/ASCOfficeOdpFile/version.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once -//1 -//0 -//0 -//33 -#define INTVER 1,0,0,33 -#define STRVER "1,0,0,33\0"