From dba6f3c7056754354be2cf57403793eae42fd793 Mon Sep 17 00:00:00 2001 From: Vikulov Dmitry Date: Sun, 27 Nov 2022 21:06:01 +0300 Subject: [PATCH] - unused files --- OOXML/DocxFormat/Namespaces.cpp | 82 +++++++++++++++++++ OOXML/DocxFormat/Namespaces.h | 50 ++--------- .../Linux/DocxFormatLib/DocxFormatLib.pro | 4 +- .../Linux/DocxFormatLib/docx_format_logic.cpp | 1 + .../Linux/DocxFormatLib/xlsx_format_logic.cpp | 1 - 5 files changed, 91 insertions(+), 47 deletions(-) create mode 100644 OOXML/DocxFormat/Namespaces.cpp diff --git a/OOXML/DocxFormat/Namespaces.cpp b/OOXML/DocxFormat/Namespaces.cpp new file mode 100644 index 0000000000..530cc9cccb --- /dev/null +++ b/OOXML/DocxFormat/Namespaces.cpp @@ -0,0 +1,82 @@ +/* + * (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 "Namespaces.h" + +namespace OOX +{ + + /*Namespace::Namespace(LPCSTR sName, LPCSTR sLink) : m_strName(sName), m_strLink(sLink) + { + }*/ + Namespace::Namespace(LPCWSTR sName, LPCWSTR sLink) : m_strName(sName), m_strLink(sLink) + { + } + + Namespaces::Namespaces() : + a(L"a", L"http://schemas.openxmlformats.org/drawingml/2006/main"), + b(L"b", L"http://schemas.openxmlformats.org/officeDocument/2006/bibliography"), + cdr(L"cdr", L"http://schemas.openxmlformats.org/drawingml/2006/chartDrawing"), + cp(L"cp", L"http://schemas.openxmlformats.org/package/2006/metadata/core-properties"), + dc(L"dc", L"http://purl.org/dc/elements/1.1/"), + dchrt(L"dchrt", L"http://schemas.openxmlformats.org/drawingml/2006/chart"), + dcmitype(L"dcmitype", L"http://purl.org/dc/dcmitype/"), + dcterms(L"dcterms", L"http://purl.org/dc/terms/"), + ddgrm(L"ddgrm", L"http://schemas.openxmlformats.org/drawingml/2006/diagram"), + dgm(L"dgm", L"http://schemas.openxmlformats.org/drawingml/2006/diagram"), + dlckcnv(L"dlckcnv", L"http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas"), + dpct(L"dpct", L"http://schemas.openxmlformats.org/drawingml/2006/picture"), + ds(L"ds", L"http://schemas.openxmlformats.org/officeDocument/2006/customXml"), + m(L"m", L"http://schemas.openxmlformats.org/officeDocument/2006/math"), + o(L"o", L"urn:schemas-microsoft-com:office:office"), + p(L"p", L"http://schemas.openxmlformats.org/presentationml/2006/main"), + pic(L"pic", L"http://schemas.openxmlformats.org/drawingml/2006/picture"), + pvml(L"pvml", L"urn:schemas-microsoft-com:office:powerpoint"), + r(L"r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships"), + s(L"s", L"http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"), + sl(L"sl", L"http://schemas.openxmlformats.org/schemaLibrary/2006/main"), + v(L"v", L"urn:schemas-microsoft-com:vml"), + ve(L"ve", L"http://schemas.openxmlformats.org/markup-compatibility/2006"), + vp(L"vp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"), + vt(L"vt", L"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"), + w(L"w", L"http://schemas.openxmlformats.org/wordprocessingml/2006/main"), + w10(L"w10", L"urn:schemas-microsoft-com:office:word"), + wne(L"wne", L"http://schemas.microsoft.com/office/word/2006/wordml"), + wp(L"wp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"), + x(L"x", L"urn:schemas-microsoft-com:office:excel"), + xdr(L"xdr", L"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"), + xmlns(L"xmlns", L"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"), + xsd(L"xsd", L"http://www.w3.org/2001/XMLSchema"), + xsi(L"xsi", L"http://www.w3.org/2001/XMLSchema-instance") + { + } +} // namespace OOX diff --git a/OOXML/DocxFormat/Namespaces.h b/OOXML/DocxFormat/Namespaces.h index 0445ac0384..697c1f1963 100644 --- a/OOXML/DocxFormat/Namespaces.h +++ b/OOXML/DocxFormat/Namespaces.h @@ -35,6 +35,9 @@ #include "../Base/Base.h" +#if defined(_WIN32) || defined(_WIN64) + #include +#endif namespace OOX { @@ -45,53 +48,14 @@ namespace OOX std::wstring m_strLink; public: - Namespace(LPCSTR sName, LPCSTR sLink) : m_strName(sName), m_strLink(sLink) - { - } - Namespace(LPCWSTR sName, LPCWSTR sLink) : m_strName(sName), m_strLink(sLink) - { - } + //Namespace(LPCSTR sName, LPCSTR sLink); + Namespace(LPCWSTR sName, LPCWSTR sLink); }; class Namespaces { public: - Namespaces() : a(L"a", L"http://schemas.openxmlformats.org/drawingml/2006/main"), - b(L"b", L"http://schemas.openxmlformats.org/officeDocument/2006/bibliography"), - cdr(L"cdr", L"http://schemas.openxmlformats.org/drawingml/2006/chartDrawing"), - cp(L"cp", L"http://schemas.openxmlformats.org/package/2006/metadata/core-properties"), - dc(L"dc", L"http://purl.org/dc/elements/1.1/"), - dchrt(L"dchrt", L"http://schemas.openxmlformats.org/drawingml/2006/chart"), - dcmitype(L"dcmitype", L"http://purl.org/dc/dcmitype/"), - dcterms(L"dcterms", L"http://purl.org/dc/terms/"), - ddgrm(L"ddgrm", L"http://schemas.openxmlformats.org/drawingml/2006/diagram"), - dgm(L"dgm", L"http://schemas.openxmlformats.org/drawingml/2006/diagram"), - dlckcnv(L"dlckcnv", L"http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas"), - dpct(L"dpct", L"http://schemas.openxmlformats.org/drawingml/2006/picture"), - ds(L"ds", L"http://schemas.openxmlformats.org/officeDocument/2006/customXml"), - m(L"m", L"http://schemas.openxmlformats.org/officeDocument/2006/math"), - o(L"o", L"urn:schemas-microsoft-com:office:office"), - p(L"p", L"http://schemas.openxmlformats.org/presentationml/2006/main"), - pic(L"pic", L"http://schemas.openxmlformats.org/drawingml/2006/picture"), - pvml(L"pvml", L"urn:schemas-microsoft-com:office:powerpoint"), - r(L"r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships"), - s(L"s", L"http://schemas.openxmlformats.org/officeDocument/2006/sharedTypes"), - sl(L"sl", L"http://schemas.openxmlformats.org/schemaLibrary/2006/main"), - v(L"v", L"urn:schemas-microsoft-com:vml"), - ve(L"ve", L"http://schemas.openxmlformats.org/markup-compatibility/2006"), - vp(L"vp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"), - vt(L"vt", L"http://schemas.openxmlformats.org/officeDocument/2006/docPropsVTypes"), - w(L"w", L"http://schemas.openxmlformats.org/wordprocessingml/2006/main"), - w10(L"w10", L"urn:schemas-microsoft-com:office:word"), - wne(L"wne", L"http://schemas.microsoft.com/office/word/2006/wordml"), - wp(L"wp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"), - x(L"x", L"urn:schemas-microsoft-com:office:excel"), - xdr(L"xdr", L"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing"), - xmlns(L"xmlns", L"http://schemas.openxmlformats.org/officeDocument/2006/extended-properties"), - xsd(L"xsd", L"http://www.w3.org/2001/XMLSchema"), - xsi(L"xsi", L"http://www.w3.org/2001/XMLSchema-instance") - { - } + Namespaces(); public: const Namespace a; @@ -131,4 +95,4 @@ namespace OOX }; } // namespace OOX -#endif // OOX_NAMESPACES_INCLUDE_H_ \ No newline at end of file +#endif // OOX_NAMESPACES_INCLUDE_H_ diff --git a/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro b/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro index 20618968c6..dcd94a5402 100644 --- a/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro +++ b/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro @@ -69,6 +69,7 @@ SOURCES += \ ../../../DocxFormat/Comments.cpp \ ../../../DocxFormat/Document.cpp \ ../../../DocxFormat/VmlDrawing.cpp \ + ../../../DocxFormat/Namespaces.cpp \ ../../../XlsxFormat/CalcChain/CalcChain.cpp \ ../../../XlsxFormat/Chart/Chart.cpp \ ../../../XlsxFormat/Chart/ChartColors.cpp \ @@ -155,7 +156,6 @@ SOURCES += \ ../../../XlsxFormat/SharedStrings/Si.cpp \ ../../../XlsxFormat/SharedStrings/Text.cpp \ ../../../XlsxFormat/SharedStrings/PhoneticPr.cpp \ - #../../../XlsxFormat/SharedStrings/rPr.cpp \ ../../../XlsxFormat/SharedStrings/Run.cpp \ ../../../XlsxFormat/SharedStrings/SharedStrings.cpp \ ../../../XlsxFormat/Pivot/Pivots.cpp \ @@ -210,7 +210,6 @@ HEADERS += \ ../../../Common/Wrap.h \ ../../../Common/ZIndex.h \ ../../../DocxFormat/Drawing/Drawing.h \ - #../../../DocxFormat/Drawing/DrawingBody.h \ ../../../DocxFormat/Drawing/DrawingExt.h \ ../../../DocxFormat/External/External.h \ ../../../DocxFormat/External/HyperLink.h \ @@ -300,7 +299,6 @@ HEADERS += \ ../../../XlsxFormat/Drawing/FromTo.h \ ../../../XlsxFormat/Drawing/Pos.h \ ../../../XlsxFormat/SharedStrings/PhoneticPr.h \ - #../../../XlsxFormat/SharedStrings/rPr.h \ ../../../XlsxFormat/SharedStrings/Run.h \ ../../../XlsxFormat/SharedStrings/SharedStrings.h \ ../../../XlsxFormat/SharedStrings/Si.h \ diff --git a/OOXML/Projects/Linux/DocxFormatLib/docx_format_logic.cpp b/OOXML/Projects/Linux/DocxFormatLib/docx_format_logic.cpp index 98244e6a20..938c42b233 100644 --- a/OOXML/Projects/Linux/DocxFormatLib/docx_format_logic.cpp +++ b/OOXML/Projects/Linux/DocxFormatLib/docx_format_logic.cpp @@ -70,6 +70,7 @@ #include "../../../DocxFormat/Document.cpp" #include "../../../DocxFormat/Comments.cpp" #include "../../../DocxFormat/VmlDrawing.cpp" +#include "../../../DocxFormat/Namespaces.cpp" #include "../../../DocxFormat/App.cpp" #include "../../../DocxFormat/Core.cpp" #include "../../../DocxFormat/Bibliography.cpp" diff --git a/OOXML/Projects/Linux/DocxFormatLib/xlsx_format_logic.cpp b/OOXML/Projects/Linux/DocxFormatLib/xlsx_format_logic.cpp index 7d5c507623..a66f81443a 100644 --- a/OOXML/Projects/Linux/DocxFormatLib/xlsx_format_logic.cpp +++ b/OOXML/Projects/Linux/DocxFormatLib/xlsx_format_logic.cpp @@ -92,6 +92,5 @@ #include "../../../XlsxFormat/ExternalLinks/ExternalLinks.cpp" #include "../../../XlsxFormat/Ole/OleObjects.cpp" #include "../../../XlsxFormat/SharedStrings/PhoneticPr.cpp" -//#include "../../../XlsxFormat/SharedStrings/rPr.cpp" #include "../../../XlsxFormat/SharedStrings/Run.cpp" #include "../../../XlsxFormat/SharedStrings/SharedStrings.cpp"