diff --git a/DoctRenderer/COMMON/Joiner/Program.cs b/DoctRenderer/COMMON/Joiner/Program.cs index dcce14afd4..ed14e8a1e9 100644 --- a/DoctRenderer/COMMON/Joiner/Program.cs +++ b/DoctRenderer/COMMON/Joiner/Program.cs @@ -106,6 +106,7 @@ namespace Joiner "Word/Editor/ParagraphContentBase.js", "Word/Editor/ParagraphContent.js", "Word/Editor/Hyperlink.js", + "Word/Editor/Field.js", "Word/Editor/Run.js", "Word/Editor/Math.js", "Word/Editor/Paragraph.js", diff --git a/DoctRenderer/COMMON/JoinerPPT/Program.cs b/DoctRenderer/COMMON/JoinerPPT/Program.cs index a6ce7ec784..4cea72e5fe 100644 --- a/DoctRenderer/COMMON/JoinerPPT/Program.cs +++ b/DoctRenderer/COMMON/JoinerPPT/Program.cs @@ -27,7 +27,7 @@ namespace Joiner "Common/FontsFreeType/font_engine.js", "Common/FontsFreeType/FontFile.js", "Common/FontsFreeType/FontManager.js", - "Common/AllFonts.js", + "Common/FontsFreeType/font_map.js", "Word/Drawing/Externals.js", "Word/Drawing/GlobalLoaders.js", "Common/commonDefines.js", @@ -46,13 +46,14 @@ namespace Joiner "Common/Charts/ChartsDrawer.js", "Common/Charts/DrawingArea.js", "Common/NumFormat.js", - "Word/Editor/Search.js", "Word/Editor/Serialize2.js", "Common/trackFile.js", + "Word/Editor/Styles.js", "Word/Editor/Numbering.js", "Word/Drawing/Metafile.js", "PowerPoint/Editor/CollaborativeEditing.js", + "Word/Drawing/GraphicsEvents.js", "Word/Drawing/WorkEvents.js", "Word/Drawing/Controls.js", @@ -61,6 +62,7 @@ namespace Joiner "Word/Editor/Common.js", "Word/Editor/Sections.js", "Common/scroll.js", + "Word/Editor/History.js", "Common/Drawings/Hit.js", "Common/Drawings/States.js", @@ -72,25 +74,32 @@ namespace Joiner "Common/Drawings/TrackObjects/PolyLine.js", "Common/Drawings/TrackObjects/Spline.js", "Common/Drawings/TrackObjects/MoveTracks.js", + "Word/Drawing/HatchPattern.js", "Word/Drawing/Graphics.js", + "Word/Drawing/Private/Graphics.js", "Word/Drawing/Overlay.js", "Word/Drawing/ShapeDrawer.js", "PowerPoint/Drawing/Transitions.js", "PowerPoint/Drawing/DrawingDocument.js", "PowerPoint/Drawing/HtmlPage.js", + "PowerPoint/apiDefines.js", + "Common/Drawings/Format/Constants.js", + "Common/Shapes/Serialize.js", "Common/Shapes/SerializeWriter.js", "Word/Editor/SerializeCommon.js", + "Common/Drawings/Math.js", "Common/Drawings/ArcTo.js", "Word/Drawing/ColorArray.js", + "PowerPoint/Editor/Format/Presentation.js", "Common/Drawings/CommonController.js", "Excel/view/DrawingObjectsController.js", "PowerPoint/Editor/DrawingObjectsController.js", - "Common/Drawings/Format/Constants.js", + "Common/Drawings/Format/Format.js", "Common/Drawings/Format/CreateGeometry.js", "Common/Drawings/Format/Geometry.js", @@ -105,6 +114,15 @@ namespace Joiner "PowerPoint/Editor/Format/SlideMaster.js", "PowerPoint/Editor/Format/Layout.js", "PowerPoint/Editor/Format/Comments.js", + + "Word/Editor/Styles.js", + "Word/Editor/Numbering.js", + "Word/Editor/ParagraphContent.js", + "Word/Editor/ParagraphContentBase.js", + "Word/Editor/Hyperlink.js", + "Word/Editor/Field.js", + "Word/Editor/Run.js", + "Word/Math/mathTypes.js", "Word/Math/mathText.js", "Word/Math/mathContent.js", @@ -118,12 +136,7 @@ namespace Joiner "Word/Math/operators.js", "Word/Math/accent.js", "Word/Math/borderBox.js", - "Word/Editor/Styles.js", - "Word/Editor/Numbering.js", - "Word/Editor/ParagraphContent.js", - "Word/Editor/ParagraphContentBase.js", - "Word/Editor/Run.js", - "Word/Editor/Hyperlink.js", + "Word/Editor/FlowObjects.js", "Word/Editor/Paragraph.js", "Word/Editor/Paragraph_Recalculate.js", @@ -133,19 +146,31 @@ namespace Joiner "Word/Editor/Table.js", "Word/Editor/Math.js", "Word/Editor/Spelling.js", + "Word/Editor/Search.js", "Word/Editor/FontClassification.js", + "PowerPoint/Editor/Format/ShapePrototype.js", "PowerPoint/Editor/Format/ImagePrototype.js", "PowerPoint/Editor/Format/GroupPrototype.js", "PowerPoint/Editor/Format/ChartSpacePrototype.js", "PowerPoint/Editor/Format/GraphicFrame.js", + + "Excel/utils/utils.js", + "Excel/model/Serialize.js", + "Excel/model/WorkbookElems.js", + "Excel/model/Workbook.js", + "Excel/model/CellInfo.js", + "Excel/model/AdvancedOptions.js", - "PowerPoint/apiDefines.js", - "PowerPoint/api.js", - "PowerPoint/apiCommon.js", + "Common/Private/Locks.js", "Common/Shapes/EditorSettings.js", - "PowerPoint/themes/Themes.js" + "PowerPoint/themes/Themes.js", + "PowerPoint/apiDefines.js", + "Common/commonDefines.js", + + "PowerPoint/api.js", + "PowerPoint/apiCommon.js" }; if (true) diff --git a/DoctRenderer/COMMON/JoinerPPT/bin/Debug/Joiner.exe b/DoctRenderer/COMMON/JoinerPPT/bin/Debug/Joiner.exe index b9623b708c..699062dd68 100644 Binary files a/DoctRenderer/COMMON/JoinerPPT/bin/Debug/Joiner.exe and b/DoctRenderer/COMMON/JoinerPPT/bin/Debug/Joiner.exe differ diff --git a/DoctRenderer/COMMON/JoinerXLS/Program.cs b/DoctRenderer/COMMON/JoinerXLS/Program.cs index 111f3ce0c2..fb1965bdcb 100644 --- a/DoctRenderer/COMMON/JoinerXLS/Program.cs +++ b/DoctRenderer/COMMON/JoinerXLS/Program.cs @@ -200,163 +200,154 @@ namespace Joiner }; */ string[] arrFilesConfig = { - "Common/Build/License.js", - "Common/browser.js", - "Common/docscoapisettings.js", - "Common/docscoapicommon.js", - "Common/docscoapi.js", - "Common/downloaderfiles.js", - "Common/apiCommon.js", - "Common/commonDefines.js", - "Common/editorscommon.js", - "Common/NumFormat.js", - "Common/Charts/charts.js", - "Common/Charts/DrawingArea.js", - "Common/Charts/DrawingObjects.js", - "Common/Charts/ChartsDrawer.js", - "Common/FontsFreeType/font_engine.js", - "Common/FontsFreeType/FontFile.js", - "Common/FontsFreeType/FontManager.js", - "Word/Drawing/HatchPattern.js", - "Word/Drawing/WorkEvents.js", - "Word/Drawing/Externals.js", - "Word/Drawing/Metafile.js", - "Excel/model/DrawingObjects/GlobalLoaders.js", - "Common/trackFile.js", - "Excel/apiDefines.js", - "Excel/document/empty-workbook.js", - "Excel/utils/utils.js", - "Excel/model/clipboard.js", - "Excel/model/autofilters.js", - "Excel/graphics/DrawingContext.js", - "Excel/graphics/pdfprinter.js", - "Excel/model/CollaborativeEditing.js", - "Excel/model/ConditionalFormatting.js", - "Excel/model/FormulaObjects/parserFormula.js", - "Excel/model/FormulaObjects/dateandtimeFunctions.js", - "Excel/model/FormulaObjects/engineeringFunctions.js", - "Excel/model/FormulaObjects/cubeFunctions.js", - "Excel/model/FormulaObjects/databaseFunctions.js", - "Excel/model/FormulaObjects/textanddataFunctions.js", - "Excel/model/FormulaObjects/statisticalFunctions.js", - "Excel/model/FormulaObjects/financialFunctions.js", - "Excel/model/FormulaObjects/mathematicFunctions.js", - "Excel/model/FormulaObjects/lookupandreferenceFunctions.js", - "Excel/model/FormulaObjects/informationFunctions.js", - "Excel/model/FormulaObjects/logicalFunctions.js", - "Excel/model/Serialize.js", - "Excel/model/WorkbookElems.js", - "Excel/model/Workbook.js", - "Excel/model/CellInfo.js", - "Excel/model/AdvancedOptions.js", - "Excel/model/History.js", - "Excel/model/UndoRedo.js", - "Excel/model/CellComment.js", - "Excel/view/mobileTouch.js", - "Excel/view/iscroll.js", - "Excel/view/PopUpSelector.js", - "Excel/view/StringRender.js", - "Excel/view/CellTextRender.js", - "Excel/view/CellEditorView.js", - "Excel/view/WorksheetView.js", - "Excel/view/HandlerList.js", - "Excel/view/EventsController.js", - "Excel/view/WorkbookView.js", - "Common/scroll.js", - "Word/Editor/SerializeCommon.js", - "Common/Drawings/Math.js", - "Common/Drawings/ArcTo.js", - "Word/Drawing/ColorArray.js", - "Common/Shapes/Serialize.js", - "Common/Shapes/SerializeWriter.js", - "Common/SerializeCommonWordExcel.js", - "Common/SerializeChart.js", - - "Common/Drawings/Hit.js", - "Common/Drawings/States.js", - "Common/Drawings/DrawingObjectsHandlers.js", - "Common/Drawings/TrackObjects/AdjustmentTracks.js", - "Common/Drawings/TrackObjects/ResizeTracks.js", - "Common/Drawings/TrackObjects/RotateTracks.js", - "Common/Drawings/TrackObjects/NewShapeTracks.js", - "Common/Drawings/TrackObjects/PolyLine.js", - "Common/Drawings/TrackObjects/Spline.js", - "Common/Drawings/TrackObjects/MoveTracks.js", - - - "Common/Drawings/CommonController.js", - "Common/Drawings/Format/Constants.js", - "Common/Drawings/Format/Format.js", - "Common/Drawings/Format/CreateGeometry.js", - "Common/Drawings/Format/Geometry.js", - "Common/Drawings/Format/Path.js", - "Common/Drawings/Format/Shape.js", - "Common/Drawings/Format/GroupShape.js", - "Common/Drawings/Format/Image.js", - "Common/Drawings/Format/ChartSpace.js", - "Common/Drawings/Format/ChartFormat.js", - "Common/Drawings/Format/TextBody.js", - "Common/wordcopypaste.js", - "Excel/view/DrawingObjectsController.js", - - "Excel/model/DrawingObjects/Graphics.js", - "Excel/model/DrawingObjects/Overlay.js", - "Excel/model/DrawingObjects/Controls.js", - "Excel/model/DrawingObjects/ShapeDrawer.js", - - - - "Excel/model/DrawingObjects/DrawingDocument.js", - - "Excel/model/DrawingObjects/Format/ShapePrototype.js", - "Excel/model/DrawingObjects/Format/ImagePrototype.js", - "Excel/model/DrawingObjects/Format/GroupPrototype.js", - "Excel/model/DrawingObjects/Format/ChartSpacePrototype.js", - - - "Word/Editor/Comments.js", - "Word/Editor/Styles.js", - "Word/Editor/FlowObjects.js", - "Word/Editor/ParagraphContent.js", - "Word/Editor/ParagraphContentBase.js", - "Word/Editor/Hyperlink.js", - "Word/Editor/Run.js", - "Word/Editor/Math.js", - "Word/Editor/Paragraph.js", - "Word/Editor/Paragraph_Recalculate.js", - "Word/Editor/Sections.js", - "Word/Editor/Numbering.js", - "Word/Editor/HeaderFooter.js", - "Word/Editor/Document.js", - "Word/Editor/DocumentContent.js", - "Word/Editor/Table.js", - "Word/Editor/Serialize2.js", - "Word/Editor/FontClassification.js", - "Word/Editor/Spelling.js", - "Word/Editor/GraphicObjects/WrapManager.js", - - "Word/Math/mathTypes.js", - "Word/Math/mathText.js", - "Word/Math/mathContent.js", - "Word/Math/base.js", - "Word/Math/fraction.js", - "Word/Math/degree.js", - "Word/Math/matrix.js", - "Word/Math/limit.js", - "Word/Math/nary.js", - "Word/Math/radical.js", - "Word/Math/operators.js", - "Word/Math/accent.js", - "Word/Math/borderBox.js", - - "Excel/model/DrawingObjects/GlobalCounters.js", - - "Word/apiCommon.js", + "Common/Build/License.js", + "Common/browser.js", + "Common/docscoapisettings.js", + "Common/docscoapicommon.js", + "Common/docscoapi.js", + "Common/downloaderfiles.js", + "Common/apiCommon.js", + "Common/commonDefines.js", + "Common/editorscommon.js", + "Common/NumFormat.js", + "Common/Charts/charts.js", + "Common/Charts/DrawingArea.js", + "Common/Charts/DrawingObjects.js", + "Common/Charts/ChartsDrawer.js", + "Common/FontsFreeType/font_engine.js", + "Common/FontsFreeType/FontFile.js", + "Common/FontsFreeType/FontManager.js", + "Common/FontsFreeType/font_map.js", + "Word/Drawing/HatchPattern.js", + "Word/Drawing/WorkEvents.js", + "Word/Drawing/Externals.js", + "Word/Drawing/Metafile.js", + "Excel/model/DrawingObjects/GlobalLoaders.js", + "Common/trackFile.js", + "Excel/apiDefines.js", + "Excel/document/empty-workbook.js", + "Excel/utils/utils.js", + "Excel/model/clipboard.js", + "Excel/model/autofilters.js", + "Excel/graphics/DrawingContext.js", + "Excel/graphics/pdfprinter.js", + "Excel/model/CollaborativeEditing.js", + "Excel/model/ConditionalFormatting.js", + "Excel/model/FormulaObjects/parserFormula.js", + "Excel/model/FormulaObjects/dateandtimeFunctions.js", + "Excel/model/FormulaObjects/engineeringFunctions.js", + "Excel/model/FormulaObjects/cubeFunctions.js", + "Excel/model/FormulaObjects/databaseFunctions.js", + "Excel/model/FormulaObjects/textanddataFunctions.js", + "Excel/model/FormulaObjects/statisticalFunctions.js", + "Excel/model/FormulaObjects/financialFunctions.js", + "Excel/model/FormulaObjects/mathematicFunctions.js", + "Excel/model/FormulaObjects/lookupandreferenceFunctions.js", + "Excel/model/FormulaObjects/informationFunctions.js", + "Excel/model/FormulaObjects/logicalFunctions.js", + "Excel/model/Serialize.js", + "Excel/model/WorkbookElems.js", + "Excel/model/Workbook.js", + "Excel/model/CellInfo.js", + "Excel/model/AdvancedOptions.js", + "Excel/model/History.js", + "Excel/model/UndoRedo.js", + "Excel/model/CellComment.js", + "Excel/model/Private/CellComment.js", + "Excel/view/mobileTouch.js", + "Excel/view/iscroll.js", + "Excel/view/PopUpSelector.js", + "Excel/view/StringRender.js", + "Excel/view/CellTextRender.js", + "Excel/view/CellEditorView.js", + "Excel/view/WorksheetView.js", + "Excel/view/Private/WorksheetView.js", + "Excel/view/HandlerList.js", + "Excel/view/EventsController.js", + "Excel/view/WorkbookView.js", + "Common/scroll.js", + "Word/Editor/SerializeCommon.js", + "Common/Drawings/Math.js", + "Common/Drawings/ArcTo.js", + "Word/Drawing/ColorArray.js", + "Common/Shapes/Serialize.js", + "Common/Shapes/SerializeWriter.js", + "Common/SerializeCommonWordExcel.js", + "Common/SerializeChart.js", + "Common/Drawings/Hit.js", + "Common/Drawings/States.js", + "Common/Drawings/DrawingObjectsHandlers.js", + "Common/Drawings/TrackObjects/AdjustmentTracks.js", + "Common/Drawings/TrackObjects/ResizeTracks.js", + "Common/Drawings/TrackObjects/RotateTracks.js", + "Common/Drawings/TrackObjects/NewShapeTracks.js", + "Common/Drawings/TrackObjects/PolyLine.js", + "Common/Drawings/TrackObjects/Spline.js", + "Common/Drawings/TrackObjects/MoveTracks.js", + "Common/Drawings/CommonController.js", + "Common/Drawings/Format/Constants.js", + "Common/Drawings/Format/Format.js", + "Common/Drawings/Format/CreateGeometry.js", + "Common/Drawings/Format/Geometry.js", + "Common/Drawings/Format/Path.js", + "Common/Drawings/Format/Shape.js", + "Common/Drawings/Format/GroupShape.js", + "Common/Drawings/Format/Image.js", + "Common/Drawings/Format/ChartSpace.js", + "Common/Drawings/Format/ChartFormat.js", + "Common/Drawings/Format/TextBody.js", + "Common/wordcopypaste.js", + "Excel/view/DrawingObjectsController.js", + "Excel/model/DrawingObjects/Graphics.js", + "Excel/model/DrawingObjects/Private/Graphics.js", + "Excel/model/DrawingObjects/Overlay.js", + "Excel/model/DrawingObjects/Controls.js", + "Excel/model/DrawingObjects/ShapeDrawer.js", + "Excel/model/DrawingObjects/DrawingDocument.js", + "Excel/model/DrawingObjects/Format/ShapePrototype.js", + "Excel/model/DrawingObjects/Format/ImagePrototype.js", + "Excel/model/DrawingObjects/Format/GroupPrototype.js", + "Excel/model/DrawingObjects/Format/ChartSpacePrototype.js", + "PowerPoint/Editor/Format/GraphicFrame.js", + "Word/Editor/Comments.js", + "Word/Editor/Styles.js", + "Word/Editor/FlowObjects.js", + "Word/Editor/ParagraphContent.js", + "Word/Editor/ParagraphContentBase.js", + "Word/Editor/Hyperlink.js", + "Word/Editor/Field.js", + "Word/Editor/Run.js", + "Word/Editor/Math.js", + "Word/Editor/Paragraph.js", + "Word/Editor/Paragraph_Recalculate.js", + "Word/Editor/Sections.js", + "Word/Editor/Numbering.js", + "Word/Editor/HeaderFooter.js", + "Word/Editor/Document.js", + "Word/Editor/DocumentContent.js", + "Word/Editor/Table.js", + "Word/Editor/Serialize2.js", + "Word/Editor/FontClassification.js", + "Word/Editor/Spelling.js", + "Word/Editor/GraphicObjects/WrapManager.js", + "Word/Math/mathTypes.js", + "Word/Math/mathText.js", + "Word/Math/mathContent.js", + "Word/Math/base.js", + "Word/Math/fraction.js", + "Word/Math/degree.js", + "Word/Math/matrix.js", + "Word/Math/limit.js", + "Word/Math/nary.js", + "Word/Math/radical.js", + "Word/Math/operators.js", + "Word/Math/accent.js", + "Word/Math/borderBox.js", + "Excel/model/DrawingObjects/GlobalCounters.js", + "Word/apiCommon.js", "Excel/api.js", - "Common/Shapes/EditorSettings.js", - "Common/commonDefines.js", - "Excel/apiDefines.js" + "Common/Shapes/EditorSettings.js" }; if (true) diff --git a/DoctRenderer/COMMON/JoinerXLS/bin/Debug/Joiner.exe b/DoctRenderer/COMMON/JoinerXLS/bin/Debug/Joiner.exe index fa4d976a06..89c5a6435e 100644 Binary files a/DoctRenderer/COMMON/JoinerXLS/bin/Debug/Joiner.exe and b/DoctRenderer/COMMON/JoinerXLS/bin/Debug/Joiner.exe differ