From fe2ca8c566af84ad0e5488dd23b6c3ab3da465dc Mon Sep 17 00:00:00 2001 From: Alexey Nagaev Date: Sat, 14 Dec 2024 11:33:47 +0300 Subject: [PATCH] Delete unused headers & add new files --- DocxRenderer/DocxRenderer.pro | 2 ++ DocxRenderer/src/logic/elements/BaseItem.h | 2 -- DocxRenderer/src/logic/elements/Table.cpp | 6 ++++++ DocxRenderer/src/logic/elements/Table.h | 15 +++++++++++++++ .../src/logic/managers/ExternalImageStorage.h | 3 +-- DocxRenderer/src/logic/managers/ImageManager.cpp | 1 + DocxRenderer/src/logic/managers/ImageManager.h | 3 +++ .../src/logic/managers/ParagraphStyleManager.h | 1 - DocxRenderer/src/resources/ColorTable.h | 1 - DocxRenderer/src/resources/VectorGraphics.cpp | 2 -- DocxRenderer/src/resources/VectorGraphics.h | 1 - 11 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 DocxRenderer/src/logic/elements/Table.cpp create mode 100644 DocxRenderer/src/logic/elements/Table.h diff --git a/DocxRenderer/DocxRenderer.pro b/DocxRenderer/DocxRenderer.pro index 1f00da46e3..5b4dc732ef 100644 --- a/DocxRenderer/DocxRenderer.pro +++ b/DocxRenderer/DocxRenderer.pro @@ -32,6 +32,7 @@ HEADERS += \ src/logic/elements/ContText.h \ src/logic/elements/Paragraph.h \ src/logic/elements/Shape.h \ + src/logic/elements/Table.h \ src/logic/elements/TextLine.h \ src/logic/managers/ExternalImageStorage.h \ src/logic/managers/FontStyleManager.h \ @@ -56,6 +57,7 @@ SOURCES += \ src/logic/elements/ContText.cpp \ src/logic/elements/Paragraph.cpp \ src/logic/elements/Shape.cpp \ + src/logic/elements/Table.cpp \ src/logic/elements/TextLine.cpp \ src/logic/managers/FontManager.cpp \ src/logic/managers/FontStyleManager.cpp \ diff --git a/DocxRenderer/src/logic/elements/BaseItem.h b/DocxRenderer/src/logic/elements/BaseItem.h index ae9f97e241..c2818ca994 100644 --- a/DocxRenderer/src/logic/elements/BaseItem.h +++ b/DocxRenderer/src/logic/elements/BaseItem.h @@ -1,6 +1,4 @@ #pragma once -#include -#include #include "../../../../DesktopEditor/common/StringBuilder.h" diff --git a/DocxRenderer/src/logic/elements/Table.cpp b/DocxRenderer/src/logic/elements/Table.cpp new file mode 100644 index 0000000000..92ab704c98 --- /dev/null +++ b/DocxRenderer/src/logic/elements/Table.cpp @@ -0,0 +1,6 @@ +#include "Table.h" + +namespace NSDocxRenderer +{ + +} // namespace NSDocxRenderer diff --git a/DocxRenderer/src/logic/elements/Table.h b/DocxRenderer/src/logic/elements/Table.h new file mode 100644 index 0000000000..8d711ee018 --- /dev/null +++ b/DocxRenderer/src/logic/elements/Table.h @@ -0,0 +1,15 @@ +#pragma once + +#include "BaseItem.h" + +namespace NSDocxRenderer +{ + class CTable : public CBaseItem + { + CTable() = default; + virtual ~CTable() = default; + }; +} // namespace NSDocxRenderer + + + diff --git a/DocxRenderer/src/logic/managers/ExternalImageStorage.h b/DocxRenderer/src/logic/managers/ExternalImageStorage.h index 1784da1a7b..77bcfd23d1 100644 --- a/DocxRenderer/src/logic/managers/ExternalImageStorage.h +++ b/DocxRenderer/src/logic/managers/ExternalImageStorage.h @@ -1,7 +1,6 @@ #pragma once -#include "../../../../DesktopEditor/raster/BgraFrame.h" +#include "../../../../DesktopEditor/graphics/Image.h" #include "../../resources/ImageInfo.h" -#include #include #ifndef DOCXRENDERER_USE_DYNAMIC_LIBRARY diff --git a/DocxRenderer/src/logic/managers/ImageManager.cpp b/DocxRenderer/src/logic/managers/ImageManager.cpp index 48c2a2b5d6..2036ea99f9 100644 --- a/DocxRenderer/src/logic/managers/ImageManager.cpp +++ b/DocxRenderer/src/logic/managers/ImageManager.cpp @@ -1,6 +1,7 @@ #include "ImageManager.h" #include "../../../../DesktopEditor/common/Directory.h" +#include "../../../../DesktopEditor/raster/BgraFrame.h" #include "../../resources/Constants.h" diff --git a/DocxRenderer/src/logic/managers/ImageManager.h b/DocxRenderer/src/logic/managers/ImageManager.h index 93ea7ac5b4..d3810fd3e1 100644 --- a/DocxRenderer/src/logic/managers/ImageManager.h +++ b/DocxRenderer/src/logic/managers/ImageManager.h @@ -1,4 +1,7 @@ #pragma once + +#include + #include "../../../../DesktopEditor/common/CalculatorCRC32.h" #include "ExternalImageStorage.h" diff --git a/DocxRenderer/src/logic/managers/ParagraphStyleManager.h b/DocxRenderer/src/logic/managers/ParagraphStyleManager.h index fce153122c..ed4d1ae182 100644 --- a/DocxRenderer/src/logic/managers/ParagraphStyleManager.h +++ b/DocxRenderer/src/logic/managers/ParagraphStyleManager.h @@ -1,6 +1,5 @@ #pragma once #include -#include #include "../elements/Paragraph.h" #include "../styles/ParagraphStyle.h" diff --git a/DocxRenderer/src/resources/ColorTable.h b/DocxRenderer/src/resources/ColorTable.h index 8ec2dc81e7..aafd08683e 100644 --- a/DocxRenderer/src/resources/ColorTable.h +++ b/DocxRenderer/src/resources/ColorTable.h @@ -1,7 +1,6 @@ #pragma once #include #include -#include class ColorTable { diff --git a/DocxRenderer/src/resources/VectorGraphics.cpp b/DocxRenderer/src/resources/VectorGraphics.cpp index 2ffed33f1e..b87b082f22 100644 --- a/DocxRenderer/src/resources/VectorGraphics.cpp +++ b/DocxRenderer/src/resources/VectorGraphics.cpp @@ -1,8 +1,6 @@ #include "VectorGraphics.h" -#include #include -#include #include #include "../../../DesktopEditor/graphics/Matrix.h" diff --git a/DocxRenderer/src/resources/VectorGraphics.h b/DocxRenderer/src/resources/VectorGraphics.h index bd43bebc76..6ec53346b1 100644 --- a/DocxRenderer/src/resources/VectorGraphics.h +++ b/DocxRenderer/src/resources/VectorGraphics.h @@ -2,7 +2,6 @@ #include "../../../DesktopEditor/graphics/GraphicsPath.h" #include -#include #include namespace NSDocxRenderer