Fix build

This commit is contained in:
Oleg.Korshul
2022-11-18 22:20:51 +03:00
parent 12c93209a3
commit 6b8804ec27
70 changed files with 98 additions and 95 deletions

View File

@ -63,7 +63,7 @@
#include <memory>
#include <string>
#include "../../OOXML/Base/Types_32.h"
#include "../../../OOXML/Base/Types_32.h"
namespace RedBlackTree

View File

@ -33,8 +33,8 @@
#include <memory>
#include <ios>
#include "../../OOXML/Base/Types_32.h"
#include "../../DesktopEditor/common/Types.h"
#include "../../../OOXML/Base/Types_32.h"
#include "../../../DesktopEditor/common/Types.h"
namespace CFCPP

View File

@ -46,7 +46,7 @@ SOURCES += \
SOURCES += \
../../Common/OfficeFileFormatChecker2.cpp \
../../Common/3dParty/pole/pole.cpp \
../../Common/DocxFormat/Source/Base/unicode_util.cpp
../../OOXML/Base/unicode_util.cpp
HEADERS += \
docbuilder_p.h \

View File

@ -3,7 +3,7 @@
#include "../../common/File.h"
#include "../../common/Array.h"
#include "../../../Common/DocxFormat/Source/Base/SmartPtr.h"
#include "../../../OOXML/Base/SmartPtr.h"
#include "../../graphics/BaseThread.h"
#define JS_VALUE_EXIST(value) (value.is_init() && !value->isNull() && !value->isUndefined())

View File

@ -53,9 +53,9 @@
#endif
#include "../../../OOXML/Base/Base.h"
#include "../../DesktopEditor/common/Types.h"
#include "../../../DesktopEditor/common/Types.h"
#include "../../../OOXML/Base/unicode_util.h"
#include "../../UnicodeConverter/UnicodeConverter.h"
#include "../../../UnicodeConverter/UnicodeConverter.h"
#include <boost/format.hpp>

View File

