From d1aa2ebfe332240619426aac295ec97d34281312 Mon Sep 17 00:00:00 2001 From: "Elena.Subbotina" Date: Fri, 29 Oct 2021 15:51:48 +0300 Subject: [PATCH] xlsb small refactoring + fix build --- .../XlsFormat/Logic/Biff_records/BiffRecord.h | 10 +- .../Logic/Biff_records/BiffRecordContinued.h | 2 +- .../XlsFormat/Logic/Biff_records/DBCell.h | 2 +- .../source/XlsFormat/Logic/Biff_records/DXF.h | 4 +- .../Logic/Biff_records/FileSharing.h | 4 +- .../XlsFormat/Logic/Biff_records/Font.cpp | 2 +- .../XlsFormat/Logic/Biff_records/Font.h | 2 +- .../source/XlsFormat/Logic/Biff_records/Lbl.h | 6 +- .../XlsFormat/Logic/Biff_records/MulRk.h | 4 +- .../XlsFormat/Logic/Biff_records/Pane.h | 6 +- .../source/XlsFormat/Logic/Biff_records/Row.h | 2 +- .../XlsFormat/Logic/Biff_records/Selection.h | 6 +- .../XlsFormat/Logic/Biff_records/ShrFmla.h | 7 +- .../XlsFormat/Logic/Biff_records/SortData.cpp | 2 +- .../XlsFormat/Logic/Biff_records/Table.h | 2 +- .../Logic/Biff_records/TableStyle.cpp | 2 +- .../Logic/Biff_records/TableStyles.cpp | 2 +- .../XlsFormat/Logic/Biff_records/UserBView.h | 4 +- .../XlsFormat/Logic/Biff_records/Window2.h | 2 +- .../Logic/Biff_structures/BitMarkedStructs.h | 4 +- .../XlsFormat/Logic/Biff_structures/CellRef.h | 2 +- .../Logic/Biff_structures/FrtHeader.h | 2 +- .../Logic/Biff_structures/FrtHeaderOld.h | 2 +- .../Logic/Biff_structures/FrtRefHeaderU.h | 2 +- .../XlsFormat/Logic/Biff_structures/Ptg.h | 2 +- .../XlsFormat/Logic/Biff_structures/PtgArea.h | 4 +- .../Logic/Biff_structures/PtgArea3d.h | 2 +- .../Logic/Biff_structures/PtgAreaN.h | 2 +- .../Logic/Biff_structures/PtgExtraList.h | 2 +- .../Logic/Biff_structures/PtgExtraMem.h | 2 +- .../XlsFormat/Logic/Biff_structures/PtgRef.h | 2 +- .../Logic/Biff_structures/PtgRef3d.h | 2 +- .../XlsFormat/Logic/Biff_structures/PtgRefN.h | 2 +- .../Logic/Biff_structures/RevLblName.cpp | 5 +- .../Logic/Biff_structures/SortCond12.h | 2 +- Common/3dParty/cryptopp/cryptest.vcxproj | 340 ------- .../DocxFormatLib/common_formatlib.cpp | 14 +- .../DocxFormatLib/docxformatlib_logic.cpp | 1 + .../DocxFormatLib/xlsbformatlib_logic.cpp | 310 ++++++ .../DocxFormatLib/xlsxformatlib_logic.cpp | 2 +- .../DocxFormat/Projects/DocxFormatLib.vcxproj | 293 +++++- .../Projects/DocxFormatLib.vcxproj.filters | 882 ++++++++++++++++-- .../Source/Common/AbstractConverter.h | 84 -- Common/DocxFormat/Source/Common/Align.cpp | 133 --- Common/DocxFormat/Source/Common/Align.h | 82 -- Common/DocxFormat/Source/Common/Color.cpp | 61 -- Common/DocxFormat/Source/Common/Color.h | 54 -- Common/DocxFormat/Source/Common/Common.h | 47 - Common/DocxFormat/Source/Common/Index.cpp | 115 --- Common/DocxFormat/Source/Common/Index.h | 78 -- Common/DocxFormat/Source/Common/NumFormat.cpp | 205 ---- Common/DocxFormat/Source/Common/NumFormat.h | 99 -- Common/DocxFormat/Source/Common/Point.h | 102 -- Common/DocxFormat/Source/Common/Position.cpp | 97 -- Common/DocxFormat/Source/Common/Position.h | 74 -- Common/DocxFormat/Source/Common/Size.h | 102 -- Common/DocxFormat/Source/Common/Wrap.cpp | 133 --- Common/DocxFormat/Source/Common/Wrap.h | 82 -- Common/DocxFormat/Source/Common/ZIndex.cpp | 55 -- Common/DocxFormat/Source/Common/ZIndex.h | 52 -- .../XlsbFormat/Biff12_records/ACBegin.cpp | 4 +- .../XlsbFormat/Biff12_records/ACBegin.h | 12 +- .../XlsbFormat/Biff12_records/ACEnd.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/ACEnd.h | 12 +- .../XlsbFormat/Biff12_records/AbsPath15.cpp | 4 +- .../XlsbFormat/Biff12_records/AbsPath15.h | 9 +- .../XlsbFormat/Biff12_records/BeginBook.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginBook.h | 12 +- .../Biff12_records/BeginBookViews.cpp | 4 +- .../Biff12_records/BeginBookViews.h | 11 +- .../Biff12_records/BeginBorders.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginBorders.h | 10 +- .../Biff12_records/BeginBundleShs.cpp | 4 +- .../Biff12_records/BeginBundleShs.h | 11 +- .../XlsbFormat/Biff12_records/BeginCFRule.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginCFRule.h | 28 +- .../Biff12_records/BeginCFRule14.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginCFRule14.h | 22 +- .../Biff12_records/BeginCellStyleXFs.cpp | 4 +- .../Biff12_records/BeginCellStyleXFs.h | 10 +- .../Biff12_records/BeginCellXFs.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginCellXFs.h | 10 +- .../Biff12_records/BeginColInfos.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginColInfos.h | 11 +- .../Biff12_records/BeginColorPalette.cpp | 4 +- .../Biff12_records/BeginColorPalette.h | 12 +- .../Biff12_records/BeginColorScale.cpp | 4 +- .../Biff12_records/BeginColorScale.h | 12 +- .../Biff12_records/BeginColorScale14.cpp | 4 +- .../Biff12_records/BeginColorScale14.h | 12 +- .../Biff12_records/BeginComment.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginComment.h | 10 +- .../Biff12_records/BeginCommentAuthors.cpp | 4 +- .../Biff12_records/BeginCommentAuthors.h | 10 +- .../Biff12_records/BeginCommentList.cpp | 4 +- .../Biff12_records/BeginCommentList.h | 10 +- .../Biff12_records/BeginComments.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginComments.h | 12 +- .../BeginConditionalFormatting.cpp | 4 +- .../BeginConditionalFormatting.h | 12 +- .../BeginConditionalFormatting14.cpp | 4 +- .../BeginConditionalFormatting14.h | 12 +- .../BeginConditionalFormattings.cpp | 4 +- .../BeginConditionalFormattings.h | 10 +- .../XlsbFormat/Biff12_records/BeginDXF14s.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginDXF14s.h | 10 +- .../XlsbFormat/Biff12_records/BeginDXFs.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginDXFs.h | 10 +- .../XlsbFormat/Biff12_records/BeginDXFs15.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginDXFs15.h | 10 +- .../Biff12_records/BeginDatabar.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginDatabar.h | 12 +- .../Biff12_records/BeginDatabar14.cpp | 4 +- .../Biff12_records/BeginDatabar14.h | 12 +- .../Biff12_records/BeginExternals.cpp | 4 +- .../Biff12_records/BeginExternals.h | 11 +- .../XlsbFormat/Biff12_records/BeginFills.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginFills.h | 10 +- .../XlsbFormat/Biff12_records/BeginFmts.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginFmts.h | 10 +- .../Biff12_records/BeginFnGroup.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginFnGroup.h | 11 +- .../XlsbFormat/Biff12_records/BeginFonts.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginFonts.h | 10 +- .../Biff12_records/BeginIconSet.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginIconSet.h | 14 +- .../Biff12_records/BeginIconSet14.cpp | 4 +- .../Biff12_records/BeginIconSet14.h | 14 +- .../Biff12_records/BeginIndexedColors.cpp | 4 +- .../Biff12_records/BeginIndexedColors.h | 12 +- .../Biff12_records/BeginListParts.cpp | 4 +- .../Biff12_records/BeginListParts.h | 11 +- .../Biff12_records/BeginMRUColors.cpp | 4 +- .../Biff12_records/BeginMRUColors.h | 12 +- .../Biff12_records/BeginMergeCells.cpp | 4 +- .../Biff12_records/BeginMergeCells.h | 10 +- .../Biff12_records/BeginRichSortCondition.cpp | 4 +- .../Biff12_records/BeginRichSortCondition.h | 10 +- .../XlsbFormat/Biff12_records/BeginSheet.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginSheet.h | 12 +- .../Biff12_records/BeginSheetData.cpp | 4 +- .../Biff12_records/BeginSheetData.h | 12 +- .../Biff12_records/BeginSlicerStyle.cpp | 4 +- .../Biff12_records/BeginSlicerStyle.h | 12 +- .../BeginSlicerStyleElements.cpp | 4 +- .../Biff12_records/BeginSlicerStyleElements.h | 12 +- .../Biff12_records/BeginSlicerStyles.cpp | 4 +- .../Biff12_records/BeginSlicerStyles.h | 12 +- .../Biff12_records/BeginSortCond.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginSortCond.h | 14 +- .../Biff12_records/BeginSortCond14.cpp | 4 +- .../Biff12_records/BeginSortCond14.h | 14 +- .../XlsbFormat/Biff12_records/BeginSst.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginSst.h | 10 +- .../Biff12_records/BeginStyleSheet.cpp | 4 +- .../Biff12_records/BeginStyleSheet.h | 12 +- .../Biff12_records/BeginStyleSheetExt14.cpp | 4 +- .../Biff12_records/BeginStyleSheetExt14.h | 12 +- .../XlsbFormat/Biff12_records/BeginStyles.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginStyles.h | 10 +- .../Biff12_records/BeginTimelineStyle.cpp | 4 +- .../Biff12_records/BeginTimelineStyle.h | 12 +- .../BeginTimelineStyleElements.cpp | 4 +- .../BeginTimelineStyleElements.h | 12 +- .../BeginTimelineStyleSheetExt15.cpp | 4 +- .../BeginTimelineStyleSheetExt15.h | 10 +- .../Biff12_records/BeginTimelineStyles.cpp | 4 +- .../Biff12_records/BeginTimelineStyles.h | 12 +- .../Biff12_records/BeginWsViews.cpp | 4 +- .../XlsbFormat/Biff12_records/BeginWsViews.h | 10 +- .../Biff12_records/BookProtection.cpp | 4 +- .../Biff12_records/BookProtection.h | 10 +- .../Biff12_records/BookProtectionIso.cpp | 4 +- .../Biff12_records/BookProtectionIso.h | 10 +- .../XlsbFormat/Biff12_records/BookView.cpp | 4 +- .../XlsbFormat/Biff12_records/BookView.h | 12 +- .../XlsbFormat/Biff12_records/Border.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/Border.h | 12 +- .../XlsbFormat/Biff12_records/BundleSh.cpp | 4 +- .../XlsbFormat/Biff12_records/BundleSh.h | 10 +- .../XlsbFormat/Biff12_records/CFIcon.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/CFIcon.h | 14 +- .../XlsbFormat/Biff12_records/CFRuleExt.cpp | 4 +- .../XlsbFormat/Biff12_records/CFRuleExt.h | 10 +- .../Source/XlsbFormat/Biff12_records/CFVO.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/CFVO.h | 22 +- .../XlsbFormat/Biff12_records/CFVO14.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/CFVO14.h | 20 +- .../XlsbFormat/Biff12_records/CalcProp.cpp | 4 +- .../XlsbFormat/Biff12_records/CalcProp.h | 13 +- .../Source/XlsbFormat/Biff12_records/Cell.h | 24 +- .../XlsbFormat/Biff12_records/CellMeta.cpp | 4 +- .../XlsbFormat/Biff12_records/CellMeta.h | 10 +- .../XlsbFormat/Biff12_records/Color.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/Color.h | 10 +- .../XlsbFormat/Biff12_records/Color14.cpp | 4 +- .../XlsbFormat/Biff12_records/Color14.h | 10 +- .../Biff12_records/CommentAuthor.cpp | 4 +- .../XlsbFormat/Biff12_records/CommentAuthor.h | 10 +- .../XlsbFormat/Biff12_records/CommentText.cpp | 4 +- .../XlsbFormat/Biff12_records/CommentText.h | 12 +- .../XlsbFormat/Biff12_records/CommonRecords.h | 152 +-- .../XlsbFormat/Biff12_records/Drawing.cpp | 4 +- .../XlsbFormat/Biff12_records/Drawing.h | 10 +- .../XlsbFormat/Biff12_records/EndBook.cpp | 4 +- .../XlsbFormat/Biff12_records/EndBook.h | 10 +- .../Biff12_records/EndBookViews.cpp | 4 +- .../XlsbFormat/Biff12_records/EndBookViews.h | 10 +- .../XlsbFormat/Biff12_records/EndBorders.cpp | 4 +- .../XlsbFormat/Biff12_records/EndBorders.h | 12 +- .../Biff12_records/EndBundleShs.cpp | 4 +- .../XlsbFormat/Biff12_records/EndBundleShs.h | 10 +- .../XlsbFormat/Biff12_records/EndCFRule.cpp | 4 +- .../XlsbFormat/Biff12_records/EndCFRule.h | 10 +- .../XlsbFormat/Biff12_records/EndCFRule14.cpp | 4 +- .../XlsbFormat/Biff12_records/EndCFRule14.h | 10 +- .../Biff12_records/EndCellStyleXFs.cpp | 4 +- .../Biff12_records/EndCellStyleXFs.h | 12 +- .../XlsbFormat/Biff12_records/EndCellXFs.cpp | 4 +- .../XlsbFormat/Biff12_records/EndCellXFs.h | 12 +- .../XlsbFormat/Biff12_records/EndColInfos.cpp | 4 +- .../XlsbFormat/Biff12_records/EndColInfos.h | 10 +- .../Biff12_records/EndColorPalette.cpp | 4 +- .../Biff12_records/EndColorPalette.h | 10 +- .../Biff12_records/EndColorScale.cpp | 4 +- .../XlsbFormat/Biff12_records/EndColorScale.h | 12 +- .../Biff12_records/EndColorScale14.cpp | 4 +- .../Biff12_records/EndColorScale14.h | 12 +- .../XlsbFormat/Biff12_records/EndComment.cpp | 4 +- .../XlsbFormat/Biff12_records/EndComment.h | 10 +- .../Biff12_records/EndCommentAuthors.cpp | 4 +- .../Biff12_records/EndCommentAuthors.h | 10 +- .../Biff12_records/EndCommentList.cpp | 4 +- .../Biff12_records/EndCommentList.h | 10 +- .../XlsbFormat/Biff12_records/EndComments.cpp | 4 +- .../XlsbFormat/Biff12_records/EndComments.h | 10 +- .../EndConditionalFormatting.cpp | 4 +- .../Biff12_records/EndConditionalFormatting.h | 10 +- .../EndConditionalFormatting14.cpp | 4 +- .../EndConditionalFormatting14.h | 10 +- .../EndConditionalFormattings.cpp | 4 +- .../EndConditionalFormattings.h | 10 +- .../XlsbFormat/Biff12_records/EndDXF14s.cpp | 4 +- .../XlsbFormat/Biff12_records/EndDXF14s.h | 12 +- .../XlsbFormat/Biff12_records/EndDXFs.cpp | 4 +- .../XlsbFormat/Biff12_records/EndDXFs.h | 12 +- .../XlsbFormat/Biff12_records/EndDXFs15.cpp | 4 +- .../XlsbFormat/Biff12_records/EndDXFs15.h | 12 +- .../XlsbFormat/Biff12_records/EndDatabar.cpp | 4 +- .../XlsbFormat/Biff12_records/EndDatabar.h | 12 +- .../Biff12_records/EndDatabar14.cpp | 4 +- .../XlsbFormat/Biff12_records/EndDatabar14.h | 12 +- .../Biff12_records/EndExternals.cpp | 4 +- .../XlsbFormat/Biff12_records/EndExternals.h | 10 +- .../XlsbFormat/Biff12_records/EndFills.cpp | 4 +- .../XlsbFormat/Biff12_records/EndFills.h | 12 +- .../XlsbFormat/Biff12_records/EndFmts.cpp | 4 +- .../XlsbFormat/Biff12_records/EndFmts.h | 12 +- .../XlsbFormat/Biff12_records/EndFnGroup.cpp | 4 +- .../XlsbFormat/Biff12_records/EndFnGroup.h | 10 +- .../XlsbFormat/Biff12_records/EndFonts.cpp | 4 +- .../XlsbFormat/Biff12_records/EndFonts.h | 12 +- .../XlsbFormat/Biff12_records/EndIconSet.cpp | 4 +- .../XlsbFormat/Biff12_records/EndIconSet.h | 10 +- .../Biff12_records/EndIconSet14.cpp | 4 +- .../XlsbFormat/Biff12_records/EndIconSet14.h | 10 +- .../Biff12_records/EndIndexedColors.cpp | 4 +- .../Biff12_records/EndIndexedColors.h | 10 +- .../Biff12_records/EndListParts.cpp | 4 +- .../XlsbFormat/Biff12_records/EndListParts.h | 10 +- .../Biff12_records/EndMRUColors.cpp | 4 +- .../XlsbFormat/Biff12_records/EndMRUColors.h | 10 +- .../Biff12_records/EndMergeCells.cpp | 4 +- .../XlsbFormat/Biff12_records/EndMergeCells.h | 10 +- .../Biff12_records/EndRichSortCondition.cpp | 4 +- .../Biff12_records/EndRichSortCondition.h | 12 +- .../XlsbFormat/Biff12_records/EndSheet.cpp | 4 +- .../XlsbFormat/Biff12_records/EndSheet.h | 10 +- .../Biff12_records/EndSheetData.cpp | 4 +- .../XlsbFormat/Biff12_records/EndSheetData.h | 10 +- .../Biff12_records/EndSlicerStyle.cpp | 4 +- .../Biff12_records/EndSlicerStyle.h | 10 +- .../Biff12_records/EndSlicerStyleElements.cpp | 4 +- .../Biff12_records/EndSlicerStyleElements.h | 10 +- .../Biff12_records/EndSlicerStyles.cpp | 4 +- .../Biff12_records/EndSlicerStyles.h | 10 +- .../XlsbFormat/Biff12_records/EndSortCond.cpp | 4 +- .../XlsbFormat/Biff12_records/EndSortCond.h | 12 +- .../Biff12_records/EndSortCond14.cpp | 4 +- .../XlsbFormat/Biff12_records/EndSortCond14.h | 12 +- .../Biff12_records/EndSortState.cpp | 4 +- .../XlsbFormat/Biff12_records/EndSortState.h | 12 +- .../XlsbFormat/Biff12_records/EndSst.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/EndSst.h | 10 +- .../Biff12_records/EndStyleSheet.cpp | 4 +- .../XlsbFormat/Biff12_records/EndStyleSheet.h | 10 +- .../Biff12_records/EndStyleSheetExt14.cpp | 4 +- .../Biff12_records/EndStyleSheetExt14.h | 10 +- .../XlsbFormat/Biff12_records/EndStyles.cpp | 4 +- .../XlsbFormat/Biff12_records/EndStyles.h | 10 +- .../Biff12_records/EndTableStyle.cpp | 4 +- .../XlsbFormat/Biff12_records/EndTableStyle.h | 10 +- .../Biff12_records/EndTableStyles.cpp | 4 +- .../Biff12_records/EndTableStyles.h | 10 +- .../Biff12_records/EndTimelineStyle.cpp | 4 +- .../Biff12_records/EndTimelineStyle.h | 10 +- .../EndTimelineStyleElements.cpp | 4 +- .../Biff12_records/EndTimelineStyleElements.h | 10 +- .../EndTimelineStyleSheetExt15.cpp | 4 +- .../EndTimelineStyleSheetExt15.h | 10 +- .../Biff12_records/EndTimelineStyles.cpp | 4 +- .../Biff12_records/EndTimelineStyles.h | 10 +- .../XlsbFormat/Biff12_records/EndWsView.cpp | 4 +- .../XlsbFormat/Biff12_records/EndWsView.h | 10 +- .../XlsbFormat/Biff12_records/EndWsViews.cpp | 4 +- .../XlsbFormat/Biff12_records/EndWsViews.h | 10 +- .../XlsbFormat/Biff12_records/FRTBegin.cpp | 4 +- .../XlsbFormat/Biff12_records/FRTBegin.h | 10 +- .../XlsbFormat/Biff12_records/FRTEnd.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/FRTEnd.h | 12 +- .../Biff12_records/FileSharingIso.cpp | 4 +- .../Biff12_records/FileSharingIso.h | 10 +- .../XlsbFormat/Biff12_records/FileVersion.cpp | 4 +- .../XlsbFormat/Biff12_records/FileVersion.h | 10 +- .../Source/XlsbFormat/Biff12_records/Fill.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/Fill.h | 23 +- .../Source/XlsbFormat/Biff12_records/Fmla.h | 22 +- .../Source/XlsbFormat/Biff12_records/Fmt.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/Fmt.h | 14 +- .../XlsbFormat/Biff12_records/FnGroup.cpp | 4 +- .../XlsbFormat/Biff12_records/FnGroup.h | 10 +- .../XlsbFormat/Biff12_records/HLink.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/HLink.h | 10 +- .../Biff12_records/IndexedColor.cpp | 4 +- .../XlsbFormat/Biff12_records/IndexedColor.h | 10 +- .../Biff12_records/LegacyDrawing.cpp | 4 +- .../XlsbFormat/Biff12_records/LegacyDrawing.h | 10 +- .../Biff12_records/LegacyDrawingHF.cpp | 4 +- .../Biff12_records/LegacyDrawingHF.h | 10 +- .../XlsbFormat/Biff12_records/ListPart.cpp | 4 +- .../XlsbFormat/Biff12_records/ListPart.h | 10 +- .../XlsbFormat/Biff12_records/MRUColor.cpp | 4 +- .../XlsbFormat/Biff12_records/MRUColor.h | 12 +- .../XlsbFormat/Biff12_records/MergeCell.cpp | 4 +- .../XlsbFormat/Biff12_records/MergeCell.h | 10 +- .../XlsbFormat/Biff12_records/OleSize.cpp | 4 +- .../XlsbFormat/Biff12_records/OleSize.h | 10 +- .../Biff12_records/PlaceholderName.cpp | 4 +- .../Biff12_records/PlaceholderName.h | 10 +- .../XlsbFormat/Biff12_records/RwDescent.cpp | 4 +- .../XlsbFormat/Biff12_records/RwDescent.h | 12 +- .../XlsbFormat/Biff12_records/SSTItem.cpp | 4 +- .../XlsbFormat/Biff12_records/SSTItem.h | 11 +- .../Biff12_records/SheetProtection.cpp | 4 +- .../Biff12_records/SheetProtection.h | 10 +- .../Biff12_records/SheetProtectionIso.cpp | 4 +- .../Biff12_records/SheetProtectionIso.h | 10 +- .../Biff12_records/SlicerStyleElement.cpp | 4 +- .../Biff12_records/SlicerStyleElement.h | 10 +- .../XlsbFormat/Biff12_records/Style.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/Style.h | 10 +- .../XlsbFormat/Biff12_records/SupAddin.cpp | 2 +- .../XlsbFormat/Biff12_records/SupAddin.h | 10 +- .../XlsbFormat/Biff12_records/SupBookSrc.cpp | 4 +- .../XlsbFormat/Biff12_records/SupBookSrc.h | 10 +- .../XlsbFormat/Biff12_records/SupSame.cpp | 4 +- .../XlsbFormat/Biff12_records/SupSame.h | 10 +- .../XlsbFormat/Biff12_records/SupSelf.cpp | 4 +- .../XlsbFormat/Biff12_records/SupSelf.h | 10 +- .../Biff12_records/TimelineStyleElement.cpp | 4 +- .../Biff12_records/TimelineStyleElement.h | 10 +- .../Source/XlsbFormat/Biff12_records/Uid.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/Uid.h | 10 +- .../XlsbFormat/Biff12_records/ValueMeta.cpp | 4 +- .../XlsbFormat/Biff12_records/ValueMeta.h | 10 +- .../XlsbFormat/Biff12_records/WbProp.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/WbProp.h | 10 +- .../XlsbFormat/Biff12_records/WsDim.cpp | 4 +- .../Source/XlsbFormat/Biff12_records/WsDim.h | 10 +- .../XlsbFormat/Biff12_records/WsFmtInfo.cpp | 4 +- .../XlsbFormat/Biff12_records/WsFmtInfo.h | 10 +- .../Biff12_structures/ACProductVersion.cpp | 6 +- .../Biff12_structures/ACProductVersion.h | 16 +- .../XlsbFormat/Biff12_structures/Blxf.cpp | 6 +- .../XlsbFormat/Biff12_structures/Blxf.h | 16 +- .../Biff12_structures/BookProtectionFlags.cpp | 6 +- .../Biff12_structures/BookProtectionFlags.h | 16 +- .../XlsbFormat/Biff12_structures/CFDateOper.h | 2 +- .../XlsbFormat/Biff12_structures/CFOper.h | 2 +- .../XlsbFormat/Biff12_structures/CFTemp.h | 2 +- .../XlsbFormat/Biff12_structures/CFTextOper.h | 2 +- .../XlsbFormat/Biff12_structures/CFType.h | 2 +- .../XlsbFormat/Biff12_structures/CFVOType14.h | 2 +- .../XlsbFormat/Biff12_structures/CFVOtype.h | 2 +- .../XlsbFormat/Biff12_structures/Cell.cpp | 6 +- .../XlsbFormat/Biff12_structures/Cell.h | 18 +- .../Biff12_structures/CellRangeRef.h | 9 +- .../XlsbFormat/Biff12_structures/CellRef.h | 8 +- .../XlsbFormat/Biff12_structures/CodeName.cpp | 6 +- .../XlsbFormat/Biff12_structures/CodeName.h | 16 +- .../XlsbFormat/Biff12_structures/ColSpan.cpp | 6 +- .../XlsbFormat/Biff12_structures/ColSpan.h | 19 +- .../XlsbFormat/Biff12_structures/FRTBlank.cpp | 6 +- .../XlsbFormat/Biff12_structures/FRTBlank.h | 16 +- .../Biff12_structures/FRTFormula.cpp | 6 +- .../XlsbFormat/Biff12_structures/FRTFormula.h | 18 +- .../Biff12_structures/FRTFormulas.cpp | 6 +- .../Biff12_structures/FRTFormulas.h | 16 +- .../Biff12_structures/FRTHeader.cpp | 6 +- .../XlsbFormat/Biff12_structures/FRTHeader.h | 21 +- .../Biff12_structures/FRTParsedFormula.cpp | 3 +- .../Biff12_structures/FRTParsedFormula.h | 4 +- .../Biff12_structures/FRTProductVersion.cpp | 6 +- .../Biff12_structures/FRTProductVersion.h | 16 +- .../XlsbFormat/Biff12_structures/FRTRef.cpp | 6 +- .../XlsbFormat/Biff12_structures/FRTRef.h | 16 +- .../XlsbFormat/Biff12_structures/FRTRefs.cpp | 6 +- .../XlsbFormat/Biff12_structures/FRTRefs.h | 15 +- .../XlsbFormat/Biff12_structures/FRTRelID.cpp | 6 +- .../XlsbFormat/Biff12_structures/FRTRelID.h | 18 +- .../XlsbFormat/Biff12_structures/FRTSqref.cpp | 6 +- .../XlsbFormat/Biff12_structures/FRTSqref.h | 16 +- .../Biff12_structures/FRTSqrefs.cpp | 6 +- .../XlsbFormat/Biff12_structures/FRTSqrefs.h | 16 +- .../Biff12_structures/GradientStop.cpp | 6 +- .../Biff12_structures/GradientStop.h | 20 +- .../Biff12_structures/GrbitFmla.cpp | 6 +- .../XlsbFormat/Biff12_structures/GrbitFmla.h | 16 +- .../Biff12_structures/IsoPasswordData.cpp | 6 +- .../Biff12_structures/IsoPasswordData.h | 16 +- .../Biff12_structures/LPByteBuf.cpp | 6 +- .../XlsbFormat/Biff12_structures/LPByteBuf.h | 16 +- .../XlsbFormat/Biff12_structures/PhRun.cpp | 5 +- .../XlsbFormat/Biff12_structures/PhRun.h | 14 +- .../XlsbFormat/Biff12_structures/RelID.cpp | 6 +- .../XlsbFormat/Biff12_structures/RelID.h | 16 +- .../XlsbFormat/Biff12_structures/RichStr.cpp | 4 +- .../XlsbFormat/Biff12_structures/RichStr.h | 11 +- .../XlsbFormat/Biff12_structures/StrRun.cpp | 8 +- .../XlsbFormat/Biff12_structures/StrRun.h | 14 +- .../XlsbFormat/Biff12_structures/SxOs.cpp | 6 +- .../XlsbFormat/Biff12_structures/SxOs.h | 20 +- .../XlsbFormat/Biff12_structures/SxSu.cpp | 6 +- .../XlsbFormat/Biff12_structures/SxSu.h | 16 +- .../Biff12_structures/UncheckedSqRfX.cpp | 6 +- .../Biff12_structures/UncheckedSqRfX.h | 17 +- .../Biff12_structures/XLWideString.h | 9 +- .../XlsbFormat/Biff12_unions/ACABSPATH.cpp | 2 + .../XlsbFormat/Biff12_unions/ACABSPATH.h | 16 +- .../XlsbFormat/Biff12_unions/ACCELLTABLE.cpp | 2 + .../XlsbFormat/Biff12_unions/ACCELLTABLE.h | 16 +- .../Source/XlsbFormat/Biff12_unions/ACFMT.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/ACFMT.h | 18 +- .../XlsbFormat/Biff12_unions/ACSORTCONDS.cpp | 2 + .../XlsbFormat/Biff12_unions/ACSORTCONDS.h | 16 +- .../Source/XlsbFormat/Biff12_unions/ACUID.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/ACUID.h | 16 +- .../XlsbFormat/Biff12_unions/BOOKVIEWS.cpp | 8 +- .../XlsbFormat/Biff12_unions/BOOKVIEWS.h | 16 +- .../XlsbFormat/Biff12_unions/BORDERS.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/BORDERS.h | 16 +- .../XlsbFormat/Biff12_unions/BUNDLESHS.cpp | 2 + .../XlsbFormat/Biff12_unions/BUNDLESHS.h | 16 +- .../Source/XlsbFormat/Biff12_unions/CELL.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/CELL.h | 22 +- .../XlsbFormat/Biff12_unions/CELLMETA.cpp | 2 + .../XlsbFormat/Biff12_unions/CELLMETA.h | 14 +- .../XlsbFormat/Biff12_unions/CELLSTYLEXFS.cpp | 2 + .../XlsbFormat/Biff12_unions/CELLSTYLEXFS.h | 18 +- .../XlsbFormat/Biff12_unions/CELLTABLE.cpp | 12 +- .../XlsbFormat/Biff12_unions/CELLTABLE.h | 20 +- .../XlsbFormat/Biff12_unions/CELLXFS.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/CELLXFS.h | 18 +- .../XlsbFormat/Biff12_unions/CFRULE.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/CFRULE.h | 27 +- .../XlsbFormat/Biff12_unions/CFRULE14.cpp | 2 + .../XlsbFormat/Biff12_unions/CFRULE14.h | 22 +- .../XlsbFormat/Biff12_unions/COLINFOS.cpp | 2 + .../XlsbFormat/Biff12_unions/COLINFOS.h | 16 +- .../XlsbFormat/Biff12_unions/COLORPALETTE.cpp | 2 + .../XlsbFormat/Biff12_unions/COLORPALETTE.h | 18 +- .../XlsbFormat/Biff12_unions/COLORSCALE.cpp | 2 + .../XlsbFormat/Biff12_unions/COLORSCALE.h | 20 +- .../XlsbFormat/Biff12_unions/COLORSCALE14.cpp | 2 + .../XlsbFormat/Biff12_unions/COLORSCALE14.h | 20 +- .../XlsbFormat/Biff12_unions/COMMENT.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/COMMENT.h | 18 +- .../Biff12_unions/COMMENTAUTHORS.cpp | 2 + .../XlsbFormat/Biff12_unions/COMMENTAUTHORS.h | 16 +- .../XlsbFormat/Biff12_unions/COMMENTLIST.cpp | 2 + .../XlsbFormat/Biff12_unions/COMMENTLIST.h | 16 +- .../XlsbFormat/Biff12_unions/COMMENTS.cpp | 2 + .../XlsbFormat/Biff12_unions/COMMENTS.h | 20 +- .../Biff12_unions/CONDITIONALFORMATTING.cpp | 2 + .../Biff12_unions/CONDITIONALFORMATTING.h | 20 +- .../Biff12_unions/CONDITIONALFORMATTING14.cpp | 2 + .../Biff12_unions/CONDITIONALFORMATTING14.h | 20 +- .../Biff12_unions/CONDITIONALFORMATTINGS.cpp | 2 + .../Biff12_unions/CONDITIONALFORMATTINGS.h | 20 +- .../XlsbFormat/Biff12_unions/DATABAR.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/DATABAR.h | 20 +- .../XlsbFormat/Biff12_unions/DATABAR14.cpp | 2 + .../XlsbFormat/Biff12_unions/DATABAR14.h | 20 +- .../XlsbFormat/Biff12_unions/DATACELL.cpp | 2 + .../XlsbFormat/Biff12_unions/DATACELL.h | 12 +- .../Source/XlsbFormat/Biff12_unions/DXF.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/DXF.h | 17 +- .../XlsbFormat/Biff12_unions/DXF14S.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/DXF14S.h | 20 +- .../Source/XlsbFormat/Biff12_unions/DXFS.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/DXFS.h | 17 +- .../XlsbFormat/Biff12_unions/DXFS15.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/DXFS15.h | 20 +- .../XlsbFormat/Biff12_unions/EXTERNALS.cpp | 7 +- .../XlsbFormat/Biff12_unions/EXTERNALS.h | 18 +- .../Source/XlsbFormat/Biff12_unions/FILLS.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/FILLS.h | 16 +- .../XlsbFormat/Biff12_unions/FMLACELL.cpp | 2 + .../XlsbFormat/Biff12_unions/FMLACELL.h | 12 +- .../Source/XlsbFormat/Biff12_unions/FMTS.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/FMTS.h | 16 +- .../XlsbFormat/Biff12_unions/FNGROUP.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/FNGROUP.h | 16 +- .../Source/XlsbFormat/Biff12_unions/FONTS.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/FONTS.h | 16 +- .../Source/XlsbFormat/Biff12_unions/FRT.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/FRT.h | 14 +- .../XlsbFormat/Biff12_unions/FRTCFRULE.cpp | 2 + .../XlsbFormat/Biff12_unions/FRTCFRULE.h | 18 +- .../XlsbFormat/Biff12_unions/FRTDXF.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/FRTDXF.h | 16 +- .../Biff12_unions/FRTSTYLESHEET.cpp | 2 + .../XlsbFormat/Biff12_unions/FRTSTYLESHEET.h | 20 +- .../XlsbFormat/Biff12_unions/FRTWORKSHEET.cpp | 2 + .../XlsbFormat/Biff12_unions/FRTWORKSHEET.h | 14 +- .../XlsbFormat/Biff12_unions/HLINKS.cpp | 6 +- .../Source/XlsbFormat/Biff12_unions/HLINKS.h | 12 +- .../XlsbFormat/Biff12_unions/ICONSET.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/ICONSET.h | 18 +- .../XlsbFormat/Biff12_unions/ICONSET14.cpp | 2 + .../XlsbFormat/Biff12_unions/ICONSET14.h | 20 +- .../Biff12_unions/INDEXEDCOLORS.cpp | 2 + .../XlsbFormat/Biff12_unions/INDEXEDCOLORS.h | 16 +- .../XlsbFormat/Biff12_unions/LISTPARTS.cpp | 2 + .../XlsbFormat/Biff12_unions/LISTPARTS.h | 16 +- .../XlsbFormat/Biff12_unions/MERGECELLS.cpp | 2 + .../XlsbFormat/Biff12_unions/MERGECELLS.h | 16 +- .../XlsbFormat/Biff12_unions/MRUCOLORS.cpp | 2 + .../XlsbFormat/Biff12_unions/MRUCOLORS.h | 16 +- .../Biff12_unions/RICHSORTCONDITION.cpp | 2 + .../Biff12_unions/RICHSORTCONDITION.h | 14 +- .../Biff12_unions/SHAREDSTRINGS.cpp | 2 + .../XlsbFormat/Biff12_unions/SHAREDSTRINGS.h | 18 +- .../XlsbFormat/Biff12_unions/SHRFMLACELL.cpp | 5 +- .../XlsbFormat/Biff12_unions/SHRFMLACELL.h | 12 +- .../XlsbFormat/Biff12_unions/SLICERSTYLE.cpp | 2 + .../XlsbFormat/Biff12_unions/SLICERSTYLE.h | 20 +- .../XlsbFormat/Biff12_unions/SLICERSTYLES.cpp | 2 + .../XlsbFormat/Biff12_unions/SLICERSTYLES.h | 16 +- .../XlsbFormat/Biff12_unions/SORTCOND.cpp | 2 + .../XlsbFormat/Biff12_unions/SORTCOND.h | 14 +- .../XlsbFormat/Biff12_unions/SORTCOND14.cpp | 2 + .../XlsbFormat/Biff12_unions/SORTCOND14.h | 14 +- .../XlsbFormat/Biff12_unions/SORTCONDS.cpp | 2 + .../XlsbFormat/Biff12_unions/SORTCONDS.h | 12 +- .../XlsbFormat/Biff12_unions/SORTSTATE.cpp | 2 + .../XlsbFormat/Biff12_unions/SORTSTATE.h | 18 +- .../XlsbFormat/Biff12_unions/STYLES.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/STYLES.h | 20 +- .../XlsbFormat/Biff12_unions/STYLESHEET14.cpp | 2 + .../XlsbFormat/Biff12_unions/STYLESHEET14.h | 20 +- .../XlsbFormat/Biff12_unions/STYLESHEET15.cpp | 2 + .../XlsbFormat/Biff12_unions/STYLESHEET15.h | 20 +- .../Source/XlsbFormat/Biff12_unions/SUP.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/SUP.h | 12 +- .../XlsbFormat/Biff12_unions/SUPADDIN.cpp | 2 + .../XlsbFormat/Biff12_unions/SUPADDIN.h | 14 +- .../XlsbFormat/Biff12_unions/SUPSAME.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/SUPSAME.h | 14 +- .../XlsbFormat/Biff12_unions/TABLECELL.cpp | 2 + .../XlsbFormat/Biff12_unions/TABLECELL.h | 16 +- .../XlsbFormat/Biff12_unions/TABLESTYLE.cpp | 2 + .../XlsbFormat/Biff12_unions/TABLESTYLE.h | 18 +- .../XlsbFormat/Biff12_unions/TABLESTYLES.cpp | 2 + .../XlsbFormat/Biff12_unions/TABLESTYLES.h | 16 +- .../Biff12_unions/TIMELINESTYLE.cpp | 2 + .../XlsbFormat/Biff12_unions/TIMELINESTYLE.h | 20 +- .../Biff12_unions/TIMELINESTYLES.cpp | 2 + .../XlsbFormat/Biff12_unions/TIMELINESTYLES.h | 16 +- .../XlsbFormat/Biff12_unions/WSVIEW2.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/WSVIEW2.h | 22 +- .../XlsbFormat/Biff12_unions/WSVIEWS2.cpp | 2 + .../XlsbFormat/Biff12_unions/WSVIEWS2.h | 18 +- .../Source/XlsbFormat/Biff12_unions/uCFVO.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/uCFVO.h | 16 +- .../XlsbFormat/Biff12_unions/uCFVO14.cpp | 2 + .../Source/XlsbFormat/Biff12_unions/uCFVO14.h | 16 +- .../Source/XlsbFormat/CommentsStream.cpp | 2 + .../Source/XlsbFormat/CommentsStream.h | 10 +- .../Source/XlsbFormat/SharedStringsStream.cpp | 2 + .../Source/XlsbFormat/SharedStringsStream.h | 10 +- .../Source/XlsbFormat/StylesStream.cpp | 2 + .../Source/XlsbFormat/StylesStream.h | 34 +- .../Source/XlsbFormat/WorkBookStream.cpp | 1 + .../Source/XlsbFormat/WorkBookStream.h | 48 +- .../Source/XlsbFormat/WorkSheetStream.cpp | 2 + .../Source/XlsbFormat/WorkSheetStream.h | 46 +- Common/DocxFormat/Source/XlsbFormat/Xlsb.cpp | 23 +- Common/DocxFormat/Source/XlsbFormat/Xlsb.h | 23 +- .../Source/XlsbFormat/XlsbElementsType.h | 14 +- .../Source/XlsxFormat/Comments/Comments.h | 2 +- .../XlsxFormat/SharedStrings/SharedStrings.h | 2 +- .../Source/XlsxFormat/Styles/Fills.h | 2 +- .../Source/XlsxFormat/Styles/Styles.h | 2 +- .../Source/XlsxFormat/Workbook/Workbook.h | 3 +- .../Worksheets/ConditionalFormatting.cpp | 2 + .../XlsxFormat/Worksheets/SheetData.cpp | 2 + .../Source/XlsxFormat/Worksheets/SheetData.h | 2 +- .../XlsxFormat/Worksheets/Worksheet.cpp | 2 +- 619 files changed, 4129 insertions(+), 4444 deletions(-) delete mode 100644 Common/3dParty/cryptopp/cryptest.vcxproj create mode 100644 Common/DocxFormat/DocxFormatLib/xlsbformatlib_logic.cpp delete mode 100644 Common/DocxFormat/Source/Common/AbstractConverter.h delete mode 100644 Common/DocxFormat/Source/Common/Align.cpp delete mode 100644 Common/DocxFormat/Source/Common/Align.h delete mode 100644 Common/DocxFormat/Source/Common/Color.cpp delete mode 100644 Common/DocxFormat/Source/Common/Color.h delete mode 100644 Common/DocxFormat/Source/Common/Common.h delete mode 100644 Common/DocxFormat/Source/Common/Index.cpp delete mode 100644 Common/DocxFormat/Source/Common/Index.h delete mode 100644 Common/DocxFormat/Source/Common/NumFormat.cpp delete mode 100644 Common/DocxFormat/Source/Common/NumFormat.h delete mode 100644 Common/DocxFormat/Source/Common/Point.h delete mode 100644 Common/DocxFormat/Source/Common/Position.cpp delete mode 100644 Common/DocxFormat/Source/Common/Position.h delete mode 100644 Common/DocxFormat/Source/Common/Size.h delete mode 100644 Common/DocxFormat/Source/Common/Wrap.cpp delete mode 100644 Common/DocxFormat/Source/Common/Wrap.h delete mode 100644 Common/DocxFormat/Source/Common/ZIndex.cpp delete mode 100644 Common/DocxFormat/Source/Common/ZIndex.h diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h index 9d03d14866..e4876628c9 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h @@ -31,9 +31,9 @@ */ #pragma once -#include -#include -#include +#include "../BaseObject.h" +#include "../Biff_structures/BitMarkedStructs.h" +#include "../BinProcessor.h" namespace XLS { @@ -61,8 +61,6 @@ public: protected: BaseObject* parent_; }; - -#define BIFF_RECORD_DEFINE_TYPE_INFO(class_name) public: const CFRecordType::TypeId getTypeId() const { return rt_ ## class_name; } - } // namespace XLS +#define BIFF_RECORD_DEFINE_TYPE_INFO(class_name) public: const XLS::CFRecordType::TypeId getTypeId() const { return rt_ ## class_name; } diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecordContinued.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecordContinued.h index 5651bfc25f..70bcc96c8f 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecordContinued.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecordContinued.h @@ -31,7 +31,7 @@ */ #pragma once -#include +#include "BiffRecord.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DBCell.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DBCell.h index fa869d2ff1..54164dd57f 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DBCell.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DBCell.h @@ -32,7 +32,7 @@ #pragma once #include "BiffRecord.h" -#include +#include "../Biff_structures/FileOffset.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DXF.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DXF.h index 72b94fc383..58d1d1cf63 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DXF.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DXF.h @@ -32,8 +32,8 @@ #pragma once #include "BiffRecord.h" -#include -#include +#include "../Biff_structures/FrtRefHeaderU.h" +#include "../Biff_structures/XFProps.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FileSharing.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FileSharing.h index 153c43e170..f0f9ad7ad8 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FileSharing.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FileSharing.h @@ -33,8 +33,8 @@ #include "BiffRecord.h" #include "../Biff_structures/BiffString.h" -#include -#include <../XlsxFormat/WritingElement.h> +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h" +#include "../../../../../Common/DocxFormat/Source/XlsxFormat/WritingElement.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp index 0bc8b1825e..13751774e4 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.cpp @@ -32,7 +32,7 @@ #include "Font.h" #include "../Biff_structures/BiffString.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.h index 0c0e112556..6e4f09a32a 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.h @@ -33,7 +33,7 @@ #include "BiffRecord.h" #include "../Biff_structures/BorderFillInfo.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Lbl.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Lbl.h index 188fe1d359..51fb0ddcfc 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Lbl.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Lbl.h @@ -32,9 +32,9 @@ #pragma once #include "BiffRecord.h" -#include -#include -#include +#include "../Biff_structures/BiffString.h" +#include "../Biff_structures/NameParsedFormula.h" +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h" namespace XLS diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulRk.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulRk.h index b99dab4a31..0d3075ac10 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulRk.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/MulRk.h @@ -32,8 +32,8 @@ #pragma once #include "BiffRecord.h" -#include -#include +#include "../Biff_structures/RkRec.h" +#include "../Biff_structures/Cell.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pane.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pane.h index d7aab8cd9d..090764f85f 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pane.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pane.h @@ -32,9 +32,9 @@ #pragma once #include "BiffRecord.h" -#include -#include -#include +#include "../Biff_structures/CellRef.h" +#include "../Biff_structures/PaneType.h" +#include "../Biff_structures/Xnum.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Row.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Row.h index 3d7b01c608..93b82ee42c 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Row.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Row.h @@ -32,7 +32,7 @@ #pragma once #include "BiffRecord.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ColSpan.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Selection.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Selection.h index f63c87af48..b9ab87c038 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Selection.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Selection.h @@ -32,9 +32,9 @@ #pragma once #include "BiffRecord.h" -#include -#include -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/UncheckedSqRfX.h" +#include "../Biff_structures/CellRangeRef.h" +#include "../Biff_structures/PaneType.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShrFmla.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShrFmla.h index e670a7ae03..781f6aa2a1 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShrFmla.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShrFmla.h @@ -32,9 +32,10 @@ #pragma once #include "BiffRecord.h" -#include -#include -#include +#include "../Biff_structures/CellRangeRef.h" +#include "../Biff_structures/SharedParsedFormula.h" +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRangeRef.h" + namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.cpp index 9812c6dddb..2f76075e9a 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.cpp @@ -31,7 +31,7 @@ */ #include "SortData.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRangeRef.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Table.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Table.h index af4cf8f1cc..4fdbfc73e2 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Table.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Table.h @@ -32,7 +32,7 @@ #pragma once #include "BiffRecord.h" -#include +#include "../Biff_structures/CellRangeRef.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.cpp index acd99fbe23..6b0f5b2d83 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.cpp @@ -31,7 +31,7 @@ */ #include "TableStyle.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.cpp index 756e2f1627..d7c13bfc0e 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.cpp @@ -31,7 +31,7 @@ */ #include "TableStyles.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/UserBView.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/UserBView.h index 44e2913157..3a41117094 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/UserBView.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/UserBView.h @@ -32,8 +32,8 @@ #pragma once #include "BiffRecord.h" -#include -#include +#include "../Biff_structures/BiffString.h" +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Window2.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Window2.h index 61196b8c4d..7b6a574c3e 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Window2.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Window2.h @@ -32,7 +32,7 @@ #pragma once #include "BiffRecord.h" -#include +#include "../Biff_structures/CellRef.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h index 44196cbfdc..ec6cb26598 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BitMarkedStructs.h @@ -35,10 +35,10 @@ #include #endif -#include "../../../Common/DocxFormat/Source/Base/Types_32.h" +#include "../../../../../Common/DocxFormat/Source/Base/Types_32.h" #include "BiffStructure.h" #include "BiffAttribute.h" -#include +#include "../../Auxiliary/HelpFunc.h" #include "Boolean.h" #pragma pack(1) diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h index 615166657c..4663d45588 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h @@ -47,7 +47,7 @@ public: BiffStructurePtr clone(); - static const ElementType type = typeCellRef; + static const ElementType type = typeCellRef; const std::wstring toString() const; void fromString(const std::wstring& str); diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtHeader.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtHeader.h index 0d5b671921..13987288b1 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtHeader.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtHeader.h @@ -32,7 +32,7 @@ #pragma once #include "BiffStructure.h" -#include +#include "../../Binary/CFRecordType.h" #include "BitMarkedStructs.h" namespace XLS diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtHeaderOld.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtHeaderOld.h index 43dccee31d..b4b9a47d9d 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtHeaderOld.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtHeaderOld.h @@ -32,7 +32,7 @@ #pragma once #include "BiffStructure.h" -#include +#include "../../Binary/CFRecordType.h" #include "BitMarkedStructs.h" namespace XLS diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtRefHeaderU.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtRefHeaderU.h index 4aab4462e1..8fea581606 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtRefHeaderU.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FrtRefHeaderU.h @@ -35,7 +35,7 @@ #include "CellRangeRef.h" #include "BitMarkedStructs.h" -#include +#include "../../Binary/CFRecordType.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Ptg.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Ptg.h index 2f1ff819ec..675eed5ff9 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Ptg.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Ptg.h @@ -35,7 +35,7 @@ #include "CellRef.h" #include #include -#include +#include "../../../Common/common.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgArea.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgArea.h index 401bd3edc6..e6c44ac620 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgArea.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgArea.h @@ -33,8 +33,8 @@ #include "OperandPtg.h" #include "CellRangeRef.h" -#include -#include +#include "BitMarkedStructs.h" +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRangeRef.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgArea3d.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgArea3d.h index aaf26be8ee..98af360070 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgArea3d.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgArea3d.h @@ -34,7 +34,7 @@ #include "OperandPtg.h" #include "CellRangeRef.h" #include "Logic/GlobalWorkbookInfo.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRangeRef.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgAreaN.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgAreaN.h index a72af02145..8fb817e408 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgAreaN.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgAreaN.h @@ -33,7 +33,7 @@ #include "OperandPtg.h" #include "CellRangeRef.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRangeRef.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgExtraList.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgExtraList.h index a2c7106aab..e0e55b4134 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgExtraList.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgExtraList.h @@ -34,7 +34,7 @@ #include "Ptg.h" #include "CellRangeRef.h" #include "Boolean.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxSu.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgExtraMem.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgExtraMem.h index 670739b524..eb4bbeaf98 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgExtraMem.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgExtraMem.h @@ -33,7 +33,7 @@ #include "Ptg.h" #include "CellRangeRef.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRangeRef.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRef.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRef.h index c52bf22716..eb791a5ee6 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRef.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRef.h @@ -33,7 +33,7 @@ #include "OperandPtg.h" #include "BitMarkedStructs.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRef.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRef3d.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRef3d.h index d757db2469..1339cefdcd 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRef3d.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRef3d.h @@ -33,7 +33,7 @@ #include "OperandPtg.h" #include "Logic/GlobalWorkbookInfo.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRef.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRefN.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRefN.h index d095ed55c7..f5cbfdd2af 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRefN.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/PtgRefN.h @@ -32,7 +32,7 @@ #pragma once #include "OperandPtg.h" -#include +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRef.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/RevLblName.cpp b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/RevLblName.cpp index 541ee96a62..2dfdc35759 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/RevLblName.cpp +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/RevLblName.cpp @@ -31,9 +31,8 @@ */ #include "RevLblName.h" -#include -#include -//#include +#include "../../Binary/CFRecord.h" +#include "../../../../../Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h" namespace XLS { diff --git a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/SortCond12.h b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/SortCond12.h index 5a0e52c8ee..c7302a1980 100644 --- a/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/SortCond12.h +++ b/ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/SortCond12.h @@ -34,7 +34,7 @@ #include "BiffStructure.h" #include "BiffString.h" #include "CellRangeRef.h" -#include +#include "BitMarkedStructs.h" namespace XLS { diff --git a/Common/3dParty/cryptopp/cryptest.vcxproj b/Common/3dParty/cryptopp/cryptest.vcxproj deleted file mode 100644 index 72dfad2666..0000000000 --- a/Common/3dParty/cryptopp/cryptest.vcxproj +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - DLL-Import Debug - Win32 - - - DLL-Import Debug - x64 - - - DLL-Import Release - Win32 - - - DLL-Import Release - x64 - - - - - - - {09cdac08-e6ae-48a9-8de7-0fbc779eebde} - cryptest - Application - - - - - - v100 - - - $(DefaultPlatformToolset) - - - - - - - - - - - - - Application - cryptest - .exe - false - MultiByte - true - - - - - $(Platform)\Output\$(Configuration)\ - $(Platform)\$(ProjectName)\$(Configuration)\ - - - $(Platform)\DLL_Output\Debug\ - $(Platform)\$(ProjectName)\$(Configuration)\ - - - $(Platform)\DLL_Output\Release\ - $(Platform)\$(ProjectName)\$(Configuration)\ - - - - - true - None - Level4 - 4231; 4251; 4275; 4355; 4505 - - - - - NoErrorReport - cryptlib.lib;Ws2_32.lib - $(Platform)\Output\$(Configuration) - true - $(OutDir)\cryptlib.pdb - $(OutDir)\cryptest.exe - Console - - - - - - %(PreprocessorDefinitions) - Disabled - ProgramDatabase - EnableFastChecks - true - MultiThreadedDebug - - - %(PreprocessorDefinitions) - 0x0409 - - - - - - NDEBUG;%(PreprocessorDefinitions) - true - MaxSpeed - true - AnySuitable - true - true - MultiThreaded - - - NDEBUG;%(PreprocessorDefinitions) - 0x0409 - - - true - true - - - - - - CRYPTOPP_IMPORTS;%(PreprocessorDefinitions) - - - $(Platform)\DLL_Output\Debug - cryptopp.lib;cryptlib.lib;Ws2_32.lib - - - - - NDEBUG;CRYPTOPP_IMPORTS;%(PreprocessorDefinitions) - - - $(Platform)\DLL_Output\Release - cryptopp.lib;cryptlib.lib;Ws2_32.lib - - - - - - StreamingSIMDExtensions2 - - - MachineX86 - true - - - - - - MachineX64 - - - - - - - echo ************************************************************************* - echo This configuration requires cryptopp.dll. You can build it yourself using - echo the cryptdll project, or obtain a pre-built, FIPS 140-2 validated DLL. If - echo you build it yourself the resulting DLL will not be considered FIPS - echo validated unless it undergoes the FIPS validation process. - echo ************************************************************************* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Common/DocxFormat/DocxFormatLib/common_formatlib.cpp b/Common/DocxFormat/DocxFormatLib/common_formatlib.cpp index 955757e4db..b5dfcc82fe 100644 --- a/Common/DocxFormat/DocxFormatLib/common_formatlib.cpp +++ b/Common/DocxFormat/DocxFormatLib/common_formatlib.cpp @@ -30,12 +30,12 @@ * */ -#include "../Source/Common/Align.cpp" -#include "../Source/Common/Color.cpp" -#include "../Source/Common/Index.cpp" -#include "../Source/Common/NumFormat.cpp" -#include "../Source/Common/Position.cpp" -#include "../Source/Common/Wrap.cpp" -#include "../Source/Common/ZIndex.cpp" +//#include "../Source/Common/Align.cpp" +//#include "../Source/Common/Color.cpp" +//#include "../Source/Common/Index.cpp" +//#include "../Source/Common/NumFormat.cpp" +//#include "../Source/Common/Position.cpp" +//#include "../Source/Common/Wrap.cpp" +//#include "../Source/Common/ZIndex.cpp" #include "../Source/Common/SimpleTypes_Word.cpp" #include "../Source/SystemUtility/SystemUtility.cpp" diff --git a/Common/DocxFormat/DocxFormatLib/docxformatlib_logic.cpp b/Common/DocxFormat/DocxFormatLib/docxformatlib_logic.cpp index 1f376f50c4..b8c9d894ab 100644 --- a/Common/DocxFormat/DocxFormatLib/docxformatlib_logic.cpp +++ b/Common/DocxFormat/DocxFormatLib/docxformatlib_logic.cpp @@ -31,6 +31,7 @@ */ #include "common_formatlib.cpp" #include "xlsxformatlib_logic.cpp" +#include "xlsbformatlib_logic.cpp" #include "../Source/DocxFormat/Logic/AlternateContent.cpp" #include "../Source/DocxFormat/Logic/Annotations.cpp" diff --git a/Common/DocxFormat/DocxFormatLib/xlsbformatlib_logic.cpp b/Common/DocxFormat/DocxFormatLib/xlsbformatlib_logic.cpp new file mode 100644 index 0000000000..77674cb4fb --- /dev/null +++ b/Common/DocxFormat/DocxFormatLib/xlsbformatlib_logic.cpp @@ -0,0 +1,310 @@ +/* + * (c) Copyright Ascensio System SIA 2010-2019 + * + * This program is a free software product. You can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License (AGPL) + * version 3 as published by the Free Software Foundation. In accordance with + * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect + * that Ascensio System SIA expressly excludes the warranty of non-infringement + * of any third-party rights. + * + * This program is distributed WITHOUT ANY WARRANTY; without even the implied + * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For + * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html + * + * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha + * street, Riga, Latvia, EU, LV-1050. + * + * The interactive user interfaces in modified source and object code versions + * of the Program must display Appropriate Legal Notices, as required under + * Section 5 of the GNU AGPL version 3. + * + * Pursuant to Section 7(b) of the License you must retain the original Product + * logo when distributing the program. Pursuant to Section 7(e) we decline to + * grant you any rights under trademark law for use of our trademarks. + * + * All the Product's GUI elements, including illustrations and icon sets, as + * well as technical writing content are licensed under the terms of the + * Creative Commons Attribution-ShareAlike 4.0 International. See the License + * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode + * + */ + +// XLSB + #include "../Source/XlsbFormat/Xlsb.cpp" + #include "../Source/XlsbFormat/WorkBookStream.cpp" + #include "../Source/XlsbFormat/WorkSheetStream.cpp" + #include "../Source/XlsbFormat/SharedStringsStream.cpp" + #include "../Source/XlsbFormat/StylesStream.cpp" + #include "../Source/XlsbFormat/CommentsStream.cpp" +// Biff12_records + #include "../Source/XlsbFormat/Biff12_records/BeginBook.cpp" + #include "../Source/XlsbFormat/Biff12_records/FRTBegin.cpp" + #include "../Source/XlsbFormat/Biff12_records/FRTEnd.cpp" + #include "../Source/XlsbFormat/Biff12_records/Uid.cpp" + #include "../Source/XlsbFormat/Biff12_records/FileVersion.cpp" + #include "../Source/XlsbFormat/Biff12_records/FileSharingIso.cpp" + #include "../Source/XlsbFormat/Biff12_records/WbProp.cpp" + #include "../Source/XlsbFormat/Biff12_records/ACBegin.cpp" + #include "../Source/XlsbFormat/Biff12_records/AbsPath15.cpp" + #include "../Source/XlsbFormat/Biff12_records/ACEnd.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginBookViews.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndBookViews.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginBundleShs.cpp" + #include "../Source/XlsbFormat/Biff12_records/BundleSh.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndBundleShs.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginFnGroup.cpp" + #include "../Source/XlsbFormat/Biff12_records/FnGroup.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndFnGroup.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginExternals.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndExternals.cpp" + #include "../Source/XlsbFormat/Biff12_records/SupSelf.cpp" + #include "../Source/XlsbFormat/Biff12_records/SupBookSrc.cpp" + #include "../Source/XlsbFormat/Biff12_records/SupSame.cpp" + #include "../Source/XlsbFormat/Biff12_records/PlaceholderName.cpp" + #include "../Source/XlsbFormat/Biff12_records/SupAddin.cpp" + #include "../Source/XlsbFormat/Biff12_records/CalcProp.cpp" + #include "../Source/XlsbFormat/Biff12_records/OleSize.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndBook.cpp" + #include "../Source/XlsbFormat/Biff12_records/BookProtectionIso.cpp" + #include "../Source/XlsbFormat/Biff12_records/BookProtection.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginSheet.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginColInfos.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndColInfos.cpp" + #include "../Source/XlsbFormat/Biff12_records/WsDim.cpp" + #include "../Source/XlsbFormat/Biff12_records/Drawing.cpp" + #include "../Source/XlsbFormat/Biff12_records/LegacyDrawing.cpp" + #include "../Source/XlsbFormat/Biff12_records/LegacyDrawingHF.cpp" + #include "../Source/XlsbFormat/Biff12_records/HLink.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginMergeCells.cpp" + #include "../Source/XlsbFormat/Biff12_records/MergeCell.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndMergeCells.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginSheetData.cpp" + #include "../Source/XlsbFormat/Biff12_records/RwDescent.cpp" + #include "../Source/XlsbFormat/Biff12_records/CellMeta.cpp" + #include "../Source/XlsbFormat/Biff12_records/ValueMeta.cpp" + #include "../Source/XlsbFormat/Biff12_records/WsFmtInfo.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndSheetData.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndWsView.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginWsViews.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndWsViews.cpp" + #include "../Source/XlsbFormat/Biff12_records/SheetProtectionIso.cpp" + #include "../Source/XlsbFormat/Biff12_records/SheetProtection.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginListParts.cpp" + #include "../Source/XlsbFormat/Biff12_records/ListPart.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndListParts.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginSortCond.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndSortCond.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginSortCond14.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndSortCond14.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginRichSortCondition.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndRichSortCondition.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndSortState.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginConditionalFormatting.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndConditionalFormatting.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginCFRule.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndCFRule.cpp" + #include "../Source/XlsbFormat/Biff12_records/CFVO.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginIconSet.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndIconSet.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginDatabar.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndDatabar.cpp" + #include "../Source/XlsbFormat/Biff12_records/Color.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginColorScale.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndColorScale.cpp" + #include "../Source/XlsbFormat/Biff12_records/CFRuleExt.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginCFRule14.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndCFRule14.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginConditionalFormatting14.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndConditionalFormatting14.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginColorScale14.cpp" + #include "../Source/XlsbFormat/Biff12_records/Color14.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndColorScale14.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginDatabar14.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndDatabar14.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginIconSet14.cpp" + #include "../Source/XlsbFormat/Biff12_records/CFIcon.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndIconSet14.cpp" + #include "../Source/XlsbFormat/Biff12_records/CFVO14.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndSheet.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginSst.cpp" + #include "../Source/XlsbFormat/Biff12_records/SSTItem.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndSst.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginStyleSheet.cpp" + #include "../Source/XlsbFormat/Biff12_records/Fmt.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginFmts.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndFmts.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginFonts.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndFonts.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginFills.cpp" + #include "../Source/XlsbFormat/Biff12_records/Fill.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndFills.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginBorders.cpp" + #include "../Source/XlsbFormat/Biff12_records/Border.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndBorders.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginCellStyleXFs.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndCellStyleXFs.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginCellXFs.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndCellXFs.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginStyles.cpp" + #include "../Source/XlsbFormat/Biff12_records/Style.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndStyles.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginDXFs.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndDXFs.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndTableStyles.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndTableStyle.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginColorPalette.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndColorPalette.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginIndexedColors.cpp" + #include "../Source/XlsbFormat/Biff12_records/IndexedColor.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndIndexedColors.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginMRUColors.cpp" + #include "../Source/XlsbFormat/Biff12_records/MRUColor.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndMRUColors.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndStyleSheet.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginConditionalFormattings.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndConditionalFormattings.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginDXF14s.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndDXF14s.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginDXFs15.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndDXFs15.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginTimelineStyle.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginTimelineStyleElements.cpp" + #include "../Source/XlsbFormat/Biff12_records/TimelineStyleElement.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndTimelineStyleElements.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndTimelineStyle.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginTimelineStyles.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndTimelineStyles.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginTimelineStyleSheetExt15.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndTimelineStyleSheetExt15.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginSlicerStyle.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginSlicerStyleElements.cpp" + #include "../Source/XlsbFormat/Biff12_records/SlicerStyleElement.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndSlicerStyleElements.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndSlicerStyle.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginSlicerStyles.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndSlicerStyles.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginStyleSheetExt14.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndStyleSheetExt14.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginComment.cpp" + #include "../Source/XlsbFormat/Biff12_records/CommentText.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndComment.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginCommentList.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndCommentList.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginCommentAuthors.cpp" + #include "../Source/XlsbFormat/Biff12_records/CommentAuthor.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndCommentAuthors.cpp" + #include "../Source/XlsbFormat/Biff12_records/BeginComments.cpp" + #include "../Source/XlsbFormat/Biff12_records/EndComments.cpp" +// Biff12_structures + #include "../Source/XlsbFormat/Biff12_structures/LPByteBuf.cpp" + #include "../Source/XlsbFormat/Biff12_structures/IsoPasswordData.cpp" + #include "../Source/XlsbFormat/Biff12_structures/CodeName.cpp" + #include "../Source/XlsbFormat/Biff12_structures/ACProductVersion.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTProductVersion.cpp" + #include "../Source/XlsbFormat/Biff12_structures/RelID.cpp" + #include "../Source/XlsbFormat/Biff12_structures/BookProtectionFlags.cpp" + #include "../Source/XlsbFormat/Biff12_structures/ColSpan.cpp" + #include "../Source/XlsbFormat/Biff12_structures/Cell.cpp" + #include "../Source/XlsbFormat/Biff12_structures/GrbitFmla.cpp" + #include "../Source/XlsbFormat/Biff12_structures/SxOs.cpp" + #include "../Source/XlsbFormat/Biff12_structures/SxSu.cpp" + #include "../Source/XlsbFormat/Biff12_structures/UncheckedSqRfX.cpp" + #include "../Source/XlsbFormat/Biff12_structures/CFType.cpp" + #include "../Source/XlsbFormat/Biff12_structures/CFTemp.cpp" + #include "../Source/XlsbFormat/Biff12_structures/CFOper.cpp" + #include "../Source/XlsbFormat/Biff12_structures/CFTextOper.cpp" + #include "../Source/XlsbFormat/Biff12_structures/CFDateOper.cpp" + #include "../Source/XlsbFormat/Biff12_structures/CFVOtype.cpp" + #include "../Source/XlsbFormat/Biff12_structures/CFVOType14.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTBlank.cpp" + #include "../Source/XlsbFormat/Biff12_structures/RichStr.cpp" + #include "../Source/XlsbFormat/Biff12_structures/StrRun.cpp" + #include "../Source/XlsbFormat/Biff12_structures/PhRun.cpp" + #include "../Source/XlsbFormat/Biff12_structures/GradientStop.cpp" + #include "../Source/XlsbFormat/Biff12_structures/Blxf.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTHeader.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTRefs.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTRef.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTSqrefs.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTSqref.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTFormulas.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTFormula.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTParsedFormula.cpp" + #include "../Source/XlsbFormat/Biff12_structures/FRTRelID.cpp" +// Biff12_unions + #include "../Source/XlsbFormat/Biff12_unions/FRT.cpp" + #include "../Source/XlsbFormat/Biff12_unions/ACUID.cpp" + #include "../Source/XlsbFormat/Biff12_unions/ACABSPATH.cpp" + #include "../Source/XlsbFormat/Biff12_unions/BOOKVIEWS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/BUNDLESHS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/FNGROUP.cpp" + #include "../Source/XlsbFormat/Biff12_unions/EXTERNALS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SUP.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SUPSAME.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SUPADDIN.cpp" + #include "../Source/XlsbFormat/Biff12_unions/COLINFOS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/HLINKS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/MERGECELLS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/CELLTABLE.cpp" + #include "../Source/XlsbFormat/Biff12_unions/ACCELLTABLE.cpp" + #include "../Source/XlsbFormat/Biff12_unions/CELL.cpp" + #include "../Source/XlsbFormat/Biff12_unions/DATACELL.cpp" + #include "../Source/XlsbFormat/Biff12_unions/FMLACELL.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SHRFMLACELL.cpp" + #include "../Source/XlsbFormat/Biff12_unions/TABLECELL.cpp" + #include "../Source/XlsbFormat/Biff12_unions/CELLMETA.cpp" + #include "../Source/XlsbFormat/Biff12_unions/WSVIEW2.cpp" + #include "../Source/XlsbFormat/Biff12_unions/WSVIEWS2.cpp" + #include "../Source/XlsbFormat/Biff12_unions/LISTPARTS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/RICHSORTCONDITION.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SORTCOND14.cpp" + #include "../Source/XlsbFormat/Biff12_unions/ACSORTCONDS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SORTCOND.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SORTCONDS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SORTSTATE.cpp" + #include "../Source/XlsbFormat/Biff12_unions/uCFVO.cpp" + #include "../Source/XlsbFormat/Biff12_unions/ICONSET.cpp" + #include "../Source/XlsbFormat/Biff12_unions/DATABAR.cpp" + #include "../Source/XlsbFormat/Biff12_unions/COLORSCALE.cpp" + #include "../Source/XlsbFormat/Biff12_unions/FRTCFRULE.cpp" + #include "../Source/XlsbFormat/Biff12_unions/CFRULE.cpp" + #include "../Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING.cpp" + #include "../Source/XlsbFormat/Biff12_unions/CFRULE14.cpp" + #include "../Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.cpp" + #include "../Source/XlsbFormat/Biff12_unions/COLORSCALE14.cpp" + #include "../Source/XlsbFormat/Biff12_unions/DATABAR14.cpp" + #include "../Source/XlsbFormat/Biff12_unions/ICONSET14.cpp" + #include "../Source/XlsbFormat/Biff12_unions/uCFVO14.cpp" + #include "../Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTINGS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/FRTWORKSHEET.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SHAREDSTRINGS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/ACFMT.cpp" + #include "../Source/XlsbFormat/Biff12_unions/FMTS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/FONTS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/FILLS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/BORDERS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/CELLSTYLEXFS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/CELLXFS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/STYLES.cpp" + #include "../Source/XlsbFormat/Biff12_unions/DXFS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/DXF.cpp" + #include "../Source/XlsbFormat/Biff12_unions/FRTDXF.cpp" + #include "../Source/XlsbFormat/Biff12_unions/TABLESTYLES.cpp" + #include "../Source/XlsbFormat/Biff12_unions/TABLESTYLE.cpp" + #include "../Source/XlsbFormat/Biff12_unions/MRUCOLORS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/INDEXEDCOLORS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/COLORPALETTE.cpp" + #include "../Source/XlsbFormat/Biff12_unions/DXF14S.cpp" + #include "../Source/XlsbFormat/Biff12_unions/DXFS15.cpp" + #include "../Source/XlsbFormat/Biff12_unions/TIMELINESTYLE.cpp" + #include "../Source/XlsbFormat/Biff12_unions/TIMELINESTYLES.cpp" + #include "../Source/XlsbFormat/Biff12_unions/STYLESHEET15.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SLICERSTYLE.cpp" + #include "../Source/XlsbFormat/Biff12_unions/SLICERSTYLES.cpp" + #include "../Source/XlsbFormat/Biff12_unions/STYLESHEET14.cpp" + #include "../Source/XlsbFormat/Biff12_unions/FRTSTYLESHEET.cpp" + #include "../Source/XlsbFormat/Biff12_unions/COMMENT.cpp" + #include "../Source/XlsbFormat/Biff12_unions/COMMENTLIST.cpp" + #include "../Source/XlsbFormat/Biff12_unions/COMMENTAUTHORS.cpp" + #include "../Source/XlsbFormat/Biff12_unions/COMMENTS.cpp" diff --git a/Common/DocxFormat/DocxFormatLib/xlsxformatlib_logic.cpp b/Common/DocxFormat/DocxFormatLib/xlsxformatlib_logic.cpp index c17cde7812..bf23bf9af5 100644 --- a/Common/DocxFormat/DocxFormatLib/xlsxformatlib_logic.cpp +++ b/Common/DocxFormat/DocxFormatLib/xlsxformatlib_logic.cpp @@ -50,4 +50,4 @@ #include "../Source/XlsxFormat/Slicer/SlicerCacheExt.cpp" #include "../Source/XlsxFormat/Slicer/Slicer.cpp" #include "../Source/XlsxFormat/NamedSheetViews/NamedSheetViews.cpp" -#include "../Source/XlsbFormat/Biff12RecordFactory.cpp" + diff --git a/Common/DocxFormat/Projects/DocxFormatLib.vcxproj b/Common/DocxFormat/Projects/DocxFormatLib.vcxproj index 761d77f012..4b5940edf1 100644 --- a/Common/DocxFormat/Projects/DocxFormatLib.vcxproj +++ b/Common/DocxFormat/Projects/DocxFormatLib.vcxproj @@ -235,25 +235,6 @@ - - - - - - - - - - - - - - - - - - - @@ -347,83 +328,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -434,10 +497,21 @@ + + + + + + + + + + + @@ -451,45 +525,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -583,14 +697,6 @@ - - - - - - - - @@ -747,80 +853,162 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -829,10 +1017,21 @@ + + + + + + + + + + + @@ -845,45 +1044,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Common/DocxFormat/Projects/DocxFormatLib.vcxproj.filters b/Common/DocxFormat/Projects/DocxFormatLib.vcxproj.filters index aa2bb39e79..5c79b41306 100644 --- a/Common/DocxFormat/Projects/DocxFormatLib.vcxproj.filters +++ b/Common/DocxFormat/Projects/DocxFormatLib.vcxproj.filters @@ -97,9 +97,6 @@ {547fea33-88e2-4642-9c2a-c290c3405e3e} - - {548a010c-e7a5-43ed-ae81-770c2e93141a} - {bf396d1c-4838-484f-bbc6-1398bb363c27} @@ -345,63 +342,6 @@ Utility\FileSys - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - Comments @@ -1171,6 +1111,405 @@ XlsxFormat\Xlsb Format\Records + + XlsxFormat\Xlsb Format + + + XlsxFormat\Xlsb Format + + + XlsxFormat\Xlsb Format + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + @@ -1233,30 +1572,6 @@ Utility\FileSys - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - - - Common - Comments @@ -1807,5 +2122,404 @@ XlsxFormat\Xlsb Format\Records + + XlsxFormat\Xlsb Format + + + XlsxFormat\Xlsb Format + + + XlsxFormat\Xlsb Format + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Records + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Structures + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + + + XlsxFormat\Xlsb Format\Unions + \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/AbstractConverter.h b/Common/DocxFormat/Source/Common/AbstractConverter.h deleted file mode 100644 index f46b06dc90..0000000000 --- a/Common/DocxFormat/Source/Common/AbstractConverter.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef ABSTRACT_CONVERTER_INCLUDE_H_ -#define ABSTRACT_CONVERTER_INCLUDE_H_ - -#include -#include - - -template -class AbstractConverter : private boost::noncopyable -{ -public: - AbstractConverter(const boost::filesystem::wpath& originPath) - { - m_origin.read(originPath); - } - -public: - const bool isInputValid(const boost::filesystem::wpath& path) const - { - return m_input.isValid(path); - } - - const bool isOriginValid(const boost::filesystem::wpath& path) const - { - return m_origin.isValid(path); - } - - const bool isOutputValid(const boost::filesystem::wpath& path) const - { - return m_output.isValid(path); - } - - void read(const boost::filesystem::wpath& path) - { - m_input.read(path); - } - - void write(const boost::filesystem::wpath& path) const - { - m_output.write(path); - } - -protected: - typedef AbstractConverter base; - -protected: - Input m_input; - Output m_output; - Output m_origin; -}; - -#endif // ABSTRACT_CONVERTER_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Align.cpp b/Common/DocxFormat/Source/Common/Align.cpp deleted file mode 100644 index 5b13c7729a..0000000000 --- a/Common/DocxFormat/Source/Common/Align.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#include "Align.h" - - -namespace Common -{ - - Align::Align() - : m_type(right) - { - } - - - const Align::Type Align::type() const - { - return m_type; - } - - - const Align Align::Right() - { - return Align(right); - } - - - const Align Align::Left() - { - return Align(left); - } - - - const Align Align::Center() - { - return Align(center); - } - - - const Align Align::Both() - { - return Align(both); - } - - - const bool Align::isRight() const - { - return m_type == right; - } - - - const bool Align::isLeft() const - { - return m_type == left; - } - - - const bool Align::isCenter() const - { - return m_type == center; - } - - - const bool Align::isBoth() const - { - return m_type == both; - } - - - void Align::setRight() - { - m_type = right; - } - - - void Align::setLeft() - { - m_type = left; - } - - - void Align::setCenter() - { - m_type = center; - } - - - void Align::setBoth() - { - m_type = both; - } - - - Align::Align(const Align::Type type) - : m_type(type) - { - } - - - void Align::fromBase(const Align& align) - { - m_type = align.m_type; - } - -} // namespace Common \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Align.h b/Common/DocxFormat/Source/Common/Align.h deleted file mode 100644 index 2cd4d0051b..0000000000 --- a/Common/DocxFormat/Source/Common/Align.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef COMMON_ALIGN_INCLUDE_H_ -#define COMMON_ALIGN_INCLUDE_H_ - - -namespace Common -{ - class Align - { - public: - Align(); - - enum Type - { - right, - left, - center, - both - }; - - public: - const Type type() const; - - public: - static const Align Right(); - static const Align Left(); - static const Align Center(); - static const Align Both(); - - public: - const bool isRight() const; - const bool isLeft() const; - const bool isCenter() const; - const bool isBoth() const; - - public: - void setRight(); - void setLeft(); - void setCenter(); - void setBoth(); - - protected: - Type m_type; - - protected: - Align(const Type type); - void fromBase(const Align& align); - }; -} // namespace Common - -#endif // COMMON_ALIGN_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Color.cpp b/Common/DocxFormat/Source/Common/Color.cpp deleted file mode 100644 index d48bdbb921..0000000000 --- a/Common/DocxFormat/Source/Common/Color.cpp +++ /dev/null @@ -1,61 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#include "Color.h" - - -namespace Common -{ - - Color::Color() - : Red(0x00), - Green(0x00), - Blue(0x00) - { - } - - - Color::Color(const int red, const int green, const int blue) - : Red(red), - Green(green), - Blue(blue) - { - } - - - void Color::fromBase(const Color& color) - { - Red = color.Red; - Green = color.Green; - Blue = color.Blue; - } - -} // namespace Common \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Color.h b/Common/DocxFormat/Source/Common/Color.h deleted file mode 100644 index 1229273163..0000000000 --- a/Common/DocxFormat/Source/Common/Color.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef COMMON_COLOR_INCLUDE_H_ -#define COMMON_COLOR_INCLUDE_H_ - -namespace Common -{ - class Color - { - public: - Color(); - Color(const int red, const int green, const int blue); - - public: - unsigned char Red; - unsigned char Green; - unsigned char Blue; - - protected: - void fromBase(const Color& color); - }; -} // namespace Common - -#endif // COMMON_COLOR_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Common.h b/Common/DocxFormat/Source/Common/Common.h deleted file mode 100644 index c10606e8dc..0000000000 --- a/Common/DocxFormat/Source/Common/Common.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef COMMON_COMMON_INCLUDE_H_ -#define COMMON_COMMON_INCLUDE_H_ - -#include "Align.h" -#include "Color.h" -#include "Index.h" -#include "Point.h" -#include "Size.h" -#include "NumFormat.h" -#include "Position.h" -#include "Wrap.h" -#include "ZIndex.h" - - -#endif // COMMON_COMMON_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Index.cpp b/Common/DocxFormat/Source/Common/Index.cpp deleted file mode 100644 index 8b54e9a636..0000000000 --- a/Common/DocxFormat/Source/Common/Index.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#include "Index.h" - - -namespace Common -{ - - Index::Index() - : m_type(normal) - { - } - - - const Index::Type Index::type() const - { - return m_type; - } - - - const Index Index::Super() - { - return Index(super); - } - - - const Index Index::Normal() - { - return Index(normal); - } - - - const Index Index::Sub() - { - return Index(sub); - } - - - const bool Index::isSuper() const - { - return m_type == super; - } - - - const bool Index::isNormal() const - { - return m_type == normal; - } - - - const bool Index::isSub() const - { - return m_type == sub; - } - - - void Index::setSuper() - { - m_type = super; - } - - - void Index::setNormal() - { - m_type = normal; - } - - - void Index::setSub() - { - m_type = sub; - } - - - Index::Index(const Index::Type type) - : m_type(type) - { - } - - - void Index::fromBase(const Index& index) - { - m_type = index.m_type; - } - -} // namespace Common \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Index.h b/Common/DocxFormat/Source/Common/Index.h deleted file mode 100644 index 69549a298e..0000000000 --- a/Common/DocxFormat/Source/Common/Index.h +++ /dev/null @@ -1,78 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef COMMON_INDEX_INCLUDE_H_ -#define COMMON_INDEX_INCLUDE_H_ - - -namespace Common -{ - class Index - { - public: - Index(); - - enum Type - { - super, - normal, - sub - }; - - public: - const Type type() const; - - public: - static const Index Super(); - static const Index Normal(); - static const Index Sub(); - - public: - const bool isSuper() const; - const bool isNormal() const; - const bool isSub() const; - - public: - void setSuper(); - void setNormal(); - void setSub(); - - protected: - Type m_type; - - protected: - Index(const Type type); - void fromBase(const Index& index); - }; -} // namespace Common - -#endif // COMMON_INDEX_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/NumFormat.cpp b/Common/DocxFormat/Source/Common/NumFormat.cpp deleted file mode 100644 index b68522325a..0000000000 --- a/Common/DocxFormat/Source/Common/NumFormat.cpp +++ /dev/null @@ -1,205 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#include "NumFormat.h" - - -namespace Common -{ - - NumFormat::NumFormat() - : m_type(decimal) - { - } - - - const NumFormat::Type NumFormat::type() const - { - return m_type; - } - - - const NumFormat NumFormat::UpperLetter() - { - return NumFormat(upperLetter); - } - - - const NumFormat NumFormat::LowerLetter() - { - return NumFormat(lowerLetter); - } - - - const NumFormat NumFormat::UpperRoman() - { - return NumFormat(upperRoman); - } - - - const NumFormat NumFormat::LowerRoman() - { - return NumFormat(lowerRoman); - } - - - const NumFormat NumFormat::Decimal() - { - return NumFormat(decimal); - } - - - const NumFormat NumFormat::Symbol() - { - return NumFormat(symbol); - } - - - const NumFormat NumFormat::Bullet() - { - return NumFormat(bullet); - } - - - const NumFormat NumFormat::Chicago() - { - return NumFormat(chicago); - } - - - const bool NumFormat::isUpperLetter() const - { - return m_type == upperLetter; - } - - - const bool NumFormat::isLowerLetter() const - { - return m_type == lowerLetter; - } - - - const bool NumFormat::isUpperRoman() const - { - return m_type == upperRoman; - } - - - const bool NumFormat::isLowerRoman() const - { - return m_type == lowerRoman; - } - - - const bool NumFormat::isDecimal() const - { - return m_type == decimal; - } - - - const bool NumFormat::isSymbol() const - { - return m_type == symbol; - } - - - const bool NumFormat::isBullet() const - { - return m_type == bullet; - } - - - const bool NumFormat::isChicago() const - { - return m_type == chicago; - } - - - void NumFormat::setUpperLetter() - { - m_type = upperLetter; - } - - - void NumFormat::setLowerLetter() - { - m_type = lowerLetter; - } - - - void NumFormat::setUpperRoman() - { - m_type = upperRoman; - } - - - void NumFormat::setLowerRoman() - { - m_type = lowerRoman; - } - - - void NumFormat::setDecimal() - { - m_type = decimal; - } - - - void NumFormat::setSymbol() - { - m_type = symbol; - } - - - void NumFormat::setBullet() - { - m_type = bullet; - } - - - void NumFormat::setChicago() - { - m_type = chicago; - } - - - NumFormat::NumFormat(const NumFormat::Type type) - : m_type(type) - { - } - - - void NumFormat::fromBase(const NumFormat& numFormat) - { - m_type = numFormat.m_type; - } - -} // namespace Common \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/NumFormat.h b/Common/DocxFormat/Source/Common/NumFormat.h deleted file mode 100644 index bc7acf4229..0000000000 --- a/Common/DocxFormat/Source/Common/NumFormat.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef COMMON_NUM_FORMAT_INCLUDE_H_ -#define COMMON_NUM_FORMAT_INCLUDE_H_ - - -namespace Common -{ - class NumFormat - { - public: - NumFormat(); - - //TODO: Add other types - enum Type - { - upperLetter, - lowerLetter, - upperRoman, - lowerRoman, - decimal, - symbol, - bullet, - chicago - }; - - public: - const Type type() const; - - public: - static const NumFormat UpperLetter(); - static const NumFormat LowerLetter(); - static const NumFormat UpperRoman(); - static const NumFormat LowerRoman(); - static const NumFormat Decimal(); - static const NumFormat Symbol(); - static const NumFormat Bullet(); - static const NumFormat Chicago(); - - public: - const bool isUpperLetter() const; - const bool isLowerLetter() const; - const bool isUpperRoman() const; - const bool isLowerRoman() const; - const bool isDecimal() const; - const bool isSymbol() const; - const bool isBullet() const; - const bool isChicago() const; - - public: - void setUpperLetter(); - void setLowerLetter(); - void setUpperRoman(); - void setLowerRoman(); - void setDecimal(); - void setSymbol(); - void setBullet(); - void setChicago(); - - protected: - Type m_type; - - protected: - NumFormat(const Type type); - void fromBase(const NumFormat& numFormat); - }; -} // namespace Common - -#endif // COMMON_NUM_FORMAT_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Point.h b/Common/DocxFormat/Source/Common/Point.h deleted file mode 100644 index 1c547564db..0000000000 --- a/Common/DocxFormat/Source/Common/Point.h +++ /dev/null @@ -1,102 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef COMMON_POINT_INCLUDE_H_ -#define COMMON_POINT_INCLUDE_H_ - -#include "Unit.h" -#include "property.h" -#include "nullable_property.h" -#include "XML.h" - - -namespace Common -{ - template - class Point - { - public: - Point() {}; - - template - Point(const XType& x, const YType& y) - : X(x), Y(y) - { - } - - template - Point(const OtherUnit& rhs) - : X(rhs.X), Y(rhs.Y) - { - } - - template - const Point& operator =(const OtherUnit& rhs) - { - X = ths.X; - Y = ths.Y; - return *this; - } - - public: - property X; - property Y; - }; -} // namespace Common - - -namespace XML -{ - template - const Common::Point XElement2Point(const XML::XElement& element, const std::string& x, const std::string& y) - { - Common::Point point; - point.X = element.attribute(x).value().ToString(); - point.Y = element.attribute(y).value().ToString(); - return point; - } - - template - const nullable > XElement2NullablePoint(const XML::XElement& element, const std::string& x, const std::string& y) - { - nullable > point; - if (element.attribute(x).exist() || element.attribute(y).exist()) - point.init(); - if (element.attribute(x).exist()) - point->X = element.attribute(x).value().ToString(); - if (element.attribute(y).exist()) - point->Y = element.attribute(y).value().ToString(); - return point; - } -} // namespace XML - -#endif // COMMON_POINT_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Position.cpp b/Common/DocxFormat/Source/Common/Position.cpp deleted file mode 100644 index 13f6dfa88c..0000000000 --- a/Common/DocxFormat/Source/Common/Position.cpp +++ /dev/null @@ -1,97 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#include "Position.h" - - -namespace Common -{ - - Position::Position() - : m_type(foreground) - { - } - - - const Position::Type Position::type() const - { - return m_type; - } - - - const Position Position::Background() - { - return Position(background); - } - - - const Position Position::Foreground() - { - return Position(foreground); - } - - - const bool Position::isBackground() const - { - return m_type == background; - } - - - const bool Position::isForeground() const - { - return m_type == foreground; - } - - - void Position::setBackground() - { - m_type = background; - } - - - void Position::setForeground() - { - m_type = foreground; - } - - - Position::Position(const Position::Type type) - : m_type(type) - { - } - - - void Position::fromBase(const Position& position) - { - m_type = position.m_type; - } - -} // namespace Common \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Position.h b/Common/DocxFormat/Source/Common/Position.h deleted file mode 100644 index b0631286b7..0000000000 --- a/Common/DocxFormat/Source/Common/Position.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef COMMON_POSITION_INCLUDE_H_ -#define COMMON_POSITION_INCLUDE_H_ - - -namespace Common -{ - class Position - { - public: - Position(); - - enum Type - { - background, - foreground - }; - - public: - const Type type() const; - - public: - static const Position Background(); - static const Position Foreground(); - - public: - const bool isBackground() const; - const bool isForeground() const; - - public: - void setBackground(); - void setForeground(); - - protected: - Type m_type; - - protected: - Position(const Type type); - void fromBase(const Position& position); - }; -} // namespace Common - -#endif // COMMON_POSITION_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Size.h b/Common/DocxFormat/Source/Common/Size.h deleted file mode 100644 index 3223d3bd21..0000000000 --- a/Common/DocxFormat/Source/Common/Size.h +++ /dev/null @@ -1,102 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef COMMON_SIZE_INCLUDE_H_ -#define COMMON_SIZE_INCLUDE_H_ - -#include "Unit.h" -#include "property.h" -#include "nullable_property.h" -#include "XML.h" - - -namespace Common -{ - template - class Size - { - public: - Size() {} - - template - Size(const HeightType& height, WidthType width) - : Height(height), Width(width) - { - } - - template - Size(const OtherUnit& rhs) - : Height(rhs.Height), Width(rhs.Width) - { - } - - template - const Size& operator =(const OtherUnit& rhs) - { - Height = ths.Height; - Width = ths.Width; - return *this; - } - - public: - property Height; - property Width; - }; -} // namespace Common - - -namespace XML -{ - template - const Common::Size XElement2Size(const XML::XElement& element, const std::string& height, const std::string& width) - { - Common::Size size; - size.Height = element.attribute(height).value().ToString(); - size.Width = element.attribute(width).value().ToString(); - return size; - } - - template - const nullable > XElement2NullableSize(const XML::XElement& element, const std::string& height, const std::string& width) - { - nullable > size; - if (element.attribute(height).exist() || element.attribute(width).exist()) - size.init(); - if (element.attribute(height).exist()) - size->Height = element.attribute(height).value().ToString(); - if (element.attribute(width).exist()) - size->Width = element.attribute(width).value().ToString(); - return size; - } -} // namespace XML - -#endif // COMMON_SIZE_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Wrap.cpp b/Common/DocxFormat/Source/Common/Wrap.cpp deleted file mode 100644 index 61c5ba88cc..0000000000 --- a/Common/DocxFormat/Source/Common/Wrap.cpp +++ /dev/null @@ -1,133 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#include "Wrap.h" - - -namespace Common -{ - - Wrap::Wrap() - : m_type(square) - { - } - - - const Wrap::Type Wrap::type() const - { - return m_type; - } - - - const Wrap Wrap::Square() - { - return Wrap(square); - } - - - const Wrap Wrap::Tight() - { - return Wrap(tight); - } - - - const Wrap Wrap::TopAndBottom() - { - return Wrap(topAndBottom); - } - - - const Wrap Wrap::None() - { - return Wrap(none); - } - - - const bool Wrap::isSquare() const - { - return m_type == square; - } - - - const bool Wrap::isTight() const - { - return m_type == tight; - } - - - const bool Wrap::isTopAndBottom() const - { - return m_type == topAndBottom; - } - - - const bool Wrap::isNone() const - { - return m_type == none; - } - - - void Wrap::setSquare() - { - m_type = square; - } - - - void Wrap::setTight() - { - m_type = tight; - } - - - void Wrap::setTopAndBottom() - { - m_type = topAndBottom; - } - - - void Wrap::setNone() - { - m_type = none; - } - - - Wrap::Wrap(const Wrap::Type type) - : m_type(type) - { - } - - - void Wrap::fromBase(const Wrap& wrap) - { - m_type = wrap.m_type; - } - -} // namespace Common \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/Wrap.h b/Common/DocxFormat/Source/Common/Wrap.h deleted file mode 100644 index cb61cdf943..0000000000 --- a/Common/DocxFormat/Source/Common/Wrap.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef COMMON_WRAP_INCLUDE_H_ -#define COMMON_WRAP_INCLUDE_H_ - - -namespace Common -{ - class Wrap - { - public: - Wrap(); - - enum Type - { - square, - tight, - topAndBottom, - none - }; - - public: - const Type type() const; - - public: - static const Wrap Square(); - static const Wrap Tight(); - static const Wrap TopAndBottom(); - static const Wrap None(); - - public: - const bool isSquare() const; - const bool isTight() const; - const bool isTopAndBottom() const; - const bool isNone() const; - - public: - void setSquare(); - void setTight(); - void setTopAndBottom(); - void setNone(); - - protected: - Type m_type; - - protected: - Wrap(const Type type); - void fromBase(const Wrap& wrap); - }; -} // namespace Common - -#endif // COMMON_WRAP_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/ZIndex.cpp b/Common/DocxFormat/Source/Common/ZIndex.cpp deleted file mode 100644 index e28b6b4477..0000000000 --- a/Common/DocxFormat/Source/Common/ZIndex.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#include "ZIndex.h" - - -namespace Common -{ - - ZIndex::ZIndex() - : Index(0) - { - } - - - ZIndex::ZIndex(const int& index) - : Index(index) - { - } - - - void ZIndex::fromBase(const ZIndex& zIndex) - { - Index = zIndex.Index; - } - -} // namespace Common \ No newline at end of file diff --git a/Common/DocxFormat/Source/Common/ZIndex.h b/Common/DocxFormat/Source/Common/ZIndex.h deleted file mode 100644 index 2aa93d72f6..0000000000 --- a/Common/DocxFormat/Source/Common/ZIndex.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2019 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha - * street, Riga, Latvia, EU, LV-1050. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#pragma once -#ifndef COMMON_Z_INDEX_INCLUDE_H_ -#define COMMON_Z_INDEX_INCLUDE_H_ - -namespace Common -{ - class ZIndex - { - public: - ZIndex(); - ZIndex(const int& index); - - public: - int Index; - - protected: - void fromBase(const ZIndex& zIndex); - }; -} // namespace Common - -#endif // COMMON_Z_INDEX_INCLUDE_H_ \ No newline at end of file diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACBegin.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACBegin.cpp index 4c634d6da2..c59757fb45 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACBegin.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACBegin.cpp @@ -33,6 +33,8 @@ #include "ACBegin.h" #include "../Biff12_structures/ACProductVersion.h" +using namespace XLS; + namespace XLSB { @@ -49,7 +51,7 @@ namespace XLSB return BaseObjectPtr(new ACBegin(*this)); } - void ACBegin::readFields(CFRecord& record) + void ACBegin::readFields(XLS::CFRecord& record) { record >> cver; for(int i = 0; i < cver; ++i) diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACBegin.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACBegin.h index 2736693df5..da1feb3ba2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACBegin.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACBegin.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtACBegin record in BIFF12 - class ACBegin: public BiffRecord + class ACBegin: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(ACBegin) BASE_OBJECT_DEFINE_CLASS_NAME(ACBegin) @@ -47,12 +45,12 @@ namespace XLSB ACBegin(); virtual ~ACBegin(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT16 cver; - BiffStructurePtrVector RgACVer; + XLS::BiffStructurePtrVector RgACVer; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACEnd.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACEnd.cpp index cf3e2ac3fe..8af85f5cae 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACEnd.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACEnd.cpp @@ -32,6 +32,8 @@ #include "ACEnd.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new ACEnd(*this)); } - void ACEnd::readFields(CFRecord& record) + void ACEnd::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACEnd.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACEnd.h index 126033676b..7edeb9f5e9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACEnd.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACEnd.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtACEnd record in BIFF12 - class ACEnd: public BiffRecord + class ACEnd: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(ACEnd) BASE_OBJECT_DEFINE_CLASS_NAME(ACEnd) @@ -47,11 +45,11 @@ namespace XLSB ACEnd(); virtual ~ACEnd(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeACEnd; + //static const XLS::ElementType type = XLS::typeACEnd; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/AbsPath15.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/AbsPath15.cpp index cc326f5ba8..2d6ffa30bf 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/AbsPath15.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/AbsPath15.cpp @@ -32,6 +32,8 @@ #include "AbsPath15.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new AbsPath15(*this)); } - void AbsPath15::readFields(CFRecord& record) + void AbsPath15::readFields(XLS::CFRecord& record) { record >> stAbsPath; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/AbsPath15.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/AbsPath15.h index 3c0a8a0748..ff761fcadc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/AbsPath15.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/AbsPath15.h @@ -31,16 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; namespace XLSB { // Logical representation of BrtAbsPath15 record in BIFF12 - class AbsPath15: public BiffRecord + class AbsPath15: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(AbsPath15) BASE_OBJECT_DEFINE_CLASS_NAME(AbsPath15) @@ -48,9 +47,9 @@ namespace XLSB AbsPath15(); virtual ~AbsPath15(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); XLWideString stAbsPath; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBook.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBook.cpp index 647d685f69..138feab903 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBook.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBook.cpp @@ -32,6 +32,8 @@ #include "BeginBook.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginBook(*this)); } - void BeginBook::readFields(CFRecord& record) + void BeginBook::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBook.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBook.h index eddc67110d..0361655cc8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBook.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBook.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginBook record in BIFF12 - class BeginBook: public BiffRecord + class BeginBook: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginBook) BASE_OBJECT_DEFINE_CLASS_NAME(BeginBook) @@ -47,11 +45,11 @@ namespace XLSB BeginBook(); virtual ~BeginBook(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginBook; + //static const XLS::ElementType type = XLS::typeBeginBook; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBookViews.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBookViews.cpp index 1d3be65800..e0fe356498 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBookViews.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBookViews.cpp @@ -32,6 +32,8 @@ #include "BeginBookViews.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginBookViews(*this)); } - void BeginBookViews::readFields(CFRecord& record) + void BeginBookViews::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBookViews.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBookViews.h index 32ddaf5088..5a1db38d79 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBookViews.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBookViews.h @@ -31,16 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" - -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginBookViews record in BIFF12 - class BeginBookViews: public BiffRecord + class BeginBookViews: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginBookViews) BASE_OBJECT_DEFINE_CLASS_NAME(BeginBookViews) @@ -48,9 +45,9 @@ namespace XLSB BeginBookViews(); virtual ~BeginBookViews(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBorders.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBorders.cpp index c349c5c130..1c5ad8910d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBorders.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBorders.cpp @@ -32,6 +32,8 @@ #include "BeginBorders.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginBorders(*this)); } - void BeginBorders::readFields(CFRecord& record) + void BeginBorders::readFields(XLS::CFRecord& record) { record >> cborders; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBorders.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBorders.h index 4f6fdf4517..a36377c6da 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBorders.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBorders.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginBorders record in BIFF12 - class BeginBorders: public BiffRecord + class BeginBorders: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginBorders) BASE_OBJECT_DEFINE_CLASS_NAME(BeginBorders) @@ -47,9 +45,9 @@ namespace XLSB BeginBorders(); virtual ~BeginBorders(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cborders; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBundleShs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBundleShs.cpp index ab18b4976b..da99def5ad 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBundleShs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBundleShs.cpp @@ -32,6 +32,8 @@ #include "BeginBundleShs.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginBundleShs(*this)); } - void BeginBundleShs::readFields(CFRecord& record) + void BeginBundleShs::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBundleShs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBundleShs.h index 81e550bb2c..6360cfb731 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBundleShs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBundleShs.h @@ -31,16 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" - -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginBundleShs record in BIFF12 - class BeginBundleShs: public BiffRecord + class BeginBundleShs: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginBundleShs) BASE_OBJECT_DEFINE_CLASS_NAME(BeginBundleShs) @@ -48,9 +45,9 @@ namespace XLSB BeginBundleShs(); virtual ~BeginBundleShs(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule.cpp index 123f56ce92..0df1e64880 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule.cpp @@ -32,6 +32,8 @@ #include "BeginCFRule.h" +using namespace XLS; + namespace XLSB { @@ -51,7 +53,7 @@ namespace XLSB return BaseObjectPtr(new BeginCFRule(*this)); } - void BeginCFRule::readFields(CFRecord& record) + void BeginCFRule::readFields(XLS::CFRecord& record) { record >> iType >> iTemplate >> dxfId >> iPri >> iParam; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule.h index 7a5a9bb580..9ca9190f3a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule.h @@ -31,36 +31,34 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/CFType.h" #include "../Biff12_structures/CFTemp.h" -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/DXFId.h" #include "../Biff12_structures/XLWideString.h" -#include - -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CFParsedFormula.h" namespace XLSB { // Logical representation of BrtBeginCFRule record in BIFF12 - class BeginCFRule: public BiffRecord + class BeginCFRule: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginCFRule) BASE_OBJECT_DEFINE_CLASS_NAME(BeginCFRule) public: - BeginCFRule(const CellRef& cell_base_ref); + BeginCFRule(const XLS::CellRef& cell_base_ref); virtual ~BeginCFRule(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeBeginCFRule; + static const XLS::ElementType type = XLS::typeBeginCFRule; - CFType iType; - CFTemp iTemplate; + XLS::CFType iType; + XLS::CFTemp iTemplate; _UINT32 dxfId; _INT32 iPri; _UINT32 iParam; @@ -73,9 +71,9 @@ namespace XLSB _UINT32 cbFmla2; _UINT32 cbFmla3; XLNullableWideString strParam; - CFParsedFormula rgce1; - CFParsedFormula rgce2; - CFParsedFormula rgce3; + XLS::CFParsedFormula rgce1; + XLS::CFParsedFormula rgce2; + XLS::CFParsedFormula rgce3; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule14.cpp index 9247294ce7..74fc028a1b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule14.cpp @@ -32,6 +32,8 @@ #include "BeginCFRule14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginCFRule14(*this)); } - void BeginCFRule14::readFields(CFRecord& record) + void BeginCFRule14::readFields(XLS::CFRecord& record) { record >> FRTheader >> iType >> iTemplate >> dxfId >> iPri >> iParam; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule14.h index 601de5c2db..9cb584c5ab 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule14.h @@ -31,22 +31,20 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/CFType.h" #include "../Biff12_structures/CFTemp.h" -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/DXFId.h" #include "../Biff12_structures/XLWideString.h" -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CFParsedFormula.h" #include "../Biff12_structures/FRTHeader.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginCFRule14 record in BIFF12 - class BeginCFRule14: public BiffRecord + class BeginCFRule14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginCFRule14) BASE_OBJECT_DEFINE_CLASS_NAME(BeginCFRule14) @@ -54,15 +52,15 @@ namespace XLSB BeginCFRule14(); virtual ~BeginCFRule14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeBeginCFRule14; + static const XLS::ElementType type = XLS::typeBeginCFRule14; - FRTHeader FRTheader; - CFType iType; - CFTemp iTemplate; + FRTHeader FRTheader; + XLS::CFType iType; + XLS::CFTemp iTemplate; _UINT32 dxfId; _INT32 iPri; _UINT32 iParam; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellStyleXFs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellStyleXFs.cpp index b739163b49..2ab896d751 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellStyleXFs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellStyleXFs.cpp @@ -32,6 +32,8 @@ #include "BeginCellStyleXFs.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginCellStyleXFs(*this)); } - void BeginCellStyleXFs::readFields(CFRecord& record) + void BeginCellStyleXFs::readFields(XLS::CFRecord& record) { record >> cxfs; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellStyleXFs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellStyleXFs.h index 8434c73ee4..6fb0c92a98 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellStyleXFs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellStyleXFs.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginCellStyleXFs record in BIFF12 - class BeginCellStyleXFs: public BiffRecord + class BeginCellStyleXFs: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginCellStyleXFs) BASE_OBJECT_DEFINE_CLASS_NAME(BeginCellStyleXFs) @@ -47,9 +45,9 @@ namespace XLSB BeginCellStyleXFs(); virtual ~BeginCellStyleXFs(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cxfs; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellXFs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellXFs.cpp index cd8d25e92c..204a8d5f1d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellXFs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellXFs.cpp @@ -32,6 +32,8 @@ #include "BeginCellXFs.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginCellXFs(*this)); } - void BeginCellXFs::readFields(CFRecord& record) + void BeginCellXFs::readFields(XLS::CFRecord& record) { record >> cxfs; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellXFs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellXFs.h index c4e1e3641d..3b82713a6c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellXFs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellXFs.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginCellXFs record in BIFF12 - class BeginCellXFs: public BiffRecord + class BeginCellXFs: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginCellXFs) BASE_OBJECT_DEFINE_CLASS_NAME(BeginCellXFs) @@ -47,9 +45,9 @@ namespace XLSB BeginCellXFs(); virtual ~BeginCellXFs(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cxfs; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColInfos.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColInfos.cpp index ae08a0f72e..ee00024210 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColInfos.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColInfos.cpp @@ -32,6 +32,8 @@ #include "BeginColInfos.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginColInfos(*this)); } - void BeginColInfos::readFields(CFRecord& record) + void BeginColInfos::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColInfos.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColInfos.h index 9d868b81eb..cbd3bdb1ff 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColInfos.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColInfos.h @@ -31,16 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" - -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginColInfos record in BIFF12 - class BeginColInfos: public BiffRecord + class BeginColInfos: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginColInfos) BASE_OBJECT_DEFINE_CLASS_NAME(BeginColInfos) @@ -48,9 +45,9 @@ namespace XLSB BeginColInfos(); virtual ~BeginColInfos(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorPalette.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorPalette.cpp index e66d73fa0f..910de1674e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorPalette.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorPalette.cpp @@ -32,6 +32,8 @@ #include "BeginColorPalette.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginColorPalette(*this)); } - void BeginColorPalette::readFields(CFRecord& record) + void BeginColorPalette::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorPalette.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorPalette.h index 061e032a0a..045b987afe 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorPalette.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorPalette.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginColorPalette record in BIFF12 - class BeginColorPalette: public BiffRecord + class BeginColorPalette: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginColorPalette) BASE_OBJECT_DEFINE_CLASS_NAME(BeginColorPalette) @@ -47,11 +45,11 @@ namespace XLSB BeginColorPalette(); virtual ~BeginColorPalette(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginColorPalette; + //static const XLS::ElementType type = XLS::typeBeginColorPalette; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale.cpp index 99b64f2b47..fe2eed7a86 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale.cpp @@ -32,6 +32,8 @@ #include "BeginColorScale.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginColorScale(*this)); } - void BeginColorScale::readFields(CFRecord& record) + void BeginColorScale::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale.h index bd4050da8d..667cf80ca3 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginColorScale record in BIFF12 - class BeginColorScale: public BiffRecord + class BeginColorScale: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginColorScale) BASE_OBJECT_DEFINE_CLASS_NAME(BeginColorScale) @@ -47,11 +45,11 @@ namespace XLSB BeginColorScale(); virtual ~BeginColorScale(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginColorScale; + //static const XLS::ElementType type = XLS::typeBeginColorScale; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale14.cpp index 5f00b9aba7..a5a8b14fad 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale14.cpp @@ -32,6 +32,8 @@ #include "BeginColorScale14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginColorScale14(*this)); } - void BeginColorScale14::readFields(CFRecord& record) + void BeginColorScale14::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale14.h index fea0383610..7983370545 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale14.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginColorScale14 record in BIFF12 - class BeginColorScale14: public BiffRecord + class BeginColorScale14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginColorScale14) BASE_OBJECT_DEFINE_CLASS_NAME(BeginColorScale14) @@ -47,11 +45,11 @@ namespace XLSB BeginColorScale14(); virtual ~BeginColorScale14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginColorScale14; + //static const XLS::ElementType type = XLS::typeBeginColorScale14; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComment.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComment.cpp index 95c31fe831..07ab11e478 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComment.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComment.cpp @@ -32,6 +32,8 @@ #include "BeginComment.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginComment(*this)); } - void BeginComment::readFields(CFRecord& record) + void BeginComment::readFields(XLS::CFRecord& record) { _GUID_ guid_; record >> iauthor >> rfx >> guid_; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComment.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComment.h index ab0dc2cd6b..c68018408f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComment.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComment.h @@ -31,16 +31,14 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/CellRangeRef.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginComment record in BIFF12 - class BeginComment: public BiffRecord + class BeginComment: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginComment) BASE_OBJECT_DEFINE_CLASS_NAME(BeginComment) @@ -48,9 +46,9 @@ namespace XLSB BeginComment(); virtual ~BeginComment(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _INT32 iauthor; UncheckedRfX rfx; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentAuthors.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentAuthors.cpp index a703da1706..2f26beb99d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentAuthors.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentAuthors.cpp @@ -32,6 +32,8 @@ #include "BeginCommentAuthors.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginCommentAuthors(*this)); } - void BeginCommentAuthors::readFields(CFRecord& record) + void BeginCommentAuthors::readFields(XLS::CFRecord& record) { } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentAuthors.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentAuthors.h index 67edb3e273..e1869d6b28 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentAuthors.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentAuthors.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginCommentAuthors record in BIFF12 - class BeginCommentAuthors: public BiffRecord + class BeginCommentAuthors: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginCommentAuthors) BASE_OBJECT_DEFINE_CLASS_NAME(BeginCommentAuthors) @@ -47,9 +45,9 @@ namespace XLSB BeginCommentAuthors(); virtual ~BeginCommentAuthors(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentList.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentList.cpp index d3faf2ec3c..c1fddac101 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentList.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentList.cpp @@ -32,6 +32,8 @@ #include "BeginCommentList.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginCommentList(*this)); } - void BeginCommentList::readFields(CFRecord& record) + void BeginCommentList::readFields(XLS::CFRecord& record) { } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentList.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentList.h index 6200d1a63e..8c6e836bdb 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentList.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCommentList.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginCommentList record in BIFF12 - class BeginCommentList: public BiffRecord + class BeginCommentList: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginCommentList) BASE_OBJECT_DEFINE_CLASS_NAME(BeginCommentList) @@ -47,9 +45,9 @@ namespace XLSB BeginCommentList(); virtual ~BeginCommentList(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComments.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComments.cpp index 34389537bf..43bbab190a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComments.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComments.cpp @@ -32,6 +32,8 @@ #include "BeginComments.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginComments(*this)); } - void BeginComments::readFields(CFRecord& record) + void BeginComments::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComments.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComments.h index 4e9544e467..ddf817325d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComments.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComments.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginComments record in BIFF12 - class BeginComments: public BiffRecord + class BeginComments: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginComments) BASE_OBJECT_DEFINE_CLASS_NAME(BeginComments) @@ -47,11 +45,11 @@ namespace XLSB BeginComments(); virtual ~BeginComments(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginComments; + //static const XLS::ElementType type = XLS::typeBeginComments; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting.cpp index b17226b8f9..e573abc360 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting.cpp @@ -32,6 +32,8 @@ #include "BeginConditionalFormatting.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginConditionalFormatting(*this)); } - void BeginConditionalFormatting::readFields(CFRecord& record) + void BeginConditionalFormatting::readFields(XLS::CFRecord& record) { record >> ccf >> fPivot >> sqrfx; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting.h index 4e6dc51902..56f6b13402 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting.h @@ -31,17 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/UncheckedSqRfX.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginConditionalFormatting record in BIFF12 - class BeginConditionalFormatting: public BiffRecord + class BeginConditionalFormatting: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginConditionalFormatting) BASE_OBJECT_DEFINE_CLASS_NAME(BeginConditionalFormatting) @@ -49,11 +47,11 @@ namespace XLSB BeginConditionalFormatting(); virtual ~BeginConditionalFormatting(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeBeginConditionalFormatting; + static const XLS::ElementType type = XLS::typeBeginConditionalFormatting; _UINT32 ccf; XLS::Boolean fPivot; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting14.cpp index 1aa6705fae..c3bc910707 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting14.cpp @@ -32,6 +32,8 @@ #include "BeginConditionalFormatting14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginConditionalFormatting14(*this)); } - void BeginConditionalFormatting14::readFields(CFRecord& record) + void BeginConditionalFormatting14::readFields(XLS::CFRecord& record) { record >> FRTheader >> ccf >> fPivot; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting14.h index a224cf5b8c..3757e3d188 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormatting14.h @@ -31,17 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTHeader.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginConditionalFormatting14 record in BIFF12 - class BeginConditionalFormatting14: public BiffRecord + class BeginConditionalFormatting14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginConditionalFormatting14) BASE_OBJECT_DEFINE_CLASS_NAME(BeginConditionalFormatting14) @@ -49,11 +47,11 @@ namespace XLSB BeginConditionalFormatting14(); virtual ~BeginConditionalFormatting14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeBeginConditionalFormatting14; + static const XLS::ElementType type = XLS::typeBeginConditionalFormatting14; FRTHeader FRTheader; _UINT32 ccf; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormattings.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormattings.cpp index 74a23923b2..9da8bfe655 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormattings.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormattings.cpp @@ -32,6 +32,8 @@ #include "BeginConditionalFormattings.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginConditionalFormattings(*this)); } - void BeginConditionalFormattings::readFields(CFRecord& record) + void BeginConditionalFormattings::readFields(XLS::CFRecord& record) { } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormattings.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormattings.h index 2ac5e53e30..01b0f07812 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormattings.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginConditionalFormattings.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginConditionalFormattings record in BIFF12 - class BeginConditionalFormattings: public BiffRecord + class BeginConditionalFormattings: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginConditionalFormattings) BASE_OBJECT_DEFINE_CLASS_NAME(BeginConditionalFormattings) @@ -47,9 +45,9 @@ namespace XLSB BeginConditionalFormattings(); virtual ~BeginConditionalFormattings(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXF14s.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXF14s.cpp index 564d9b4c23..ba3ee90b90 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXF14s.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXF14s.cpp @@ -32,6 +32,8 @@ #include "BeginDXF14s.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginDXF14s(*this)); } - void BeginDXF14s::readFields(CFRecord& record) + void BeginDXF14s::readFields(XLS::CFRecord& record) { record >> FRTheader >> cdxfs; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXF14s.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXF14s.h index 615971b321..a05f699d1e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXF14s.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXF14s.h @@ -31,16 +31,14 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginDXF14s record in BIFF12 - class BeginDXF14s: public BiffRecord + class BeginDXF14s: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginDXF14s) BASE_OBJECT_DEFINE_CLASS_NAME(BeginDXF14s) @@ -48,9 +46,9 @@ namespace XLSB BeginDXF14s(); virtual ~BeginDXF14s(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); FRTBlank FRTheader; _UINT32 cdxfs; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs.cpp index fa47aef802..01442245dd 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs.cpp @@ -32,6 +32,8 @@ #include "BeginDXFs.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginDXFs(*this)); } - void BeginDXFs::readFields(CFRecord& record) + void BeginDXFs::readFields(XLS::CFRecord& record) { record >> cdxfs; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs.h index 9c735aec53..ccc1518ef8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginDXFs record in BIFF12 - class BeginDXFs: public BiffRecord + class BeginDXFs: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginDXFs) BASE_OBJECT_DEFINE_CLASS_NAME(BeginDXFs) @@ -47,9 +45,9 @@ namespace XLSB BeginDXFs(); virtual ~BeginDXFs(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cdxfs; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs15.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs15.cpp index 8b5d29551b..ace3b0bb83 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs15.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs15.cpp @@ -32,6 +32,8 @@ #include "BeginDXFs15.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginDXFs15(*this)); } - void BeginDXFs15::readFields(CFRecord& record) + void BeginDXFs15::readFields(XLS::CFRecord& record) { record >> FRTheader >> cdxfs; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs15.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs15.h index 199055bca4..c645b6f413 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs15.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDXFs15.h @@ -31,16 +31,14 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginDXFs15 record in BIFF12 - class BeginDXFs15: public BiffRecord + class BeginDXFs15: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginDXFs15) BASE_OBJECT_DEFINE_CLASS_NAME(BeginDXFs15) @@ -48,9 +46,9 @@ namespace XLSB BeginDXFs15(); virtual ~BeginDXFs15(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); FRTBlank FRTheader; _UINT32 cdxfs; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar.cpp index 0d5974b077..d0f8886074 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar.cpp @@ -32,6 +32,8 @@ #include "BeginDatabar.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginDatabar(*this)); } - void BeginDatabar::readFields(CFRecord& record) + void BeginDatabar::readFields(XLS::CFRecord& record) { record >> bLenMin >> bLenMax >> fShowValue; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar.h index ac95a82d73..4c42bc93a8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginDatabar record in BIFF12 - class BeginDatabar: public BiffRecord + class BeginDatabar: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginDatabar) BASE_OBJECT_DEFINE_CLASS_NAME(BeginDatabar) @@ -47,11 +45,11 @@ namespace XLSB BeginDatabar(); virtual ~BeginDatabar(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeBeginDatabar; + static const XLS::ElementType type = XLS::typeBeginDatabar; BYTE bLenMin; BYTE bLenMax; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar14.cpp index f34c8fc796..3a4be11f3b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar14.cpp @@ -32,6 +32,8 @@ #include "BeginDatabar14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginDatabar14(*this)); } - void BeginDatabar14::readFields(CFRecord& record) + void BeginDatabar14::readFields(XLS::CFRecord& record) { record >> FRTheader >> bLenMin >> bLenMax >> fShowValue >> bDirection >> bAxisPosType; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar14.h index d4142f8cc3..6bdcd57418 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginDatabar14.h @@ -31,16 +31,14 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginDatabar14 record in BIFF12 - class BeginDatabar14: public BiffRecord + class BeginDatabar14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginDatabar14) BASE_OBJECT_DEFINE_CLASS_NAME(BeginDatabar14) @@ -48,11 +46,11 @@ namespace XLSB BeginDatabar14(); virtual ~BeginDatabar14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeBeginDatabar14; + static const XLS::ElementType type = XLS::typeBeginDatabar14; FRTBlank FRTheader; BYTE bLenMin; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginExternals.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginExternals.cpp index 88d8021409..2641550fe4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginExternals.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginExternals.cpp @@ -32,6 +32,8 @@ #include "BeginExternals.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginExternals(*this)); } - void BeginExternals::readFields(CFRecord& record) + void BeginExternals::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginExternals.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginExternals.h index 843bc0d062..77c1525344 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginExternals.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginExternals.h @@ -31,16 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" - -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginExternals record in BIFF12 - class BeginExternals: public BiffRecord + class BeginExternals: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginExternals) BASE_OBJECT_DEFINE_CLASS_NAME(BeginExternals) @@ -48,9 +45,9 @@ namespace XLSB BeginExternals(); virtual ~BeginExternals(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFills.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFills.cpp index 5ab1910b87..fcce126e78 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFills.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFills.cpp @@ -32,6 +32,8 @@ #include "BeginFills.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginFills(*this)); } - void BeginFills::readFields(CFRecord& record) + void BeginFills::readFields(XLS::CFRecord& record) { record >> cfills; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFills.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFills.h index 875731d1a5..1c3151f001 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFills.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFills.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginFills record in BIFF12 - class BeginFills: public BiffRecord + class BeginFills: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginFills) BASE_OBJECT_DEFINE_CLASS_NAME(BeginFills) @@ -47,9 +45,9 @@ namespace XLSB BeginFills(); virtual ~BeginFills(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cfills; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFmts.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFmts.cpp index a949348716..8347dec86b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFmts.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFmts.cpp @@ -32,6 +32,8 @@ #include "BeginFmts.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginFmts(*this)); } - void BeginFmts::readFields(CFRecord& record) + void BeginFmts::readFields(XLS::CFRecord& record) { record >> cfmts; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFmts.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFmts.h index 98dc995cb1..3dfe5addb2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFmts.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFmts.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginFmts record in BIFF12 - class BeginFmts: public BiffRecord + class BeginFmts: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginFmts) BASE_OBJECT_DEFINE_CLASS_NAME(BeginFmts) @@ -47,9 +45,9 @@ namespace XLSB BeginFmts(); virtual ~BeginFmts(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cfmts; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFnGroup.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFnGroup.cpp index dfc99cc721..644cab694e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFnGroup.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFnGroup.cpp @@ -32,6 +32,8 @@ #include "BeginFnGroup.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginFnGroup(*this)); } - void BeginFnGroup::readFields(CFRecord& record) + void BeginFnGroup::readFields(XLS::CFRecord& record) { record >> iMac; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFnGroup.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFnGroup.h index e130a0d06a..0a6f7c065c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFnGroup.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFnGroup.h @@ -31,16 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" - -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginFnGroup record in BIFF12 - class BeginFnGroup: public BiffRecord + class BeginFnGroup: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginFnGroup) BASE_OBJECT_DEFINE_CLASS_NAME(BeginFnGroup) @@ -48,9 +45,9 @@ namespace XLSB BeginFnGroup(); virtual ~BeginFnGroup(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); BYTE iMac; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFonts.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFonts.cpp index f08a1d6fdc..13c8c598dc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFonts.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFonts.cpp @@ -32,6 +32,8 @@ #include "BeginFonts.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginFonts(*this)); } - void BeginFonts::readFields(CFRecord& record) + void BeginFonts::readFields(XLS::CFRecord& record) { record >> cfonts; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFonts.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFonts.h index f065fdfabf..e67879e13d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFonts.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginFonts.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginFonts record in BIFF12 - class BeginFonts: public BiffRecord + class BeginFonts: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginFonts) BASE_OBJECT_DEFINE_CLASS_NAME(BeginFonts) @@ -47,9 +45,9 @@ namespace XLSB BeginFonts(); virtual ~BeginFonts(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cfonts; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet.cpp index 677bd65012..bdbcda4bbb 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet.cpp @@ -32,6 +32,8 @@ #include "BeginIconSet.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginIconSet(*this)); } - void BeginIconSet::readFields(CFRecord& record) + void BeginIconSet::readFields(XLS::CFRecord& record) { unsigned short flags; record >> iSet >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet.h index 0eee1b43a5..6f45e49ff2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginIconSet record in BIFF12 - class BeginIconSet: public BiffRecord + class BeginIconSet: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginIconSet) BASE_OBJECT_DEFINE_CLASS_NAME(BeginIconSet) @@ -47,13 +45,13 @@ namespace XLSB BeginIconSet(); virtual ~BeginIconSet(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeBeginIconSet; + static const XLS::ElementType type = XLS::typeBeginIconSet; - KPISets iSet; + XLS::KPISets iSet; bool fIcon; bool fReverse; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet14.cpp index bc3798943b..8fdbc2c245 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet14.cpp @@ -32,6 +32,8 @@ #include "BeginIconSet14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginIconSet14(*this)); } - void BeginIconSet14::readFields(CFRecord& record) + void BeginIconSet14::readFields(XLS::CFRecord& record) { record >> FRTheader; unsigned short flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet14.h index fb0052fb9f..cf0814c307 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIconSet14.h @@ -31,16 +31,14 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginIconSet14 record in BIFF12 - class BeginIconSet14: public BiffRecord + class BeginIconSet14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginIconSet14) BASE_OBJECT_DEFINE_CLASS_NAME(BeginIconSet14) @@ -48,14 +46,14 @@ namespace XLSB BeginIconSet14(); virtual ~BeginIconSet14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeBeginIconSet14; + static const XLS::ElementType type = XLS::typeBeginIconSet14; FRTBlank FRTheader; - KPISets14 iSet; + XLS::KPISets14 iSet; bool fCustom; bool fIcon; bool fReverse; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIndexedColors.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIndexedColors.cpp index 796323e036..d8805d33b9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIndexedColors.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIndexedColors.cpp @@ -32,6 +32,8 @@ #include "BeginIndexedColors.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginIndexedColors(*this)); } - void BeginIndexedColors::readFields(CFRecord& record) + void BeginIndexedColors::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIndexedColors.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIndexedColors.h index 40f689cc9b..f9c4c22adc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIndexedColors.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginIndexedColors.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginIndexedColors record in BIFF12 - class BeginIndexedColors: public BiffRecord + class BeginIndexedColors: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginIndexedColors) BASE_OBJECT_DEFINE_CLASS_NAME(BeginIndexedColors) @@ -47,11 +45,11 @@ namespace XLSB BeginIndexedColors(); virtual ~BeginIndexedColors(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginIndexedColors; + //static const XLS::ElementType type = XLS::typeBeginIndexedColors; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginListParts.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginListParts.cpp index d5ab5833e8..9849d00787 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginListParts.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginListParts.cpp @@ -32,6 +32,8 @@ #include "BeginListParts.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginListParts(*this)); } - void BeginListParts::readFields(CFRecord& record) + void BeginListParts::readFields(XLS::CFRecord& record) { record >> cParts; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginListParts.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginListParts.h index 5d5f497b98..896940d806 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginListParts.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginListParts.h @@ -31,16 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" - -using namespace XLS; - namespace XLSB { // Logical representation of BrtBeginListParts record in BIFF12 - class BeginListParts: public BiffRecord + class BeginListParts: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginListParts) BASE_OBJECT_DEFINE_CLASS_NAME(BeginListParts) @@ -48,9 +45,9 @@ namespace XLSB BeginListParts(); virtual ~BeginListParts(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cParts; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMRUColors.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMRUColors.cpp index 5e2af40627..72fd52628a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMRUColors.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMRUColors.cpp @@ -32,6 +32,8 @@ #include "BeginMRUColors.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginMRUColors(*this)); } - void BeginMRUColors::readFields(CFRecord& record) + void BeginMRUColors::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMRUColors.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMRUColors.h index f5c4f46abf..c17a021c53 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMRUColors.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMRUColors.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginMRUColors record in BIFF12 - class BeginMRUColors: public BiffRecord + class BeginMRUColors: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginMRUColors) BASE_OBJECT_DEFINE_CLASS_NAME(BeginMRUColors) @@ -47,11 +47,11 @@ namespace XLSB BeginMRUColors(); virtual ~BeginMRUColors(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginMRUColors; + //static const XLS::ElementType type = XLS::typeBeginMRUColors; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMergeCells.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMergeCells.cpp index 800cc6cb92..388b95c987 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMergeCells.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMergeCells.cpp @@ -32,6 +32,8 @@ #include "BeginMergeCells.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginMergeCells(*this)); } - void BeginMergeCells::readFields(CFRecord& record) + void BeginMergeCells::readFields(XLS::CFRecord& record) { record >> cmcs; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMergeCells.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMergeCells.h index de8a3aa1c5..0e281302ec 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMergeCells.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginMergeCells.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginMergeCells record in BIFF12 - class BeginMergeCells: public BiffRecord + class BeginMergeCells: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginMergeCells) BASE_OBJECT_DEFINE_CLASS_NAME(BeginMergeCells) @@ -48,9 +48,9 @@ namespace XLSB BeginMergeCells(); virtual ~BeginMergeCells(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cmcs; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginRichSortCondition.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginRichSortCondition.cpp index a9c47d3d46..d9a40592ce 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginRichSortCondition.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginRichSortCondition.cpp @@ -32,6 +32,8 @@ #include "BeginRichSortCondition.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginRichSortCondition(*this)); } - void BeginRichSortCondition::readFields(CFRecord& record) + void BeginRichSortCondition::readFields(XLS::CFRecord& record) { record.skipNunBytes(26); // unused record >> stSsList >> key; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginRichSortCondition.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginRichSortCondition.h index 4d9427710e..eafacee94e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginRichSortCondition.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginRichSortCondition.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginRichSortCondition record in BIFF12 - class BeginRichSortCondition: public BiffRecord + class BeginRichSortCondition: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginRichSortCondition) BASE_OBJECT_DEFINE_CLASS_NAME(BeginRichSortCondition) @@ -48,9 +48,9 @@ namespace XLSB BeginRichSortCondition(); virtual ~BeginRichSortCondition(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); XLNullableWideString stSsList; XLWideString key; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheet.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheet.cpp index 5a25e2d833..dedf8be0d3 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheet.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheet.cpp @@ -32,6 +32,8 @@ #include "BeginSheet.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginSheet(*this)); } - void BeginSheet::readFields(CFRecord& record) + void BeginSheet::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheet.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheet.h index c5622cd7c0..58e3a7e2e9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheet.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheet.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginSheet record in BIFF12 - class BeginSheet: public BiffRecord + class BeginSheet: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginSheet) BASE_OBJECT_DEFINE_CLASS_NAME(BeginSheet) @@ -47,11 +47,11 @@ namespace XLSB BeginSheet(); virtual ~BeginSheet(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginSheet; + //static const XLS::ElementType type = XLS::typeBeginSheet; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheetData.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheetData.cpp index bc54926efc..aceaa8bb97 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheetData.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheetData.cpp @@ -32,6 +32,8 @@ #include "BeginSheetData.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginSheetData(*this)); } - void BeginSheetData::readFields(CFRecord& record) + void BeginSheetData::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheetData.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheetData.h index b1a7fc5936..e915945a95 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheetData.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSheetData.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginSheetData record in BIFF12 - class BeginSheetData: public BiffRecord + class BeginSheetData: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginSheetData) BASE_OBJECT_DEFINE_CLASS_NAME(BeginSheetData) @@ -47,11 +47,11 @@ namespace XLSB BeginSheetData(); virtual ~BeginSheetData(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginSheetData; + //static const XLS::ElementType type = XLS::typeBeginSheetData; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyle.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyle.cpp index 52aad76262..b8b2ea1b58 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyle.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyle.cpp @@ -32,6 +32,8 @@ #include "BeginSlicerStyle.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginSlicerStyle(*this)); } - void BeginSlicerStyle::readFields(CFRecord& record) + void BeginSlicerStyle::readFields(XLS::CFRecord& record) { record >> FRTheader >> stName; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyle.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyle.h index d8ca9a2b34..28ff2ed181 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyle.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyle.h @@ -31,17 +31,17 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginSlicerStyle record in BIFF12 - class BeginSlicerStyle: public BiffRecord + class BeginSlicerStyle: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginSlicerStyle) BASE_OBJECT_DEFINE_CLASS_NAME(BeginSlicerStyle) @@ -49,11 +49,11 @@ namespace XLSB BeginSlicerStyle(); virtual ~BeginSlicerStyle(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginSlicerStyle; + //static const XLS::ElementType type = XLS::typeBeginSlicerStyle; FRTBlank FRTheader; XLNullableWideString stName; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyleElements.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyleElements.cpp index a7bf0c1ec7..b5addeb459 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyleElements.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyleElements.cpp @@ -32,6 +32,8 @@ #include "BeginSlicerStyleElements.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginSlicerStyleElements(*this)); } - void BeginSlicerStyleElements::readFields(CFRecord& record) + void BeginSlicerStyleElements::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyleElements.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyleElements.h index d5951d736c..7fa11b7475 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyleElements.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyleElements.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginSlicerStyleElements record in BIFF12 - class BeginSlicerStyleElements: public BiffRecord + class BeginSlicerStyleElements: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginSlicerStyleElements) BASE_OBJECT_DEFINE_CLASS_NAME(BeginSlicerStyleElements) @@ -47,11 +47,11 @@ namespace XLSB BeginSlicerStyleElements(); virtual ~BeginSlicerStyleElements(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginSlicerStyleElements; + //static const XLS::ElementType type = XLS::typeBeginSlicerStyleElements; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyles.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyles.cpp index 86c25f69c5..ec00619319 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyles.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyles.cpp @@ -32,6 +32,8 @@ #include "BeginSlicerStyles.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginSlicerStyles(*this)); } - void BeginSlicerStyles::readFields(CFRecord& record) + void BeginSlicerStyles::readFields(XLS::CFRecord& record) { record >> FRTheader >> stDefSlicer; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyles.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyles.h index ec802ab735..89ae513425 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyles.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSlicerStyles.h @@ -31,17 +31,17 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginSlicerStyles record in BIFF12 - class BeginSlicerStyles: public BiffRecord + class BeginSlicerStyles: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginSlicerStyles) BASE_OBJECT_DEFINE_CLASS_NAME(BeginSlicerStyles) @@ -49,11 +49,11 @@ namespace XLSB BeginSlicerStyles(); virtual ~BeginSlicerStyles(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginSlicerStyles; + //static const XLS::ElementType type = XLS::typeBeginSlicerStyles; FRTBlank FRTheader; XLWideString stDefSlicer; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond.cpp index 4819da76d8..a0c32ed68c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond.cpp @@ -32,6 +32,8 @@ #include "BeginSortCond.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginSortCond(*this)); } - void BeginSortCond::readFields(CFRecord& record) + void BeginSortCond::readFields(XLS::CFRecord& record) { unsigned short flags; record >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond.h index 7566902838..852b9e12fd 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond.h @@ -31,17 +31,17 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" #include "../Biff12_structures/CellRangeRef.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginSortCond record in BIFF12 - class BeginSortCond: public BiffRecord + class BeginSortCond: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginSortCond) BASE_OBJECT_DEFINE_CLASS_NAME(BeginSortCond) @@ -49,16 +49,16 @@ namespace XLSB BeginSortCond(); virtual ~BeginSortCond(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); bool fSortDes; unsigned short sortOn; XLSB::UncheckedRfX rfx; - CondDataValue condDataValue; - CFFlag cfflag; + XLS::CondDataValue condDataValue; + XLS::CFFlag cfflag; XLSB::XLNullableWideString stSslist; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond14.cpp index f01549e1c1..655005bfbe 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond14.cpp @@ -32,6 +32,8 @@ #include "BeginSortCond14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginSortCond14(*this)); } - void BeginSortCond14::readFields(CFRecord& record) + void BeginSortCond14::readFields(XLS::CFRecord& record) { unsigned short flags; record >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond14.h index 8376255116..a2da4557ff 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSortCond14.h @@ -31,17 +31,17 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" #include "../Biff12_structures/CellRangeRef.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginSortCond14 record in BIFF12 - class BeginSortCond14: public BiffRecord + class BeginSortCond14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginSortCond14) BASE_OBJECT_DEFINE_CLASS_NAME(BeginSortCond14) @@ -49,16 +49,16 @@ namespace XLSB BeginSortCond14(); virtual ~BeginSortCond14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); bool fSortDes; unsigned short sortOn; XLSB::UncheckedRfX rfx; - CondDataValue condDataValue; - CFFlag14 cfflag14; + XLS::CondDataValue condDataValue; + XLS::CFFlag14 cfflag14; XLSB::XLNullableWideString stSslist; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSst.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSst.cpp index f866dcb5fb..c16312fe23 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSst.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSst.cpp @@ -32,6 +32,8 @@ #include "BeginSst.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginSst(*this)); } - void BeginSst::readFields(CFRecord& record) + void BeginSst::readFields(XLS::CFRecord& record) { record >> cstTotal >> cstUnique; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSst.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSst.h index 8960c0e63c..853655ff1d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSst.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginSst.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginSst record in BIFF12 - class BeginSst: public BiffRecord + class BeginSst: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginSst) BASE_OBJECT_DEFINE_CLASS_NAME(BeginSst) @@ -47,9 +47,9 @@ namespace XLSB BeginSst(); virtual ~BeginSst(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cstTotal; _UINT32 cstUnique; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheet.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheet.cpp index 4774a67b98..d4b81679d5 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheet.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheet.cpp @@ -32,6 +32,8 @@ #include "BeginStyleSheet.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginStyleSheet(*this)); } - void BeginStyleSheet::readFields(CFRecord& record) + void BeginStyleSheet::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheet.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheet.h index a2daf9c6a8..d2b8a0ed54 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheet.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheet.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginStyleSheet record in BIFF12 - class BeginStyleSheet: public BiffRecord + class BeginStyleSheet: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginStyleSheet) BASE_OBJECT_DEFINE_CLASS_NAME(BeginStyleSheet) @@ -47,11 +47,11 @@ namespace XLSB BeginStyleSheet(); virtual ~BeginStyleSheet(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginStyleSheet; + //static const XLS::ElementType type = XLS::typeBeginStyleSheet; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheetExt14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheetExt14.cpp index 126319c27b..dca52ea3a4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheetExt14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheetExt14.cpp @@ -32,6 +32,8 @@ #include "BeginStyleSheetExt14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginStyleSheetExt14(*this)); } - void BeginStyleSheetExt14::readFields(CFRecord& record) + void BeginStyleSheetExt14::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheetExt14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheetExt14.h index 87b04f84fa..793aa30279 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheetExt14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyleSheetExt14.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginStyleSheetExt14 record in BIFF12 - class BeginStyleSheetExt14: public BiffRecord + class BeginStyleSheetExt14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginStyleSheetExt14) BASE_OBJECT_DEFINE_CLASS_NAME(BeginStyleSheetExt14) @@ -47,11 +47,11 @@ namespace XLSB BeginStyleSheetExt14(); virtual ~BeginStyleSheetExt14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginStyleSheetExt14; + //static const XLS::ElementType type = XLS::typeBeginStyleSheetExt14; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyles.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyles.cpp index 5d87b3aa6d..e203d7f7cf 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyles.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyles.cpp @@ -32,6 +32,8 @@ #include "BeginStyles.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginStyles(*this)); } - void BeginStyles::readFields(CFRecord& record) + void BeginStyles::readFields(XLS::CFRecord& record) { record >> cstyles; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyles.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyles.h index 7c3d15280f..e33e9ed66e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyles.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginStyles.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginStyles record in BIFF12 - class BeginStyles: public BiffRecord + class BeginStyles: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginStyles) BASE_OBJECT_DEFINE_CLASS_NAME(BeginStyles) @@ -47,9 +47,9 @@ namespace XLSB BeginStyles(); virtual ~BeginStyles(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 cstyles; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyle.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyle.cpp index c922b717ce..fedb2d2308 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyle.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyle.cpp @@ -32,6 +32,8 @@ #include "BeginTimelineStyle.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginTimelineStyle(*this)); } - void BeginTimelineStyle::readFields(CFRecord& record) + void BeginTimelineStyle::readFields(XLS::CFRecord& record) { record >> FRTheader >> stDefTimelineStyle; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyle.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyle.h index 3340609dcd..3f3373c580 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyle.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyle.h @@ -31,17 +31,17 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginTimelineStyle record in BIFF12 - class BeginTimelineStyle: public BiffRecord + class BeginTimelineStyle: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginTimelineStyle) BASE_OBJECT_DEFINE_CLASS_NAME(BeginTimelineStyle) @@ -49,11 +49,11 @@ namespace XLSB BeginTimelineStyle(); virtual ~BeginTimelineStyle(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginTimelineStyle; + //static const XLS::ElementType type = XLS::typeBeginTimelineStyle; FRTBlank FRTheader; XLNullableWideString stDefTimelineStyle; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleElements.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleElements.cpp index b57fbef5aa..f275c126cf 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleElements.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleElements.cpp @@ -32,6 +32,8 @@ #include "BeginTimelineStyleElements.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginTimelineStyleElements(*this)); } - void BeginTimelineStyleElements::readFields(CFRecord& record) + void BeginTimelineStyleElements::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleElements.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleElements.h index 3efde9e012..4e6b2f91bf 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleElements.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleElements.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginTimelineStyleElements record in BIFF12 - class BeginTimelineStyleElements: public BiffRecord + class BeginTimelineStyleElements: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginTimelineStyleElements) BASE_OBJECT_DEFINE_CLASS_NAME(BeginTimelineStyleElements) @@ -47,11 +47,11 @@ namespace XLSB BeginTimelineStyleElements(); virtual ~BeginTimelineStyleElements(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginTimelineStyleElements; + //static const XLS::ElementType type = XLS::typeBeginTimelineStyleElements; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleSheetExt15.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleSheetExt15.cpp index 48f9c18eee..b368f43685 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleSheetExt15.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleSheetExt15.cpp @@ -32,6 +32,8 @@ #include "BeginTimelineStyleSheetExt15.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginTimelineStyleSheetExt15(*this)); } - void BeginTimelineStyleSheetExt15::readFields(CFRecord& record) + void BeginTimelineStyleSheetExt15::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleSheetExt15.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleSheetExt15.h index 30b4a572d2..b6fc195e8a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleSheetExt15.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyleSheetExt15.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginTimelineStyleSheetExt15 record in BIFF12 - class BeginTimelineStyleSheetExt15: public BiffRecord + class BeginTimelineStyleSheetExt15: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginTimelineStyleSheetExt15) BASE_OBJECT_DEFINE_CLASS_NAME(BeginTimelineStyleSheetExt15) @@ -47,9 +47,9 @@ namespace XLSB BeginTimelineStyleSheetExt15(); virtual ~BeginTimelineStyleSheetExt15(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyles.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyles.cpp index ff712ef6da..fbe50e045c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyles.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyles.cpp @@ -32,6 +32,8 @@ #include "BeginTimelineStyles.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginTimelineStyles(*this)); } - void BeginTimelineStyles::readFields(CFRecord& record) + void BeginTimelineStyles::readFields(XLS::CFRecord& record) { record >> FRTheader >> stDefTimelineStyle; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyles.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyles.h index 50d0f52668..195178b1c6 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyles.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginTimelineStyles.h @@ -31,17 +31,17 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginTimelineStyles record in BIFF12 - class BeginTimelineStyles: public BiffRecord + class BeginTimelineStyles: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginTimelineStyles) BASE_OBJECT_DEFINE_CLASS_NAME(BeginTimelineStyles) @@ -49,11 +49,11 @@ namespace XLSB BeginTimelineStyles(); virtual ~BeginTimelineStyles(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBeginTimelineStyles; + //static const XLS::ElementType type = XLS::typeBeginTimelineStyles; FRTBlank FRTheader; XLWideString stDefTimelineStyle; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginWsViews.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginWsViews.cpp index 299cddbca2..29081c4dc9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginWsViews.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginWsViews.cpp @@ -32,6 +32,8 @@ #include "BeginWsViews.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BeginWsViews(*this)); } - void BeginWsViews::readFields(CFRecord& record) + void BeginWsViews::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginWsViews.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginWsViews.h index 3fcf09704e..0f51a1ace8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginWsViews.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginWsViews.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBeginWsViews record in BIFF12 - class BeginWsViews: public BiffRecord + class BeginWsViews: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BeginWsViews) BASE_OBJECT_DEFINE_CLASS_NAME(BeginWsViews) @@ -47,9 +47,9 @@ namespace XLSB BeginWsViews(); virtual ~BeginWsViews(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtection.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtection.cpp index c829d792da..4bc2ecba5e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtection.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtection.cpp @@ -32,6 +32,8 @@ #include "BookProtection.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BookProtection(*this)); } - void BookProtection::readFields(CFRecord& record) + void BookProtection::readFields(XLS::CFRecord& record) { record >> protpwdBook; record >> protpwdRev; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtection.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtection.h index 729d9112d8..16fa47ce1d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtection.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtection.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/BookProtectionFlags.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBookProtection record in BIFF12 - class BookProtection: public BiffRecord + class BookProtection: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BookProtection) BASE_OBJECT_DEFINE_CLASS_NAME(BookProtection) @@ -48,9 +48,9 @@ namespace XLSB BookProtection(); virtual ~BookProtection(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT16 protpwdBook; _UINT16 protpwdRev; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtectionIso.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtectionIso.cpp index 515dbf7092..85285132e5 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtectionIso.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtectionIso.cpp @@ -32,6 +32,8 @@ #include "BookProtectionIso.h" +using namespace XLS; + namespace XLSB { @@ -51,7 +53,7 @@ namespace XLSB } - void BookProtectionIso::readFields(CFRecord& record) + void BookProtectionIso::readFields(XLS::CFRecord& record) { record >> dwBookSpinCount; record >> dwRevSpinCount; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtectionIso.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtectionIso.h index a9ae113f8d..9edd0d8d35 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtectionIso.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookProtectionIso.h @@ -31,17 +31,17 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/BookProtectionFlags.h" #include "../Biff12_structures/IsoPasswordData.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBookProtectionIso record in BIFF12 - class BookProtectionIso: public BiffRecord + class BookProtectionIso: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BookProtectionIso) BASE_OBJECT_DEFINE_CLASS_NAME(BookProtectionIso) @@ -49,9 +49,9 @@ namespace XLSB BookProtectionIso(); virtual ~BookProtectionIso(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 dwBookSpinCount; _UINT32 dwRevSpinCount; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookView.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookView.cpp index 6c807c8315..45bb9f973d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookView.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookView.cpp @@ -32,6 +32,8 @@ #include "BookView.h" +using namespace XLS; + namespace XLSB { @@ -51,7 +53,7 @@ namespace XLSB } - void BookView::readFields(CFRecord& record) + void BookView::readFields(XLS::CFRecord& record) { unsigned short flags; record >> xWn >> yWn >> dxWn >> dyWn >> iTabRatio >> itabFirst >> itabCur >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookView.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookView.h index 91f530a610..3416fed6d7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookView.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BookView.h @@ -31,16 +31,16 @@ */ #pragma once -#include -#include "../Source/XlsxFormat/WritingElement.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Window1.h" +#include "../../XlsxFormat/WritingElement.h" #include "../XlsbElementsType.h" -using namespace XLS; + namespace XLSB { // Logical representation of BookView record in BIFF12 - class BookView: public Window1 + class BookView: public XLS::Window1 { BIFF_RECORD_DEFINE_TYPE_INFO(BookView) BASE_OBJECT_DEFINE_CLASS_NAME(BookView) @@ -48,9 +48,9 @@ namespace XLSB BookView(); ~BookView(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); //----------------------------- _INT32 xWn; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Border.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Border.cpp index 19b613d3f1..7aa5491662 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Border.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Border.cpp @@ -32,6 +32,8 @@ #include "Border.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new Border(*this)); } - void Border::readFields(CFRecord& record) + void Border::readFields(XLS::CFRecord& record) { unsigned char flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Border.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Border.h index c91563fe7d..2f72db0e7e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Border.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Border.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/Blxf.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBorder record in BIFF12 - class Border: public BiffRecord + class Border: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(Border) BASE_OBJECT_DEFINE_CLASS_NAME(Border) @@ -48,11 +48,11 @@ namespace XLSB Border(); virtual ~Border(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeBorder; + //static const XLS::ElementType type = XLS::typeBorder; bool fBdrDiagDown; bool fBdrDiagUp; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BundleSh.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BundleSh.cpp index 1bc9d0c71f..36bd48967a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BundleSh.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BundleSh.cpp @@ -32,6 +32,8 @@ #include "BundleSh.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new BundleSh(*this)); } - void BundleSh::readFields(CFRecord& record) + void BundleSh::readFields(XLS::CFRecord& record) { record >> hsState >> iTabID >> strRelID >> strName; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BundleSh.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BundleSh.h index 4a15598b12..41a872ebd4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BundleSh.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/BundleSh.h @@ -31,18 +31,18 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" #include "../Biff12_structures/RelID.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtBundleSh record in BIFF12 - class BundleSh: public BiffRecord + class BundleSh: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(BundleSh) BASE_OBJECT_DEFINE_CLASS_NAME(BundleSh) @@ -50,9 +50,9 @@ namespace XLSB BundleSh(); virtual ~BundleSh(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); enum ST_SheetState { VISIBLE = 0x00000000, diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFIcon.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFIcon.cpp index 67d26ecf77..c691a70ed8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFIcon.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFIcon.cpp @@ -32,6 +32,8 @@ #include "CFIcon.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new CFIcon(*this)); } - void CFIcon::readFields(CFRecord& record) + void CFIcon::readFields(XLS::CFRecord& record) { record >> FRTheader >> iconSet >> index; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFIcon.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFIcon.h index 80944682f1..9a59ca1bec 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFIcon.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFIcon.h @@ -31,16 +31,14 @@ */ #pragma once -#include -#include "../../XlsxFormat/WritingElement.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../Biff12_structures/FRTBlank.h" - -using namespace XLS; +#include "../../XlsxFormat/WritingElement.h" namespace XLSB { // Logical representation of BrtCFIcon record in BIFF12 - class CFIcon: public BiffRecord + class CFIcon: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(CFIcon) BASE_OBJECT_DEFINE_CLASS_NAME(CFIcon) @@ -48,12 +46,12 @@ namespace XLSB CFIcon(); virtual ~CFIcon(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); FRTBlank FRTheader; - KPISets14 iconSet; + XLS::KPISets14 iconSet; _INT32 index; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFRuleExt.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFRuleExt.cpp index 446d5b4da8..94c4319bf4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFRuleExt.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFRuleExt.cpp @@ -32,6 +32,8 @@ #include "CFRuleExt.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new CFRuleExt(*this)); } - void CFRuleExt::readFields(CFRecord& record) + void CFRuleExt::readFields(XLS::CFRecord& record) { _GUID_ guid_; record >> FRTHeader >> guid_; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFRuleExt.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFRuleExt.h index 9ee2669b15..b47008d88e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFRuleExt.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFRuleExt.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtCFRuleExt record in BIFF12 - class CFRuleExt: public BiffRecord + class CFRuleExt: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(CFRuleExt) BASE_OBJECT_DEFINE_CLASS_NAME(CFRuleExt) @@ -48,9 +48,9 @@ namespace XLSB CFRuleExt(); virtual ~CFRuleExt(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); FRTBlank FRTHeader; std::wstring guid; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO.cpp index b123298048..405384e4fb 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO.cpp @@ -32,6 +32,8 @@ #include "CFVO.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new CFVO(*this)); } - void CFVO::readFields(CFRecord& record) + void CFVO::readFields(XLS::CFRecord& record) { record >> iType >> numParam >> fSaveGTE >> fGTE >> cbFmla; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO.h index d96985a200..706fdc8f24 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO.h @@ -31,18 +31,18 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/CFVOtype.h" -#include -#include -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Xnum.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CFVOParsedFormula.h" + namespace XLSB { // Logical representation of BrtCFVO record in BIFF12 - class CFVO: public BiffRecord + class CFVO: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(CFVO) BASE_OBJECT_DEFINE_CLASS_NAME(CFVO) @@ -50,18 +50,18 @@ namespace XLSB CFVO(); virtual ~CFVO(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeCFVO; + static const XLS::ElementType type = XLS::typeCFVO; - CFVOtype iType; - Xnum numParam; + XLS::CFVOtype iType; + XLS::Xnum numParam; XLS::Boolean fSaveGTE; XLS::Boolean fGTE; _UINT32 cbFmla; - CFVOParsedFormula formula; + XLS::CFVOParsedFormula formula; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO14.cpp index 6c13b7662a..1adcceeed0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO14.cpp @@ -32,6 +32,8 @@ #include "CFVO14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new CFVO14(*this)); } - void CFVO14::readFields(CFRecord& record) + void CFVO14::readFields(XLS::CFRecord& record) { record >> FRTheader >> iType >> numParam >> fSaveGTE >> fGTE >> cbFmla; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO14.h index ee226dd2f0..81974dbb3b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CFVO14.h @@ -31,20 +31,18 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/CFVOType14.h" -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Xnum.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CFVOParsedFormula.h" #include "../Biff12_structures/FRTHeader.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtCFVO14 record in BIFF12 - class CFVO14: public BiffRecord + class CFVO14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(CFVO14) BASE_OBJECT_DEFINE_CLASS_NAME(CFVO14) @@ -52,15 +50,15 @@ namespace XLSB CFVO14(); virtual ~CFVO14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeCFVO14; + static const XLS::ElementType type = XLS::typeCFVO14; FRTHeader FRTheader; - CFVOType14 iType; - Xnum numParam; + XLS::CFVOType14 iType; + XLS::Xnum numParam; XLS::Boolean fSaveGTE; XLS::Boolean fGTE; _UINT32 cbFmla; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CalcProp.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CalcProp.cpp index 2f39d40306..d7d9d9278c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CalcProp.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CalcProp.cpp @@ -32,6 +32,8 @@ #include "CalcProp.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new CalcProp(*this)); } - void CalcProp::readFields(CFRecord& record) + void CalcProp::readFields(XLS::CFRecord& record) { unsigned int flags; record >> recalcID >> fAutoRecalc >> cCalcCount >> xnumDelta >> cUserThreadCount; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CalcProp.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CalcProp.h index 146a60d953..e4050ba864 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CalcProp.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CalcProp.h @@ -31,16 +31,15 @@ */ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Xnum.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtCalcProp record in BIFF12 - class CalcProp: public BiffRecord + class CalcProp: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(CalcProp) BASE_OBJECT_DEFINE_CLASS_NAME(CalcProp) @@ -48,9 +47,9 @@ namespace XLSB CalcProp(); virtual ~CalcProp(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); enum calcMode { MANUAL = 0x00000000, @@ -61,7 +60,7 @@ namespace XLSB _UINT32 recalcID; _UINT32 fAutoRecalc; //calcMode _UINT32 cCalcCount; - Xnum xnumDelta; + XLS::Xnum xnumDelta; _INT32 cUserThreadCount; bool fFullCalcOnLoad; bool fRefA1; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Cell.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Cell.h index dda9fa1f0f..eb9f743bc5 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Cell.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Cell.h @@ -31,13 +31,11 @@ */ #pragma once -#include #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/Cell.h" -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Xnum.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; namespace XLSB { @@ -45,15 +43,14 @@ namespace XLSB class CellBase { public: - - Cell cell; + Cell cell; }; template -class Cell_T: public CellBase, public BiffRecord +class Cell_T: public CellBase, public XLS::BiffRecord { public: - const CFRecordType::TypeId getTypeId() const + const XLS::CFRecordType::TypeId getTypeId() const { return id; } @@ -86,31 +83,30 @@ class Cell_T: public CellBase, public BiffRecord } } - virtual ~Cell_T() { } - BaseObjectPtr clone() + XLS::BaseObjectPtr clone() { - return BaseObjectPtr(new Cell_T(*this)); + return XLS::BaseObjectPtr(new Cell_T(*this)); } - void readFields(CFRecord& record) + void readFields(XLS::CFRecord& record) { record >> cell; if(id != rt_CellBlank) record >> value; } - T value; + T value; }; typedef Cell_T CellBlank; -typedef Cell_T CellRk; +typedef Cell_T CellRk; typedef Cell_T CellError; typedef Cell_T, rt_CellBool> CellBool; -typedef Cell_T CellReal; +typedef Cell_T CellReal; typedef Cell_T<_UINT32, rt_CellIsst> CellIsst; typedef Cell_T CellSt; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CellMeta.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CellMeta.cpp index f5562dae2a..7c28b06835 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CellMeta.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CellMeta.cpp @@ -32,6 +32,8 @@ #include "CellMeta.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new CellMeta(*this)); } - void CellMeta::readFields(CFRecord& record) + void CellMeta::readFields(XLS::CFRecord& record) { record >> icmb; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CellMeta.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CellMeta.h index 4839bed0e5..0ef573ece9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CellMeta.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CellMeta.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtCellMeta record in BIFF12 - class CellMeta: public BiffRecord + class CellMeta: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(CellMeta) BASE_OBJECT_DEFINE_CLASS_NAME(CellMeta) @@ -47,9 +47,9 @@ namespace XLSB CellMeta(); virtual ~CellMeta(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _INT32 icmb; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color.cpp index f7f31c2fd3..a7f62874b7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color.cpp @@ -32,6 +32,8 @@ #include "Color.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new Color(*this)); } - void Color::readFields(CFRecord& record) + void Color::readFields(XLS::CFRecord& record) { unsigned char flags; record >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color.h index 97c49e0777..7c17c21125 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtColor record in BIFF12 - class Color: public BiffRecord + class Color: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(Color) BASE_OBJECT_DEFINE_CLASS_NAME(Color) @@ -47,9 +47,9 @@ namespace XLSB Color(); virtual ~Color(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); bool fValidRGB; BYTE xColorType; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color14.cpp index 0c524be758..a11efac62a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color14.cpp @@ -32,6 +32,8 @@ #include "Color14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new Color14(*this)); } - void Color14::readFields(CFRecord& record) + void Color14::readFields(XLS::CFRecord& record) { record >> FRTheader; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color14.h index 586c7849c5..3030b4f086 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Color14.h @@ -31,17 +31,17 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" #include "Color.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtColor14 record in BIFF12 - class Color14: public BiffRecord + class Color14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(Color14) BASE_OBJECT_DEFINE_CLASS_NAME(Color14) @@ -49,9 +49,9 @@ namespace XLSB Color14(); virtual ~Color14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); FRTBlank FRTheader; Color color; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentAuthor.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentAuthor.cpp index 77e51747a0..4b19274103 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentAuthor.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentAuthor.cpp @@ -32,6 +32,8 @@ #include "CommentAuthor.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new CommentAuthor(*this)); } - void CommentAuthor::readFields(CFRecord& record) + void CommentAuthor::readFields(XLS::CFRecord& record) { record >> author; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentAuthor.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentAuthor.h index d7b2a8773f..98db31fc23 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentAuthor.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentAuthor.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtCommentAuthor record in BIFF12 - class CommentAuthor: public BiffRecord + class CommentAuthor: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(CommentAuthor) BASE_OBJECT_DEFINE_CLASS_NAME(CommentAuthor) @@ -48,9 +48,9 @@ namespace XLSB CommentAuthor(); virtual ~CommentAuthor(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); XLWideString author; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentText.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentText.cpp index 99d26cf41d..bf1843b1e7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentText.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentText.cpp @@ -32,6 +32,8 @@ #include "CommentText.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new CommentText(*this)); } - void CommentText::readFields(CFRecord& record) + void CommentText::readFields(XLS::CFRecord& record) { record >> text; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentText.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentText.h index 5a21a3c0c1..2030765035 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentText.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommentText.h @@ -31,16 +31,14 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/RichStr.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtCommentText record in BIFF12 - class CommentText: public BiffRecord + class CommentText: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(CommentText) BASE_OBJECT_DEFINE_CLASS_NAME(CommentText) @@ -48,11 +46,11 @@ namespace XLSB CommentText(); virtual ~CommentText(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - RichStr text; + RichStr text; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommonRecords.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommonRecords.h index d672555beb..7d2975b947 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommonRecords.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/CommonRecords.h @@ -31,28 +31,28 @@ */ #pragma once -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/FileSharing.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ExternSheet.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Window1.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Lbl.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/UserBView.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/WOpt.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BookExt.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ColInfo.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Row.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Table.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/ShrFmla.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Array.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Window2.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Pane.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Selection.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SortData.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/Font.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/XF.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/DXF.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyles.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyle.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/TableStyleElement.h" #include "../../XlsxFormat/WritingElement.h" @@ -63,9 +63,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(FileSharing) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new FileSharing(*this)); + return XLS::BaseObjectPtr(new FileSharing(*this)); } }; @@ -74,9 +74,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(ExternSheet) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new ExternSheet(*this)); + return XLS::BaseObjectPtr(new ExternSheet(*this)); } }; @@ -85,9 +85,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(BookView) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new BookView(*this)); + return XLS::BaseObjectPtr(new BookView(*this)); } }; @@ -95,9 +95,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(Name) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new Name(*this)); + return XLS::BaseObjectPtr(new Name(*this)); } }; @@ -105,9 +105,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(UserBookView) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new UserBookView(*this)); + return XLS::BaseObjectPtr(new UserBookView(*this)); } }; @@ -115,9 +115,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(WebOpt) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new WebOpt(*this)); + return XLS::BaseObjectPtr(new WebOpt(*this)); } }; @@ -125,9 +125,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(FileRecover) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new FileRecover(*this)); + return XLS::BaseObjectPtr(new FileRecover(*this)); } }; @@ -135,9 +135,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(ColInfo) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new ColInfo(*this)); + return XLS::BaseObjectPtr(new ColInfo(*this)); } }; @@ -145,9 +145,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(RowHdr) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new RowHdr(*this)); + return XLS::BaseObjectPtr(new RowHdr(*this)); } }; @@ -155,31 +155,31 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(Table) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new Table(*this)); + return XLS::BaseObjectPtr(new Table(*this)); } }; class ShrFmla: public XLS::ShrFmla { BIFF_RECORD_DEFINE_TYPE_INFO(ShrFmla) - ShrFmla(const CellRef& cell_base_ref_init) : XLS::ShrFmla(cell_base_ref_init) {} + ShrFmla(const XLS::CellRef& cell_base_ref_init) : XLS::ShrFmla(cell_base_ref_init) {} - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new ShrFmla(*this)); + return XLS::BaseObjectPtr(new ShrFmla(*this)); } }; class ArrFmla: public XLS::Array { BIFF_RECORD_DEFINE_TYPE_INFO(ArrFmla) - ArrFmla(const CellRef& cell_base_ref_init) : XLS::Array(cell_base_ref_init) {} + ArrFmla(const XLS::CellRef& cell_base_ref_init) : XLS::Array(cell_base_ref_init) {} - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new ArrFmla(*this)); + return XLS::BaseObjectPtr(new ArrFmla(*this)); } }; @@ -187,9 +187,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(BeginWsView) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new BeginWsView(*this)); + return XLS::BaseObjectPtr(new BeginWsView(*this)); } }; @@ -197,9 +197,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(Pane) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new Pane(*this)); + return XLS::BaseObjectPtr(new Pane(*this)); } }; @@ -207,9 +207,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(Sel) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new Sel(*this)); + return XLS::BaseObjectPtr(new Sel(*this)); } }; @@ -217,9 +217,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(BeginSortState) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new BeginSortState(*this)); + return XLS::BaseObjectPtr(new BeginSortState(*this)); } }; @@ -227,9 +227,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(Font) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new Font(*this)); + return XLS::BaseObjectPtr(new Font(*this)); } }; @@ -240,9 +240,9 @@ namespace XLSB XF(size_t& cell_xf_current_id, size_t& style_xf_current_id) : XLS::XF(cell_xf_current_id, style_xf_current_id) {} - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new XF(*this)); + return XLS::BaseObjectPtr(new XF(*this)); } }; @@ -250,9 +250,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(DXF) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new DXF(*this)); + return XLS::BaseObjectPtr(new DXF(*this)); } }; @@ -260,9 +260,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(BeginTableStyles) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new BeginTableStyles(*this)); + return XLS::BaseObjectPtr(new BeginTableStyles(*this)); } }; @@ -270,19 +270,19 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(BeginTableStyle) - BaseObjectPtr clone() override - { - return BaseObjectPtr(new BeginTableStyle(*this)); - } + XLS::BaseObjectPtr clone() override + { + return XLS::BaseObjectPtr(new BeginTableStyle(*this)); + } }; class TableStyleElement: public XLS::TableStyleElement { BIFF_RECORD_DEFINE_TYPE_INFO(TableStyleElement) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new TableStyleElement(*this)); + return XLS::BaseObjectPtr(new TableStyleElement(*this)); } }; @@ -290,14 +290,14 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(DXF14) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new DXF14(*this)); + return XLS::BaseObjectPtr(new DXF14(*this)); } - static const ElementType type = typeDXF14; + static const XLS::ElementType type = XLS::typeDXF14; - void readFields(CFRecord& record) override + void readFields(XLS::CFRecord& record) override { record.skipNunBytes(4); XLS::DXF::readFields(record); @@ -308,9 +308,9 @@ namespace XLSB { BIFF_RECORD_DEFINE_TYPE_INFO(DXF15) - BaseObjectPtr clone() override + XLS::BaseObjectPtr clone() override { - return BaseObjectPtr(new DXF15(*this)); + return XLS::BaseObjectPtr(new DXF15(*this)); } }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Drawing.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Drawing.cpp index 109474b67f..5aaf1cd12c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Drawing.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Drawing.cpp @@ -32,6 +32,8 @@ #include "Drawing.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new Drawing(*this)); } - void Drawing::readFields(CFRecord& record) + void Drawing::readFields(XLS::CFRecord& record) { record >> stRelId; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Drawing.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Drawing.h index cb4d6e64dc..25777cd3ff 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Drawing.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Drawing.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/RelID.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtDrawing record in BIFF12 - class Drawing: public BiffRecord + class Drawing: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(Drawing) BASE_OBJECT_DEFINE_CLASS_NAME(Drawing) @@ -48,9 +48,9 @@ namespace XLSB Drawing(); virtual ~Drawing(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); RelID stRelId; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBook.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBook.cpp index 9f3fc0271b..76dd3835e7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBook.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBook.cpp @@ -32,6 +32,8 @@ #include "EndBook.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndBook(*this)); } - void EndBook::readFields(CFRecord& record) + void EndBook::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBook.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBook.h index b97b71f69a..c25d04722e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBook.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBook.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndBook record in BIFF12 - class EndBook: public BiffRecord + class EndBook: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndBook) BASE_OBJECT_DEFINE_CLASS_NAME(EndBook) @@ -47,9 +47,9 @@ namespace XLSB EndBook(); virtual ~EndBook(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBookViews.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBookViews.cpp index 649c5e5f1b..e8f7d84c6f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBookViews.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBookViews.cpp @@ -32,6 +32,8 @@ #include "EndBookViews.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndBookViews(*this)); } - void EndBookViews::readFields(CFRecord& record) + void EndBookViews::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBookViews.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBookViews.h index e653d775bd..46f24c614f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBookViews.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBookViews.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndBookViews record in BIFF12 - class EndBookViews: public BiffRecord + class EndBookViews: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndBookViews) BASE_OBJECT_DEFINE_CLASS_NAME(EndBookViews) @@ -48,9 +48,9 @@ namespace XLSB EndBookViews(); virtual ~EndBookViews(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBorders.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBorders.cpp index c5a1a68b30..0679dddcdc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBorders.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBorders.cpp @@ -32,6 +32,8 @@ #include "EndBorders.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndBorders(*this)); } - void EndBorders::readFields(CFRecord& record) + void EndBorders::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBorders.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBorders.h index 992a90081e..f949e49a85 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBorders.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBorders.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndBorders record in BIFF12 - class EndBorders: public BiffRecord + class EndBorders: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndBorders) BASE_OBJECT_DEFINE_CLASS_NAME(EndBorders) @@ -47,11 +47,11 @@ namespace XLSB EndBorders(); virtual ~EndBorders(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndBorders; + //static const XLS::ElementType type = XLS::typeEndBorders; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBundleShs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBundleShs.cpp index 27a2330e88..934f63b8df 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBundleShs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBundleShs.cpp @@ -32,6 +32,8 @@ #include "EndBundleShs.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndBundleShs(*this)); } - void EndBundleShs::readFields(CFRecord& record) + void EndBundleShs::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBundleShs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBundleShs.h index b9e4fd2a5d..3bbef1d286 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBundleShs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndBundleShs.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndBundleShs record in BIFF12 - class EndBundleShs: public BiffRecord + class EndBundleShs: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndBundleShs) BASE_OBJECT_DEFINE_CLASS_NAME(EndBundleShs) @@ -48,9 +48,9 @@ namespace XLSB EndBundleShs(); virtual ~EndBundleShs(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule.cpp index bd4ebb0d35..9a0b684698 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule.cpp @@ -32,6 +32,8 @@ #include "EndCFRule.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndCFRule(*this)); } - void EndCFRule::readFields(CFRecord& record) + void EndCFRule::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule.h index e67f1b204a..c3b207dd14 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndCFRule record in BIFF12 - class EndCFRule: public BiffRecord + class EndCFRule: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndCFRule) BASE_OBJECT_DEFINE_CLASS_NAME(EndCFRule) @@ -48,9 +48,9 @@ namespace XLSB EndCFRule(); virtual ~EndCFRule(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule14.cpp index d7df8b30f1..647aed02ad 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule14.cpp @@ -32,6 +32,8 @@ #include "EndCFRule14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndCFRule14(*this)); } - void EndCFRule14::readFields(CFRecord& record) + void EndCFRule14::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule14.h index 9e43dd0b6f..cc994823b6 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCFRule14.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndCFRule14 record in BIFF12 - class EndCFRule14: public BiffRecord + class EndCFRule14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndCFRule14) BASE_OBJECT_DEFINE_CLASS_NAME(EndCFRule14) @@ -48,9 +48,9 @@ namespace XLSB EndCFRule14(); virtual ~EndCFRule14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellStyleXFs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellStyleXFs.cpp index e68e2f5641..028ebb9124 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellStyleXFs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellStyleXFs.cpp @@ -32,6 +32,8 @@ #include "EndCellStyleXFs.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndCellStyleXFs(*this)); } - void EndCellStyleXFs::readFields(CFRecord& record) + void EndCellStyleXFs::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellStyleXFs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellStyleXFs.h index 059369c269..36036f1e60 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellStyleXFs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellStyleXFs.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndCellStyleXFs record in BIFF12 - class EndCellStyleXFs: public BiffRecord + class EndCellStyleXFs: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndCellStyleXFs) BASE_OBJECT_DEFINE_CLASS_NAME(EndCellStyleXFs) @@ -47,11 +47,11 @@ namespace XLSB EndCellStyleXFs(); virtual ~EndCellStyleXFs(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndCellStyleXFs; + //static const XLS::ElementType type = XLS::typeEndCellStyleXFs; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellXFs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellXFs.cpp index 9bd63d87c3..c8a5893b68 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellXFs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellXFs.cpp @@ -32,6 +32,8 @@ #include "EndCellXFs.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndCellXFs(*this)); } - void EndCellXFs::readFields(CFRecord& record) + void EndCellXFs::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellXFs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellXFs.h index 0bd874807a..02e7c6ed57 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellXFs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCellXFs.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndCellXFs record in BIFF12 - class EndCellXFs: public BiffRecord + class EndCellXFs: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndCellXFs) BASE_OBJECT_DEFINE_CLASS_NAME(EndCellXFs) @@ -47,11 +47,11 @@ namespace XLSB EndCellXFs(); virtual ~EndCellXFs(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndCellXFs; + //static const XLS::ElementType type = XLS::typeEndCellXFs; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColInfos.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColInfos.cpp index 0b413cad38..70f5ef0b3d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColInfos.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColInfos.cpp @@ -32,6 +32,8 @@ #include "EndColInfos.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndColInfos(*this)); } - void EndColInfos::readFields(CFRecord& record) + void EndColInfos::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColInfos.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColInfos.h index a32bcb8e32..f7ff71c450 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColInfos.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColInfos.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndColInfos record in BIFF12 - class EndColInfos: public BiffRecord + class EndColInfos: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndColInfos) BASE_OBJECT_DEFINE_CLASS_NAME(EndColInfos) @@ -48,9 +48,9 @@ namespace XLSB EndColInfos(); virtual ~EndColInfos(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorPalette.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorPalette.cpp index 40848e1f72..23039ad8c2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorPalette.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorPalette.cpp @@ -32,6 +32,8 @@ #include "EndColorPalette.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndColorPalette(*this)); } - void EndColorPalette::readFields(CFRecord& record) + void EndColorPalette::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorPalette.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorPalette.h index de08bc9bc0..890a0e2727 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorPalette.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorPalette.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndColorPalette record in BIFF12 - class EndColorPalette: public BiffRecord + class EndColorPalette: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndColorPalette) BASE_OBJECT_DEFINE_CLASS_NAME(EndColorPalette) @@ -47,9 +47,9 @@ namespace XLSB EndColorPalette(); virtual ~EndColorPalette(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale.cpp index f34a5d3844..71e7c0eaa5 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale.cpp @@ -32,6 +32,8 @@ #include "EndColorScale.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndColorScale(*this)); } - void EndColorScale::readFields(CFRecord& record) + void EndColorScale::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale.h index a05737d327..33401ffef2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndColorScale record in BIFF12 - class EndColorScale: public BiffRecord + class EndColorScale: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndColorScale) BASE_OBJECT_DEFINE_CLASS_NAME(EndColorScale) @@ -47,11 +47,11 @@ namespace XLSB EndColorScale(); virtual ~EndColorScale(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndColorScale; + //static const XLS::ElementType type = XLS::typeEndColorScale; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale14.cpp index cba2c03aae..8899628397 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale14.cpp @@ -32,6 +32,8 @@ #include "EndColorScale14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndColorScale14(*this)); } - void EndColorScale14::readFields(CFRecord& record) + void EndColorScale14::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale14.h index 62851bcb26..34a97ccb3f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndColorScale14.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndColorScale14 record in BIFF12 - class EndColorScale14: public BiffRecord + class EndColorScale14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndColorScale14) BASE_OBJECT_DEFINE_CLASS_NAME(EndColorScale14) @@ -47,11 +47,11 @@ namespace XLSB EndColorScale14(); virtual ~EndColorScale14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndColorScale14; + //static const XLS::ElementType type = XLS::typeEndColorScale14; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComment.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComment.cpp index 5593fe2f8b..d4cf568223 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComment.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComment.cpp @@ -32,6 +32,8 @@ #include "EndComment.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndComment(*this)); } - void EndComment::readFields(CFRecord& record) + void EndComment::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComment.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComment.h index efda0e64c7..f9a45c2434 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComment.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComment.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndComment record in BIFF12 - class EndComment: public BiffRecord + class EndComment: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndComment) BASE_OBJECT_DEFINE_CLASS_NAME(EndComment) @@ -47,9 +47,9 @@ namespace XLSB EndComment(); virtual ~EndComment(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentAuthors.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentAuthors.cpp index d6909123a2..0becc0ddd5 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentAuthors.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentAuthors.cpp @@ -32,6 +32,8 @@ #include "EndCommentAuthors.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndCommentAuthors(*this)); } - void EndCommentAuthors::readFields(CFRecord& record) + void EndCommentAuthors::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentAuthors.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentAuthors.h index f8e43b251b..7fecc39f58 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentAuthors.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentAuthors.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndCommentAuthors record in BIFF12 - class EndCommentAuthors: public BiffRecord + class EndCommentAuthors: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndCommentAuthors) BASE_OBJECT_DEFINE_CLASS_NAME(EndCommentAuthors) @@ -47,9 +47,9 @@ namespace XLSB EndCommentAuthors(); virtual ~EndCommentAuthors(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentList.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentList.cpp index 3df085132c..c316e02360 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentList.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentList.cpp @@ -32,6 +32,8 @@ #include "EndCommentList.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndCommentList(*this)); } - void EndCommentList::readFields(CFRecord& record) + void EndCommentList::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentList.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentList.h index 2f78e9ec26..0919227b82 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentList.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndCommentList.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndCommentList record in BIFF12 - class EndCommentList: public BiffRecord + class EndCommentList: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndCommentList) BASE_OBJECT_DEFINE_CLASS_NAME(EndCommentList) @@ -47,9 +47,9 @@ namespace XLSB EndCommentList(); virtual ~EndCommentList(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComments.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComments.cpp index d62235bc4b..f3f1cb73ab 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComments.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComments.cpp @@ -32,6 +32,8 @@ #include "EndComments.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndComments(*this)); } - void EndComments::readFields(CFRecord& record) + void EndComments::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComments.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComments.h index 1e37e63759..c12ea308b4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComments.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndComments.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndComments record in BIFF12 - class EndComments: public BiffRecord + class EndComments: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndComments) BASE_OBJECT_DEFINE_CLASS_NAME(EndComments) @@ -47,9 +47,9 @@ namespace XLSB EndComments(); virtual ~EndComments(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting.cpp index 8f2f0f6ed5..c8136525de 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting.cpp @@ -32,6 +32,8 @@ #include "EndConditionalFormatting.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndConditionalFormatting(*this)); } - void EndConditionalFormatting::readFields(CFRecord& record) + void EndConditionalFormatting::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting.h index 17896053d6..800caabc77 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndConditionalFormatting record in BIFF12 - class EndConditionalFormatting: public BiffRecord + class EndConditionalFormatting: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndConditionalFormatting) BASE_OBJECT_DEFINE_CLASS_NAME(EndConditionalFormatting) @@ -48,9 +48,9 @@ namespace XLSB EndConditionalFormatting(); virtual ~EndConditionalFormatting(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting14.cpp index b3f121153f..5d488117cd 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting14.cpp @@ -32,6 +32,8 @@ #include "EndConditionalFormatting14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndConditionalFormatting14(*this)); } - void EndConditionalFormatting14::readFields(CFRecord& record) + void EndConditionalFormatting14::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting14.h index 5ca56d2cd5..6d8acec732 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormatting14.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndConditionalFormatting14 record in BIFF12 - class EndConditionalFormatting14: public BiffRecord + class EndConditionalFormatting14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndConditionalFormatting14) BASE_OBJECT_DEFINE_CLASS_NAME(EndConditionalFormatting14) @@ -48,9 +48,9 @@ namespace XLSB EndConditionalFormatting14(); virtual ~EndConditionalFormatting14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormattings.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormattings.cpp index dc1a300fa1..e55e0b3558 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormattings.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormattings.cpp @@ -32,6 +32,8 @@ #include "EndConditionalFormattings.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndConditionalFormattings(*this)); } - void EndConditionalFormattings::readFields(CFRecord& record) + void EndConditionalFormattings::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormattings.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormattings.h index 57e1e3fdea..519f8e713d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormattings.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndConditionalFormattings.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndConditionalFormattings record in BIFF12 - class EndConditionalFormattings: public BiffRecord + class EndConditionalFormattings: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndConditionalFormattings) BASE_OBJECT_DEFINE_CLASS_NAME(EndConditionalFormattings) @@ -48,9 +48,9 @@ namespace XLSB EndConditionalFormattings(); virtual ~EndConditionalFormattings(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXF14s.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXF14s.cpp index f4b5cac208..fa6bacefeb 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXF14s.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXF14s.cpp @@ -32,6 +32,8 @@ #include "EndDXF14s.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndDXF14s(*this)); } - void EndDXF14s::readFields(CFRecord& record) + void EndDXF14s::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXF14s.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXF14s.h index cb4bc37ab3..7936f984ea 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXF14s.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXF14s.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndDXF14s record in BIFF12 - class EndDXF14s: public BiffRecord + class EndDXF14s: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndDXF14s) BASE_OBJECT_DEFINE_CLASS_NAME(EndDXF14s) @@ -47,11 +47,11 @@ namespace XLSB EndDXF14s(); virtual ~EndDXF14s(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndDXF14s; + //static const XLS::ElementType type = XLS::typeEndDXF14s; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs.cpp index cd66774d15..012d92ed36 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs.cpp @@ -32,6 +32,8 @@ #include "EndDXFs.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndDXFs(*this)); } - void EndDXFs::readFields(CFRecord& record) + void EndDXFs::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs.h index 76d69cb836..e415ccce21 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndDXFs record in BIFF12 - class EndDXFs: public BiffRecord + class EndDXFs: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndDXFs) BASE_OBJECT_DEFINE_CLASS_NAME(EndDXFs) @@ -47,11 +47,11 @@ namespace XLSB EndDXFs(); virtual ~EndDXFs(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndDXFs; + //static const XLS::ElementType type = XLS::typeEndDXFs; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs15.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs15.cpp index 16b1a52ca5..3ad904b079 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs15.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs15.cpp @@ -32,6 +32,8 @@ #include "EndDXFs15.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndDXFs15(*this)); } - void EndDXFs15::readFields(CFRecord& record) + void EndDXFs15::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs15.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs15.h index f5c8660df8..2809459335 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs15.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDXFs15.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndDXFs15 record in BIFF12 - class EndDXFs15: public BiffRecord + class EndDXFs15: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndDXFs15) BASE_OBJECT_DEFINE_CLASS_NAME(EndDXFs15) @@ -47,11 +47,11 @@ namespace XLSB EndDXFs15(); virtual ~EndDXFs15(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndDXFs15; + //static const XLS::ElementType type = XLS::typeEndDXFs15; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar.cpp index 48bb9f3dad..6288182d9c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar.cpp @@ -32,6 +32,8 @@ #include "EndDatabar.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndDatabar(*this)); } - void EndDatabar::readFields(CFRecord& record) + void EndDatabar::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar.h index ec23f29c08..ff0f53cbb8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndDatabar record in BIFF12 - class EndDatabar: public BiffRecord + class EndDatabar: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndDatabar) BASE_OBJECT_DEFINE_CLASS_NAME(EndDatabar) @@ -47,11 +47,11 @@ namespace XLSB EndDatabar(); virtual ~EndDatabar(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndDatabar; + //static const XLS::ElementType type = XLS::typeEndDatabar; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar14.cpp index 2b4a8f91fe..14854edcfd 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar14.cpp @@ -32,6 +32,8 @@ #include "EndDatabar14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndDatabar14(*this)); } - void EndDatabar14::readFields(CFRecord& record) + void EndDatabar14::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar14.h index 1f5ad7cdca..83ac23bf7d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndDatabar14.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndDatabar14 record in BIFF12 - class EndDatabar14: public BiffRecord + class EndDatabar14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndDatabar14) BASE_OBJECT_DEFINE_CLASS_NAME(EndDatabar14) @@ -47,11 +47,11 @@ namespace XLSB EndDatabar14(); virtual ~EndDatabar14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndDatabar14; + //static const XLS::ElementType type = XLS::typeEndDatabar14; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndExternals.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndExternals.cpp index c73e3bf3f8..08da6639e2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndExternals.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndExternals.cpp @@ -32,6 +32,8 @@ #include "EndExternals.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndExternals(*this)); } - void EndExternals::readFields(CFRecord& record) + void EndExternals::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndExternals.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndExternals.h index 8dc079d468..1874f0d50f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndExternals.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndExternals.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndExternals record in BIFF12 - class EndExternals: public BiffRecord + class EndExternals: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndExternals) BASE_OBJECT_DEFINE_CLASS_NAME(EndExternals) @@ -48,9 +48,9 @@ namespace XLSB EndExternals(); virtual ~EndExternals(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFills.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFills.cpp index 087c81beea..5b93093d42 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFills.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFills.cpp @@ -32,6 +32,8 @@ #include "EndFills.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndFills(*this)); } - void EndFills::readFields(CFRecord& record) + void EndFills::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFills.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFills.h index 0adb4211e1..51f3fd88dd 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFills.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFills.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndFills record in BIFF12 - class EndFills: public BiffRecord + class EndFills: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndFills) BASE_OBJECT_DEFINE_CLASS_NAME(EndFills) @@ -47,11 +47,11 @@ namespace XLSB EndFills(); virtual ~EndFills(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndFills; + //static const XLS::ElementType type = XLS::typeEndFills; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFmts.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFmts.cpp index 1bfcfc1c9a..acb6522af7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFmts.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFmts.cpp @@ -32,6 +32,8 @@ #include "EndFmts.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndFmts(*this)); } - void EndFmts::readFields(CFRecord& record) + void EndFmts::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFmts.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFmts.h index 37318bcdea..0f5df1ca6f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFmts.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFmts.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndFmts record in BIFF12 - class EndFmts: public BiffRecord + class EndFmts: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndFmts) BASE_OBJECT_DEFINE_CLASS_NAME(EndFmts) @@ -47,11 +47,11 @@ namespace XLSB EndFmts(); virtual ~EndFmts(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndFmts; + //static const XLS::ElementType type = XLS::typeEndFmts; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFnGroup.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFnGroup.cpp index 6a3a07f136..b5369f9bd1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFnGroup.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFnGroup.cpp @@ -32,6 +32,8 @@ #include "EndFnGroup.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndFnGroup(*this)); } - void EndFnGroup::readFields(CFRecord& record) + void EndFnGroup::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFnGroup.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFnGroup.h index 6cb8dae36b..646227fce8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFnGroup.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFnGroup.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndFnGroup record in BIFF12 - class EndFnGroup: public BiffRecord + class EndFnGroup: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndFnGroup) BASE_OBJECT_DEFINE_CLASS_NAME(EndFnGroup) @@ -48,9 +48,9 @@ namespace XLSB EndFnGroup(); virtual ~EndFnGroup(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFonts.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFonts.cpp index 5f7018072b..09caa83587 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFonts.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFonts.cpp @@ -32,6 +32,8 @@ #include "EndFonts.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndFonts(*this)); } - void EndFonts::readFields(CFRecord& record) + void EndFonts::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFonts.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFonts.h index cfc4ada5d4..b80e5fc6fc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFonts.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndFonts.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndFonts record in BIFF12 - class EndFonts: public BiffRecord + class EndFonts: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndFonts) BASE_OBJECT_DEFINE_CLASS_NAME(EndFonts) @@ -47,11 +47,11 @@ namespace XLSB EndFonts(); virtual ~EndFonts(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndFonts; + //static const XLS::ElementType type = XLS::typeEndFonts; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet.cpp index bdcc4f038a..ca904fbf59 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet.cpp @@ -32,6 +32,8 @@ #include "EndIconSet.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndIconSet(*this)); } - void EndIconSet::readFields(CFRecord& record) + void EndIconSet::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet.h index f698109339..9f0e0a8d4c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndIconSet record in BIFF12 - class EndIconSet: public BiffRecord + class EndIconSet: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndIconSet) BASE_OBJECT_DEFINE_CLASS_NAME(EndIconSet) @@ -47,9 +47,9 @@ namespace XLSB EndIconSet(); virtual ~EndIconSet(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet14.cpp index 5f35604fa0..7642783f52 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet14.cpp @@ -32,6 +32,8 @@ #include "EndIconSet14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndIconSet14(*this)); } - void EndIconSet14::readFields(CFRecord& record) + void EndIconSet14::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet14.h index 81f056db79..a22bb428bc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIconSet14.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndIconSet14 record in BIFF12 - class EndIconSet14: public BiffRecord + class EndIconSet14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndIconSet14) BASE_OBJECT_DEFINE_CLASS_NAME(EndIconSet14) @@ -47,9 +47,9 @@ namespace XLSB EndIconSet14(); virtual ~EndIconSet14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIndexedColors.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIndexedColors.cpp index 6f81eed950..946746e097 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIndexedColors.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIndexedColors.cpp @@ -32,6 +32,8 @@ #include "EndIndexedColors.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndIndexedColors(*this)); } - void EndIndexedColors::readFields(CFRecord& record) + void EndIndexedColors::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIndexedColors.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIndexedColors.h index b75c8a0b08..af73338e6a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIndexedColors.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndIndexedColors.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndIndexedColors record in BIFF12 - class EndIndexedColors: public BiffRecord + class EndIndexedColors: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndIndexedColors) BASE_OBJECT_DEFINE_CLASS_NAME(EndIndexedColors) @@ -47,9 +47,9 @@ namespace XLSB EndIndexedColors(); virtual ~EndIndexedColors(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndListParts.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndListParts.cpp index c9f69a7440..3e5a09e02e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndListParts.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndListParts.cpp @@ -32,6 +32,8 @@ #include "EndListParts.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndListParts(*this)); } - void EndListParts::readFields(CFRecord& record) + void EndListParts::readFields(XLS::CFRecord& record) { } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndListParts.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndListParts.h index abbb0a66a8..67f6959d04 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndListParts.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndListParts.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndListParts record in BIFF12 - class EndListParts: public BiffRecord + class EndListParts: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndListParts) BASE_OBJECT_DEFINE_CLASS_NAME(EndListParts) @@ -47,9 +47,9 @@ namespace XLSB EndListParts(); virtual ~EndListParts(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMRUColors.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMRUColors.cpp index 099cb6f94c..49368fc8c7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMRUColors.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMRUColors.cpp @@ -32,6 +32,8 @@ #include "EndMRUColors.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndMRUColors(*this)); } - void EndMRUColors::readFields(CFRecord& record) + void EndMRUColors::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMRUColors.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMRUColors.h index ae3af65d4b..f33afbc2b6 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMRUColors.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMRUColors.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndMRUColors record in BIFF12 - class EndMRUColors: public BiffRecord + class EndMRUColors: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndMRUColors) BASE_OBJECT_DEFINE_CLASS_NAME(EndMRUColors) @@ -47,9 +47,9 @@ namespace XLSB EndMRUColors(); virtual ~EndMRUColors(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMergeCells.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMergeCells.cpp index 6813268d3f..ce0e868e06 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMergeCells.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMergeCells.cpp @@ -32,6 +32,8 @@ #include "EndMergeCells.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndMergeCells(*this)); } - void EndMergeCells::readFields(CFRecord& record) + void EndMergeCells::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMergeCells.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMergeCells.h index 1b90a55395..84c1546ddd 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMergeCells.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndMergeCells.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndMergeCells record in BIFF12 - class EndMergeCells: public BiffRecord + class EndMergeCells: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndMergeCells) BASE_OBJECT_DEFINE_CLASS_NAME(EndMergeCells) @@ -48,9 +48,9 @@ namespace XLSB EndMergeCells(); virtual ~EndMergeCells(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndRichSortCondition.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndRichSortCondition.cpp index 983548096d..1615991342 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndRichSortCondition.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndRichSortCondition.cpp @@ -32,6 +32,8 @@ #include "EndRichSortCondition.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndRichSortCondition(*this)); } - void EndRichSortCondition::readFields(CFRecord& record) + void EndRichSortCondition::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndRichSortCondition.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndRichSortCondition.h index 538d92a675..696e227148 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndRichSortCondition.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndRichSortCondition.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndRichSortCondition record in BIFF12 - class EndRichSortCondition: public BiffRecord + class EndRichSortCondition: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndRichSortCondition) BASE_OBJECT_DEFINE_CLASS_NAME(EndRichSortCondition) @@ -47,11 +47,11 @@ namespace XLSB EndRichSortCondition(); virtual ~EndRichSortCondition(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndRichSortCondition; + //static const XLS::ElementType type = XLS::typeEndRichSortCondition; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheet.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheet.cpp index 4f9ed3a6e4..22cedf6d1d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheet.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheet.cpp @@ -32,6 +32,8 @@ #include "EndSheet.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndSheet(*this)); } - void EndSheet::readFields(CFRecord& record) + void EndSheet::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheet.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheet.h index 2fb7ecd971..e2a0d9997d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheet.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheet.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndSheet record in BIFF12 - class EndSheet: public BiffRecord + class EndSheet: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndSheet) BASE_OBJECT_DEFINE_CLASS_NAME(EndSheet) @@ -47,9 +47,9 @@ namespace XLSB EndSheet(); virtual ~EndSheet(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheetData.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheetData.cpp index 7242a1ab8b..074bc7ec35 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheetData.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheetData.cpp @@ -32,6 +32,8 @@ #include "EndSheetData.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndSheetData(*this)); } - void EndSheetData::readFields(CFRecord& record) + void EndSheetData::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheetData.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheetData.h index 6cedd8b13f..1d9863cdbc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheetData.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSheetData.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndSheetData record in BIFF12 - class EndSheetData: public BiffRecord + class EndSheetData: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndSheetData) BASE_OBJECT_DEFINE_CLASS_NAME(EndSheetData) @@ -47,9 +47,9 @@ namespace XLSB EndSheetData(); virtual ~EndSheetData(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyle.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyle.cpp index 48c5777024..73e6278d8e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyle.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyle.cpp @@ -32,6 +32,8 @@ #include "EndSlicerStyle.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndSlicerStyle(*this)); } - void EndSlicerStyle::readFields(CFRecord& record) + void EndSlicerStyle::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyle.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyle.h index e86d876c40..f3441af9de 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyle.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyle.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndSlicerStyle record in BIFF12 - class EndSlicerStyle: public BiffRecord + class EndSlicerStyle: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndSlicerStyle) BASE_OBJECT_DEFINE_CLASS_NAME(EndSlicerStyle) @@ -47,9 +47,9 @@ namespace XLSB EndSlicerStyle(); virtual ~EndSlicerStyle(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyleElements.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyleElements.cpp index 18a1f63f85..91d3bae8da 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyleElements.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyleElements.cpp @@ -32,6 +32,8 @@ #include "EndSlicerStyleElements.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndSlicerStyleElements(*this)); } - void EndSlicerStyleElements::readFields(CFRecord& record) + void EndSlicerStyleElements::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyleElements.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyleElements.h index fa3a254320..2dc674c672 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyleElements.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyleElements.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndSlicerStyleElements record in BIFF12 - class EndSlicerStyleElements: public BiffRecord + class EndSlicerStyleElements: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndSlicerStyleElements) BASE_OBJECT_DEFINE_CLASS_NAME(EndSlicerStyleElements) @@ -47,9 +47,9 @@ namespace XLSB EndSlicerStyleElements(); virtual ~EndSlicerStyleElements(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyles.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyles.cpp index ad3582c162..29ea069893 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyles.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyles.cpp @@ -32,6 +32,8 @@ #include "EndSlicerStyles.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndSlicerStyles(*this)); } - void EndSlicerStyles::readFields(CFRecord& record) + void EndSlicerStyles::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyles.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyles.h index aa875c7409..151e30f294 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyles.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSlicerStyles.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndSlicerStyles record in BIFF12 - class EndSlicerStyles: public BiffRecord + class EndSlicerStyles: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndSlicerStyles) BASE_OBJECT_DEFINE_CLASS_NAME(EndSlicerStyles) @@ -47,9 +47,9 @@ namespace XLSB EndSlicerStyles(); virtual ~EndSlicerStyles(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond.cpp index bad2c42532..6497a33634 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond.cpp @@ -32,6 +32,8 @@ #include "EndSortCond.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndSortCond(*this)); } - void EndSortCond::readFields(CFRecord& record) + void EndSortCond::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond.h index 6d751a897d..ddc2194c14 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndSortCond record in BIFF12 - class EndSortCond: public BiffRecord + class EndSortCond: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndSortCond) BASE_OBJECT_DEFINE_CLASS_NAME(EndSortCond) @@ -47,11 +47,11 @@ namespace XLSB EndSortCond(); virtual ~EndSortCond(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndSortCond; + //static const XLS::ElementType type = XLS::typeEndSortCond; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond14.cpp index b126a4f37d..2180265ab8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond14.cpp @@ -32,6 +32,8 @@ #include "EndSortCond14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndSortCond14(*this)); } - void EndSortCond14::readFields(CFRecord& record) + void EndSortCond14::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond14.h index f688cb968c..85490a8efe 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortCond14.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndSortCond14 record in BIFF12 - class EndSortCond14: public BiffRecord + class EndSortCond14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndSortCond14) BASE_OBJECT_DEFINE_CLASS_NAME(EndSortCond14) @@ -47,11 +47,11 @@ namespace XLSB EndSortCond14(); virtual ~EndSortCond14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndSortCond14; + //static const XLS::ElementType type = XLS::typeEndSortCond14; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortState.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortState.cpp index 43a5302f69..c9e74a8000 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortState.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortState.cpp @@ -32,6 +32,8 @@ #include "EndSortState.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndSortState(*this)); } - void EndSortState::readFields(CFRecord& record) + void EndSortState::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortState.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortState.h index fbc0fd421e..ed1d3f4d5c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortState.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSortState.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndSortState record in BIFF12 - class EndSortState: public BiffRecord + class EndSortState: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndSortState) BASE_OBJECT_DEFINE_CLASS_NAME(EndSortState) @@ -47,11 +47,11 @@ namespace XLSB EndSortState(); virtual ~EndSortState(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeEndSortState; + //static const XLS::ElementType type = XLS::typeEndSortState; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSst.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSst.cpp index 506905abe5..905786db88 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSst.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSst.cpp @@ -32,6 +32,8 @@ #include "EndSst.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndSst(*this)); } - void EndSst::readFields(CFRecord& record) + void EndSst::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSst.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSst.h index e9b6fe1beb..0dcd72951f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSst.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndSst.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndSst record in BIFF12 - class EndSst: public BiffRecord + class EndSst: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndSst) BASE_OBJECT_DEFINE_CLASS_NAME(EndSst) @@ -47,9 +47,9 @@ namespace XLSB EndSst(); virtual ~EndSst(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheet.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheet.cpp index f6b0508c38..485d99a856 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheet.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheet.cpp @@ -32,6 +32,8 @@ #include "EndStyleSheet.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndStyleSheet(*this)); } - void EndStyleSheet::readFields(CFRecord& record) + void EndStyleSheet::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheet.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheet.h index dd0744f8e6..08ee092089 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheet.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheet.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndStyleSheet record in BIFF12 - class EndStyleSheet: public BiffRecord + class EndStyleSheet: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndStyleSheet) BASE_OBJECT_DEFINE_CLASS_NAME(EndStyleSheet) @@ -47,9 +47,9 @@ namespace XLSB EndStyleSheet(); virtual ~EndStyleSheet(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheetExt14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheetExt14.cpp index 88321b2660..23c6550b79 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheetExt14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheetExt14.cpp @@ -32,6 +32,8 @@ #include "EndStyleSheetExt14.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndStyleSheetExt14(*this)); } - void EndStyleSheetExt14::readFields(CFRecord& record) + void EndStyleSheetExt14::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheetExt14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheetExt14.h index 35844c5a7a..fca656e7f7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheetExt14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyleSheetExt14.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndStyleSheetExt14 record in BIFF12 - class EndStyleSheetExt14: public BiffRecord + class EndStyleSheetExt14: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndStyleSheetExt14) BASE_OBJECT_DEFINE_CLASS_NAME(EndStyleSheetExt14) @@ -47,9 +47,9 @@ namespace XLSB EndStyleSheetExt14(); virtual ~EndStyleSheetExt14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyles.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyles.cpp index a3fe8c6c81..7e49530285 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyles.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyles.cpp @@ -32,6 +32,8 @@ #include "EndStyles.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndStyles(*this)); } - void EndStyles::readFields(CFRecord& record) + void EndStyles::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyles.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyles.h index 5747f5c137..6272415a9d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyles.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndStyles.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndStyles record in BIFF12 - class EndStyles: public BiffRecord + class EndStyles: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndStyles) BASE_OBJECT_DEFINE_CLASS_NAME(EndStyles) @@ -47,9 +47,9 @@ namespace XLSB EndStyles(); virtual ~EndStyles(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyle.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyle.cpp index 2b41d17374..44dcaee5ea 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyle.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyle.cpp @@ -32,6 +32,8 @@ #include "EndTableStyle.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndTableStyle(*this)); } - void EndTableStyle::readFields(CFRecord& record) + void EndTableStyle::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyle.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyle.h index cdf5a9a80c..b44e433920 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyle.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyle.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndTableStyle record in BIFF12 - class EndTableStyle: public BiffRecord + class EndTableStyle: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndTableStyle) BASE_OBJECT_DEFINE_CLASS_NAME(EndTableStyle) @@ -47,9 +47,9 @@ namespace XLSB EndTableStyle(); virtual ~EndTableStyle(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyles.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyles.cpp index 2a267c14b8..d495475779 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyles.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyles.cpp @@ -32,6 +32,8 @@ #include "EndTableStyles.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndTableStyles(*this)); } - void EndTableStyles::readFields(CFRecord& record) + void EndTableStyles::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyles.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyles.h index 38de002dc6..4969ccd148 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyles.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTableStyles.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndTableStyles record in BIFF12 - class EndTableStyles: public BiffRecord + class EndTableStyles: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndTableStyles) BASE_OBJECT_DEFINE_CLASS_NAME(EndTableStyles) @@ -47,9 +47,9 @@ namespace XLSB EndTableStyles(); virtual ~EndTableStyles(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyle.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyle.cpp index 970dc47bbc..50359c96a8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyle.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyle.cpp @@ -32,6 +32,8 @@ #include "EndTimelineStyle.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndTimelineStyle(*this)); } - void EndTimelineStyle::readFields(CFRecord& record) + void EndTimelineStyle::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyle.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyle.h index 01c738f2da..990f9626ec 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyle.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyle.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndTimelineStyle record in BIFF12 - class EndTimelineStyle: public BiffRecord + class EndTimelineStyle: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndTimelineStyle) BASE_OBJECT_DEFINE_CLASS_NAME(EndTimelineStyle) @@ -47,9 +47,9 @@ namespace XLSB EndTimelineStyle(); virtual ~EndTimelineStyle(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleElements.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleElements.cpp index 17a42f85ff..913b7762ea 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleElements.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleElements.cpp @@ -32,6 +32,8 @@ #include "EndTimelineStyleElements.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndTimelineStyleElements(*this)); } - void EndTimelineStyleElements::readFields(CFRecord& record) + void EndTimelineStyleElements::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleElements.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleElements.h index d26b0b018c..c0c05acb50 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleElements.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleElements.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndTimelineStyleElements record in BIFF12 - class EndTimelineStyleElements: public BiffRecord + class EndTimelineStyleElements: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndTimelineStyleElements) BASE_OBJECT_DEFINE_CLASS_NAME(EndTimelineStyleElements) @@ -47,9 +47,9 @@ namespace XLSB EndTimelineStyleElements(); virtual ~EndTimelineStyleElements(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleSheetExt15.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleSheetExt15.cpp index b4510d99dd..c9386561e1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleSheetExt15.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleSheetExt15.cpp @@ -32,6 +32,8 @@ #include "EndTimelineStyleSheetExt15.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndTimelineStyleSheetExt15(*this)); } - void EndTimelineStyleSheetExt15::readFields(CFRecord& record) + void EndTimelineStyleSheetExt15::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleSheetExt15.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleSheetExt15.h index f3f17db403..3365a11553 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleSheetExt15.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyleSheetExt15.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndTimelineStyleSheetExt15 record in BIFF12 - class EndTimelineStyleSheetExt15: public BiffRecord + class EndTimelineStyleSheetExt15: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndTimelineStyleSheetExt15) BASE_OBJECT_DEFINE_CLASS_NAME(EndTimelineStyleSheetExt15) @@ -47,9 +47,9 @@ namespace XLSB EndTimelineStyleSheetExt15(); virtual ~EndTimelineStyleSheetExt15(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyles.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyles.cpp index 68eecc409c..67bfd7ee0a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyles.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyles.cpp @@ -32,6 +32,8 @@ #include "EndTimelineStyles.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndTimelineStyles(*this)); } - void EndTimelineStyles::readFields(CFRecord& record) + void EndTimelineStyles::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyles.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyles.h index 9385d14f31..d83db6e9fc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyles.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndTimelineStyles.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndTimelineStyles record in BIFF12 - class EndTimelineStyles: public BiffRecord + class EndTimelineStyles: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndTimelineStyles) BASE_OBJECT_DEFINE_CLASS_NAME(EndTimelineStyles) @@ -47,9 +47,9 @@ namespace XLSB EndTimelineStyles(); virtual ~EndTimelineStyles(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsView.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsView.cpp index 7cd366f264..1e90aabcf4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsView.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsView.cpp @@ -32,6 +32,8 @@ #include "EndWsView.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndWsView(*this)); } - void EndWsView::readFields(CFRecord& record) + void EndWsView::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsView.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsView.h index aaafd38e5d..22ebc9760c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsView.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsView.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndWsView record in BIFF12 - class EndWsView: public BiffRecord + class EndWsView: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndWsView) BASE_OBJECT_DEFINE_CLASS_NAME(EndWsView) @@ -47,9 +47,9 @@ namespace XLSB EndWsView(); virtual ~EndWsView(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsViews.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsViews.cpp index c3a3f76adf..47fa4ff0ac 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsViews.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsViews.cpp @@ -32,6 +32,8 @@ #include "EndWsViews.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new EndWsViews(*this)); } - void EndWsViews::readFields(CFRecord& record) + void EndWsViews::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsViews.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsViews.h index 548afc661b..ab905b2b80 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsViews.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/EndWsViews.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtEndWsViews record in BIFF12 - class EndWsViews: public BiffRecord + class EndWsViews: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(EndWsViews) BASE_OBJECT_DEFINE_CLASS_NAME(EndWsViews) @@ -47,9 +47,9 @@ namespace XLSB EndWsViews(); virtual ~EndWsViews(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTBegin.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTBegin.cpp index 10a80c76f0..355e443901 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTBegin.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTBegin.cpp @@ -32,6 +32,8 @@ #include "FRTBegin.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new FRTBegin(*this)); } - void FRTBegin::readFields(CFRecord& record) + void FRTBegin::readFields(XLS::CFRecord& record) { record >> productVersion; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTBegin.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTBegin.h index 6bac77146b..5c1f9ad90c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTBegin.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTBegin.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTProductVersion.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtFRTBegin record in BIFF12 - class FRTBegin: public BiffRecord + class FRTBegin: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(FRTBegin) BASE_OBJECT_DEFINE_CLASS_NAME(FRTBegin) @@ -48,9 +48,9 @@ namespace XLSB FRTBegin(); virtual ~FRTBegin(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); FRTProductVersion productVersion; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTEnd.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTEnd.cpp index d9d97955e1..cf8710d14f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTEnd.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTEnd.cpp @@ -32,6 +32,8 @@ #include "FRTEnd.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new FRTEnd(*this)); } - void FRTEnd::readFields(CFRecord& record) + void FRTEnd::readFields(XLS::CFRecord& record) { // No data in this record } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTEnd.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTEnd.h index 1e7075094c..5d791d74ea 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTEnd.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FRTEnd.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtFRTEnd record in BIFF12 - class FRTEnd: public BiffRecord + class FRTEnd: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(FRTEnd) BASE_OBJECT_DEFINE_CLASS_NAME(FRTEnd) @@ -47,11 +47,11 @@ namespace XLSB FRTEnd(); virtual ~FRTEnd(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeFRTEnd; + //static const XLS::ElementType type = XLS::typeFRTEnd; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileSharingIso.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileSharingIso.cpp index 6bb22be9eb..54535629d5 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileSharingIso.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileSharingIso.cpp @@ -32,6 +32,8 @@ #include "FileSharingIso.h" +using namespace XLS; + namespace XLSB { @@ -51,7 +53,7 @@ namespace XLSB } - void FileSharingIso::readFields(CFRecord& record) + void FileSharingIso::readFields(XLS::CFRecord& record) { record >> dwSpinCount; record >> fReadOnlyRec; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileSharingIso.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileSharingIso.h index d6d7177100..0191141dd9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileSharingIso.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileSharingIso.h @@ -31,18 +31,16 @@ */ #pragma once -#include #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" #include "../Biff12_structures/LPByteBuf.h" -#include -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Boolean.h" namespace XLSB { // Logical representation of BrtFileSharingIso record in BIFF12 - class FileSharingIso: public BiffRecord + class FileSharingIso: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(FileSharingIso) BASE_OBJECT_DEFINE_CLASS_NAME(FileSharingIso) @@ -50,9 +48,9 @@ namespace XLSB FileSharingIso(); virtual ~FileSharingIso(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 dwSpinCount; XLS::Boolean fReadOnlyRec; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileVersion.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileVersion.cpp index 17567761a5..611fa2a74b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileVersion.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileVersion.cpp @@ -32,6 +32,8 @@ #include "FileVersion.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new FileVersion(*this)); } - void FileVersion::readFields(CFRecord& record) + void FileVersion::readFields(XLS::CFRecord& record) { record >> guidCodeName; record >> stAppName; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileVersion.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileVersion.h index dcc084313d..f35a616f36 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileVersion.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FileVersion.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtFileVersion record in BIFF12 - class FileVersion: public BiffRecord + class FileVersion: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(FileVersion) BASE_OBJECT_DEFINE_CLASS_NAME(FileVersion) @@ -48,9 +48,9 @@ namespace XLSB FileVersion(); virtual ~FileVersion(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _GUID_ guidCodeName; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fill.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fill.cpp index 96151b659f..214fff85d1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fill.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fill.cpp @@ -32,6 +32,8 @@ #include "Fill.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new Fill(*this)); } - void Fill::readFields(CFRecord& record) + void Fill::readFields(XLS::CFRecord& record) { record >> fls; brtColorFore.readFields(record); diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fill.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fill.h index 13498f6931..fd0943aa7d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fill.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fill.h @@ -31,18 +31,17 @@ */ #pragma once -#include #include "../../XlsxFormat/WritingElement.h" -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Xnum.h" #include "Color.h" #include "../Biff12_structures/GradientStop.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtFill record in BIFF12 - class Fill: public BiffRecord + class Fill: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(Fill) BASE_OBJECT_DEFINE_CLASS_NAME(Fill) @@ -50,21 +49,21 @@ namespace XLSB Fill(); virtual ~Fill(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeFill; + //static const XLS::ElementType type = XLS::typeFill; _UINT32 fls; Color brtColorFore; Color brtColorBack; _UINT32 iGradientType; - Xnum xnumDegree; - Xnum xnumFillToLeft; - Xnum xnumFillToRight; - Xnum xnumFillToTop; - Xnum xnumFillToBottom; + XLS::Xnum xnumDegree; + XLS::Xnum xnumFillToLeft; + XLS::Xnum xnumFillToRight; + XLS::Xnum xnumFillToTop; + XLS::Xnum xnumFillToBottom; _UINT32 cNumStop; std::vector xfillGradientStop; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmla.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmla.h index d2b110e958..ef5486db90 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmla.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmla.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/Cell.h" #include "../Biff12_structures/XLWideString.h" #include "../Biff12_structures/GrbitFmla.h" -#include -#include -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellParsedFormula.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Xnum.h" + namespace XLSB { @@ -50,14 +50,14 @@ namespace XLSB FmlaBase(bool flag) : formula(flag) {} Cell cell; GrbitFmla grbitFlags; - CellParsedFormula formula; + XLS::CellParsedFormula formula; }; template - class Fmla_T: public FmlaBase, public BiffRecord + class Fmla_T: public FmlaBase, public XLS::BiffRecord { public: - const CFRecordType::TypeId getTypeId() const + const XLS::CFRecordType::TypeId getTypeId() const { return id; } @@ -91,12 +91,12 @@ namespace XLSB { } - BaseObjectPtr clone() + XLS::BaseObjectPtr clone() { - return BaseObjectPtr(new Fmla_T(*this)); + return XLS::BaseObjectPtr(new Fmla_T(*this)); } - void readFields(CFRecord& record) + void readFields(XLS::CFRecord& record) { record >> cell >> value >> grbitFlags >> formula; } @@ -106,7 +106,7 @@ namespace XLSB typedef Fmla_T FmlaString; typedef Fmla_T, rt_FmlaBool> FmlaBool; - typedef Fmla_T FmlaNum; + typedef Fmla_T FmlaNum; typedef Fmla_T FmlaError; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmt.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmt.cpp index 49577f7c0b..d97d9d5048 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmt.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmt.cpp @@ -32,6 +32,8 @@ #include "Fmt.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new Fmt(*this)); } - void Fmt::readFields(CFRecord& record) + void Fmt::readFields(XLS::CFRecord& record) { record >> ifmt >> stFmtCode; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmt.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmt.h index 42226487b4..d3690dd1db 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmt.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Fmt.h @@ -31,16 +31,14 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtFmt record in BIFF12 - class Fmt: public BiffRecord + class Fmt: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(Fmt) BASE_OBJECT_DEFINE_CLASS_NAME(Fmt) @@ -48,13 +46,13 @@ namespace XLSB Fmt(); virtual ~Fmt(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - static const ElementType type = typeFmt; + static const XLS::ElementType type = XLS::typeFmt; - IFmt ifmt; + XLS::IFmt ifmt; XLWideString stFmtCode; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FnGroup.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FnGroup.cpp index e22523ba8e..897a313eee 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FnGroup.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FnGroup.cpp @@ -32,6 +32,8 @@ #include "FnGroup.h" +using namespace XLS; + namespace XLSB { @@ -51,7 +53,7 @@ namespace XLSB } - void FnGroup::readFields(CFRecord& record) + void FnGroup::readFields(XLS::CFRecord& record) { record >> stGroup; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FnGroup.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FnGroup.h index 64970f8a44..abab033ed8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FnGroup.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/FnGroup.h @@ -31,17 +31,17 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtFnGroup record in BIFF12 - class FnGroup: public BiffRecord + class FnGroup: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(FnGroup) BASE_OBJECT_DEFINE_CLASS_NAME(FnGroup) @@ -49,9 +49,9 @@ namespace XLSB FnGroup(); ~FnGroup(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); XLWideString stGroup; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/HLink.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/HLink.cpp index 6798cdaf80..ffac0ad401 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/HLink.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/HLink.cpp @@ -32,6 +32,8 @@ #include "HLink.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new HLink(*this)); } - void HLink::readFields(CFRecord& record) + void HLink::readFields(XLS::CFRecord& record) { record >> rfx >> relId >> location >> tooltip >> display; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/HLink.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/HLink.h index 2f708b90c0..2a68d72e6b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/HLink.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/HLink.h @@ -31,18 +31,18 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../Biff12_structures/CellRangeRef.h" #include "../Biff12_structures/RelID.h" #include "../Biff12_structures/XLWideString.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtHLink record in BIFF12 - class HLink: public BiffRecord + class HLink: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(HLink) BASE_OBJECT_DEFINE_CLASS_NAME(HLink) @@ -50,9 +50,9 @@ namespace XLSB HLink(); virtual ~HLink(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); UncheckedRfX rfx; RelID relId; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/IndexedColor.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/IndexedColor.cpp index c4ddf74964..1360951411 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/IndexedColor.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/IndexedColor.cpp @@ -32,6 +32,8 @@ #include "IndexedColor.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new IndexedColor(*this)); } - void IndexedColor::readFields(CFRecord& record) + void IndexedColor::readFields(XLS::CFRecord& record) { record >> bRed >> bGreen >> bBlue; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/IndexedColor.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/IndexedColor.h index 346466f3da..c615372f20 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/IndexedColor.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/IndexedColor.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtIndexedColor record in BIFF12 - class IndexedColor: public BiffRecord + class IndexedColor: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(IndexedColor) BASE_OBJECT_DEFINE_CLASS_NAME(IndexedColor) @@ -47,9 +47,9 @@ namespace XLSB IndexedColor(); virtual ~IndexedColor(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); BYTE bRed; BYTE bGreen; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawing.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawing.cpp index 7298f9f973..f185a7ca62 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawing.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawing.cpp @@ -32,6 +32,8 @@ #include "LegacyDrawing.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new LegacyDrawing(*this)); } - void LegacyDrawing::readFields(CFRecord& record) + void LegacyDrawing::readFields(XLS::CFRecord& record) { record >> stRelId; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawing.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawing.h index a7ebfcebdd..1376e9a24d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawing.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawing.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/RelID.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtLegacyDrawing record in BIFF12 - class LegacyDrawing: public BiffRecord + class LegacyDrawing: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(LegacyDrawing) BASE_OBJECT_DEFINE_CLASS_NAME(LegacyDrawing) @@ -48,9 +48,9 @@ namespace XLSB LegacyDrawing(); virtual ~LegacyDrawing(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); RelID stRelId; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawingHF.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawingHF.cpp index 3c768c50a1..80ac5aa374 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawingHF.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawingHF.cpp @@ -32,6 +32,8 @@ #include "LegacyDrawingHF.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new LegacyDrawingHF(*this)); } - void LegacyDrawingHF::readFields(CFRecord& record) + void LegacyDrawingHF::readFields(XLS::CFRecord& record) { record >> stRelId; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawingHF.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawingHF.h index b990fedd0a..24b4f8f621 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawingHF.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/LegacyDrawingHF.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/RelID.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtLegacyDrawingHF record in BIFF12 - class LegacyDrawingHF: public BiffRecord + class LegacyDrawingHF: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(LegacyDrawingHF) BASE_OBJECT_DEFINE_CLASS_NAME(LegacyDrawingHF) @@ -48,9 +48,9 @@ namespace XLSB LegacyDrawingHF(); virtual ~LegacyDrawingHF(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); RelID stRelId; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ListPart.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ListPart.cpp index 1b5bb0d223..06a44d6ace 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ListPart.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ListPart.cpp @@ -32,6 +32,8 @@ #include "ListPart.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new ListPart(*this)); } - void ListPart::readFields(CFRecord& record) + void ListPart::readFields(XLS::CFRecord& record) { record >> stRelID; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ListPart.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ListPart.h index bdecb845cf..b440c4abc3 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ListPart.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ListPart.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/RelID.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtListPart record in BIFF12 - class ListPart: public BiffRecord + class ListPart: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(ListPart) BASE_OBJECT_DEFINE_CLASS_NAME(ListPart) @@ -48,9 +48,9 @@ namespace XLSB ListPart(); virtual ~ListPart(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); RelID stRelID; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MRUColor.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MRUColor.cpp index 223a493cc1..ea8c10b43d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MRUColor.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MRUColor.cpp @@ -32,6 +32,8 @@ #include "MRUColor.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new MRUColor(*this)); } - void MRUColor::readFields(CFRecord& record) + void MRUColor::readFields(XLS::CFRecord& record) { colorMRU.readFields(record); } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MRUColor.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MRUColor.h index a2188646e1..eb80b21499 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MRUColor.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MRUColor.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "Color.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtMRUColor record in BIFF12 - class MRUColor: public BiffRecord + class MRUColor: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(MRUColor) BASE_OBJECT_DEFINE_CLASS_NAME(MRUColor) @@ -48,11 +48,11 @@ namespace XLSB MRUColor(); virtual ~MRUColor(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeMRUColor; + //static const XLS::ElementType type = XLS::typeMRUColor; Color colorMRU; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MergeCell.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MergeCell.cpp index d7badad2b5..b9780a6a2b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MergeCell.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MergeCell.cpp @@ -32,6 +32,8 @@ #include "MergeCell.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new MergeCell(*this)); } - void MergeCell::readFields(CFRecord& record) + void MergeCell::readFields(XLS::CFRecord& record) { record >> rfx; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MergeCell.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MergeCell.h index 99f145c499..0c6323bee4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MergeCell.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/MergeCell.h @@ -31,17 +31,17 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/CellRangeRef.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtMergeCell record in BIFF12 - class MergeCell: public BiffRecord + class MergeCell: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(MergeCell) BASE_OBJECT_DEFINE_CLASS_NAME(MergeCell) @@ -49,9 +49,9 @@ namespace XLSB MergeCell(); ~MergeCell(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); UncheckedRfX rfx; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/OleSize.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/OleSize.cpp index 7c831eea78..02bfb308fa 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/OleSize.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/OleSize.cpp @@ -32,6 +32,8 @@ #include "OleSize.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new OleSize(*this)); } - void OleSize::readFields(CFRecord& record) + void OleSize::readFields(XLS::CFRecord& record) { record >> rfx; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/OleSize.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/OleSize.h index ce098e933a..b95f8bd41e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/OleSize.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/OleSize.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/CellRangeRef.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtOleSize record in BIFF12 - class OleSize: public BiffRecord + class OleSize: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(OleSize) BASE_OBJECT_DEFINE_CLASS_NAME(OleSize) @@ -48,9 +48,9 @@ namespace XLSB OleSize(); virtual ~OleSize(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); UncheckedRfX rfx; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/PlaceholderName.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/PlaceholderName.cpp index ee5cf805a7..623b71b938 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/PlaceholderName.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/PlaceholderName.cpp @@ -32,6 +32,8 @@ #include "PlaceholderName.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new PlaceholderName(*this)); } - void PlaceholderName::readFields(CFRecord& record) + void PlaceholderName::readFields(XLS::CFRecord& record) { record >> name; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/PlaceholderName.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/PlaceholderName.h index fe1bbb5945..fb05ffc492 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/PlaceholderName.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/PlaceholderName.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/XLWideString.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtPlaceholderName record in BIFF12 - class PlaceholderName: public BiffRecord + class PlaceholderName: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(PlaceholderName) BASE_OBJECT_DEFINE_CLASS_NAME(PlaceholderName) @@ -48,9 +48,9 @@ namespace XLSB PlaceholderName(); virtual ~PlaceholderName(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); XLNameWideString name; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/RwDescent.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/RwDescent.cpp index 3e3d06d671..2afd8c5f54 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/RwDescent.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/RwDescent.cpp @@ -32,6 +32,8 @@ #include "RwDescent.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new RwDescent(*this)); } - void RwDescent::readFields(CFRecord& record) + void RwDescent::readFields(XLS::CFRecord& record) { record >> dyDescent; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/RwDescent.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/RwDescent.h index 067bf830f6..cb240f59b0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/RwDescent.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/RwDescent.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtRwDescent record in BIFF12 - class RwDescent: public BiffRecord + class RwDescent: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(RwDescent) BASE_OBJECT_DEFINE_CLASS_NAME(RwDescent) @@ -47,11 +47,11 @@ namespace XLSB RwDescent(); virtual ~RwDescent(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - //static const ElementType type = typeRwDescent; + //static const XLS::ElementType type = XLS::typeRwDescent; _UINT16 dyDescent; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SSTItem.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SSTItem.cpp index d1608df5e6..f27839d962 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SSTItem.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SSTItem.cpp @@ -32,6 +32,8 @@ #include "SSTItem.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new SSTItem(*this)); } - void SSTItem::readFields(CFRecord& record) + void SSTItem::readFields(XLS::CFRecord& record) { record >> richStr; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SSTItem.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SSTItem.h index 7200e1ac9d..a486d155c2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SSTItem.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SSTItem.h @@ -31,16 +31,15 @@ */ #pragma once -#include #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/RichStr.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtSSTItem record in BIFF12 - class SSTItem: public BiffRecord + class SSTItem: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(SSTItem) BASE_OBJECT_DEFINE_CLASS_NAME(SSTItem) @@ -48,11 +47,11 @@ namespace XLSB SSTItem(); virtual ~SSTItem(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); - RichStr richStr; + RichStr richStr; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtection.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtection.cpp index fb7fdb0285..442744de20 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtection.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtection.cpp @@ -32,6 +32,8 @@ #include "SheetProtection.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new SheetProtection(*this)); } - void SheetProtection::readFields(CFRecord& record) + void SheetProtection::readFields(XLS::CFRecord& record) { record >> protpwd; record >> fLocked >> fObjects >> fScenarios >> fFormatCells >> fFormatColumns >> fFormatRows >> fInsertColumns >> fInsertRows; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtection.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtection.h index 209d7f03bd..8cf3d2e3c4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtection.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtection.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtSheetProtection record in BIFF12 - class SheetProtection: public BiffRecord + class SheetProtection: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(SheetProtection) BASE_OBJECT_DEFINE_CLASS_NAME(SheetProtection) @@ -47,9 +47,9 @@ namespace XLSB SheetProtection(); virtual ~SheetProtection(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT16 protpwd; XLS::Boolean fLocked; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtectionIso.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtectionIso.cpp index 520b090f1a..6b5d48c6ab 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtectionIso.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtectionIso.cpp @@ -32,6 +32,8 @@ #include "SheetProtectionIso.h" +using namespace XLS; + namespace XLSB { @@ -51,7 +53,7 @@ namespace XLSB } - void SheetProtectionIso::readFields(CFRecord& record) + void SheetProtectionIso::readFields(XLS::CFRecord& record) { record >> dwSpinCount; record >> fLocked >> fObjects >> fScenarios >> fFormatCells >> fFormatColumns >> fFormatRows >> fInsertColumns >> fInsertRows; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtectionIso.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtectionIso.h index 1daf99e6d5..187a1167e7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtectionIso.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SheetProtectionIso.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/IsoPasswordData.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtSheetProtectionIso record in BIFF12 - class SheetProtectionIso: public BiffRecord + class SheetProtectionIso: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(SheetProtectionIso) BASE_OBJECT_DEFINE_CLASS_NAME(SheetProtectionIso) @@ -48,9 +48,9 @@ namespace XLSB SheetProtectionIso(); virtual ~SheetProtectionIso(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 dwSpinCount; XLS::Boolean fLocked; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SlicerStyleElement.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SlicerStyleElement.cpp index 4f9f658b65..f651109c52 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SlicerStyleElement.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SlicerStyleElement.cpp @@ -32,6 +32,8 @@ #include "SlicerStyleElement.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new SlicerStyleElement(*this)); } - void SlicerStyleElement::readFields(CFRecord& record) + void SlicerStyleElement::readFields(XLS::CFRecord& record) { record >> FRTheader >> tseType >> dxfId; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SlicerStyleElement.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SlicerStyleElement.h index 59bec40d21..c2383db73c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SlicerStyleElement.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SlicerStyleElement.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtSlicerStyleElement record in BIFF12 - class SlicerStyleElement: public BiffRecord + class SlicerStyleElement: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(SlicerStyleElement) BASE_OBJECT_DEFINE_CLASS_NAME(SlicerStyleElement) @@ -48,9 +48,9 @@ namespace XLSB SlicerStyleElement(); virtual ~SlicerStyleElement(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); FRTBlank FRTheader; _UINT32 tseType; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Style.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Style.cpp index 1bc54e5f51..5a3282a232 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Style.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Style.cpp @@ -33,6 +33,8 @@ #include "Style.h" #include "../Biff12_structures/XLWideString.h" +using namespace XLS; + namespace XLSB { @@ -49,7 +51,7 @@ namespace XLSB return BaseObjectPtr(new Style(*this)); } - void Style::readFields(CFRecord& record) + void Style::readFields(XLS::CFRecord& record) { record >> ixf; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Style.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Style.h index bf9d2dc60c..0256988354 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Style.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Style.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtStyle record in BIFF12 - class Style: public BiffRecord + class Style: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(Style) BASE_OBJECT_DEFINE_CLASS_NAME(Style) @@ -47,9 +47,9 @@ namespace XLSB Style(); virtual ~Style(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _UINT32 ixf; bool fBuiltIn; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupAddin.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupAddin.cpp index 9048eb280b..21a0724440 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupAddin.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupAddin.cpp @@ -48,7 +48,7 @@ namespace XLSB return BaseObjectPtr(new SupAddin(*this)); } - void SupAddin::readFields(CFRecord& record) + void SupAddin::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupAddin.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupAddin.h index a5736db3ac..523bad3c14 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupAddin.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupAddin.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtSupAddin record in BIFF12 - class SupAddin: public BiffRecord + class SupAddin: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(SupAddin) BASE_OBJECT_DEFINE_CLASS_NAME(SupAddin) @@ -47,9 +47,9 @@ namespace XLSB SupAddin(); virtual ~SupAddin(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupBookSrc.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupBookSrc.cpp index 54a9f407ae..4bbe348d97 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupBookSrc.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupBookSrc.cpp @@ -32,6 +32,8 @@ #include "SupBookSrc.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new SupBookSrc(*this)); } - void SupBookSrc::readFields(CFRecord& record) + void SupBookSrc::readFields(XLS::CFRecord& record) { record >> strRelID; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupBookSrc.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupBookSrc.h index 0caee8c302..2652876499 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupBookSrc.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupBookSrc.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/RelID.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtSupBookSrc record in BIFF12 - class SupBookSrc: public BiffRecord + class SupBookSrc: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(SupBookSrc) BASE_OBJECT_DEFINE_CLASS_NAME(SupBookSrc) @@ -48,9 +48,9 @@ namespace XLSB SupBookSrc(); virtual ~SupBookSrc(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); RelID strRelID; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSame.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSame.cpp index 436a61b7f1..cf7be67fae 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSame.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSame.cpp @@ -32,6 +32,8 @@ #include "SupSame.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new SupSame(*this)); } - void SupSame::readFields(CFRecord& record) + void SupSame::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSame.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSame.h index c0ccf1dcff..f49eccece6 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSame.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSame.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtSupSame record in BIFF12 - class SupSame: public BiffRecord + class SupSame: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(SupSame) BASE_OBJECT_DEFINE_CLASS_NAME(SupSame) @@ -47,9 +47,9 @@ namespace XLSB SupSame(); virtual ~SupSame(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSelf.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSelf.cpp index 88539cc529..9ba7679640 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSelf.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSelf.cpp @@ -32,6 +32,8 @@ #include "SupSelf.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new SupSelf(*this)); } - void SupSelf::readFields(CFRecord& record) + void SupSelf::readFields(XLS::CFRecord& record) { //empty data } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSelf.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSelf.h index 68ca3b20a5..ddf451e4fa 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSelf.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/SupSelf.h @@ -31,15 +31,13 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; - namespace XLSB { // Logical representation of BrtSupSelf record in BIFF12 - class SupSelf: public BiffRecord + class SupSelf: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(SupSelf) BASE_OBJECT_DEFINE_CLASS_NAME(SupSelf) @@ -47,9 +45,9 @@ namespace XLSB SupSelf(); virtual ~SupSelf(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/TimelineStyleElement.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/TimelineStyleElement.cpp index ecb2258f3f..b49d39f480 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/TimelineStyleElement.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/TimelineStyleElement.cpp @@ -32,6 +32,8 @@ #include "TimelineStyleElement.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new TimelineStyleElement(*this)); } - void TimelineStyleElement::readFields(CFRecord& record) + void TimelineStyleElement::readFields(XLS::CFRecord& record) { record >> FRTheader >> tseType >> dxfId; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/TimelineStyleElement.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/TimelineStyleElement.h index af8c7382b1..9b7b322bb9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/TimelineStyleElement.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/TimelineStyleElement.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/FRTBlank.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtTimelineStyleElement record in BIFF12 - class TimelineStyleElement: public BiffRecord + class TimelineStyleElement: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(TimelineStyleElement) BASE_OBJECT_DEFINE_CLASS_NAME(TimelineStyleElement) @@ -48,9 +48,9 @@ namespace XLSB TimelineStyleElement(); virtual ~TimelineStyleElement(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); FRTBlank FRTheader; _UINT32 tseType; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Uid.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Uid.cpp index 9a37b34297..28e99fb9fb 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Uid.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Uid.cpp @@ -32,6 +32,8 @@ #include "Uid.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new Uid(*this)); } - void Uid::readFields(CFRecord& record) + void Uid::readFields(XLS::CFRecord& record) { record >> value; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Uid.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Uid.h index 85b1ec1f21..edfb9f0f7a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Uid.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/Uid.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtUid record in BIFF12 - class Uid: public BiffRecord + class Uid: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(Uid) BASE_OBJECT_DEFINE_CLASS_NAME(Uid) @@ -47,9 +47,9 @@ namespace XLSB Uid(); virtual ~Uid(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _GUID_ value; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ValueMeta.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ValueMeta.cpp index 13e40385ce..81168bf900 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ValueMeta.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ValueMeta.cpp @@ -32,6 +32,8 @@ #include "ValueMeta.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new ValueMeta(*this)); } - void ValueMeta::readFields(CFRecord& record) + void ValueMeta::readFields(XLS::CFRecord& record) { record >> ivmb; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ValueMeta.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ValueMeta.h index 051dab3319..4fac6f0f76 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ValueMeta.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/ValueMeta.h @@ -31,15 +31,15 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtValueMeta record in BIFF12 - class ValueMeta: public BiffRecord + class ValueMeta: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(ValueMeta) BASE_OBJECT_DEFINE_CLASS_NAME(ValueMeta) @@ -47,9 +47,9 @@ namespace XLSB ValueMeta(); virtual ~ValueMeta(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); _INT32 ivmb; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WbProp.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WbProp.cpp index 15eb3a9f5a..5834955b05 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WbProp.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WbProp.cpp @@ -32,6 +32,8 @@ #include "WbProp.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new WbProp(*this)); } - void WbProp::readFields(CFRecord& record) + void WbProp::readFields(XLS::CFRecord& record) { unsigned int flags; record >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WbProp.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WbProp.h index df16697fb3..06f6ef4cb1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WbProp.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WbProp.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/CodeName.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtWbProp record in BIFF12 - class WbProp: public BiffRecord + class WbProp: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(WbProp) BASE_OBJECT_DEFINE_CLASS_NAME(WbProp) @@ -48,9 +48,9 @@ namespace XLSB WbProp(); virtual ~WbProp(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); bool f1904; bool fHideBorderUnselLists; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsDim.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsDim.cpp index f37dd97393..b7c3319860 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsDim.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsDim.cpp @@ -32,6 +32,8 @@ #include "WsDim.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BaseObjectPtr(new WsDim(*this)); } - void WsDim::readFields(CFRecord& record) + void WsDim::readFields(XLS::CFRecord& record) { record >> rfx; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsDim.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsDim.h index aa7b3f6a5d..cffc8cd832 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsDim.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsDim.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" #include "../Biff12_structures/CellRangeRef.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtWsDim record in BIFF12 - class WsDim: public BiffRecord + class WsDim: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(WsDim) BASE_OBJECT_DEFINE_CLASS_NAME(WsDim) @@ -48,9 +48,9 @@ namespace XLSB WsDim(); virtual ~WsDim(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); UncheckedRfX rfx; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsFmtInfo.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsFmtInfo.cpp index 96f082b471..b87a706145 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsFmtInfo.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsFmtInfo.cpp @@ -32,6 +32,8 @@ #include "WsFmtInfo.h" +using namespace XLS; + namespace XLSB { @@ -51,7 +53,7 @@ namespace XLSB } - void WsFmtInfo::readFields(CFRecord& record) + void WsFmtInfo::readFields(XLS::CFRecord& record) { unsigned short flags; record >> dxGCol >> cchDefColWidth >> miyDefRwHeight >> flags >> iOutLevelRw >> iOutLevelCol; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsFmtInfo.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsFmtInfo.h index aebd0d78be..1b72539384 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsFmtInfo.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_records/WsFmtInfo.h @@ -31,16 +31,16 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../../XlsxFormat/WritingElement.h" -using namespace XLS; + namespace XLSB { // Logical representation of BrtWsFmtInfo record in BIFF12 - class WsFmtInfo: public BiffRecord + class WsFmtInfo: public XLS::BiffRecord { BIFF_RECORD_DEFINE_TYPE_INFO(WsFmtInfo) BASE_OBJECT_DEFINE_CLASS_NAME(WsFmtInfo) @@ -48,9 +48,9 @@ namespace XLSB WsFmtInfo(); ~WsFmtInfo(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - void readFields(CFRecord& record); + void readFields(XLS::CFRecord& record); //----------------------------- _UINT32 dxGCol; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ACProductVersion.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ACProductVersion.cpp index e6980935c1..37fd941c19 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ACProductVersion.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ACProductVersion.cpp @@ -32,6 +32,8 @@ #include "ACProductVersion.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - ACProductVersion::ACProductVersion(CFRecord& record) + ACProductVersion::ACProductVersion(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new ACProductVersion(*this)); } - void ACProductVersion::load(CFRecord& record) + void ACProductVersion::load(XLS::CFRecord& record) { unsigned short flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ACProductVersion.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ACProductVersion.h index 1cc5459077..8d8aa42457 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ACProductVersion.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ACProductVersion.h @@ -32,24 +32,24 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" + -using namespace XLS; namespace XLSB { - class ACProductVersion : public BiffStructure + class ACProductVersion : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(ACProductVersion) public: ACProductVersion(); - ACProductVersion(CFRecord& record); + ACProductVersion(XLS::CFRecord& record); virtual ~ACProductVersion(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); _UINT16 fileVersion; _UINT16 fileProduct; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Blxf.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Blxf.cpp index 6872d90b64..18f0262a87 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Blxf.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Blxf.cpp @@ -32,6 +32,8 @@ #include "Blxf.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - Blxf::Blxf(CFRecord& record) + Blxf::Blxf(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new Blxf(*this)); } - void Blxf::load(CFRecord& record) + void Blxf::load(XLS::CFRecord& record) { record >> dg; record.skipNunBytes(1); diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Blxf.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Blxf.h index e74f9e2dc5..b23ff172cd 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Blxf.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Blxf.h @@ -32,25 +32,25 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../Biff12_records/Color.h" -using namespace XLS; + namespace XLSB { - class Blxf : public BiffStructure + class Blxf : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(Blxf) public: Blxf(); - Blxf(CFRecord& record); + Blxf(XLS::CFRecord& record); virtual ~Blxf(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); BYTE dg; Color brtColor; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/BookProtectionFlags.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/BookProtectionFlags.cpp index 7ef8f7b77b..0f0c4e7ed8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/BookProtectionFlags.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/BookProtectionFlags.cpp @@ -32,6 +32,8 @@ #include "BookProtectionFlags.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - BookProtectionFlags::BookProtectionFlags(CFRecord& record) + BookProtectionFlags::BookProtectionFlags(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new BookProtectionFlags(*this)); } - void BookProtectionFlags::load(CFRecord& record) + void BookProtectionFlags::load(XLS::CFRecord& record) { unsigned short flags; record >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/BookProtectionFlags.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/BookProtectionFlags.h index 1ba9f13297..2a622087b6 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/BookProtectionFlags.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/BookProtectionFlags.h @@ -32,24 +32,24 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" + -using namespace XLS; namespace XLSB { - class BookProtectionFlags : public BiffStructure + class BookProtectionFlags : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(BookProtectionFlags) public: BookProtectionFlags(); - BookProtectionFlags(CFRecord& record); + BookProtectionFlags(XLS::CFRecord& record); virtual ~BookProtectionFlags(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); bool fLockStructure; bool fLockWindow; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFDateOper.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFDateOper.h index b4f4b46a4f..7890c183a8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFDateOper.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFDateOper.h @@ -31,7 +31,7 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffAttribute.h" namespace XLS { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFOper.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFOper.h index 5cd6ed8722..c4a65594cf 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFOper.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFOper.h @@ -31,7 +31,7 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffAttribute.h" namespace XLS { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFTemp.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFTemp.h index d350c210ae..6ef2361264 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFTemp.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFTemp.h @@ -31,7 +31,7 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffAttribute.h" namespace XLS { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFTextOper.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFTextOper.h index 56a627d48b..329eaa0b44 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFTextOper.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFTextOper.h @@ -31,7 +31,7 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffAttribute.h" namespace XLS { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFType.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFType.h index 17bc8ae1c6..eddb59b6d9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFType.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFType.h @@ -31,7 +31,7 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffAttribute.h" namespace XLS { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFVOType14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFVOType14.h index 8f44470147..a8e4926dcf 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFVOType14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFVOType14.h @@ -31,7 +31,7 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffAttribute.h" namespace XLS { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFVOtype.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFVOtype.h index 50f265fdbb..0e79973ea3 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFVOtype.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CFVOtype.h @@ -31,7 +31,7 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffAttribute.h" namespace XLS { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Cell.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Cell.cpp index f2eb56b1ba..e586e74d39 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Cell.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Cell.cpp @@ -32,6 +32,8 @@ #include "Cell.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - Cell::Cell(CFRecord& record) + Cell::Cell(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new Cell(*this)); } - void Cell::load(CFRecord& record) + void Cell::load(XLS::CFRecord& record) { unsigned int flags; record >> column >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Cell.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Cell.h index 6a3c53e351..6f41c31751 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Cell.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/Cell.h @@ -32,26 +32,26 @@ #pragma once -#include -#include " +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" + -using namespace XLS; namespace XLSB { - class Cell : public BiffStructure + class Cell : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(Cell) public: Cell(); - Cell(CFRecord& record); + Cell(XLS::CFRecord& record); virtual ~Cell(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); - UncheckedCol column; + XLS::UncheckedCol column; _UINT32 iStyleRef; bool fPhShow; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRangeRef.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRangeRef.h index 830bf3f61e..f87f1232e9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRangeRef.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRangeRef.h @@ -32,17 +32,16 @@ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRangeRef.h" -using namespace XLS; namespace XLSB { DEFINE_NAME_CLASS(UncheckedRfX) DEFINE_NAME_CLASS(RgceArea) DEFINE_NAME_CLASS(RgceAreaRel) - typedef CellRangeRef_T UncheckedRfX; - typedef CellRangeRef_T RgceArea; - typedef CellRangeRef_T RgceAreaRel; + typedef XLS::CellRangeRef_T UncheckedRfX; + typedef XLS::CellRangeRef_T RgceArea; + typedef XLS::CellRangeRef_T RgceAreaRel; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRef.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRef.h index ec527ecb6f..c5a7fede37 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRef.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CellRef.h @@ -32,16 +32,16 @@ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h" + -using namespace XLS; namespace XLSB { DEFINE_NAME_CLASS(RgceLoc) DEFINE_NAME_CLASS(RgceLocRel) - typedef CellRef_T RgceLoc; - typedef CellRef_T RgceLocRel; + typedef XLS::CellRef_T RgceLoc; + typedef XLS::CellRef_T RgceLocRel; //typedef CellRef_T RgceElfLocExtra; //typedef CellRef_T RgceElfLoc; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CodeName.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CodeName.cpp index b739ff07ff..efacb70721 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CodeName.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CodeName.cpp @@ -32,6 +32,8 @@ #include "CodeName.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - CodeName::CodeName(CFRecord& record) + CodeName::CodeName(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new CodeName(*this)); } - void CodeName::load(CFRecord& record) + void CodeName::load(XLS::CFRecord& record) { record >> value; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CodeName.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CodeName.h index 18cd0a9a7d..bbe608191e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CodeName.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/CodeName.h @@ -32,25 +32,25 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "XLWideString.h" -using namespace XLS; + namespace XLSB { - class CodeName : public BiffStructure + class CodeName : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(CodeName) public: CodeName(); - CodeName(CFRecord& record); + CodeName(XLS::CFRecord& record); virtual ~CodeName(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); XLWideString value; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ColSpan.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ColSpan.cpp index 4f4aa84f24..42f2b8d8be 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ColSpan.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ColSpan.cpp @@ -32,6 +32,8 @@ #include "ColSpan.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - ColSpan::ColSpan(CFRecord& record) + ColSpan::ColSpan(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new ColSpan(*this)); } - void ColSpan::load(CFRecord& record) + void ColSpan::load(XLS::CFRecord& record) { record >> colMic >> colLast; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ColSpan.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ColSpan.h index 037805b37c..dcd7fc84da 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ColSpan.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/ColSpan.h @@ -32,27 +32,26 @@ #pragma once -#include -#include " +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" -using namespace XLS; namespace XLSB { - class ColSpan : public BiffStructure + class ColSpan : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(ColSpan) public: ColSpan(); - ColSpan(CFRecord& record); + ColSpan(XLS::CFRecord& record); virtual ~ColSpan(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); - UncheckedCol colMic; - UncheckedCol colLast; + XLS::UncheckedCol colMic; + XLS::UncheckedCol colLast; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTBlank.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTBlank.cpp index 58da2286b1..a0981beab0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTBlank.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTBlank.cpp @@ -32,6 +32,8 @@ #include "FRTBlank.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - FRTBlank::FRTBlank(CFRecord& record) + FRTBlank::FRTBlank(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new FRTBlank(*this)); } - void FRTBlank::load(CFRecord& record) + void FRTBlank::load(XLS::CFRecord& record) { record.skipNunBytes(4); // reserved } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTBlank.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTBlank.h index 807ba5ac75..bccc2ca0fb 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTBlank.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTBlank.h @@ -32,24 +32,24 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" + -using namespace XLS; namespace XLSB { - class FRTBlank : public BiffStructure + class FRTBlank : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(FRTBlank) public: FRTBlank(); - FRTBlank(CFRecord& record); + FRTBlank(XLS::CFRecord& record); virtual ~FRTBlank(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormula.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormula.cpp index db7fb0d1e6..00e01e1b5a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormula.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormula.cpp @@ -32,6 +32,8 @@ #include "FRTFormula.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - FRTFormula::FRTFormula(CFRecord& record) + FRTFormula::FRTFormula(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new FRTFormula(*this)); } - void FRTFormula::load(CFRecord& record) + void FRTFormula::load(XLS::CFRecord& record) { record.skipNunBytes(4); record >> formula; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormula.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormula.h index fddfc53a34..735ddf50b1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormula.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormula.h @@ -32,27 +32,27 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "FRTParsedFormula.h" -using namespace XLS; + namespace XLSB { - class FRTFormula : public BiffStructure + class FRTFormula : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(FRTFormula) public: FRTFormula(); - FRTFormula(CFRecord& record); + FRTFormula(XLS::CFRecord& record); virtual ~FRTFormula(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); - FRTParsedFormula formula; + XLS::FRTParsedFormula formula; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormulas.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormulas.cpp index 67ae6fe107..4140d9fb26 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormulas.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormulas.cpp @@ -32,6 +32,8 @@ #include "FRTFormulas.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - FRTFormulas::FRTFormulas(CFRecord& record) + FRTFormulas::FRTFormulas(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new FRTFormulas(*this)); } - void FRTFormulas::load(CFRecord& record) + void FRTFormulas::load(XLS::CFRecord& record) { record >> cformula; FRTFormula formula; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormulas.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormulas.h index 6c75f9b8c3..d9816f40e6 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormulas.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTFormulas.h @@ -32,25 +32,25 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "FRTFormula.h" -using namespace XLS; + namespace XLSB { - class FRTFormulas : public BiffStructure + class FRTFormulas : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(FRTFormulas) public: FRTFormulas(); - FRTFormulas(CFRecord& record); + FRTFormulas(XLS::CFRecord& record); virtual ~FRTFormulas(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); _UINT32 cformula; std::vector array; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTHeader.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTHeader.cpp index 8c12acb52c..0c2386f7be 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTHeader.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTHeader.cpp @@ -32,6 +32,8 @@ #include "FRTHeader.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - FRTHeader::FRTHeader(CFRecord& record) + FRTHeader::FRTHeader(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new FRTHeader(*this)); } - void FRTHeader::load(CFRecord& record) + void FRTHeader::load(XLS::CFRecord& record) { unsigned int flags; record >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTHeader.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTHeader.h index 0b9b473509..3058a0229f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTHeader.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTHeader.h @@ -32,28 +32,27 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "FRTRefs.h" #include "FRTSqrefs.h" #include "FRTFormulas.h" #include "FRTRelID.h" -using namespace XLS; namespace XLSB { - class FRTHeader : public BiffStructure + class FRTHeader : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(FRTHeader) public: FRTHeader(); - FRTHeader(CFRecord& record); + FRTHeader(XLS::CFRecord& record); virtual ~FRTHeader(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); bool fRef; bool fSqref; @@ -61,9 +60,9 @@ namespace XLSB bool fRelID; FRTRefs rgRefs; - FRTSqrefs rgSqrefs; - FRTFormulas rgFormulas; - FRTRelID relID; + FRTSqrefs rgSqrefs; + FRTFormulas rgFormulas; + FRTRelID relID; }; typedef boost::shared_ptr FRTHeaderPtr; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTParsedFormula.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTParsedFormula.cpp index 3519ee1def..f40aee2026 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTParsedFormula.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTParsedFormula.cpp @@ -31,7 +31,6 @@ */ #include "FRTParsedFormula.h" -#include namespace XLS { @@ -45,7 +44,7 @@ BiffStructurePtr FRTParsedFormula::clone() return BiffStructurePtr(new FRTParsedFormula(*this)); } -void FRTParsedFormula::load(CFRecord& record) +void FRTParsedFormula::load(XLS::CFRecord& record) { unsigned int cce; unsigned int cb; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTParsedFormula.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTParsedFormula.h index 197a711014..af819cc79f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTParsedFormula.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTParsedFormula.h @@ -31,7 +31,7 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ParsedFormula.h" namespace XLS { @@ -42,7 +42,7 @@ class FRTParsedFormula : public ParsedFormula public: FRTParsedFormula(); BiffStructurePtr clone(); - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTProductVersion.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTProductVersion.cpp index 63c52798de..783f8d1172 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTProductVersion.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTProductVersion.cpp @@ -32,6 +32,8 @@ #include "FRTProductVersion.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - FRTProductVersion::FRTProductVersion(CFRecord& record) + FRTProductVersion::FRTProductVersion(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new FRTProductVersion(*this)); } - void FRTProductVersion::load(CFRecord& record) + void FRTProductVersion::load(XLS::CFRecord& record) { unsigned short flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTProductVersion.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTProductVersion.h index 7a9262a906..fab745cde3 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTProductVersion.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTProductVersion.h @@ -32,24 +32,24 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" + -using namespace XLS; namespace XLSB { - class FRTProductVersion : public BiffStructure + class FRTProductVersion : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(FRTProductVersion) public: FRTProductVersion(); - FRTProductVersion(CFRecord& record); + FRTProductVersion(XLS::CFRecord& record); virtual ~FRTProductVersion(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); _UINT16 version; _UINT16 product; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRef.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRef.cpp index a365807202..bd82e9b3a8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRef.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRef.cpp @@ -32,6 +32,8 @@ #include "FRTRef.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - FRTRef::FRTRef(CFRecord& record) + FRTRef::FRTRef(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new FRTRef(*this)); } - void FRTRef::load(CFRecord& record) + void FRTRef::load(XLS::CFRecord& record) { unsigned int flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRef.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRef.h index 4b944b2e43..1c2c99fdd1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRef.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRef.h @@ -32,25 +32,25 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "CellRangeRef.h" -using namespace XLS; + namespace XLSB { - class FRTRef : public BiffStructure + class FRTRef : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(FRTRef) public: FRTRef(); - FRTRef(CFRecord& record); + FRTRef(XLS::CFRecord& record); virtual ~FRTRef(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); bool fAdjDelete; bool fDoAdjust; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRefs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRefs.cpp index 98225a2bc4..66e43b75d9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRefs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRefs.cpp @@ -32,6 +32,8 @@ #include "FRTRefs.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - FRTRefs::FRTRefs(CFRecord& record) + FRTRefs::FRTRefs(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new FRTRefs(*this)); } - void FRTRefs::load(CFRecord& record) + void FRTRefs::load(XLS::CFRecord& record) { record >> cref; FRTRef frtref; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRefs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRefs.h index 20fbe71a69..278b97498c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRefs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRefs.h @@ -32,25 +32,24 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "FRTRef.h" -using namespace XLS; namespace XLSB { - class FRTRefs : public BiffStructure + class FRTRefs : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(FRTRefs) public: FRTRefs(); - FRTRefs(CFRecord& record); + FRTRefs(XLS::CFRecord& record); virtual ~FRTRefs(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); _UINT32 cref; std::vector array; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRelID.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRelID.cpp index 4b769f88c1..44b19bb4b4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRelID.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRelID.cpp @@ -32,6 +32,8 @@ #include "FRTRelID.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - FRTRelID::FRTRelID(CFRecord& record) + FRTRelID::FRTRelID(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new FRTRelID(*this)); } - void FRTRelID::load(CFRecord& record) + void FRTRelID::load(XLS::CFRecord& record) { record >> relId; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRelID.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRelID.h index 30257e3234..76ab14f6c7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRelID.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTRelID.h @@ -32,27 +32,27 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "XLWideString.h" -using namespace XLS; + namespace XLSB { - class FRTRelID : public BiffStructure + class FRTRelID : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(FRTRelID) public: FRTRelID(); - FRTRelID(CFRecord& record); + FRTRelID(XLS::CFRecord& record); virtual ~FRTRelID(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); - LPWideString relId; + XLS::LPWideString relId; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqref.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqref.cpp index a0bf3ea740..929da57f7d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqref.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqref.cpp @@ -32,6 +32,8 @@ #include "FRTSqref.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - FRTSqref::FRTSqref(CFRecord& record) + FRTSqref::FRTSqref(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new FRTSqref(*this)); } - void FRTSqref::load(CFRecord& record) + void FRTSqref::load(XLS::CFRecord& record) { unsigned int flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqref.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqref.h index 0bffe3c9b1..2f3201ea23 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqref.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqref.h @@ -32,25 +32,25 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "UncheckedSqRfX.h" -using namespace XLS; + namespace XLSB { - class FRTSqref : public BiffStructure + class FRTSqref : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(FRTSqref) public: FRTSqref(); - FRTSqref(CFRecord& record); + FRTSqref(XLS::CFRecord& record); virtual ~FRTSqref(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); bool fAdjDelete; bool fDoAdjust; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqrefs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqrefs.cpp index 21a18c1601..458a8078f0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqrefs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqrefs.cpp @@ -32,6 +32,8 @@ #include "FRTSqrefs.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - FRTSqrefs::FRTSqrefs(CFRecord& record) + FRTSqrefs::FRTSqrefs(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new FRTSqrefs(*this)); } - void FRTSqrefs::load(CFRecord& record) + void FRTSqrefs::load(XLS::CFRecord& record) { record >> csqref; FRTSqref frtsqref; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqrefs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqrefs.h index f856a4eb3a..9f49e62432 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqrefs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/FRTSqrefs.h @@ -32,25 +32,25 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "FRTSqref.h" -using namespace XLS; + namespace XLSB { - class FRTSqrefs : public BiffStructure + class FRTSqrefs : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(FRTSqrefs) public: FRTSqrefs(); - FRTSqrefs(CFRecord& record); + FRTSqrefs(XLS::CFRecord& record); virtual ~FRTSqrefs(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); _UINT32 csqref; std::vector array; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GradientStop.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GradientStop.cpp index 6ea8a7b78a..0387794c1b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GradientStop.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GradientStop.cpp @@ -32,6 +32,8 @@ #include "GradientStop.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - GradientStop::GradientStop(CFRecord& record) + GradientStop::GradientStop(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new GradientStop(*this)); } - void GradientStop::load(CFRecord& record) + void GradientStop::load(XLS::CFRecord& record) { brtColor.readFields(record); record >> xnumPosition; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GradientStop.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GradientStop.h index 0318348e1b..f10fd30be7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GradientStop.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GradientStop.h @@ -32,29 +32,29 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "../Biff12_records/Color.h" -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/Xnum.h" + -using namespace XLS; namespace XLSB { - class GradientStop : public BiffStructure + class GradientStop : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(GradientStop) public: GradientStop(); - GradientStop(CFRecord& record); + GradientStop(XLS::CFRecord& record); virtual ~GradientStop(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); Color brtColor; - Xnum xnumPosition; + XLS::Xnum xnumPosition; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GrbitFmla.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GrbitFmla.cpp index 225d86a4c7..0e7c47281f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GrbitFmla.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GrbitFmla.cpp @@ -32,6 +32,8 @@ #include "GrbitFmla.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - GrbitFmla::GrbitFmla(CFRecord& record) + GrbitFmla::GrbitFmla(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new GrbitFmla(*this)); } - void GrbitFmla::load(CFRecord& record) + void GrbitFmla::load(XLS::CFRecord& record) { unsigned short flags; record >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GrbitFmla.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GrbitFmla.h index b6aca09d33..4f61708da2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GrbitFmla.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/GrbitFmla.h @@ -32,24 +32,24 @@ #pragma once -#include -#include " +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" + -using namespace XLS; namespace XLSB { - class GrbitFmla : public BiffStructure + class GrbitFmla : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(GrbitFmla) public: GrbitFmla(); - GrbitFmla(CFRecord& record); + GrbitFmla(XLS::CFRecord& record); virtual ~GrbitFmla(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); bool fAlwaysCalc; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/IsoPasswordData.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/IsoPasswordData.cpp index 9995010f9e..1be069bc20 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/IsoPasswordData.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/IsoPasswordData.cpp @@ -32,13 +32,15 @@ #include "IsoPasswordData.h" +using namespace XLS; + namespace XLSB { IsoPasswordData::IsoPasswordData() { } - IsoPasswordData::IsoPasswordData(CFRecord& record) + IsoPasswordData::IsoPasswordData(XLS::CFRecord& record) { load(record); } @@ -48,7 +50,7 @@ namespace XLSB return BiffStructurePtr(new IsoPasswordData(*this)); } - void IsoPasswordData::load(CFRecord& record) + void IsoPasswordData::load(XLS::CFRecord& record) { record >> rgbHash; record >> rgbSalt; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/IsoPasswordData.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/IsoPasswordData.h index f6223b71f3..1824299175 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/IsoPasswordData.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/IsoPasswordData.h @@ -31,27 +31,27 @@ */ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "LPByteBuf.h" #include "XLWideString.h" -using namespace XLS; + namespace XLSB { - class IsoPasswordData : public BiffStructure + class IsoPasswordData : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(LPByteBuf) public: IsoPasswordData(); - IsoPasswordData(CFRecord& record); + IsoPasswordData(XLS::CFRecord& record); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); LPByteBuf rgbHash; LPByteBuf rgbSalt; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/LPByteBuf.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/LPByteBuf.cpp index ad0914a711..4112e34a2c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/LPByteBuf.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/LPByteBuf.cpp @@ -32,13 +32,15 @@ #include "LPByteBuf.h" +using namespace XLS; + namespace XLSB { LPByteBuf::LPByteBuf() { } - LPByteBuf::LPByteBuf(CFRecord& record) + LPByteBuf::LPByteBuf(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new LPByteBuf(*this)); } - void LPByteBuf::load(CFRecord& record) + void LPByteBuf::load(XLS::CFRecord& record) { record >> cbLength; if(cbLength > 0) diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/LPByteBuf.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/LPByteBuf.h index 348a013ac8..cdb2ad477d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/LPByteBuf.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/LPByteBuf.h @@ -32,24 +32,24 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" + -using namespace XLS; namespace XLSB { - class LPByteBuf : public BiffStructure + class LPByteBuf : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(LPByteBuf) public: LPByteBuf(); - LPByteBuf(CFRecord& record); + LPByteBuf(XLS::CFRecord& record); virtual ~LPByteBuf(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); _UINT32 cbLength; BYTE* rgbData; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/PhRun.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/PhRun.cpp index f85bfd3379..a1942f4478 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/PhRun.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/PhRun.cpp @@ -31,7 +31,8 @@ */ #include "PhRun.h" -#include + +using namespace XLS; namespace XLSB { @@ -43,7 +44,7 @@ BiffStructurePtr PhRun::clone() } -void PhRun::load(CFRecord& record) +void PhRun::load(XLS::CFRecord& record) { unsigned short flags; record >> ichFirst >> ichMom >> cchMom >> ifnt >> flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/PhRun.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/PhRun.h index 09b886f32c..2e795b1964 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/PhRun.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/PhRun.h @@ -31,22 +31,22 @@ */ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" + -using namespace XLS; namespace XLSB { -class PhRun : public BiffStructure +class PhRun : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(PhRun) public: - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); unsigned short ichFirst; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RelID.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RelID.cpp index 6d6cd95569..e8a610eb94 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RelID.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RelID.cpp @@ -32,6 +32,8 @@ #include "RelID.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - RelID::RelID(CFRecord& record) + RelID::RelID(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new RelID(*this)); } - void RelID::load(CFRecord& record) + void RelID::load(XLS::CFRecord& record) { record >> value; } diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RelID.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RelID.h index 8ae89e6775..9edc944a0b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RelID.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RelID.h @@ -32,25 +32,25 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "XLWideString.h" -using namespace XLS; + namespace XLSB { - class RelID : public BiffStructure + class RelID : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(RelID) public: RelID(); - RelID(CFRecord& record); + RelID(XLS::CFRecord& record); virtual ~RelID(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); XLNullableWideString value; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RichStr.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RichStr.cpp index 0fc42fc401..9b899c5173 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RichStr.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RichStr.cpp @@ -32,6 +32,8 @@ #include "RichStr.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB return BiffStructurePtr(new RichStr(*this)); } - void RichStr::load(CFRecord& record) + void RichStr::load(XLS::CFRecord& record) { unsigned char flags; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RichStr.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RichStr.h index 5d16f572bb..2754eed52b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RichStr.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/RichStr.h @@ -32,26 +32,23 @@ #pragma once -#include -#include #include "XLWideString.h" #include "StrRun.h" #include "PhRun.h" -using namespace XLS; namespace XLSB { - class RichStr : public BiffStructure + class RichStr : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(RichStr) public: RichStr(); virtual ~RichStr(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); bool fRichStr; bool fExtStr; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/StrRun.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/StrRun.cpp index 3ade8e0a33..69759ba8c5 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/StrRun.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/StrRun.cpp @@ -32,7 +32,9 @@ #include "StrRun.h" -namespace XLS +using namespace XLS; + +namespace XLSB { @@ -41,10 +43,10 @@ BiffStructurePtr StrRun::clone() return BiffStructurePtr(new StrRun(*this)); } -void StrRun::load(CFRecord& record) +void StrRun::load(XLS::CFRecord& record) { record >> ich >> ifnt; } -} // namespace XLS +} // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/StrRun.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/StrRun.h index 3eb83a3917..dd1ff4846b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/StrRun.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/StrRun.h @@ -31,23 +31,23 @@ */ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" -namespace XLS +namespace XLSB { class CFRecord; -class StrRun : public BiffStructure +class StrRun : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(StrRun) public: - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); unsigned short ich; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxOs.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxOs.cpp index f1a1274938..ce358f0a03 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxOs.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxOs.cpp @@ -32,6 +32,8 @@ #include "SxOs.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - SxOs::SxOs(CFRecord& record) + SxOs::SxOs(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new SxOs(*this)); } - void SxOs::load(CFRecord& record) + void SxOs::load(XLS::CFRecord& record) { record >> notLast; record.skipNunBytes(2); // reserved diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxOs.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxOs.h index bc2211a22e..6a876a57ff 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxOs.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxOs.h @@ -32,28 +32,28 @@ #pragma once -#include -#include " -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffString.h" + -using namespace XLS; namespace XLSB { - class SxOs : public BiffStructure + class SxOs : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(SxOs) public: SxOs(); - SxOs(CFRecord& record); + SxOs(XLS::CFRecord& record); virtual ~SxOs(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); XLS::Boolean notLast; - LPWideString column; + XLS::LPWideString column; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxSu.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxSu.cpp index dcaf3d07e6..a56faf3aeb 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxSu.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxSu.cpp @@ -32,6 +32,8 @@ #include "SxSu.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - SxSu::SxSu(CFRecord& record) + SxSu::SxSu(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new SxSu(*this)); } - void SxSu::load(CFRecord& record) + void SxSu::load(XLS::CFRecord& record) { record.skipNunBytes(2); // reserved record >> csxos >> sxosFirst >> sxosLast; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxSu.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxSu.h index 46ade6d639..0d533eccb4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxSu.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/SxSu.h @@ -32,25 +32,25 @@ #pragma once -#include -#include " +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "SxOs.h" -using namespace XLS; + namespace XLSB { - class SxSu : public BiffStructure + class SxSu : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(SxSu) public: SxSu(); - SxSu(CFRecord& record); + SxSu(XLS::CFRecord& record); virtual ~SxSu(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); BYTE csxos; SxOs sxosFirst; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/UncheckedSqRfX.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/UncheckedSqRfX.cpp index 1c99319e9c..7fc3ff92a8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/UncheckedSqRfX.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/UncheckedSqRfX.cpp @@ -32,6 +32,8 @@ #include "UncheckedSqRfX.h" +using namespace XLS; + namespace XLSB { @@ -39,7 +41,7 @@ namespace XLSB { } - UncheckedSqRfX::UncheckedSqRfX(CFRecord& record) + UncheckedSqRfX::UncheckedSqRfX(XLS::CFRecord& record) { load(record); } @@ -53,7 +55,7 @@ namespace XLSB return BiffStructurePtr(new UncheckedSqRfX(*this)); } - void UncheckedSqRfX::load(CFRecord& record) + void UncheckedSqRfX::load(XLS::CFRecord& record) { record >> crfx; UncheckedRfX rfx; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/UncheckedSqRfX.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/UncheckedSqRfX.h index 383b3193a1..a7c960b02d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/UncheckedSqRfX.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/UncheckedSqRfX.h @@ -32,30 +32,29 @@ #pragma once -#include -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffStructure.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h" #include "CellRangeRef.h" -using namespace XLS; namespace XLSB { - class UncheckedSqRfX : public BiffStructure + class UncheckedSqRfX : public XLS::BiffStructure { BASE_STRUCTURE_DEFINE_CLASS_NAME(UncheckedSqRfX) public: UncheckedSqRfX(); - UncheckedSqRfX(CFRecord& record); + UncheckedSqRfX(XLS::CFRecord& record); virtual ~UncheckedSqRfX(); - BiffStructurePtr clone(); + XLS::BiffStructurePtr clone(); - static const ElementType type = typeBiffStructure; + static const XLS::ElementType type = XLS::typeBiffStructure; - virtual void load(CFRecord& record); + virtual void load(XLS::CFRecord& record); _INT32 crfx; std::vector rgrfx; - const CellRef getLocationFirstCell() const; + const XLS::CellRef getLocationFirstCell() const; std::wstring strValue; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h index a12f8e2578..1d696e9083 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_structures/XLWideString.h @@ -32,13 +32,12 @@ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/BiffString.h" -using namespace XLS; namespace XLSB { - typedef XLUnicodeString_T XLNameWideString; - typedef XLUnicodeString_T XLNullableWideString; - typedef XLUnicodeString_T XLWideString; + typedef XLS::XLUnicodeString_T XLNameWideString; + typedef XLS::XLUnicodeString_T XLNullableWideString; + typedef XLS::XLUnicodeString_T XLWideString; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACABSPATH.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACABSPATH.cpp index d7d627680f..215ce53062 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACABSPATH.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACABSPATH.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/AbsPath15.h" #include "../Biff12_records/ACEnd.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACABSPATH.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACABSPATH.h index 0ea657cbe2..f3c3225636 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACABSPATH.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACABSPATH.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class ACABSPATH: public CompositeObject + class ACABSPATH: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(ACABSPATH) public: ACABSPATH(); virtual ~ACABSPATH(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtACBegin; - BaseObjectPtr m_BrtAbsPath15; - BaseObjectPtr m_BrtACEnd; + XLS::BaseObjectPtr m_BrtACBegin; + XLS::BaseObjectPtr m_BrtAbsPath15; + XLS::BaseObjectPtr m_BrtACEnd; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACCELLTABLE.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACCELLTABLE.cpp index 4d47e8249b..69fe664046 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACCELLTABLE.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACCELLTABLE.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/RwDescent.h" #include "../Biff12_records/ACEnd.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACCELLTABLE.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACCELLTABLE.h index 8c368ac966..5a85761d34 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACCELLTABLE.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACCELLTABLE.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class ACCELLTABLE: public CompositeObject + class ACCELLTABLE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(ACCELLTABLE) public: ACCELLTABLE(); virtual ~ACCELLTABLE(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtACBegin; - BaseObjectPtr m_BrtRwDescent; - BaseObjectPtr m_BrtACEnd; + XLS::BaseObjectPtr m_BrtACBegin; + XLS::BaseObjectPtr m_BrtRwDescent; + XLS::BaseObjectPtr m_BrtACEnd; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACFMT.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACFMT.cpp index 1fdda4beb0..dd1b8057bf 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACFMT.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACFMT.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/Fmt.h" #include "../Biff12_records/ACEnd.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACFMT.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACFMT.h index 223eb8cf05..6bc318c57d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACFMT.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACFMT.h @@ -31,29 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class ACFMT: public CompositeObject + class ACFMT: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(ACFMT) public: ACFMT(); virtual ~ACFMT(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeACFMT; + static const XLS::ElementType type = XLS::typeACFMT; - BaseObjectPtr m_BrtACBegin; - BaseObjectPtr m_BrtFmt; - BaseObjectPtr m_BrtACEnd; + XLS::BaseObjectPtr m_BrtACBegin; + XLS::BaseObjectPtr m_BrtFmt; + XLS::BaseObjectPtr m_BrtACEnd; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACSORTCONDS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACSORTCONDS.cpp index a9383594eb..8b2dcf3292 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACSORTCONDS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACSORTCONDS.cpp @@ -35,6 +35,8 @@ #include "../Biff12_unions/SORTCOND14.h" #include "../Biff12_records/ACEnd.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACSORTCONDS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACSORTCONDS.h index 4b862892b4..34f8dee367 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACSORTCONDS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACSORTCONDS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class ACSORTCONDS: public CompositeObject + class ACSORTCONDS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(ACSORTCONDS) public: ACSORTCONDS(); virtual ~ACSORTCONDS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtACBegin; - std::vector m_arSORTCOND14; - BaseObjectPtr m_BrtACEnd; + XLS::BaseObjectPtr m_BrtACBegin; + std::vector m_arSORTCOND14; + XLS::BaseObjectPtr m_BrtACEnd; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACUID.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACUID.cpp index ec303d2016..485ab6d508 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACUID.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACUID.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/Uid.h" #include "../Biff12_records/ACEnd.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACUID.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACUID.h index a3dc03002f..861a691fdb 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACUID.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ACUID.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class ACUID: public CompositeObject + class ACUID: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(ACUID) public: ACUID(); virtual ~ACUID(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtACBegin; - BaseObjectPtr m_BrtUid; - BaseObjectPtr m_BrtACEnd; + XLS::BaseObjectPtr m_BrtACBegin; + XLS::BaseObjectPtr m_BrtUid; + XLS::BaseObjectPtr m_BrtACEnd; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BOOKVIEWS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BOOKVIEWS.cpp index f217b1f4ae..176c03b92e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BOOKVIEWS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BOOKVIEWS.cpp @@ -37,6 +37,8 @@ #include "../Biff12_unions/ACUID.h" #include "../Biff12_unions/FRT.h" +using namespace XLS; + namespace XLSB { @@ -48,7 +50,7 @@ namespace XLSB { } - class Parenthesis_BOOKVIEWS: public CompositeObject + class Parenthesis_BOOKVIEWS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_BOOKVIEWS) public: @@ -57,7 +59,7 @@ namespace XLSB return BaseObjectPtr(new Parenthesis_BOOKVIEWS(*this)); } - const bool loadContent(BinProcessor& proc) + const bool loadContent(XLS::BinProcessor& proc) { if (proc.optional()) { @@ -85,7 +87,7 @@ namespace XLSB BaseObjectPtr m_ACUID; BaseObjectPtr m_BrtBookView; - std::vector m_arFRT; + std::vector m_arFRT; }; BaseObjectPtr BOOKVIEWS::clone() diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BOOKVIEWS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BOOKVIEWS.h index 0687d20d6b..e3b232f79b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BOOKVIEWS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BOOKVIEWS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class BOOKVIEWS: public CompositeObject + class BOOKVIEWS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(BOOKVIEWS) public: BOOKVIEWS(); virtual ~BOOKVIEWS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginBookViews; - std::vector m_arBrtBookView; - BaseObjectPtr m_BrtEndBookViews; + XLS::BaseObjectPtr m_BrtBeginBookViews; + std::vector m_arBrtBookView; + XLS::BaseObjectPtr m_BrtEndBookViews; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BORDERS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BORDERS.cpp index 952042569d..8e164b544c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BORDERS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BORDERS.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/Border.h" #include "../Biff12_records/EndBorders.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BORDERS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BORDERS.h index a1fe8f69ee..560e75e650 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BORDERS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BORDERS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class BORDERS: public CompositeObject + class BORDERS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(BORDERS) public: BORDERS(); virtual ~BORDERS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginBorders; - std::vector m_arBrtBorder; - BaseObjectPtr m_BrtEndBorders; + XLS::BaseObjectPtr m_BrtBeginBorders; + std::vector m_arBrtBorder; + XLS::BaseObjectPtr m_BrtEndBorders; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BUNDLESHS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BUNDLESHS.cpp index 64c24b6eb7..919255c04f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BUNDLESHS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BUNDLESHS.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/BundleSh.h" #include "../Biff12_records/EndBundleShs.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BUNDLESHS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BUNDLESHS.h index 8eb14a5458..b856fac67b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BUNDLESHS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/BUNDLESHS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class BUNDLESHS: public CompositeObject + class BUNDLESHS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(BUNDLESHS) public: BUNDLESHS(); virtual ~BUNDLESHS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginBundleShs; - std::vector m_arBrtBundleSh; - BaseObjectPtr m_BrtEndBundleShs; + XLS::BaseObjectPtr m_BrtBeginBundleShs; + std::vector m_arBrtBundleSh; + XLS::BaseObjectPtr m_BrtEndBundleShs; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELL.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELL.cpp index cc16f68845..80cb1e0951 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELL.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELL.cpp @@ -38,6 +38,8 @@ #include "../Biff12_unions/CELLMETA.h" #include "../Biff12_unions/FRT.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELL.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELL.h index 7415521c03..2f5ff4809f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELL.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELL.h @@ -31,30 +31,30 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class CELL: public CompositeObject + class CELL: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CELL) public: CELL(_INT32 row); virtual ~CELL(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_TABLECELL; - BaseObjectPtr m_DATACELL; - BaseObjectPtr m_FMLACELL; - BaseObjectPtr m_SHRFMLACELL; - BaseObjectPtr m_CELLMETA; - std::vector m_arFRT; + XLS::BaseObjectPtr m_TABLECELL; + XLS::BaseObjectPtr m_DATACELL; + XLS::BaseObjectPtr m_FMLACELL; + XLS::BaseObjectPtr m_SHRFMLACELL; + XLS::BaseObjectPtr m_CELLMETA; + std::vector m_arFRT; _INT32 m_Row; //_INT32 m_Col; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLMETA.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLMETA.cpp index 0033a9c7b9..51a92df965 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLMETA.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLMETA.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/CellMeta.h" #include "../Biff12_records/ValueMeta.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLMETA.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLMETA.h index bb130598dd..d37b8c97fd 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLMETA.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLMETA.h @@ -31,26 +31,26 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class CELLMETA: public CompositeObject + class CELLMETA: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CELLMETA) public: CELLMETA(); virtual ~CELLMETA(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtCellMeta; - BaseObjectPtr m_BrtValueMeta; + XLS::BaseObjectPtr m_BrtCellMeta; + XLS::BaseObjectPtr m_BrtValueMeta; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLSTYLEXFS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLSTYLEXFS.cpp index 4d094b5944..4eff6dcb55 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLSTYLEXFS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLSTYLEXFS.cpp @@ -36,6 +36,8 @@ #include "../Biff12_unions/FRT.h" #include "../Biff12_records/EndCellStyleXFs.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLSTYLEXFS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLSTYLEXFS.h index 6431de10ab..8836deafc0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLSTYLEXFS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLSTYLEXFS.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class CELLSTYLEXFS: public CompositeObject + class CELLSTYLEXFS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CELLSTYLEXFS) public: CELLSTYLEXFS(); virtual ~CELLSTYLEXFS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginCellStyleXFs; - std::vector m_arBrtXF; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndCellStyleXFs; + XLS::BaseObjectPtr m_BrtBeginCellStyleXFs; + std::vector m_arBrtXF; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndCellStyleXFs; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLTABLE.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLTABLE.cpp index 719075e5ad..22021facdf 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLTABLE.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLTABLE.cpp @@ -36,7 +36,9 @@ #include "../Biff12_unions/FRT.h" #include "../Biff12_unions/CELL.h" #include "../Biff12_records/EndSheetData.h" -#include "Biff12_records/CommonRecords.h" +#include "../Biff12_records/CommonRecords.h" + +using namespace XLS; namespace XLSB { @@ -49,7 +51,7 @@ namespace XLSB { } - class Parenthesis_CELLTABLE: public CompositeObject + class Parenthesis_CELLTABLE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_CELLTABLE) public: @@ -58,7 +60,7 @@ namespace XLSB return BaseObjectPtr(new Parenthesis_CELLTABLE(*this)); } - const bool loadContent(BinProcessor& proc) + const bool loadContent(XLS::BinProcessor& proc) { if (proc.optional()) { @@ -98,8 +100,8 @@ namespace XLSB BaseObjectPtr m_ACCELLTABLE; BaseObjectPtr m_BrtRowHdr; - std::vector m_arCELL; - std::vector m_arFRT; + std::vector m_arCELL; + std::vector m_arFRT; }; BaseObjectPtr CELLTABLE::clone() diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLTABLE.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLTABLE.h index 574d83feae..6954d90af3 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLTABLE.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLTABLE.h @@ -31,35 +31,35 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class CELLTABLE: public CompositeObject + class CELLTABLE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CELLTABLE) public: CELLTABLE(); virtual ~CELLTABLE(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); struct _data { - BaseObjectPtr m_ACCELLTABLE; - BaseObjectPtr m_BrtRowHdr; - std::vector m_arCELL; + XLS::BaseObjectPtr m_ACCELLTABLE; + XLS::BaseObjectPtr m_BrtRowHdr; + std::vector m_arCELL; }; - BaseObjectPtr m_BrtBeginSheetData; + XLS::BaseObjectPtr m_BrtBeginSheetData; std::vector<_data> m_arParenthesis_CELLTABLE; - BaseObjectPtr m_BrtEndSheetData; + XLS::BaseObjectPtr m_BrtEndSheetData; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLXFS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLXFS.cpp index 3df3cfab44..7ae427794a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLXFS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLXFS.cpp @@ -36,6 +36,8 @@ #include "../Biff12_unions/FRT.h" #include "../Biff12_records/EndCellXFs.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLXFS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLXFS.h index 1c6e29ea4f..15f4fcd605 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLXFS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CELLXFS.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class CELLXFS: public CompositeObject + class CELLXFS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CELLXFS) public: CELLXFS(); virtual ~CELLXFS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginCellXFs; - std::vector m_arBrtXF; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndCellXFs; + XLS::BaseObjectPtr m_BrtBeginCellXFs; + std::vector m_arBrtXF; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndCellXFs; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE.cpp index aabe4e9596..49a9dbf4dc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE.cpp @@ -38,6 +38,8 @@ #include "../Biff12_unions/FRTCFRULE.h" #include "../Biff12_records/EndCFRule.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE.h index d7a6bfc101..c3051cd9d2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE.h @@ -31,33 +31,30 @@ */ #pragma once -#include -#include - -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h" namespace XLSB { - - class CFRULE: public CompositeObject + class CFRULE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CFRULE) public: - CFRULE(const CellRef& cell_base_ref); + CFRULE(const XLS::CellRef& cell_base_ref); virtual ~CFRULE(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeCFRULE; + static const XLS::ElementType type = XLS::typeCFRULE; - BaseObjectPtr m_BrtBeginCFRule; - BaseObjectPtr m_source; - BaseObjectPtr m_FRTRULE; - BaseObjectPtr m_BrtEndCFRule; + XLS::BaseObjectPtr m_BrtBeginCFRule; + XLS::BaseObjectPtr m_source; + XLS::BaseObjectPtr m_FRTRULE; + XLS::BaseObjectPtr m_BrtEndCFRule; - CellRef ref; + XLS::CellRef ref; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE14.cpp index 29e90b0d58..694c6cb16c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE14.cpp @@ -38,6 +38,8 @@ #include "../Biff12_unions/FRT.h" #include "../Biff12_records/EndCFRule14.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE14.h index 0955031b13..7d53d90f16 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CFRULE14.h @@ -31,31 +31,29 @@ */ #pragma once -#include -#include - -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/CellRef.h" namespace XLSB { - class CFRULE14: public CompositeObject + class CFRULE14: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CFRULE) public: CFRULE14(); virtual ~CFRULE14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeCFRULE14; + static const XLS::ElementType type = XLS::typeCFRULE14; - BaseObjectPtr m_BrtBeginCFRule14; - BaseObjectPtr m_source; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndCFRule14; + XLS::BaseObjectPtr m_BrtBeginCFRule14; + XLS::BaseObjectPtr m_source; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndCFRule14; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLINFOS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLINFOS.cpp index b62adbcd1b..4ca367fc67 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLINFOS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLINFOS.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/CommonRecords.h" #include "../Biff12_records/EndColInfos.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLINFOS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLINFOS.h index fb550e1f5d..5c70577fdd 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLINFOS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLINFOS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class COLINFOS: public CompositeObject + class COLINFOS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(COLINFOS) public: COLINFOS(); virtual ~COLINFOS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginColInfos; - std::vector m_arBrtColInfo; - BaseObjectPtr m_BrtEndColInfos; + XLS::BaseObjectPtr m_BrtBeginColInfos; + std::vector m_arBrtColInfo; + XLS::BaseObjectPtr m_BrtEndColInfos; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORPALETTE.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORPALETTE.cpp index 74586261b1..e5ea653359 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORPALETTE.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORPALETTE.cpp @@ -36,6 +36,8 @@ #include "../Biff12_unions/MRUCOLORS.h" #include "../Biff12_records/EndColorPalette.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORPALETTE.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORPALETTE.h index 1a3e8c67cd..dae3609221 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORPALETTE.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORPALETTE.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class COLORPALETTE: public CompositeObject + class COLORPALETTE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(COLORPALETTE) public: COLORPALETTE(); virtual ~COLORPALETTE(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginColorPalette; - BaseObjectPtr m_INDEXEDCOLORS; - BaseObjectPtr m_MRUCOLORS; - BaseObjectPtr m_BrtEndColorPalette; + XLS::BaseObjectPtr m_BrtBeginColorPalette; + XLS::BaseObjectPtr m_INDEXEDCOLORS; + XLS::BaseObjectPtr m_MRUCOLORS; + XLS::BaseObjectPtr m_BrtEndColorPalette; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE.cpp index abe857256b..f5cdb8f54d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/Color.h" #include "../Biff12_records/EndColorScale.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE.h index f91f1563e8..83cb385d11 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE.h @@ -31,30 +31,30 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class COLORSCALE: public CompositeObject + class COLORSCALE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(COLORSCALE) public: COLORSCALE(); virtual ~COLORSCALE(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeCOLORSCALE; + static const XLS::ElementType type = XLS::typeCOLORSCALE; - BaseObjectPtr m_BrtBeginColorScale; - std::vector m_arCFVO; - std::vector m_arBrtColor; - BaseObjectPtr m_BrtEndColorScale; + XLS::BaseObjectPtr m_BrtBeginColorScale; + std::vector m_arCFVO; + std::vector m_arBrtColor; + XLS::BaseObjectPtr m_BrtEndColorScale; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE14.cpp index 784c0d580c..01ef9d1c24 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE14.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/Color14.h" #include "../Biff12_records/EndColorScale14.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE14.h index a728e81a34..40dda1f7ef 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COLORSCALE14.h @@ -31,30 +31,28 @@ */ #pragma once -#include - -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" namespace XLSB { - class COLORSCALE14: public CompositeObject + class COLORSCALE14: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(COLORSCALE14) public: COLORSCALE14(); virtual ~COLORSCALE14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeCOLORSCALE14; + static const XLS::ElementType type = XLS::typeCOLORSCALE14; - BaseObjectPtr m_BrtBeginColorScale14; - std::vector m_arCFVO14; - std::vector m_arBrtColor14; - BaseObjectPtr m_BrtEndColorScale14; + XLS::BaseObjectPtr m_BrtBeginColorScale14; + std::vector m_arCFVO14; + std::vector m_arBrtColor14; + XLS::BaseObjectPtr m_BrtEndColorScale14; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENT.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENT.cpp index 797fe4e575..aa5734bb84 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENT.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENT.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/CommentText.h" #include "../Biff12_records/EndComment.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENT.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENT.h index c7a338d8d6..d133c41809 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENT.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENT.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class COMMENT: public CompositeObject + class COMMENT: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(COMMENT) public: COMMENT(); virtual ~COMMENT(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_ACUID; - BaseObjectPtr m_BrtBeginComment; - BaseObjectPtr m_BrtCommentText; - BaseObjectPtr m_BrtEndComment; + XLS::BaseObjectPtr m_ACUID; + XLS::BaseObjectPtr m_BrtBeginComment; + XLS::BaseObjectPtr m_BrtCommentText; + XLS::BaseObjectPtr m_BrtEndComment; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTAUTHORS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTAUTHORS.cpp index 2ab92426bc..2f379082f0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTAUTHORS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTAUTHORS.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/CommentAuthor.h" #include "../Biff12_records/EndCommentAuthors.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTAUTHORS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTAUTHORS.h index ec6987a1d5..c7b03bc96f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTAUTHORS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTAUTHORS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class COMMENTAUTHORS: public CompositeObject + class COMMENTAUTHORS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(COMMENTAUTHORS) public: COMMENTAUTHORS(); virtual ~COMMENTAUTHORS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginCommentAuthors; - std::vector m_arBrtCommentAuthor; - BaseObjectPtr m_BrtEndCommentAuthors; + XLS::BaseObjectPtr m_BrtBeginCommentAuthors; + std::vector m_arBrtCommentAuthor; + XLS::BaseObjectPtr m_BrtEndCommentAuthors; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTLIST.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTLIST.cpp index 86eab8a50f..7ed8feeec8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTLIST.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTLIST.cpp @@ -35,6 +35,8 @@ #include "../Biff12_unions/COMMENT.h" #include "../Biff12_records/EndCommentList.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTLIST.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTLIST.h index f8c1160a40..861408882a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTLIST.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTLIST.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class COMMENTLIST: public CompositeObject + class COMMENTLIST: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(COMMENTLIST) public: COMMENTLIST(); virtual ~COMMENTLIST(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginCommentList; - std::vector m_arCOMMENT; - BaseObjectPtr m_BrtEndCommentList; + XLS::BaseObjectPtr m_BrtBeginCommentList; + std::vector m_arCOMMENT; + XLS::BaseObjectPtr m_BrtEndCommentList; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTS.cpp index 0667be7392..9f01b2af5b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTS.cpp @@ -37,6 +37,8 @@ #include "../Biff12_unions/FRT.h" #include "../Biff12_records/EndComments.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTS.h index c2489c721b..14a37eedb2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/COMMENTS.h @@ -31,29 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class COMMENTS: public CompositeObject + class COMMENTS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(COMMENTS) public: COMMENTS(); virtual ~COMMENTS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginComments; - BaseObjectPtr m_COMMENTAUTHORS; - BaseObjectPtr m_COMMENTLIST; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndComments; + XLS::BaseObjectPtr m_BrtBeginComments; + XLS::BaseObjectPtr m_COMMENTAUTHORS; + XLS::BaseObjectPtr m_COMMENTLIST; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndComments; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING.cpp index 404d7bcf03..50b484d3b3 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING.cpp @@ -36,6 +36,8 @@ #include "../Biff12_unions/FRT.h" #include "../Biff12_records/EndConditionalFormatting.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING.h index 31df0e2e9f..daaf2a3ac1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING.h @@ -31,30 +31,30 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class CONDITIONALFORMATTING: public CompositeObject + class CONDITIONALFORMATTING: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CONDITIONALFORMATTING) public: CONDITIONALFORMATTING(); virtual ~CONDITIONALFORMATTING(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeCONDITIONALFORMATTING; + static const XLS::ElementType type = XLS::typeCONDITIONALFORMATTING; - BaseObjectPtr m_BrtBeginConditionalFormatting; - std::vector m_arCFRULE; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndConditionalFormatting; + XLS::BaseObjectPtr m_BrtBeginConditionalFormatting; + std::vector m_arCFRULE; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndConditionalFormatting; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.cpp index ae9a61667e..df9fd5dc28 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.cpp @@ -36,6 +36,8 @@ #include "../Biff12_unions/FRT.h" #include "../Biff12_records/EndConditionalFormatting14.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.h index d87c401cd5..0e492e8785 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTING14.h @@ -31,30 +31,30 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class CONDITIONALFORMATTING14: public CompositeObject + class CONDITIONALFORMATTING14: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CONDITIONALFORMATTING14) public: CONDITIONALFORMATTING14(); virtual ~CONDITIONALFORMATTING14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeCONDITIONALFORMATTING14; + static const XLS::ElementType type = XLS::typeCONDITIONALFORMATTING14; - BaseObjectPtr m_BrtBeginConditionalFormatting14; - std::vector m_arCFRULE14; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndConditionalFormatting14; + XLS::BaseObjectPtr m_BrtBeginConditionalFormatting14; + std::vector m_arCFRULE14; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndConditionalFormatting14; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTINGS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTINGS.cpp index 64135bbac3..27b3e7c73f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTINGS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTINGS.cpp @@ -37,6 +37,8 @@ #include "../Biff12_records/FRTEnd.h" #include "../Biff12_records/EndConditionalFormattings.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTINGS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTINGS.h index 10e308ad29..d078b0e2a5 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTINGS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/CONDITIONALFORMATTINGS.h @@ -31,29 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class CONDITIONALFORMATTINGS: public CompositeObject + class CONDITIONALFORMATTINGS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CONDITIONALFORMATTINGS) public: CONDITIONALFORMATTINGS(); virtual ~CONDITIONALFORMATTINGS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtFRTBegin; - BaseObjectPtr m_BrtBeginConditionalFormattings; - std::vector m_arCONDITIONALFORMATTING14; - BaseObjectPtr m_BrtEndConditionalFormattings; - BaseObjectPtr m_BrtFRTEnd; + XLS::BaseObjectPtr m_BrtFRTBegin; + XLS::BaseObjectPtr m_BrtBeginConditionalFormattings; + std::vector m_arCONDITIONALFORMATTING14; + XLS::BaseObjectPtr m_BrtEndConditionalFormattings; + XLS::BaseObjectPtr m_BrtFRTEnd; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR.cpp index abe05e3ea6..fed87ed9e1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/Color.h" #include "../Biff12_records/EndDatabar.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR.h index 2e08224bf6..0c054465d0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR.h @@ -31,30 +31,30 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class DATABAR: public CompositeObject + class DATABAR: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(DATABAR) public: DATABAR(); virtual ~DATABAR(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeDATABAR; + static const XLS::ElementType type = XLS::typeDATABAR; - BaseObjectPtr m_BrtBeginDatabar; - std::vector m_arCFVO; - BaseObjectPtr m_BrtColor; - BaseObjectPtr m_BrtEndDatabar; + XLS::BaseObjectPtr m_BrtBeginDatabar; + std::vector m_arCFVO; + XLS::BaseObjectPtr m_BrtColor; + XLS::BaseObjectPtr m_BrtEndDatabar; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR14.cpp index 3be62420ac..a5eecb6bfb 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR14.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/Color14.h" #include "../Biff12_records/EndDatabar14.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR14.h index acfcc7c605..98edab67e9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATABAR14.h @@ -31,30 +31,30 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class DATABAR14: public CompositeObject + class DATABAR14: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(DATABAR14) public: DATABAR14(); virtual ~DATABAR14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeDATABAR14; + static const XLS::ElementType type = XLS::typeDATABAR14; - BaseObjectPtr m_BrtBeginDatabar14; - std::vector m_arCFVO14; - std::vector m_arBrtColor14; - BaseObjectPtr m_BrtEndDatabar14; + XLS::BaseObjectPtr m_BrtBeginDatabar14; + std::vector m_arCFVO14; + std::vector m_arBrtColor14; + XLS::BaseObjectPtr m_BrtEndDatabar14; _INT32 iPri; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATACELL.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATACELL.cpp index 904f0a49b0..38252f4838 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATACELL.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATACELL.cpp @@ -33,6 +33,8 @@ #include "DATACELL.h" #include "../Biff12_records/Cell.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATACELL.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATACELL.h index 578dd69373..18a3658daa 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATACELL.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DATACELL.h @@ -31,25 +31,25 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class DATACELL: public CompositeObject + class DATACELL: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(TABLECELL) public: DATACELL(); virtual ~DATACELL(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_source; + XLS::BaseObjectPtr m_source; _INT32 m_Col; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF.cpp index cb8b8ddd4d..ab2b6a279a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/ACEnd.h" #include "../Biff12_unions/FRTDXF.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF.h index e4e24745b5..a2ca5f1426 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF.h @@ -31,28 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class uDXF: public CompositeObject + class uDXF: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(uDXF) public: uDXF(); virtual ~uDXF(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeuDXF; + static const XLS::ElementType type = XLS::typeuDXF; + + XLS::BaseObjectPtr m_BrtDXF; + XLS::BaseObjectPtr m_BrtFRTDXF; - BaseObjectPtr m_BrtDXF; - BaseObjectPtr m_BrtFRTDXF; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF14S.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF14S.cpp index cfdb5f31e4..705d64cc16 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF14S.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF14S.cpp @@ -37,6 +37,8 @@ #include "../Biff12_records/FRTEnd.h" #include "../Biff12_records/EndDXF14s.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF14S.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF14S.h index 61994170ff..64d8a0cab0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF14S.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXF14S.h @@ -31,29 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class DXF14S: public CompositeObject + class DXF14S: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(DXF14S) public: DXF14S(); virtual ~DXF14S(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtFRTBegin; - BaseObjectPtr m_BrtBeginDXF14s; - std::vector m_arDXF14; - BaseObjectPtr m_BrtEndDXF14s; - BaseObjectPtr m_BrtFRTEnd; + XLS::BaseObjectPtr m_BrtFRTBegin; + XLS::BaseObjectPtr m_BrtBeginDXF14s; + std::vector m_arDXF14; + XLS::BaseObjectPtr m_BrtEndDXF14s; + XLS::BaseObjectPtr m_BrtFRTEnd; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS.cpp index c293de0811..fe6f3ee9dc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS.cpp @@ -36,6 +36,8 @@ #include "../Biff12_unions/DXF.h" #include "../Biff12_records/EndDXFs.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS.h index 7db3dc0152..1e3508c68f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS.h @@ -31,28 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class DXFS: public CompositeObject + class DXFS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(DXFS) public: DXFS(); virtual ~DXFS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); - - BaseObjectPtr m_BrtBeginDXFs; - std::vector m_aruDXF; - BaseObjectPtr m_BrtEndDXFs; + virtual const bool loadContent(XLS::BinProcessor& proc); + XLS::BaseObjectPtr m_BrtBeginDXFs; + std::vector m_aruDXF; + XLS::BaseObjectPtr m_BrtEndDXFs; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS15.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS15.cpp index 530656088b..4248caf7a7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS15.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS15.cpp @@ -37,6 +37,8 @@ #include "../Biff12_records/FRTEnd.h" #include "../Biff12_records/EndDXFs15.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS15.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS15.h index 6df98f9ffe..d450759b36 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS15.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/DXFS15.h @@ -31,29 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class DXFS15: public CompositeObject + class DXFS15: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(DXFS15) public: DXFS15(); virtual ~DXFS15(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtFRTBegin; - BaseObjectPtr m_BrtBeginDXFs15; - std::vector m_arDXF15; - BaseObjectPtr m_BrtEndDXFs15; - BaseObjectPtr m_BrtFRTEnd; + XLS::BaseObjectPtr m_BrtFRTBegin; + XLS::BaseObjectPtr m_BrtBeginDXFs15; + std::vector m_arDXF15; + XLS::BaseObjectPtr m_BrtEndDXFs15; + XLS::BaseObjectPtr m_BrtFRTEnd; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/EXTERNALS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/EXTERNALS.cpp index f805fdcb3a..00f993374b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/EXTERNALS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/EXTERNALS.cpp @@ -31,10 +31,13 @@ */ #include "EXTERNALS.h" -#include "../Biff12_records/BeginExternals.h" #include "SUP.h" + +#include "../Biff12_records/BeginExternals.h" #include "../Biff12_records/EndExternals.h" -#include "Biff12_records/CommonRecords.h" +#include "../Biff12_records/CommonRecords.h" + +using namespace XLS; namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/EXTERNALS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/EXTERNALS.h index 48d1ea9fa5..db3ab0d033 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/EXTERNALS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/EXTERNALS.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class EXTERNALS: public CompositeObject + class EXTERNALS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(EXTERNALS) public: EXTERNALS(); virtual ~EXTERNALS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginExternals; - std::vector m_arSUP; - BaseObjectPtr m_BrtExternSheet; - BaseObjectPtr m_BrtEndExternals; + XLS::BaseObjectPtr m_BrtBeginExternals; + std::vector m_arSUP; + XLS::BaseObjectPtr m_BrtExternSheet; + XLS::BaseObjectPtr m_BrtEndExternals; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FILLS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FILLS.cpp index 236df86c97..aac0840702 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FILLS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FILLS.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/Fill.h" #include "../Biff12_records/EndFills.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FILLS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FILLS.h index e19f0acd27..c3f0e7d502 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FILLS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FILLS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class FILLS: public CompositeObject + class FILLS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(FILLS) public: FILLS(); virtual ~FILLS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginFills; - std::vector m_arBrtFill; - BaseObjectPtr m_BrtEndFills; + XLS::BaseObjectPtr m_BrtBeginFills; + std::vector m_arBrtFill; + XLS::BaseObjectPtr m_BrtEndFills; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMLACELL.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMLACELL.cpp index 0c01180d25..f93e0e7022 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMLACELL.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMLACELL.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/CommonRecords.h" #include "../Biff12_records/Fmla.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMLACELL.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMLACELL.h index 69d7134d25..0f7a3d335f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMLACELL.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMLACELL.h @@ -31,25 +31,25 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class FMLACELL: public CompositeObject + class FMLACELL: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(FMLACELL) public: FMLACELL(); virtual ~FMLACELL(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_source; + XLS::BaseObjectPtr m_source; _INT32 m_Col; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMTS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMTS.cpp index 2f9532de6c..c6d48b3063 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMTS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMTS.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/Fmt.h" #include "../Biff12_records/EndFmts.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMTS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMTS.h index 6ecdc85c9e..12c2a89468 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMTS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FMTS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class FMTS: public CompositeObject + class FMTS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(FMTS) public: FMTS(); virtual ~FMTS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginFmts; - std::vector m_arFmt; - BaseObjectPtr m_BrtEndFmts; + XLS::BaseObjectPtr m_BrtBeginFmts; + std::vector m_arFmt; + XLS::BaseObjectPtr m_BrtEndFmts; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FNGROUP.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FNGROUP.cpp index 7c6cb9228e..5779940c8c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FNGROUP.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FNGROUP.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/FnGroup.h" #include "../Biff12_records/EndFnGroup.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FNGROUP.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FNGROUP.h index d00d1aa897..01f8e3f05a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FNGROUP.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FNGROUP.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class FNGROUP: public CompositeObject + class FNGROUP: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(FNGROUP) public: FNGROUP(); virtual ~FNGROUP(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginFnGroup; - std::vector m_arBrtFnGroup; - BaseObjectPtr m_BrtEndFnGroup; + XLS::BaseObjectPtr m_BrtBeginFnGroup; + std::vector m_arBrtFnGroup; + XLS::BaseObjectPtr m_BrtEndFnGroup; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FONTS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FONTS.cpp index 3651ea1791..8777a9759c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FONTS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FONTS.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/BeginFonts.h" #include "../Biff12_records/EndFonts.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FONTS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FONTS.h index e34180b48e..47bfcf2777 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FONTS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FONTS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class FONTS: public CompositeObject + class FONTS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(FONTS) public: FONTS(); virtual ~FONTS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginFonts; - std::vector m_arBrtFont; - BaseObjectPtr m_BrtEndFonts; + XLS::BaseObjectPtr m_BrtBeginFonts; + std::vector m_arBrtFont; + XLS::BaseObjectPtr m_BrtEndFonts; //GlobalWorkbookInfoPtr global_info; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRT.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRT.cpp index 95ae295295..53906968d0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRT.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRT.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/FRTBegin.h" #include "../Biff12_records/FRTEnd.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRT.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRT.h index 201a016f78..7801456a69 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRT.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRT.h @@ -31,26 +31,26 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class FRT: public CompositeObject + class FRT: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(FRT) public: FRT(); virtual ~FRT(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtFRTBegin; - BaseObjectPtr m_BrtFRTEnd; + XLS::BaseObjectPtr m_BrtFRTBegin; + XLS::BaseObjectPtr m_BrtFRTEnd; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTCFRULE.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTCFRULE.cpp index b0f4c7c4df..45a8dfa40a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTCFRULE.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTCFRULE.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/FRTEnd.h" #include "../Biff12_unions/FRT.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTCFRULE.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTCFRULE.h index bc535f3884..d42ac4f97f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTCFRULE.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTCFRULE.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class FRTCFRULE: public CompositeObject + class FRTCFRULE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(FRTCFRULE) public: FRTCFRULE(); virtual ~FRTCFRULE(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtFRTBegin; - BaseObjectPtr m_BrtCFRuleExt; - BaseObjectPtr m_BrtFRTEnd; - std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtFRTBegin; + XLS::BaseObjectPtr m_BrtCFRuleExt; + XLS::BaseObjectPtr m_BrtFRTEnd; + std::vector m_arFRT; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTDXF.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTDXF.cpp index 5857b1b0df..91bc184a6a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTDXF.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTDXF.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/CommonRecords.h" #include "../Biff12_unions/FRT.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTDXF.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTDXF.h index 1a7e35af4b..a3f04b86a1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTDXF.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTDXF.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class FRTDXF: public CompositeObject + class FRTDXF: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(FRTDXF) public: FRTDXF(); virtual ~FRTDXF(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeFRTDXF; + static const XLS::ElementType type = XLS::typeFRTDXF; - BaseObjectPtr m_BrtDXF; - std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtDXF; + std::vector m_arFRT; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTSTYLESHEET.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTSTYLESHEET.cpp index b7ce651d9a..29831d7ec1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTSTYLESHEET.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTSTYLESHEET.cpp @@ -36,6 +36,8 @@ #include "../Biff12_unions/STYLESHEET15.h" #include "../Biff12_unions/DXFS15.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTSTYLESHEET.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTSTYLESHEET.h index 600b4facb1..8926b465a1 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTSTYLESHEET.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTSTYLESHEET.h @@ -31,30 +31,30 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class FRTSTYLESHEET: public CompositeObject + class FRTSTYLESHEET: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(FRTSTYLESHEET) public: FRTSTYLESHEET(); virtual ~FRTSTYLESHEET(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeFRTSTYLESHEET; + static const XLS::ElementType type = XLS::typeFRTSTYLESHEET; - BaseObjectPtr m_STYLESHEET14; - BaseObjectPtr m_DXF14S; - BaseObjectPtr m_STYLESHEET15; - BaseObjectPtr m_DXFS15; + XLS::BaseObjectPtr m_STYLESHEET14; + XLS::BaseObjectPtr m_DXF14S; + XLS::BaseObjectPtr m_STYLESHEET15; + XLS::BaseObjectPtr m_DXFS15; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTWORKSHEET.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTWORKSHEET.cpp index 86c2cd0223..c3846019e8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTWORKSHEET.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTWORKSHEET.cpp @@ -33,6 +33,8 @@ #include "FRTWORKSHEET.h" #include "../Biff12_unions/CONDITIONALFORMATTINGS.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTWORKSHEET.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTWORKSHEET.h index a0a9e2f4f9..949886c09d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTWORKSHEET.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/FRTWORKSHEET.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class FRTWORKSHEET: public CompositeObject + class FRTWORKSHEET: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(FRTWORKSHEET) public: FRTWORKSHEET(); virtual ~FRTWORKSHEET(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeFRTWORKSHEET; + static const XLS::ElementType type = XLS::typeFRTWORKSHEET; - BaseObjectPtr m_CONDITIONALFORMATTINGS; + XLS::BaseObjectPtr m_CONDITIONALFORMATTINGS; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/HLINKS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/HLINKS.cpp index 8d11657fcd..d13b70b224 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/HLINKS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/HLINKS.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/HLink.h" #include "../Biff12_unions/ACUID.h" +using namespace XLS; + namespace XLSB { @@ -45,7 +47,7 @@ namespace XLSB { } - class Parenthesis_HLINKS: public CompositeObject + class Parenthesis_HLINKS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(Parenthesis_HLINKS) public: @@ -54,7 +56,7 @@ namespace XLSB return BaseObjectPtr(new Parenthesis_HLINKS(*this)); } - const bool loadContent(BinProcessor& proc) + const bool loadContent(XLS::BinProcessor& proc) { if (proc.optional()) { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/HLINKS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/HLINKS.h index 7ca06cc670..1e1069071b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/HLINKS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/HLINKS.h @@ -31,25 +31,25 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class HLINKS: public CompositeObject + class HLINKS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(HLINKS) public: HLINKS(); virtual ~HLINKS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - std::vector m_arHlinks; + std::vector m_arHlinks; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET.cpp index 1209e5e706..875a1ddffa 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET.cpp @@ -35,6 +35,8 @@ #include "../Biff12_unions/uCFVO.h" #include "../Biff12_records/EndIconSet.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET.h index 0ddf61c706..fbddfb5dfa 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET.h @@ -31,29 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class ICONSET: public CompositeObject + class ICONSET: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(ICONSET) public: ICONSET(); virtual ~ICONSET(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeICONSET; + static const XLS::ElementType type = XLS::typeICONSET; - BaseObjectPtr m_BrtBeginIconSet; - std::vector m_arCFVO; - BaseObjectPtr m_BrtEndIconSet; + XLS::BaseObjectPtr m_BrtBeginIconSet; + std::vector m_arCFVO; + XLS::BaseObjectPtr m_BrtEndIconSet; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET14.cpp index 8560d9d995..6ae43dc331 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET14.cpp @@ -36,6 +36,8 @@ #include "../Biff12_records/CFIcon.h" #include "../Biff12_records/EndIconSet14.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET14.h index 62f5ea5116..eeee88b1b7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/ICONSET14.h @@ -31,30 +31,30 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class ICONSET14: public CompositeObject + class ICONSET14: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(ICONSET14) public: ICONSET14(); virtual ~ICONSET14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeICONSET14; + static const XLS::ElementType type = XLS::typeICONSET14; - BaseObjectPtr m_BrtBeginIconSet14; - std::vector m_arCFVO14; - std::vector m_arBrtCFIcon; - BaseObjectPtr m_BrtEndIconSet14; + XLS::BaseObjectPtr m_BrtBeginIconSet14; + std::vector m_arCFVO14; + std::vector m_arBrtCFIcon; + XLS::BaseObjectPtr m_BrtEndIconSet14; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/INDEXEDCOLORS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/INDEXEDCOLORS.cpp index e6b4083c53..a70ddabdf2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/INDEXEDCOLORS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/INDEXEDCOLORS.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/IndexedColor.h" #include "../Biff12_records/EndIndexedColors.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/INDEXEDCOLORS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/INDEXEDCOLORS.h index 5db98f65ec..3ceadd5329 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/INDEXEDCOLORS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/INDEXEDCOLORS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class INDEXEDCOLORS: public CompositeObject + class INDEXEDCOLORS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(INDEXEDCOLORS) public: INDEXEDCOLORS(); virtual ~INDEXEDCOLORS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginIndexedColors; - std::vector m_arIndexedColor; - BaseObjectPtr m_BrtEndIndexedColors; + XLS::BaseObjectPtr m_BrtBeginIndexedColors; + std::vector m_arIndexedColor; + XLS::BaseObjectPtr m_BrtEndIndexedColors; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/LISTPARTS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/LISTPARTS.cpp index ab4f2e5caa..0e7383763e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/LISTPARTS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/LISTPARTS.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/ListPart.h" #include "../Biff12_records/EndListParts.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/LISTPARTS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/LISTPARTS.h index bbe1e0256c..b7200d92db 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/LISTPARTS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/LISTPARTS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class LISTPARTS: public CompositeObject + class LISTPARTS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(LISTPARTS) public: LISTPARTS(); virtual ~LISTPARTS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginListParts; - std::vector m_arBrtListPart; - BaseObjectPtr m_BrtEndListParts; + XLS::BaseObjectPtr m_BrtBeginListParts; + std::vector m_arBrtListPart; + XLS::BaseObjectPtr m_BrtEndListParts; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MERGECELLS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MERGECELLS.cpp index d2fd349f0f..1674aece08 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MERGECELLS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MERGECELLS.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/MergeCell.h" #include "../Biff12_records/EndMergeCells.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MERGECELLS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MERGECELLS.h index 998596c154..121f0ce3b0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MERGECELLS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MERGECELLS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class MERGECELLS: public CompositeObject + class MERGECELLS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(MERGECELLS) public: MERGECELLS(); virtual ~MERGECELLS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginMergeCells; - std::vector m_arBrtMergeCell; - BaseObjectPtr m_BrtEndMergeCells; + XLS::BaseObjectPtr m_BrtBeginMergeCells; + std::vector m_arBrtMergeCell; + XLS::BaseObjectPtr m_BrtEndMergeCells; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MRUCOLORS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MRUCOLORS.cpp index 51ca7651cc..3653839052 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MRUCOLORS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MRUCOLORS.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/MRUColor.h" #include "../Biff12_records/EndMRUColors.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MRUCOLORS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MRUCOLORS.h index a98c26cdc6..8c91ce561d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MRUCOLORS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/MRUCOLORS.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class MRUCOLORS: public CompositeObject + class MRUCOLORS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(MRUCOLORS) public: MRUCOLORS(); virtual ~MRUCOLORS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginMRUColors; - std::vector m_arMRUColor; - BaseObjectPtr m_BrtEndMRUColors; + XLS::BaseObjectPtr m_BrtBeginMRUColors; + std::vector m_arMRUColor; + XLS::BaseObjectPtr m_BrtEndMRUColors; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/RICHSORTCONDITION.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/RICHSORTCONDITION.cpp index dc5329334c..8c3eca1ce2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/RICHSORTCONDITION.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/RICHSORTCONDITION.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/BeginRichSortCondition.h" #include "../Biff12_records/EndRichSortCondition.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/RICHSORTCONDITION.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/RICHSORTCONDITION.h index ef505e5e10..2f245fb425 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/RICHSORTCONDITION.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/RICHSORTCONDITION.h @@ -31,26 +31,26 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class RICHSORTCONDITION: public CompositeObject + class RICHSORTCONDITION: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(RICHSORTCONDITION) public: RICHSORTCONDITION(); virtual ~RICHSORTCONDITION(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginRichSortCondition; - BaseObjectPtr m_BrtEndRichSortCondition; + XLS::BaseObjectPtr m_BrtBeginRichSortCondition; + XLS::BaseObjectPtr m_BrtEndRichSortCondition; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHAREDSTRINGS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHAREDSTRINGS.cpp index f5f06f7838..197093023c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHAREDSTRINGS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHAREDSTRINGS.cpp @@ -37,6 +37,8 @@ #include "FRT.h" #include "../Biff12_records/EndSst.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHAREDSTRINGS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHAREDSTRINGS.h index 904127ea1c..988b5dc92e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHAREDSTRINGS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHAREDSTRINGS.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class SHAREDSTRINGS: public CompositeObject + class SHAREDSTRINGS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SHAREDSTRINGS) public: SHAREDSTRINGS(); virtual ~SHAREDSTRINGS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginSst; - std::vector m_arBrtSSTItem; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndSst; + XLS::BaseObjectPtr m_BrtBeginSst; + std::vector m_arBrtSSTItem; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndSst; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHRFMLACELL.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHRFMLACELL.cpp index 074f83a7d3..b6c35c1eb0 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHRFMLACELL.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHRFMLACELL.cpp @@ -32,7 +32,10 @@ #include "SHRFMLACELL.h" #include "../Biff12_records/CommonRecords.h" -#include +#include "../Biff12_structures/CellRef.h" + +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHRFMLACELL.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHRFMLACELL.h index cffe36a122..2c8bb26180 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHRFMLACELL.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SHRFMLACELL.h @@ -31,25 +31,25 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class SHRFMLACELL: public CompositeObject + class SHRFMLACELL: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SHRFMLACELL) public: SHRFMLACELL(_INT32 row, _INT32 col); virtual ~SHRFMLACELL(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_source; + XLS::BaseObjectPtr m_source; _INT32 m_Row; _INT32 m_Col; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLE.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLE.cpp index 2406b62dd5..e9bfaa8b31 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLE.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLE.cpp @@ -37,6 +37,8 @@ #include "../Biff12_records/EndSlicerStyleElements.h" #include "../Biff12_records/EndSlicerStyle.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLE.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLE.h index 47c4c34d1e..2d46e58de5 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLE.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLE.h @@ -31,29 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class SLICERSTYLE: public CompositeObject + class SLICERSTYLE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SLICERSTYLE) public: SLICERSTYLE(); virtual ~SLICERSTYLE(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginSlicerStyle; - BaseObjectPtr m_BrtBeginSlicerStyleElements; - std::vector m_arBrtSlicerStyleElement; - BaseObjectPtr m_BrtEndSlicerStyleElements; - BaseObjectPtr m_BrtEndSlicerStyle; + XLS::BaseObjectPtr m_BrtBeginSlicerStyle; + XLS::BaseObjectPtr m_BrtBeginSlicerStyleElements; + std::vector m_arBrtSlicerStyleElement; + XLS::BaseObjectPtr m_BrtEndSlicerStyleElements; + XLS::BaseObjectPtr m_BrtEndSlicerStyle; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLES.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLES.cpp index f11263604a..116ccd3a9e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLES.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLES.cpp @@ -35,6 +35,8 @@ #include "../Biff12_unions/SLICERSTYLE.h" #include "../Biff12_records/EndSlicerStyles.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLES.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLES.h index 348479104c..a694db8528 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLES.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SLICERSTYLES.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class SLICERSTYLES: public CompositeObject + class SLICERSTYLES: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SLICERSTYLES) public: SLICERSTYLES(); virtual ~SLICERSTYLES(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginSlicerStyles; - std::vector m_arSLICERSTYLE; - BaseObjectPtr m_BrtEndSlicerStyles; + XLS::BaseObjectPtr m_BrtBeginSlicerStyles; + std::vector m_arSLICERSTYLE; + XLS::BaseObjectPtr m_BrtEndSlicerStyles; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND.cpp index 4d71e55e0d..3ee43c8d21 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/BeginSortCond.h" #include "../Biff12_records/EndSortCond.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND.h index 8fa88a5c45..1db88f7fe8 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND.h @@ -31,26 +31,26 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class SORTCOND: public CompositeObject + class SORTCOND: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SORTCOND) public: SORTCOND(); virtual ~SORTCOND(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginSortCond; - BaseObjectPtr m_BrtEndSortCond; + XLS::BaseObjectPtr m_BrtBeginSortCond; + XLS::BaseObjectPtr m_BrtEndSortCond; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND14.cpp index 2ba84d6106..bf2042fa6c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND14.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/BeginSortCond14.h" #include "../Biff12_records/EndSortCond14.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND14.h index 90f47e390e..ccc06a0322 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCOND14.h @@ -31,26 +31,26 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class SORTCOND14: public CompositeObject + class SORTCOND14: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SORTCOND14) public: SORTCOND14(); virtual ~SORTCOND14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginSortCond14; - BaseObjectPtr m_BrtEndSortCond14; + XLS::BaseObjectPtr m_BrtBeginSortCond14; + XLS::BaseObjectPtr m_BrtEndSortCond14; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCONDS.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCONDS.cpp index 8044196165..a4e0897a42 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCONDS.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCONDS.cpp @@ -33,6 +33,8 @@ #include "SORTCONDS.h" #include "../Biff12_unions/SORTCOND.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCONDS.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCONDS.h index 268eebf92b..0fa9811159 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCONDS.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTCONDS.h @@ -31,25 +31,25 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class SORTCONDS: public CompositeObject + class SORTCONDS: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SORTCONDS) public: SORTCONDS(); virtual ~SORTCONDS(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - std::vector m_arSORTCOND; + std::vector m_arSORTCOND; }; } // namespace XLSB diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTSTATE.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTSTATE.cpp index a15f5c4219..b05b919854 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTSTATE.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTSTATE.cpp @@ -38,6 +38,8 @@ #include "FRT.h" #include "../Biff12_records/EndSortState.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTSTATE.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTSTATE.h index 135b987975..6b9b86a924 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTSTATE.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SORTSTATE.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class SORTSTATE: public CompositeObject + class SORTSTATE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SORTSTATE) public: SORTSTATE(); virtual ~SORTSTATE(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginSortState; - BaseObjectPtr m_source; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndSortState; + XLS::BaseObjectPtr m_BrtBeginSortState; + XLS::BaseObjectPtr m_source; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndSortState; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLES.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLES.cpp index 677a67eb5d..0bbfef25ac 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLES.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLES.cpp @@ -37,6 +37,8 @@ #include "../Biff12_unions/FRT.h" #include "../Biff12_records/EndStyles.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLES.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLES.h index e5c421448e..a48fd72943 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLES.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLES.h @@ -31,29 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class STYLES: public CompositeObject + class STYLES: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(STYLES) public: STYLES(); virtual ~STYLES(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginStyles; - std::vector m_arACUID; - std::vector m_arBrtStyle; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndStyles; + XLS::BaseObjectPtr m_BrtBeginStyles; + std::vector m_arACUID; + std::vector m_arBrtStyle; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndStyles; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET14.cpp index c103ce0818..f936a9045c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET14.cpp @@ -37,6 +37,8 @@ #include "../Biff12_records/EndStyleSheetExt14.h" #include "../Biff12_records/FRTEnd.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET14.h index 24fc1aa6ec..4948b9c9c9 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET14.h @@ -31,29 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class STYLESHEET14: public CompositeObject + class STYLESHEET14: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(STYLESHEET14) public: STYLESHEET14(); virtual ~STYLESHEET14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtFRTBegin; - BaseObjectPtr m_BrtBeginStyleSheetExt14; - BaseObjectPtr m_SLICERSTYLES; - BaseObjectPtr m_BrtEndStyleSheetExt14; - BaseObjectPtr m_BrtFRTEnd; + XLS::BaseObjectPtr m_BrtFRTBegin; + XLS::BaseObjectPtr m_BrtBeginStyleSheetExt14; + XLS::BaseObjectPtr m_SLICERSTYLES; + XLS::BaseObjectPtr m_BrtEndStyleSheetExt14; + XLS::BaseObjectPtr m_BrtFRTEnd; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET15.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET15.cpp index 4b15877af1..12d0045303 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET15.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET15.cpp @@ -37,6 +37,8 @@ #include "../Biff12_records/EndTimelineStyleSheetExt15.h" #include "../Biff12_records/FRTEnd.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET15.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET15.h index 3ec0fd7cba..efe13b88c7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET15.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/STYLESHEET15.h @@ -31,29 +31,29 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class STYLESHEET15: public CompositeObject + class STYLESHEET15: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(STYLESHEET15) public: STYLESHEET15(); virtual ~STYLESHEET15(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtFRTBegin; - BaseObjectPtr m_BrtBeginTimelineStyleSheetExt15; - BaseObjectPtr m_TIMELINESTYLES; - BaseObjectPtr m_BrtEndTimelineStyleSheetExt15; - BaseObjectPtr m_BrtFRTEnd; + XLS::BaseObjectPtr m_BrtFRTBegin; + XLS::BaseObjectPtr m_BrtBeginTimelineStyleSheetExt15; + XLS::BaseObjectPtr m_TIMELINESTYLES; + XLS::BaseObjectPtr m_BrtEndTimelineStyleSheetExt15; + XLS::BaseObjectPtr m_BrtFRTEnd; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUP.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUP.cpp index 07855d76d4..6efadf8ed7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUP.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUP.cpp @@ -36,6 +36,8 @@ #include "SUPSAME.h" #include "SUPADDIN.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUP.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUP.h index 359c190c2f..a552eff6eb 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUP.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUP.h @@ -31,25 +31,25 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class SUP: public CompositeObject + class SUP: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SUP) public: SUP(); virtual ~SUP(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_source; + XLS::BaseObjectPtr m_source; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPADDIN.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPADDIN.cpp index 67a56852b4..3bc751880d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPADDIN.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPADDIN.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/SupAddin.h" #include "../Biff12_records/PlaceholderName.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPADDIN.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPADDIN.h index ce2f249e38..be12d1630a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPADDIN.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPADDIN.h @@ -31,26 +31,24 @@ */ #pragma once -#include - -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" namespace XLSB { - class SUPADDIN: public CompositeObject + class SUPADDIN: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SUPADDIN) public: SUPADDIN(); virtual ~SUPADDIN(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtSupAddin; - std::vector m_arBrtPlaceholderName; + XLS::BaseObjectPtr m_BrtSupAddin; + std::vector m_arBrtPlaceholderName; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPSAME.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPSAME.cpp index 72ccd8a1c5..a409f46262 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPSAME.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPSAME.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/SupSame.h" #include "../Biff12_records/PlaceholderName.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPSAME.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPSAME.h index 80ff5bbe67..655cf35c1b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPSAME.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/SUPSAME.h @@ -31,26 +31,26 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class SUPSAME: public CompositeObject + class SUPSAME: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SUPSAME) public: SUPSAME(); virtual ~SUPSAME(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtSupSame; - std::vector m_arBrtPlaceholderName; + XLS::BaseObjectPtr m_BrtSupSame; + std::vector m_arBrtPlaceholderName; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLECELL.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLECELL.cpp index 52b4eda3a2..4270d43a5e 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLECELL.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLECELL.cpp @@ -35,6 +35,8 @@ #include "../Biff12_records/Cell.h" #include "CELLMETA.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLECELL.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLECELL.h index f961737489..96a62f8899 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLECELL.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLECELL.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class TABLECELL: public CompositeObject + class TABLECELL: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(TABLECELL) public: TABLECELL(); virtual ~TABLECELL(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtTable; - BaseObjectPtr m_CELLMETA; - BaseObjectPtr m_source; + XLS::BaseObjectPtr m_BrtTable; + XLS::BaseObjectPtr m_CELLMETA; + XLS::BaseObjectPtr m_source; _INT32 m_Col; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLE.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLE.cpp index a92d2bbae5..ea1b68a9cf 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLE.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLE.cpp @@ -35,6 +35,8 @@ #include "../Biff12_unions/ACUID.h" #include "../Biff12_records/EndTableStyle.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLE.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLE.h index 2b90881100..0c3d406d6f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLE.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLE.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class TABLESTYLE: public CompositeObject + class TABLESTYLE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(TABLESTYLE) public: TABLESTYLE(); virtual ~TABLESTYLE(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginTableStyle; - BaseObjectPtr m_ACUID; - std::vector m_arBrtTableStyleElement; - BaseObjectPtr m_BrtEndTableStyle; + XLS::BaseObjectPtr m_BrtBeginTableStyle; + XLS::BaseObjectPtr m_ACUID; + std::vector m_arBrtTableStyleElement; + XLS::BaseObjectPtr m_BrtEndTableStyle; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLES.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLES.cpp index 886d91f0a2..f4e90d3558 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLES.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLES.cpp @@ -35,6 +35,8 @@ #include "../Biff12_unions/TABLESTYLE.h" #include "../Biff12_records/EndTableStyles.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLES.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLES.h index 189eb3e387..bd79c3b029 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLES.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TABLESTYLES.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class TABLESTYLES: public CompositeObject + class TABLESTYLES: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(TABLESTYLES) public: TABLESTYLES(); virtual ~TABLESTYLES(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginTableStyles; - std::vector m_arTABLESTYLE; - BaseObjectPtr m_BrtEndTableStyles; + XLS::BaseObjectPtr m_BrtBeginTableStyles; + std::vector m_arTABLESTYLE; + XLS::BaseObjectPtr m_BrtEndTableStyles; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLE.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLE.cpp index cde571b239..10920173b4 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLE.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLE.cpp @@ -37,6 +37,8 @@ #include "../Biff12_records/EndTimelineStyleElements.h" #include "../Biff12_records/EndTimelineStyle.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLE.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLE.h index 09c3dbcfac..f3c7fde2e7 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLE.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLE.h @@ -31,29 +31,27 @@ */ #pragma once -#include - -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" namespace XLSB { - class TIMELINESTYLE: public CompositeObject + class TIMELINESTYLE: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(TIMELINESTYLE) public: TIMELINESTYLE(); virtual ~TIMELINESTYLE(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginTimelineStyle; - BaseObjectPtr m_BrtBeginTimelineStyleElements; - std::vector m_arBrtTimelineStyleElement; - BaseObjectPtr m_BrtEndTimelineStyleElements; - BaseObjectPtr m_BrtEndTimelineStyle; + XLS::BaseObjectPtr m_BrtBeginTimelineStyle; + XLS::BaseObjectPtr m_BrtBeginTimelineStyleElements; + std::vector m_arBrtTimelineStyleElement; + XLS::BaseObjectPtr m_BrtEndTimelineStyleElements; + XLS::BaseObjectPtr m_BrtEndTimelineStyle; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLES.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLES.cpp index 6967c41561..4dfd52caf2 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLES.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLES.cpp @@ -35,6 +35,8 @@ #include "../Biff12_unions/TIMELINESTYLE.h" #include "../Biff12_records/EndTimelineStyles.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLES.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLES.h index 598350d2f0..d89bc8a751 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLES.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/TIMELINESTYLES.h @@ -31,27 +31,27 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class TIMELINESTYLES: public CompositeObject + class TIMELINESTYLES: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(TIMELINESTYLES) public: TIMELINESTYLES(); virtual ~TIMELINESTYLES(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginTimelineStyles; - std::vector m_arTIMELINESTYLE; - BaseObjectPtr m_BrtEndTimelineStyles; + XLS::BaseObjectPtr m_BrtBeginTimelineStyles; + std::vector m_arTIMELINESTYLE; + XLS::BaseObjectPtr m_BrtEndTimelineStyles; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEW2.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEW2.cpp index 369304dc68..afec41a662 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEW2.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEW2.cpp @@ -36,6 +36,8 @@ #include "../Biff12_unions/ACUID.h" #include "../Biff12_unions/FRT.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEW2.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEW2.h index 64c5e6de0b..02f697c702 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEW2.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEW2.h @@ -31,30 +31,30 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class WSVIEW2: public CompositeObject + class WSVIEW2: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(WSVIEW2) public: WSVIEW2(); virtual ~WSVIEW2(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_ACUID; - BaseObjectPtr m_BrtBeginWsView; - BaseObjectPtr m_BrtPane; - std::vector m_arBrtSel; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndWsView; + XLS::BaseObjectPtr m_ACUID; + XLS::BaseObjectPtr m_BrtBeginWsView; + XLS::BaseObjectPtr m_BrtPane; + std::vector m_arBrtSel; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndWsView; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEWS2.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEWS2.cpp index c47436b838..33d21f16ce 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEWS2.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEWS2.cpp @@ -36,6 +36,8 @@ #include "../Biff12_unions/FRT.h" #include "../Biff12_records/EndWsViews.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEWS2.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEWS2.h index a1d5e4adda..1d4c313669 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEWS2.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/WSVIEWS2.h @@ -31,28 +31,26 @@ */ #pragma once -#include - -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" namespace XLSB { - class WSVIEWS2: public CompositeObject + class WSVIEWS2: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(WSVIEWS2) public: WSVIEWS2(); virtual ~WSVIEWS2(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginWsViews; - std::vector m_arWSVIEW2; - std::vector m_arFRT; - BaseObjectPtr m_BrtEndWsViews; + XLS::BaseObjectPtr m_BrtBeginWsViews; + std::vector m_arWSVIEW2; + std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtEndWsViews; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO.cpp index bfaf261109..41ff9b3734 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/CFVO.h" #include "../Biff12_unions/FRT.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO.h index 0cf0128571..2c4e43d140 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO.h @@ -31,28 +31,28 @@ */ #pragma once -#include +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" + -using namespace XLS; namespace XLSB { - class uCFVO: public CompositeObject + class uCFVO: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(uCFVO) public: uCFVO(); virtual ~uCFVO(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeuCFVO; + static const XLS::ElementType type = XLS::typeuCFVO; - BaseObjectPtr m_BrtCFVO; - std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtCFVO; + std::vector m_arFRT; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO14.cpp b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO14.cpp index dda07b6aab..caba31826c 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO14.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO14.cpp @@ -34,6 +34,8 @@ #include "../Biff12_records/CFVO14.h" #include "../Biff12_unions/FRT.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO14.h b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO14.h index ac4412decf..ffa83ab5fc 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO14.h +++ b/Common/DocxFormat/Source/XlsbFormat/Biff12_unions/uCFVO14.h @@ -31,28 +31,26 @@ */ #pragma once -#include - -using namespace XLS; +#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" namespace XLSB { - class uCFVO14: public CompositeObject + class uCFVO14: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(uCFVO14) public: uCFVO14(); virtual ~uCFVO14(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const ElementType type = typeuCFVO14; + static const XLS::ElementType type = XLS::typeuCFVO14; - BaseObjectPtr m_BrtCFVO14; - std::vector m_arFRT; + XLS::BaseObjectPtr m_BrtCFVO14; + std::vector m_arFRT; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/CommentsStream.cpp b/Common/DocxFormat/Source/XlsbFormat/CommentsStream.cpp index 9ad13aeda2..9af28da63d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/CommentsStream.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/CommentsStream.cpp @@ -34,6 +34,8 @@ #include "Biff12_records/CommonRecords.h" #include "Biff12_unions/COMMENTS.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/CommentsStream.h b/Common/DocxFormat/Source/XlsbFormat/CommentsStream.h index 8f82f0da01..f8bbf45b50 100644 --- a/Common/DocxFormat/Source/XlsbFormat/CommentsStream.h +++ b/Common/DocxFormat/Source/XlsbFormat/CommentsStream.h @@ -42,7 +42,7 @@ #include #include "../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" -using namespace XLS; + namespace XLSB { class StreamCacheReader; @@ -50,18 +50,18 @@ namespace XLSB class CommentsStream; typedef std::shared_ptr CommentsStreamPtr; - class CommentsStream: public CompositeObject + class CommentsStream: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(CommentsStream) public: CommentsStream(); virtual ~CommentsStream(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_COMMENTS; + XLS::BaseObjectPtr m_COMMENTS; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/SharedStringsStream.cpp b/Common/DocxFormat/Source/XlsbFormat/SharedStringsStream.cpp index 68619b3518..a6485141cd 100644 --- a/Common/DocxFormat/Source/XlsbFormat/SharedStringsStream.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/SharedStringsStream.cpp @@ -34,6 +34,8 @@ #include "Biff12_records/CommonRecords.h" #include "Biff12_unions/SHAREDSTRINGS.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/SharedStringsStream.h b/Common/DocxFormat/Source/XlsbFormat/SharedStringsStream.h index 7f1514fd5b..bc3e135581 100644 --- a/Common/DocxFormat/Source/XlsbFormat/SharedStringsStream.h +++ b/Common/DocxFormat/Source/XlsbFormat/SharedStringsStream.h @@ -42,7 +42,7 @@ #include #include "../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" -using namespace XLS; + namespace XLSB { class StreamCacheReader; @@ -50,18 +50,18 @@ namespace XLSB class SharedStringsStream; typedef std::shared_ptr SharedStringsStreamPtr; - class SharedStringsStream: public CompositeObject + class SharedStringsStream: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(SharedStringsStream) public: SharedStringsStream(); virtual ~SharedStringsStream(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_SHAREDSTRINGS; + XLS::BaseObjectPtr m_SHAREDSTRINGS; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/StylesStream.cpp b/Common/DocxFormat/Source/XlsbFormat/StylesStream.cpp index 64a6a87dca..036344044f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/StylesStream.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/StylesStream.cpp @@ -47,6 +47,8 @@ #include "Biff12_unions/FRTSTYLESHEET.h" #include "Biff12_records/EndStyleSheet.h" +using namespace XLS; + namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/StylesStream.h b/Common/DocxFormat/Source/XlsbFormat/StylesStream.h index eda9a6fd7f..cc572d420f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/StylesStream.h +++ b/Common/DocxFormat/Source/XlsbFormat/StylesStream.h @@ -42,7 +42,7 @@ #include #include "../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" -using namespace XLS; + namespace XLSB { class StreamCacheReader; @@ -50,30 +50,30 @@ namespace XLSB class StylesStream; typedef std::shared_ptr StylesStreamPtr; - class StylesStream: public CompositeObject + class StylesStream: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(StylesStream) public: StylesStream(); virtual ~StylesStream(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - BaseObjectPtr m_BrtBeginStyleSheet; - BaseObjectPtr m_FMTS; - BaseObjectPtr m_FONTS; - BaseObjectPtr m_FILLS; - BaseObjectPtr m_BORDERS; - BaseObjectPtr m_CELLSTYLEXFS; - BaseObjectPtr m_CELLXFS; - BaseObjectPtr m_STYLES; - BaseObjectPtr m_DXFS; - BaseObjectPtr m_TABLESTYLES; - BaseObjectPtr m_COLORPALETTE; - BaseObjectPtr m_BrtEndStyleSheet; - BaseObjectPtr m_FRTSTYLESHEET; + XLS::BaseObjectPtr m_BrtBeginStyleSheet; + XLS::BaseObjectPtr m_FMTS; + XLS::BaseObjectPtr m_FONTS; + XLS::BaseObjectPtr m_FILLS; + XLS::BaseObjectPtr m_BORDERS; + XLS::BaseObjectPtr m_CELLSTYLEXFS; + XLS::BaseObjectPtr m_CELLXFS; + XLS::BaseObjectPtr m_STYLES; + XLS::BaseObjectPtr m_DXFS; + XLS::BaseObjectPtr m_TABLESTYLES; + XLS::BaseObjectPtr m_COLORPALETTE; + XLS::BaseObjectPtr m_BrtEndStyleSheet; + XLS::BaseObjectPtr m_FRTSTYLESHEET; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/WorkBookStream.cpp b/Common/DocxFormat/Source/XlsbFormat/WorkBookStream.cpp index 01ebbcb367..9c5ab5520a 100644 --- a/Common/DocxFormat/Source/XlsbFormat/WorkBookStream.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/WorkBookStream.cpp @@ -49,6 +49,7 @@ #include "Biff12_records/BookProtectionIso.h" #include "Biff12_unions/FRT.h" +using namespace XLS; namespace XLSB { diff --git a/Common/DocxFormat/Source/XlsbFormat/WorkBookStream.h b/Common/DocxFormat/Source/XlsbFormat/WorkBookStream.h index 9193ef76cb..c05dadb331 100644 --- a/Common/DocxFormat/Source/XlsbFormat/WorkBookStream.h +++ b/Common/DocxFormat/Source/XlsbFormat/WorkBookStream.h @@ -42,7 +42,7 @@ #include #include "../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" typedef BYTE *LPBYTE; -using namespace XLS; + namespace XLSB { class StreamCacheReader; @@ -50,39 +50,39 @@ namespace XLSB class WorkBookStream; typedef std::shared_ptr WorkBookStreamPtr; - class WorkBookStream: public CompositeObject + class WorkBookStream: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(WorkBookStream) public: WorkBookStream(); virtual ~WorkBookStream(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const XLS::ElementType type = typeWorkbookStreamObject; + static const XLS::ElementType type = XLS::typeWorkbookStreamObject; - BaseObjectPtr m_BrtBeginBook; - BaseObjectPtr m_BrtFileVersion; - BaseObjectPtr m_BrtFileSharingIso; - BaseObjectPtr m_BrtFileSharing; - BaseObjectPtr m_BrtBookProtectionIso; - BaseObjectPtr m_BrtBookProtection; - BaseObjectPtr m_BrtWbProp; - BaseObjectPtr m_ACABSPATH; - BaseObjectPtr m_BOOKVIEWS; - BaseObjectPtr m_BUNDLESHS; - BaseObjectPtr m_FNGROUP; - BaseObjectPtr m_EXTERNALS; - BaseObjectPtr m_BrtCalcProp; - BaseObjectPtr m_BrtOleSize; - BaseObjectPtr m_BrtWebOpt; - BaseObjectPtr m_BrtEndBook; + XLS::BaseObjectPtr m_BrtBeginBook; + XLS::BaseObjectPtr m_BrtFileVersion; + XLS::BaseObjectPtr m_BrtFileSharingIso; + XLS::BaseObjectPtr m_BrtFileSharing; + XLS::BaseObjectPtr m_BrtBookProtectionIso; + XLS::BaseObjectPtr m_BrtBookProtection; + XLS::BaseObjectPtr m_BrtWbProp; + XLS::BaseObjectPtr m_ACABSPATH; + XLS::BaseObjectPtr m_BOOKVIEWS; + XLS::BaseObjectPtr m_BUNDLESHS; + XLS::BaseObjectPtr m_FNGROUP; + XLS::BaseObjectPtr m_EXTERNALS; + XLS::BaseObjectPtr m_BrtCalcProp; + XLS::BaseObjectPtr m_BrtOleSize; + XLS::BaseObjectPtr m_BrtWebOpt; + XLS::BaseObjectPtr m_BrtEndBook; - std::vector m_arBrtName; - std::vector m_arBrtUserBookView; - std::vector m_arBrtFileRecover; + std::vector m_arBrtName; + std::vector m_arBrtUserBookView; + std::vector m_arBrtFileRecover; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/WorkSheetStream.cpp b/Common/DocxFormat/Source/XlsbFormat/WorkSheetStream.cpp index 1467b34440..0dcc95ae07 100644 --- a/Common/DocxFormat/Source/XlsbFormat/WorkSheetStream.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/WorkSheetStream.cpp @@ -52,6 +52,8 @@ #include "Biff12_unions/FRTWORKSHEET.h" #include "Biff12_records/EndSheet.h" +using namespace XLS; + namespace XLSB {; diff --git a/Common/DocxFormat/Source/XlsbFormat/WorkSheetStream.h b/Common/DocxFormat/Source/XlsbFormat/WorkSheetStream.h index f643b40594..e5916f696f 100644 --- a/Common/DocxFormat/Source/XlsbFormat/WorkSheetStream.h +++ b/Common/DocxFormat/Source/XlsbFormat/WorkSheetStream.h @@ -42,7 +42,7 @@ #include #include "../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/CompositeObject.h" typedef BYTE *LPBYTE; -using namespace XLS; + namespace XLSB { class StreamCacheReader; @@ -50,38 +50,38 @@ namespace XLSB class WorkSheetStream; typedef std::shared_ptr WorkSheetStreamPtr; - class WorkSheetStream: public CompositeObject + class WorkSheetStream: public XLS::CompositeObject { BASE_OBJECT_DEFINE_CLASS_NAME(WorkBookStream) public: WorkSheetStream(); virtual ~WorkSheetStream(); - BaseObjectPtr clone(); + XLS::BaseObjectPtr clone(); - virtual const bool loadContent(BinProcessor& proc); + virtual const bool loadContent(XLS::BinProcessor& proc); - static const XLS::ElementType type = typeWorksheetSubstream; + static const XLS::ElementType type = XLS::typeWorksheetSubstream; - BaseObjectPtr m_BrtBeginSheet; - std::vector m_arCOLINFOS; - BaseObjectPtr m_BrtWsDim; - BaseObjectPtr m_BrtDrawing; - BaseObjectPtr m_BrtLegacyDrawing; - BaseObjectPtr m_BrtLegacyDrawingHF; - BaseObjectPtr m_HLINKS; - BaseObjectPtr m_MERGECELLS; - BaseObjectPtr m_CELLTABLE; - BaseObjectPtr m_BrtWsFmtInfo; - BaseObjectPtr m_WSVIEWS2; - BaseObjectPtr m_BrtSheetProtectionIso; - BaseObjectPtr m_BrtSheetProtection; - BaseObjectPtr m_LISTPARTS; - BaseObjectPtr m_SORTSTATE; - std::vector m_arCONDITIONALFORMATTING; - BaseObjectPtr m_FRTWORKSHEET; + XLS::BaseObjectPtr m_BrtBeginSheet; + std::vector m_arCOLINFOS; + XLS::BaseObjectPtr m_BrtWsDim; + XLS::BaseObjectPtr m_BrtDrawing; + XLS::BaseObjectPtr m_BrtLegacyDrawing; + XLS::BaseObjectPtr m_BrtLegacyDrawingHF; + XLS::BaseObjectPtr m_HLINKS; + XLS::BaseObjectPtr m_MERGECELLS; + XLS::BaseObjectPtr m_CELLTABLE; + XLS::BaseObjectPtr m_BrtWsFmtInfo; + XLS::BaseObjectPtr m_WSVIEWS2; + XLS::BaseObjectPtr m_BrtSheetProtectionIso; + XLS::BaseObjectPtr m_BrtSheetProtection; + XLS::BaseObjectPtr m_LISTPARTS; + XLS::BaseObjectPtr m_SORTSTATE; + std::vector m_arCONDITIONALFORMATTING; + XLS::BaseObjectPtr m_FRTWORKSHEET; - BaseObjectPtr m_BrtEndSheet; + XLS::BaseObjectPtr m_BrtEndSheet; }; diff --git a/Common/DocxFormat/Source/XlsbFormat/Xlsb.cpp b/Common/DocxFormat/Source/XlsbFormat/Xlsb.cpp index 6c8ee596e6..e546369e0d 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Xlsb.cpp +++ b/Common/DocxFormat/Source/XlsbFormat/Xlsb.cpp @@ -30,18 +30,37 @@ * */ #include "Xlsb.h" + +#include "../XlsxFormat/Workbook/Workbook.h" #include "../XlsxFormat/SharedStrings/SharedStrings.h" #include "../XlsxFormat/Styles/Styles.h" #include "../XlsxFormat/Worksheets/Worksheet.h" -#include "../XlsxFormat/Comments/Comments.h" +#include "../XlsxFormat/CalcChain/CalcChain.h" +#include "../XlsxFormat/ExternalLinks/ExternalLinks.h" +#include "../XlsxFormat/ExternalLinks/ExternalLinkPath.h" +#include "../XlsxFormat/Pivot/PivotTable.h" +#include "../XlsxFormat/Pivot/PivotCacheDefinition.h" +#include "../XlsxFormat/Pivot/PivotCacheRecords.h" + +#include "../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.h" +#include "../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/WorkbookStreamObject.h" +#include "../../../../ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStreamCacheReader.h" +#include "../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/BinProcessor.h" #include "../../../../DesktopEditor/common/SystemUtils.h" +using namespace XLS; + OOX::Spreadsheet::CXlsb::~CXlsb() { } - +void OOX::Spreadsheet::CXlsb::init() +{ + workbook_code_page = XLS::WorkbookStreamObject::DefaultCodePage; + xls_global_info = boost::shared_ptr(new XLS::GlobalWorkbookInfo(workbook_code_page, nullptr)); + xls_global_info->Version = 0x0800; +} bool OOX::Spreadsheet::CXlsb::ReadBin(const CPath& oFilePath, XLS::BaseObject* objStream) { NSFile::CFileBinary oFile; diff --git a/Common/DocxFormat/Source/XlsbFormat/Xlsb.h b/Common/DocxFormat/Source/XlsbFormat/Xlsb.h index c41411d3a7..4b9838ec93 100644 --- a/Common/DocxFormat/Source/XlsbFormat/Xlsb.h +++ b/Common/DocxFormat/Source/XlsbFormat/Xlsb.h @@ -32,10 +32,14 @@ #pragma once #include "../XlsxFormat/Xlsx.h" -#include "../../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.h" -#include "../../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/WorkbookStreamObject.h" -#include "../../../../../../ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStreamCacheReader.h" -#include "../../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/BinProcessor.h" + +namespace XLS +{ + class GlobalWorkbookInfo; + typedef boost::shared_ptr GlobalWorkbookInfoPtr; + + class BaseObject; +} namespace OOX { @@ -62,18 +66,11 @@ namespace OOX private: - void init() - { - auto workbook_code_page = XLS::WorkbookStreamObject::DefaultCodePage; - xls_global_info = boost::shared_ptr(new XLS::GlobalWorkbookInfo(workbook_code_page, nullptr)); - xls_global_info->Version = 0x0800; - - m_binaryReader = std::make_shared(); - } - + void init(); XLS::GlobalWorkbookInfoPtr xls_global_info; std::shared_ptr m_binaryReader; + unsigned short workbook_code_page; }; } //Spreadsheet diff --git a/Common/DocxFormat/Source/XlsbFormat/XlsbElementsType.h b/Common/DocxFormat/Source/XlsbFormat/XlsbElementsType.h index 388148d5b2..4eabc1189b 100644 --- a/Common/DocxFormat/Source/XlsbFormat/XlsbElementsType.h +++ b/Common/DocxFormat/Source/XlsbFormat/XlsbElementsType.h @@ -30,16 +30,4 @@ * */ #pragma once -#include "../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/XlsElementsType.h" -//namespace XLS -//{ - -//enum class ElementType -//{ -// typeBrtBeginBook = typeOfficeArtClientTextbox + 1, - -//}; - - - -//} +#include "../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/XlsElementsType.h" diff --git a/Common/DocxFormat/Source/XlsxFormat/Comments/Comments.h b/Common/DocxFormat/Source/XlsxFormat/Comments/Comments.h index 1d5b1ac7c5..a76db650ab 100644 --- a/Common/DocxFormat/Source/XlsxFormat/Comments/Comments.h +++ b/Common/DocxFormat/Source/XlsxFormat/Comments/Comments.h @@ -32,7 +32,7 @@ #pragma once #include "../Xlsx.h" -#include "../XlsbFormat/Xlsb.h" +#include "../../XlsbFormat/Xlsb.h" #include "../Worksheets/Worksheet.h" #include "../SharedStrings/Si.h" diff --git a/Common/DocxFormat/Source/XlsxFormat/SharedStrings/SharedStrings.h b/Common/DocxFormat/Source/XlsxFormat/SharedStrings/SharedStrings.h index b1d5678cec..2c65364424 100644 --- a/Common/DocxFormat/Source/XlsxFormat/SharedStrings/SharedStrings.h +++ b/Common/DocxFormat/Source/XlsxFormat/SharedStrings/SharedStrings.h @@ -32,7 +32,7 @@ #pragma once #include "../Xlsx.h" -#include "../XlsbFormat/Xlsb.h" +#include "../../XlsbFormat/Xlsb.h" #include "../CommonInclude.h" #include "Si.h" diff --git a/Common/DocxFormat/Source/XlsxFormat/Styles/Fills.h b/Common/DocxFormat/Source/XlsxFormat/Styles/Fills.h index 920f450cf3..f81c13107f 100644 --- a/Common/DocxFormat/Source/XlsxFormat/Styles/Fills.h +++ b/Common/DocxFormat/Source/XlsxFormat/Styles/Fills.h @@ -329,7 +329,7 @@ namespace OOX for(auto &gradStop : ptr->xfillGradientStop) { auto ptrGradStop = new CGradientStop(); - auto ptrBiffStruct = dynamic_cast(&gradStop); + auto ptrBiffStruct = dynamic_cast(&gradStop); ptrGradStop->fromBin(ptrBiffStruct); m_arrItems.push_back(ptrGradStop); } diff --git a/Common/DocxFormat/Source/XlsxFormat/Styles/Styles.h b/Common/DocxFormat/Source/XlsxFormat/Styles/Styles.h index 1fe4f6bae3..10fd5d5af5 100644 --- a/Common/DocxFormat/Source/XlsxFormat/Styles/Styles.h +++ b/Common/DocxFormat/Source/XlsxFormat/Styles/Styles.h @@ -32,7 +32,7 @@ #pragma once #include "../Xlsx.h" -#include "../XlsbFormat/Xlsb.h" +#include "../../XlsbFormat/Xlsb.h" #include "../XlsxFlat.h" #include "../CommonInclude.h" diff --git a/Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h b/Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h index 827e51c1f7..02adc8c2d4 100644 --- a/Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h +++ b/Common/DocxFormat/Source/XlsxFormat/Workbook/Workbook.h @@ -32,8 +32,9 @@ #pragma once #include "../Xlsx.h" -#include "../XlsbFormat/Xlsb.h" #include "../XlsxFlat.h" +#include "../../XlsbFormat/Xlsb.h" + #include "../CommonInclude.h" #include "BookViews.h" diff --git a/Common/DocxFormat/Source/XlsxFormat/Worksheets/ConditionalFormatting.cpp b/Common/DocxFormat/Source/XlsxFormat/Worksheets/ConditionalFormatting.cpp index 84176ed0fe..95194a1600 100644 --- a/Common/DocxFormat/Source/XlsxFormat/Worksheets/ConditionalFormatting.cpp +++ b/Common/DocxFormat/Source/XlsxFormat/Worksheets/ConditionalFormatting.cpp @@ -63,6 +63,8 @@ #include "../../XlsbFormat/Biff12_records/BeginDatabar14.h" #include "../../XlsbFormat/Biff12_records/BeginIconSet14.h" +using namespace XLS; + namespace OOX { namespace Spreadsheet diff --git a/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.cpp b/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.cpp index 40afd78339..217c87f978 100644 --- a/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.cpp +++ b/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.cpp @@ -58,6 +58,8 @@ #include +using namespace XLS; + namespace OOX { namespace Spreadsheet diff --git a/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.h b/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.h index bc6f9e0244..ceca7adbf0 100644 --- a/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.h +++ b/Common/DocxFormat/Source/XlsxFormat/Worksheets/SheetData.h @@ -156,7 +156,7 @@ namespace OOX } void fromXLSB (NSBinPptxRW::CBinaryFileReader& oStream); void fromXLSBExt (NSBinPptxRW::CBinaryFileReader& oStream, _UINT16 nFlags); - void fromBin(BaseObjectPtr& obj, SimpleTypes::Spreadsheet::ECellFormulaType eType); + void fromBin(XLS::BaseObjectPtr& obj, SimpleTypes::Spreadsheet::ECellFormulaType eType); virtual EElementType getType () const { return et_x_Formula; diff --git a/Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.cpp b/Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.cpp index 2edba8c322..e8aff2f246 100644 --- a/Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.cpp +++ b/Common/DocxFormat/Source/XlsxFormat/Worksheets/Worksheet.cpp @@ -40,7 +40,7 @@ #include "../../DocxFormat/Media/Image.h" #include "../../DocxFormat/VmlDrawing.h" -#include "../XlsbFormat/Xlsb.h" +#include "../../XlsbFormat/Xlsb.h" #include "../../XlsbFormat/WorkSheetStream.h"