From d6dfe0623f1e6bf24ce5bf00e7be71e5c264a5c0 Mon Sep 17 00:00:00 2001 From: Vikulov Dmitry Date: Thu, 2 Feb 2023 15:14:17 +0300 Subject: [PATCH] pptx forward decs --- OOXML/Binary/Presentation/PPTXWriter.cpp | 8 ++++++++ OOXML/PPTXFormat/Logic/Pic.cpp | 1 + OOXML/PPTXFormat/Logic/Shape.cpp | 1 + OOXML/PPTXFormat/NotesMaster.cpp | 3 +++ OOXML/PPTXFormat/NotesMaster.h | 5 +++-- OOXML/PPTXFormat/NotesSlide.cpp | 2 ++ OOXML/PPTXFormat/NotesSlide.h | 5 ++++- OOXML/PPTXFormat/ViewProps.cpp | 8 ++++++++ OOXML/PPTXFormat/ViewProps.h | 18 +++++++++++------- OdfFile/Writer/Converter/PptxConverter.cpp | 4 ++++ 10 files changed, 45 insertions(+), 10 deletions(-) diff --git a/OOXML/Binary/Presentation/PPTXWriter.cpp b/OOXML/Binary/Presentation/PPTXWriter.cpp index 30e76558e8..c6c51a42a8 100644 --- a/OOXML/Binary/Presentation/PPTXWriter.cpp +++ b/OOXML/Binary/Presentation/PPTXWriter.cpp @@ -37,6 +37,14 @@ #include "../../PPTXFormat/Logic/TxStyles.h" #include "../../PPTXFormat/Logic/Hf.h" +#include "../../PPTXFormat/ViewProps/GridSpacing.h" +#include "../../PPTXFormat/ViewProps/NormalViewPr.h" +#include "../../PPTXFormat/ViewProps/NotesTextViewPr.h" +#include "../../PPTXFormat/ViewProps/NotesViewPr.h" +#include "../../PPTXFormat/ViewProps/OutlineViewPr.h" +#include "../../PPTXFormat/ViewProps/SlideViewPr.h" +#include "../../PPTXFormat/ViewProps/SorterViewPr.h" + namespace NSBinPptxRW { CPPTXWriter::CPPTXWriter() : m_oPresentation(&m_oDocument), m_oTableStyles(&m_oDocument), m_oVmlDrawing(&m_oDocument), diff --git a/OOXML/PPTXFormat/Logic/Pic.cpp b/OOXML/PPTXFormat/Logic/Pic.cpp index f51f62a9f2..d9f91cf646 100644 --- a/OOXML/PPTXFormat/Logic/Pic.cpp +++ b/OOXML/PPTXFormat/Logic/Pic.cpp @@ -51,6 +51,7 @@ #include "./../SlideMaster.h" #include "./../Slide.h" #include "./../NotesSlide.h" +#include "./../NotesMaster.h" #include "Media/MediaFile.h" #include "Media/WavAudioFile.h" diff --git a/OOXML/PPTXFormat/Logic/Shape.cpp b/OOXML/PPTXFormat/Logic/Shape.cpp index b02a06a220..c8d6befd2f 100644 --- a/OOXML/PPTXFormat/Logic/Shape.cpp +++ b/OOXML/PPTXFormat/Logic/Shape.cpp @@ -39,6 +39,7 @@ #include "Pic.h" #include "../NotesSlide.h" +#include "../NotesMaster.h" namespace PPTX { diff --git a/OOXML/PPTXFormat/NotesMaster.cpp b/OOXML/PPTXFormat/NotesMaster.cpp index 4857319d1a..ddb5d3244c 100644 --- a/OOXML/PPTXFormat/NotesMaster.cpp +++ b/OOXML/PPTXFormat/NotesMaster.cpp @@ -31,8 +31,11 @@ */ #include "NotesMaster.h" + +#include "TableStyles.h" #include "Logic/Hf.h" #include "Logic/TextListStyle.h" +#include "Logic/Shape.h" namespace PPTX { diff --git a/OOXML/PPTXFormat/NotesMaster.h b/OOXML/PPTXFormat/NotesMaster.h index 7b78298219..cec4a93497 100644 --- a/OOXML/PPTXFormat/NotesMaster.h +++ b/OOXML/PPTXFormat/NotesMaster.h @@ -39,8 +39,6 @@ #include "Logic/ClrMap.h" #include "Logic/CSld.h" -#include "TableStyles.h" -#include "Logic/Shape.h" namespace PPTX { @@ -50,6 +48,9 @@ namespace PPTX class TextListStyle; } + class Theme; + class TableStyles; + class NotesMaster : public WrapperFile, public FileContainer { public: diff --git a/OOXML/PPTXFormat/NotesSlide.cpp b/OOXML/PPTXFormat/NotesSlide.cpp index f918aaa27c..cc57d12ece 100644 --- a/OOXML/PPTXFormat/NotesSlide.cpp +++ b/OOXML/PPTXFormat/NotesSlide.cpp @@ -31,6 +31,8 @@ */ #include "NotesSlide.h" + +#include "NotesMaster.h" #include "Logic/ClrMapOvr.h" namespace PPTX diff --git a/OOXML/PPTXFormat/NotesSlide.h b/OOXML/PPTXFormat/NotesSlide.h index ad967f92ad..3a6f69c591 100644 --- a/OOXML/PPTXFormat/NotesSlide.h +++ b/OOXML/PPTXFormat/NotesSlide.h @@ -36,7 +36,7 @@ #include "WrapperFile.h" #include "FileContainer.h" #include "FileTypes.h" -#include "NotesMaster.h" +#include "Logic/CSld.h" namespace PPTX { @@ -45,6 +45,9 @@ namespace PPTX class ClrMapOvr; } + class Theme; + class NotesMaster; + class NotesSlide : public WrapperFile, public FileContainer { public: diff --git a/OOXML/PPTXFormat/ViewProps.cpp b/OOXML/PPTXFormat/ViewProps.cpp index d5a43c5199..25a39273cb 100644 --- a/OOXML/PPTXFormat/ViewProps.cpp +++ b/OOXML/PPTXFormat/ViewProps.cpp @@ -32,6 +32,14 @@ #include "ViewProps.h" +#include "ViewProps/GridSpacing.h" +#include "ViewProps/NormalViewPr.h" +#include "ViewProps/NotesTextViewPr.h" +#include "ViewProps/NotesViewPr.h" +#include "ViewProps/OutlineViewPr.h" +#include "ViewProps/SlideViewPr.h" +#include "ViewProps/SorterViewPr.h" + namespace PPTX { ViewProps::ViewProps(OOX::Document* pMain) : WrapperFile(pMain), PPTX::FileContainer(pMain) diff --git a/OOXML/PPTXFormat/ViewProps.h b/OOXML/PPTXFormat/ViewProps.h index 33d024f0e2..d201fd4d3f 100644 --- a/OOXML/PPTXFormat/ViewProps.h +++ b/OOXML/PPTXFormat/ViewProps.h @@ -36,16 +36,20 @@ #include "FileTypes.h" #include "Limit/LastView.h" -#include "ViewProps/GridSpacing.h" -#include "ViewProps/NormalViewPr.h" -#include "ViewProps/NotesTextViewPr.h" -#include "ViewProps/NotesViewPr.h" -#include "ViewProps/OutlineViewPr.h" -#include "ViewProps/SlideViewPr.h" -#include "ViewProps/SorterViewPr.h" namespace PPTX { + namespace nsViewProps + { + class GridSpacing; + class NormalViewPr; + class NotesTextViewPr; + class NotesViewPr; + class OutlineViewPr; + class SlideViewPr; + class SorterViewPr; + } + class ViewProps : public WrapperFile, public PPTX::FileContainer { public: diff --git a/OdfFile/Writer/Converter/PptxConverter.cpp b/OdfFile/Writer/Converter/PptxConverter.cpp index 7b10678090..f91cd12b84 100644 --- a/OdfFile/Writer/Converter/PptxConverter.cpp +++ b/OdfFile/Writer/Converter/PptxConverter.cpp @@ -39,6 +39,7 @@ #include "../../../OOXML/PPTXFormat/SlideLayout.h" #include "../../../OOXML/PPTXFormat/NotesMaster.h" #include "../../../OOXML/PPTXFormat/NotesSlide.h" +#include "../../../OOXML/PPTXFormat/TableStyles.h" #include "../../../OOXML/PPTXFormat/Logic/Table/Table.h" #include "../../../OOXML/PPTXFormat/Logic/Timing/Par.h" @@ -46,7 +47,10 @@ #include "../../../OOXML/PPTXFormat/Logic/Timing/CTn.h" #include "../../../OOXML/PPTXFormat/Logic/Timing/Timing.h" +#include "../../../OOXML/PPTXFormat/Logic/TcBdr.h" +#include "../../../OOXML/PPTXFormat/Logic/TablePartStyle.h" #include "../../../OOXML/PPTXFormat/Logic/CxnSp.h" +#include "../../../OOXML/PPTXFormat/Logic/Shape.h" #include "../../../OOXML/PPTXFormat/Logic/TxStyles.h" #include "../../../OOXML/PPTXFormat/Logic/ClrMapOvr.h" #include "../../../OOXML/PPTXFormat/Logic/Transitions/Transition.h"