@ -37,7 +37,7 @@
#include <boost/shared_ptr.hpp>
#include "../../DesktopEditor/common/File.h"
#include "../../../DesktopEditor/common/File.h"
inline static std::wstring ReplaceString(std::wstring subject, const std::wstring& search, const std::wstring& replace)
{

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "../../Structures/ColorIndexStruct.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "AnimationInfoAtom.h"
#include "../SoundContainer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "ParaBuildContainer.h"

View File

@ -32,8 +32,8 @@
#pragma once
#include "../Reader/Records.h"
#include "../Enums/_includer.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "BuildAtom.h"
#include "ChartBuildAtom.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "VisualPageAtom.h"
#include "VisualShapeAtom.h"

View File

@ -32,8 +32,8 @@
#pragma once
#include "../Reader/Records.h"
#include "../Enums/_includer.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "BuildAtom.h"
#include "DiagramBuildAtom.h"

View File

@ -32,8 +32,8 @@
#pragma once
#include "../Reader/Records.h"
#include "../Enums/_includer.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"
#include "TimeAnimateBehaviorContainer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT
{

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT
{

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT
{

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "ParaBuildLevel.h"
#include "BuildAtom.h"
#include "ParaBuildAtom.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "LevelInfoAtom.h"
#include "ExtTimeNodeContainer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeNodeAtom.h"
#include "TimePropertyList4TimeNodeContainer.h"
#include "TimeColorBehaviorContainer.h"

View File

@ -32,8 +32,8 @@
#pragma once
#include "../Reader/Records.h"
#include "../Enums/_includer.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeVariant.h"
#include "TimeAnimateBehaviorAtom.h"
#include "TimeStringListContainer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT
{

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeAnimationValueListEntry.h"
#include <memory>

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeVariant.h"
#include "TimeAnimationValueAtom.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT

View File

@ -32,8 +32,8 @@
#pragma once
#include "../Reader/Records.h"
#include "../Enums/RecordType.h"
#include "../../Reader/Records.h"
#include "../../Enums/RecordType.h"
#include "TimeBehaviorAtom.h"
#include "TimeStringListContainer.h"
#include "TimePropertyList4TimeBehavior.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeAnimateColor.h"
#include "TimeAnimateColorBy.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeColorBehaviorAtom.h"
#include "TimeBehaviorContainer.h"

View File

@ -32,8 +32,8 @@
#pragma once
#include "../Reader/Records.h"
#include "../Enums/_includer.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeCommandBehaviorAtom.h"
#include "TimeBehaviorContainer.h"

View File

@ -32,8 +32,8 @@
#pragma once
#include "../Reader/Records.h"
#include "../Enums/_includer.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeConditionAtom.h"
#include "ClientVisualElementContainer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeEffectBehaviorAtom.h"
#include "TimeVariant.h"
#include "TimeBehaviorContainer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT
{

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeMotionBehaviorAtom.h"
#include "TimeVariant.h"
#include "TimeBehaviorContainer.h"

View File

@ -32,8 +32,8 @@
#pragma once
#include "../Reader/Records.h"
#include "../Enums/_includer.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeVariant.h"
namespace PPT_FORMAT
{

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeVariant4Behavior.h"

View File

@ -32,9 +32,9 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeVariant.h"
#include "../Enums/_includer.h"
#include "../../Enums/_includer.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT
{

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeRotationBehaviorAtom.h"
#include "TimeBehaviorContainer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeScaleBehaviorAtom.h"
#include "TimeBehaviorContainer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
namespace PPT_FORMAT
{

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeSetBehaviorAtom.h"
#include "TimeBehaviorContainer.h"
#include "TimeVariant.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "TimeVariant.h"

View File

@ -32,8 +32,8 @@
#pragma once
#include "../Reader/Records.h"
#include "../Enums/_includer.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"
#include "TimeVariant.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"
namespace PPT_FORMAT

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"

View File

@ -32,7 +32,7 @@
#pragma once
#include "../Reader/Records.h"
#include "../../Reader/Records.h"
#include "../../Enums/_includer.h"

View File

@ -32,8 +32,8 @@
#pragma once
#include "../../Sheets/Common/Common.h"
#include "../../Sheets/Common/Common.h"
#include "../../DesktopEditor/common/Directory.h"
#include "../../../../DesktopEditor/common/Directory.h"
#include "../../../../DesktopEditor/common/StringBuilder.h"
namespace Writers
{

View File

@ -32,7 +32,8 @@
#pragma once
#include "../../Sheets/Common/Common.h"
#include "../../DesktopEditor/graphics/pro/Fonts.h"
#include "../../../../DesktopEditor/graphics/pro/Fonts.h"
#include "../../../../DesktopEditor/common/StringBuilder.h"
#include <boost/unordered_map.hpp>
namespace Writers

View File

@ -33,10 +33,10 @@
#include "../../Base/Nullable.h"
#include "BinReaderWriterDefines.h"
#include "../../Common/Base64.h"
#include "../../../Common/Base64.h"
#include "imagemanager.h"
#include "./XmlWriter.h"
#include "../PPTXFormat/FileContainer.h"
#include "../../PPTXFormat/FileContainer.h"
#include "../../DocxFormat/WritingElement.h"
#include "../Document/DocWrapper/DocxSerializer.h"
#include "BinaryFileReaderWriter.h"

View File

@ -33,7 +33,7 @@
#include "../../SystemUtility/File.h"
#include "BinReaderWriterDefines.h"
#include "../../../DesktopEditor/graphics/pro/Fonts.h"
#include "../../Common/Base64.h"
#include "../../../Common/Base64.h"
#include "../../../DesktopEditor/common/Array.h"
#include "../../Base/Nullable.h"

View File

@ -31,6 +31,8 @@
*/
#include "Drawing.h"
#include "../Document.h"
#include "../DocxFlat.h"
namespace OOX
{

View File

@ -34,7 +34,7 @@
#include "Info.h"
#include "../../DesktopEditor/common/SystemUtils.h"
#include "../../Common/DocxFormat/Source/Base/Base.h"
#include "../../OOXML/Base/Base.h"
namespace PdfWriter
{

View File

@ -8,7 +8,7 @@ TARGET = standardtester
SOURCES += \
$$PWD/../../../../core/Common/OfficeFileFormatChecker2.cpp \
$$PWD/../../../../core/Common/3dParty/pole/pole.cpp \
$$PWD/../../../../core/Common/DocxFormat/Source/Base/unicode_util.cpp
$$PWD/../../../../core/OOXML/Base/unicode_util.cpp
SOURCES += main.cpp

View File

@ -6,9 +6,9 @@ CONFIG -= qt
TARGET = x2ttester
SOURCES += \
$$PWD/../../../../core/Common/OfficeFileFormatChecker2.cpp \
$$PWD/../../../../core/Common/OfficeFileFormatChecker2.cpp \
$$PWD/../../../../core/Common/3dParty/pole/pole.cpp \
$$PWD/../../../../core/Common/DocxFormat/Source/Base/unicode_util.cpp
$$PWD/../../../../core/OOXML/Base/unicode_util.cpp
HEADERS += x2tTester.h

View File

@ -20,18 +20,18 @@ SUBDIRS = \
CompoundFileLib \
X2tConverter
XlsbFormatLib.file = ../../../OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro
DocxFormatLib.file = ../../../OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro
PPTXFormatLib.file = ../../../OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro
BinDocument.file = ../../../OOXML/Projects/Linux/BinDocument/BinDocument.pro
TxtXmlFormatLib.file = ../../../TxtFile/Projects/Linux/TxtXmlFormatLib.pro
RtfFormatLib.file = ../../../RtfFile/Projects/Linux/RtfFormatLib.pro
PptFormatLib.file = ../../../MsBinaryFile/Projects/PPTFormatLib/Linux/PPTFormatLib.pro
DocFormatLib.file = ../../../MsBinaryFile/Projects/DocFormatLib/Linux/DocFormatLib.pro
OdfFormatLib.file = ../../../OdfFile/Projects/Linux/OdfFormatLib.pro
XlsFormatLib.file = ../../../MsBinaryFile/Projects/XlsFormatLib/Linux/XlsFormatLib.pro
VbaFormatLib.file = ../../../MsBinaryFile/Projects/VbaFormatLib/Linux/VbaFormatLib.pro
CompoundFileLib.file = ../../../Common/cfcpp/cfcpp.pro
XlsbFormatLib.file = ../../../OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro
DocxFormatLib.file = ../../../OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro
PPTXFormatLib.file = ../../../OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro
BinDocument.file = ../../../OOXML/Projects/Linux/BinDocument/BinDocument.pro
TxtXmlFormatLib.file = ../../../TxtFile/Projects/Linux/TxtXmlFormatLib.pro
RtfFormatLib.file = ../../../RtfFile/Projects/Linux/RtfFormatLib.pro
PptFormatLib.file = ../../../MsBinaryFile/Projects/PPTFormatLib/Linux/PPTFormatLib.pro
DocFormatLib.file = ../../../MsBinaryFile/Projects/DocFormatLib/Linux/DocFormatLib.pro
OdfFormatLib.file = ../../../OdfFile/Projects/Linux/OdfFormatLib.pro
XlsFormatLib.file = ../../../MsBinaryFile/Projects/XlsFormatLib/Linux/XlsFormatLib.pro
VbaFormatLib.file = ../../../MsBinaryFile/Projects/VbaFormatLib/Linux/VbaFormatLib.pro
CompoundFileLib.file = ../../../Common/cfcpp/cfcpp.pro
X2tConverter.depends = \
XlsbFormatLib \