mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-07-20 03:08:28 +08:00
.
This commit is contained in:
Elena.Subbotina
@ -1,320 +0,0 @@
|
||||
#-------------------------------------------------
|
||||
#
|
||||
# Project created by QtCreator 2014-12-16T18:28:23
|
||||
#
|
||||
#-------------------------------------------------
|
||||
|
||||
QT -= core gui
|
||||
|
||||
TARGET = PptFormatLib
|
||||
TEMPLATE = lib
|
||||
CONFIG += staticlib
|
||||
|
||||
CORE_ROOT_DIR = $$PWD/../../..
|
||||
PWD_ROOT_DIR = $$PWD
|
||||
|
||||
CONFIG += core_x2t
|
||||
include(../../../Common/base.pri)
|
||||
|
||||
#BOOST
|
||||
include($$PWD/../../../Common/3dParty/boost/boost.pri)
|
||||
|
||||
DEFINES += UNICODE \
|
||||
_UNICODE \
|
||||
_PRESENTATION_WRITER_ \
|
||||
_SVG_CONVERT_TO_IMAGE_ \
|
||||
DONT_WRITE_EMBEDDED_FONTS
|
||||
#DISABLE_FILE_DOWNLOADER
|
||||
|
||||
HEADERS += \
|
||||
../Converter/Animation/AnimationParser.h \
|
||||
../Converter/Animation/Animation_1995.h \
|
||||
../Converter/Animation/TimingExeption.h \
|
||||
../Converter/Animation/TimingUtils.h \
|
||||
../Converter/Animation/Timing_1995.h \
|
||||
../Converter/Animation/Timing_2010.h \
|
||||
../Converter/Animation/hashcode10.h \
|
||||
../Converter/Animation/intermediate_anim.h \
|
||||
../Converter/timing.h \
|
||||
../Converter/transition.h \
|
||||
../Enums/RecordType.h \
|
||||
../Enums/_includer.h \
|
||||
../Enums/enums.h \
|
||||
../PPTFormatLib.h \
|
||||
../PPTXWriter/BulletsConverter.h \
|
||||
../PPTXWriter/TableWriter.h \
|
||||
../PPTXWriter/TxBodyConverter.h \
|
||||
../Reader/ClassesAtom.h \
|
||||
../Reader/CommonZLib.h \
|
||||
../Reader/ExtXmlUtils.hpp \
|
||||
../Reader/PPTDocumentInfo.h \
|
||||
../Reader/PPTDocumentInfoOneUser.h \
|
||||
../Reader/PPTFileDefines.h \
|
||||
../Reader/PPTFileReader.h \
|
||||
../Reader/ReadStructures.h \
|
||||
../Reader/Records.h \
|
||||
../Reader/RoundTripExtractor.h \
|
||||
../Reader/Slide.h \
|
||||
../Reader/SlideInfo.h \
|
||||
../Reader/SlidePersist.h \
|
||||
../Records/Animations/AnimationInfoAtom.h \
|
||||
../Records/Animations/AnimationInfoContainer.h \
|
||||
../Records/Animations/BuildAtom.h \
|
||||
../Records/Animations/BuildListContainer.h \
|
||||
../Records/Animations/BuildListSubContainer.h \
|
||||
../Records/Animations/ChartBuildAtom.h \
|
||||
../Records/Animations/ChartBuildContainer.h \
|
||||
../Records/Animations/ClientVisualElementContainer.h \
|
||||
../Records/Animations/DiagramBuildAtom.h \
|
||||
../Records/Animations/DiagramBuildContainer.h \
|
||||
../Records/Animations/ExtTimeNodeContainer.h \
|
||||
../Records/Animations/HashCode10Atom.h \
|
||||
../Records/Animations/LevelInfoAtom.h \
|
||||
../Records/Animations/ParaBuildAtom.h \
|
||||
../Records/Animations/ParaBuildContainer.h \
|
||||
../Records/Animations/ParaBuildLevel.h \
|
||||
../Records/Animations/SubEffectContainer.h \
|
||||
../Records/Animations/TimeAnimateBehaviorAtom.h \
|
||||
../Records/Animations/TimeAnimateBehaviorContainer.h \
|
||||
../Records/Animations/TimeAnimateColor.h \
|
||||
../Records/Animations/TimeAnimateColorBy.h \
|
||||
../Records/Animations/TimeAnimationValueAtom.h \
|
||||
../Records/Animations/TimeAnimationValueListContainer.h \
|
||||
../Records/Animations/TimeAnimationValueListEntry.h \
|
||||
../Records/Animations/TimeBehaviorAtom.h \
|
||||
../Records/Animations/TimeBehaviorContainer.h \
|
||||
../Records/Animations/TimeColorBehaviorAtom.h \
|
||||
../Records/Animations/TimeColorBehaviorContainer.h \
|
||||
../Records/Animations/TimeCommandBehaviorAtom.h \
|
||||
../Records/Animations/TimeCommandBehaviorContainer.h \
|
||||
../Records/Animations/TimeConditionAtom.h \
|
||||
../Records/Animations/TimeConditionContainer.h \
|
||||
../Records/Animations/TimeDisplayType.h \
|
||||
../Records/Animations/TimeEffectBehaviorAtom.h \
|
||||
../Records/Animations/TimeEffectBehaviorContainer.h \
|
||||
../Records/Animations/TimeEffectID.h \
|
||||
../Records/Animations/TimeEffectNodeType.h \
|
||||
../Records/Animations/TimeEffectType.h \
|
||||
../Records/Animations/TimeGroupID.h \
|
||||
../Records/Animations/TimeIterateDataAtom.h \
|
||||
../Records/Animations/TimeMasterRelType.h \
|
||||
../Records/Animations/TimeModifierAtom.h \
|
||||
../Records/Animations/TimeMotionBehaviorAtom.h \
|
||||
../Records/Animations/TimeMotionBehaviorContainer.h \
|
||||
../Records/Animations/TimeNodeAtom.h \
|
||||
../Records/Animations/TimeNodeTimeFilter.h \
|
||||
../Records/Animations/TimePropertyList4TimeBehavior.h \
|
||||
../Records/Animations/TimePropertyList4TimeNodeContainer.h \
|
||||
../Records/Animations/TimeRotationBehaviorAtom.h \
|
||||
../Records/Animations/TimeRotationBehaviorContainer.h \
|
||||
../Records/Animations/TimeScaleBehaviorAtom.h \
|
||||
../Records/Animations/TimeScaleBehaviorContainer.h \
|
||||
../Records/Animations/TimeSequenceDataAtom.h \
|
||||
../Records/Animations/TimeSetBehaviorAtom.h \
|
||||
../Records/Animations/TimeSetBehaviorContainer.h \
|
||||
../Records/Animations/TimeStringListContainer.h \
|
||||
../Records/Animations/TimeVariant.h \
|
||||
../Records/Animations/TimeVariant4Behavior.h \
|
||||
../Records/Animations/VisualPageAtom.h \
|
||||
../Records/Animations/VisualShapeAtom.h \
|
||||
../Records/Animations/VisualShapeChartElementAtom.h \
|
||||
../Records/Animations/VisualShapeGeneralAtom.h \
|
||||
../Records/Animations/VisualSoundAtom.h \
|
||||
../Records/Animations/_includer.h \
|
||||
../Records/BlipCollection9Container.h \
|
||||
../Records/BlipEntityAtom.h \
|
||||
../Records/BookmarkEntityAtom.h \
|
||||
../Records/BookmarkSeedAtom.h \
|
||||
../Records/BuildAtom.h \
|
||||
../Records/DocInfoListContainer.h \
|
||||
../Records/DocProgTagsContainer.h \
|
||||
../Records/MouseInteractiveInfoContainer.h \
|
||||
../Records/OfficeArtClientData.h \
|
||||
../Records/OfficeArtClientTextbox.h \
|
||||
../Records/PlaceHolderAtom.h \
|
||||
../Records/RoundTrip.h \
|
||||
../Records/ShapeProgBinaryTagSubContainerOrAtom.h \
|
||||
../Records/CFMasks.h \
|
||||
../Records/ColorSchemeAtom.h \
|
||||
../Records/CString.h \
|
||||
../Records/CurrentUserAtom.h \
|
||||
../Records/DocRoutingSlipAtom.h \
|
||||
../Records/DocumentAtom.h \
|
||||
../Records/DocumentRecords.h \
|
||||
../Records/DocumentTextInfo.h \
|
||||
../Records/EndDocument.h \
|
||||
../Records/ExCDAudioContainer.h \
|
||||
../Records/ExControlAtom.h \
|
||||
../Records/ExHyperlinkAtom.h \
|
||||
../Records/ExMediaAtom.h \
|
||||
../Records/ExMIDIAudioContainer.h \
|
||||
../Records/ExObjListAtom.h \
|
||||
../Records/ExObjListContainer.h \
|
||||
../Records/ExObjRefAtom.h \
|
||||
../Records/ExOleEmbedAtom.h \
|
||||
../Records/ExOleLinkAtom.h \
|
||||
../Records/ExOleObjAtom.h \
|
||||
../Records/ExVideoContainer.h \
|
||||
../Records/ExWAVAudioEmbeddedContainer.h \
|
||||
../Records/ExWAVAudioLinkContainer.h \
|
||||
../Records/FontEntityAtom.h \
|
||||
../Records/GridSpacing10Atom.h \
|
||||
../Records/GuideAtom.h \
|
||||
../Records/HeadersFootersAtom.h \
|
||||
../Records/InteractiveInfoAtom.h \
|
||||
../Records/KinsokuAtom.h \
|
||||
../Records/KinsokuContainer.h \
|
||||
../Records/KinsokuFollowingAtom.h \
|
||||
../Records/KinsokuLeadingAtom.h \
|
||||
../Records/MasterPersistAtom.h \
|
||||
../Records/MasterTextPropAtom.h \
|
||||
../Records/MetafileBlob.h \
|
||||
../Records/MouseTextInteractiveInfoAtom.h \
|
||||
../Records/NamedShowSlidesAtom.h \
|
||||
../Records/NormalViewSetInfoAtom.h \
|
||||
../Records/NotesAtom.h \
|
||||
../Records/NotesPersistAtom.h \
|
||||
../Records/NoZoomViewInfoAtom.h \
|
||||
../Records/OutlineTextRefAtom.h \
|
||||
../Records/FontCollection10Container.h \
|
||||
../Records/FontEmbedFlags10Atom.h \
|
||||
../Records/OutlineTextProps9Container.h \
|
||||
../Records/OutlineTextPropsHeaderExAtom.h \
|
||||
../Records/PFMasks.h \
|
||||
../Records/PersistDirectoryAtom.h \
|
||||
../Records/PlaceHolderAtom.h \
|
||||
../Records/ProgStringTagContainer.h \
|
||||
../Records/RecordsIncluder.h \
|
||||
../Records/ShapeFlags10Atom.h \
|
||||
../Records/ShapeFlagsAtom.h \
|
||||
../Records/Comment10Container.h \
|
||||
../Records/LinkedShape10Atom.h \
|
||||
../Records/LinkedSlide10Atom.h \
|
||||
../Records/SlideFlags10Atom.h \
|
||||
../Records/SlideProgTagsContainer.h \
|
||||
../Records/SlideTime10Atom.h \
|
||||
../Records/SlideAtom.h \
|
||||
../Records/SlideColorSchemeAtom.h \
|
||||
../Records/SlideContainer.h \
|
||||
../Records/SlideListWithText.h \
|
||||
../Records/SlidePersistAtom.h \
|
||||
../Records/SlideProgTagsContainer.h \
|
||||
../Records/SlideViewInfoAtom.h \
|
||||
../Records/SoundCollAtom.h \
|
||||
../Records/SoundCollectionContainer.h \
|
||||
../Records/SoundContainer.h \
|
||||
../Records/SoundDataBlob.h \
|
||||
../Records/SSDocInfoAtom.h \
|
||||
../Records/SSlideLayoutAtom.h \
|
||||
../Records/SSSlideInfoAtom.h \
|
||||
../Records/StyleTextPropAtom.h \
|
||||
../Records/StyleTextProp10Atom.h \
|
||||
../Records/StyleTextProp11Atom.h \
|
||||
../Records/StyleTextProp9Atom.h \
|
||||
../Records/TextCFException10.h \
|
||||
../Records/TextCFException9.h \
|
||||
../Records/TextDefaults9Atom.h \
|
||||
../Records/TextMasterStyle9Atom.h \
|
||||
../Records/TextMasterStyle9Level.h \
|
||||
../Records/TextSIException.h \
|
||||
../Records/TextBookmarkAtom.h \
|
||||
../Records/TextBytesAtom.h \
|
||||
../Records/TextCFExceptionAtom.h \
|
||||
../Records/TextCharsAtom.h \
|
||||
../Records/TextFullSettings.h \
|
||||
../Records/TextHeaderAtom.h \
|
||||
../Records/TextInteractiveInfoAtom.h \
|
||||
../Records/TextMasterStyle9Atom.h \
|
||||
../Records/TextMasterStyle9Level.h \
|
||||
../Records/TextMasterStyleAtom.h \
|
||||
../Records/TextPFException9.h \
|
||||
../Records/TextPFExceptionAtom.h \
|
||||
../Records/TextRulerAtom.h \
|
||||
../Records/TextSIExceptionAtom.h \
|
||||
../Records/TextSpecInfoAtom.h \
|
||||
../Records/UserEditAtom.h \
|
||||
../Records/VBAInfoAtom.h \
|
||||
../Records/ViewInfoAtom.h \
|
||||
../Records/ZoomViewInfoAtom.h \
|
||||
../Records/Animations/AnimationTypes.h \
|
||||
../Records/Drawing/BlipStoreContainer.h \
|
||||
../Records/Drawing/BlipStoreEntry.h \
|
||||
../Records/Drawing/ChildAnchor.h \
|
||||
../Records/Drawing/ClientAnchor.h \
|
||||
../Records/Drawing/DrawingContainer.h \
|
||||
../Records/Drawing/DrawingGroup.h \
|
||||
../Records/Drawing/DrawingRecord.h \
|
||||
../Records/Drawing/GroupShape.h \
|
||||
../Records/Drawing/GroupShapeContainer.h \
|
||||
../Records/Drawing/RegGroupItems.h \
|
||||
../Records/Drawing/Shape.h \
|
||||
../Records/Drawing/ShapeContainer.h \
|
||||
../Records/Drawing/ShapeProperties.h \
|
||||
../Records/Drawing/TextBox.h \
|
||||
../Records/Drawing/ArtBlip.h \
|
||||
../PPTXWriter/Converter.h \
|
||||
../PPTXWriter/ImageManager.h \
|
||||
../PPTXWriter/ShapeWriter.h \
|
||||
../PPTXWriter/StylesWriter.h \
|
||||
../../../ASCOfficePPTXFile/Editor/Drawing/Element.h \
|
||||
../../../ASCOfficePPTXFile/Editor/Drawing/Elements.h \
|
||||
../../../ASCOfficePPTXFile/Editor/Drawing/Layout.h \
|
||||
../../../ASCOfficePPTXFile/Editor/Drawing/Slide.h \
|
||||
../../../ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.h \
|
||||
../../../ASCOfficePPTXFile/Editor/Drawing/TextStructures.h \
|
||||
../../../ASCOfficePPTXFile/Editor/Drawing/Theme.h \
|
||||
../../../Common/3dParty/pole/pole.h \
|
||||
../Structures/ColorIndex.h \
|
||||
../Structures/ColorIndexStruct.h \
|
||||
../Structures/ColorStruct.h \
|
||||
../Structures/DateTimeStruct.h \
|
||||
../Structures/IStruct.h \
|
||||
../Structures/PointStruct.h \
|
||||
../Structures/RatioStruct.h \
|
||||
../Structures/RectStruct.h \
|
||||
../Structures/ScalingStruct.h \
|
||||
../Structures/SmallRectStruct.h \
|
||||
../Structures/TmsfTimeStruct.h \
|
||||
../Structures/WideColorStruct.h \
|
||||
../Structures/_includer.h
|
||||
|
||||
core_release {
|
||||
SOURCES += \
|
||||
pptformatlib_logic.cpp
|
||||
}
|
||||
|
||||
core_debug {
|
||||
SOURCES += \
|
||||
../Enums/RecordType.cpp \
|
||||
../PPTFormatLib.cpp \
|
||||
../Reader/ReadStructures.cpp \
|
||||
../Reader/RoundTripExtractor.cpp \
|
||||
../Reader/PPTDocumentInfoOneUser.cpp \
|
||||
../Reader/Records.cpp \
|
||||
../Reader/PPTFileReader.cpp \
|
||||
../Reader/SlidePersist.cpp \
|
||||
../PPTXWriter/Converter.cpp \
|
||||
../PPTXWriter/ShapeWriter.cpp \
|
||||
../PPTXWriter/TableWriter.cpp \
|
||||
../PPTXWriter/TxBodyConverter.cpp \
|
||||
../Records/Drawing/ArtBlip.cpp \
|
||||
../Records/Drawing/ShapeContainer.cpp \
|
||||
../Records/Animations/TimeVariant.cpp \
|
||||
../Records/BlipEntityAtom.cpp
|
||||
}
|
||||
|
||||
SOURCES += \
|
||||
../../../ASCOfficePPTXFile/Editor/Drawing/Elements.cpp \
|
||||
../../../ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.cpp \
|
||||
../../../Common/3dParty/pole/pole.cpp \
|
||||
../Converter/Animation/AnimationParser.cpp \
|
||||
../Converter/Animation/Animation_1995.cpp \
|
||||
../Converter/Animation/TimingUtils.cpp \
|
||||
../Converter/Animation/Timing_1995.cpp \
|
||||
../Converter/Animation/Timing_2010.cpp \
|
||||
../Converter/Animation/hashcode10.cpp \
|
||||
../Converter/Animation/intermediate_anim.cpp \
|
||||
../Converter/timing.cpp \
|
||||
../Converter/transition.cpp \
|
||||
../PPTXWriter/BulletsConverter.cpp
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Timing.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Timing/Timing.h"
|
||||
|
||||
#include "../Records/SlideProgTagsContainer.h"
|
||||
#include "../PPTXWriter/ImageManager.h"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Timing/Timing.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Timing/Timing.h"
|
||||
#include "../PPTXWriter/ImageManager.h"
|
||||
#include "Animation/intermediate_anim.h"
|
||||
|
||||
|
||||
@ -1,16 +1,16 @@
|
||||
#include "transition.h"
|
||||
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/Transition.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/TransitionBase.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/EmptyTransition.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/OrientationTransition.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/EightDirectionTransition.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/OptionalBlackTransition.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SideDirectionTransition.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/CornerDirectionTransition.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/WheelTransition.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SplitTransition.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/ZoomTransition.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/Transition.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/TransitionBase.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/EmptyTransition.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/OrientationTransition.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/EightDirectionTransition.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/OptionalBlackTransition.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/SideDirectionTransition.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/CornerDirectionTransition.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/WheelTransition.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/SplitTransition.h"
|
||||
#include "../../../OOXML/PPTXFormat/Logic/Transitions/ZoomTransition.h"
|
||||
|
||||
|
||||
using namespace PPT::Converter;
|
||||
|
||||
@ -491,7 +491,8 @@ void Animation::FillBldLst(
|
||||
if (!pBLC)
|
||||
return;
|
||||
// Write p
|
||||
for (unsigned i = 0; i < pBLC->n_arrRgChildRec.size(); i++)
|
||||
|
||||
for (unsigned i = 0; i < pBLC->n_arrRgChildRec.size(); i++)
|
||||
{
|
||||
PPTX::Logic::BuildNodeBase oBuildNodeBase;
|
||||
switch ( pBLC->n_arrRgChildRec[i]->m_oHeader.RecType ) {
|
||||
|
||||
@ -31,14 +31,14 @@
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "../../../ASCOfficePPTXFile/Editor/Drawing/Document.h"
|
||||
#include "../Drawing/Document.h"
|
||||
|
||||
#include "../../../ASCOfficePPTXFile/Editor/DefaultNotesMaster.h"
|
||||
#include "../../../ASCOfficePPTXFile/Editor/DefaultNotesTheme.h"
|
||||
#include "../../../OOXML/Binary/Presentation/DefaultNotesMaster.h"
|
||||
#include "../../../OOXML/Binary/Presentation/DefaultNotesTheme.h"
|
||||
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/NotesMaster.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/SlideMaster.h"
|
||||
#include "../../../ASCOfficePPTXFile/PPTXFormat/HandoutMaster.h"
|
||||
#include "../../../OOXML/PPTXFormat/NotesMaster.h"
|
||||
#include "../../../OOXML/PPTXFormat/SlideMaster.h"
|
||||
#include "../../../OOXML/PPTXFormat/HandoutMaster.h"
|
||||
|
||||
#include "TableWriter.h"
|
||||
#include "../Reader/PPTDocumentInfo.h"
|
||||
@ -51,19 +51,35 @@
|
||||
#include "../Converter/Animation/AnimationParser.h"
|
||||
#include "../Converter/transition.h"
|
||||
|
||||
#include "../../../ASCOfficeXlsFile2/source/Common/simple_xml_writer.h"
|
||||
#include "../../Common/Utils/simple_xml_writer.h"
|
||||
|
||||
#include "../Reader/RoundTripExtractor.h"
|
||||
#include "../../../DesktopEditor/common/Directory.h"
|
||||
#include "../../../DesktopEditor/common/SystemUtils.h"
|
||||
|
||||
#include <boost/uuid/detail/md5.hpp>
|
||||
#include <boost/algorithm/hex.hpp>
|
||||
#include <boost/regex.hpp>
|
||||
|
||||
typedef boost::uuids::detail::md5 MD5;
|
||||
|
||||
namespace PPT_FORMAT
|
||||
{
|
||||
static std::string md5(const BYTE* pData, const ULONG dataLen)
|
||||
{
|
||||
std::string strHash;
|
||||
boost::uuids::detail::md5 hash;
|
||||
boost::uuids::detail::md5::digest_type digest;
|
||||
|
||||
hash.process_bytes(pData, dataLen);
|
||||
hash.get_digest(digest);
|
||||
|
||||
const auto charDigest = reinterpret_cast<const char *>(&digest);
|
||||
boost::algorithm::hex(charDigest, charDigest + sizeof(boost::uuids::detail::md5::digest_type),
|
||||
std::back_inserter(strHash));
|
||||
|
||||
return strHash;
|
||||
}
|
||||
namespace NSPPTXWriterConst
|
||||
{
|
||||
static std::wstring g_string_rels_presentation = _T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\
|
||||
@ -717,7 +733,8 @@ bool CPPTXWriter::WriteRoundTripTheme(const CRecordSlide *pSlide, std::unordered
|
||||
// compare hash
|
||||
char* pointerToThemeElems = strstr((char*)utf8Data, "<a:themeElements>");
|
||||
UINT hashShift = pointerToThemeElems ? pointerToThemeElems - (char*)utf8Data : 0;
|
||||
auto strHash = CFile::md5(utf8Data+hashShift, utf8DataSize-hashShift);
|
||||
|
||||
auto strHash = md5(utf8Data+hashShift, utf8DataSize-hashShift);
|
||||
|
||||
needRels = (int)std::string(utf8Data, utf8Data + utf8DataSize).find("rId") != -1;
|
||||
|
||||
@ -1286,29 +1303,29 @@ void PPT_FORMAT::CPPTXWriter::WriteColorScheme(CStringWriter& oStringWriter, con
|
||||
oStringWriter.WriteStringXML(name);
|
||||
oStringWriter.WriteString(L"\">");
|
||||
|
||||
oStringWriter.WriteString(L"<a:dk1><a:srgbClr val=\"" + XmlUtils::IntToString(colors[14].GetLONG_RGB(), L"%06X") + L"\"/></a:dk1>");
|
||||
oStringWriter.WriteString(L"<a:dk1><a:srgbClr val=\"" + XmlUtils::ToString(colors[14].GetLONG_RGB(), L"%06X") + L"\"/></a:dk1>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:lt1><a:srgbClr val=\"" + XmlUtils::IntToString(colors[13].GetLONG_RGB(), L"%06X") + L"\"/></a:lt1>");
|
||||
oStringWriter.WriteString(L"<a:lt1><a:srgbClr val=\"" + XmlUtils::ToString(colors[13].GetLONG_RGB(), L"%06X") + L"\"/></a:lt1>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:dk2><a:srgbClr val=\"" + XmlUtils::IntToString(colors[16].GetLONG_RGB(), L"%06X") + L"\"/></a:dk2>");
|
||||
oStringWriter.WriteString(L"<a:dk2><a:srgbClr val=\"" + XmlUtils::ToString(colors[16].GetLONG_RGB(), L"%06X") + L"\"/></a:dk2>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:lt2><a:srgbClr val=\"" + XmlUtils::IntToString(colors[15].GetLONG_RGB(), L"%06X") + L"\"/></a:lt2>");
|
||||
oStringWriter.WriteString(L"<a:lt2><a:srgbClr val=\"" + XmlUtils::ToString(colors[15].GetLONG_RGB(), L"%06X") + L"\"/></a:lt2>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:accent1><a:srgbClr val=\"" + XmlUtils::IntToString(colors[5].GetLONG_RGB(), L"%06X") + L"\"/></a:accent1>");
|
||||
oStringWriter.WriteString(L"<a:accent1><a:srgbClr val=\"" + XmlUtils::ToString(colors[5].GetLONG_RGB(), L"%06X") + L"\"/></a:accent1>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:accent2><a:srgbClr val=\"" + XmlUtils::IntToString(colors[6].GetLONG_RGB(), L"%06X") + L"\"/></a:accent2>");
|
||||
oStringWriter.WriteString(L"<a:accent2><a:srgbClr val=\"" + XmlUtils::ToString(colors[6].GetLONG_RGB(), L"%06X") + L"\"/></a:accent2>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:accent3><a:srgbClr val=\"" + XmlUtils::IntToString(colors[7].GetLONG_RGB(), L"%06X") + L"\"/></a:accent3>");
|
||||
oStringWriter.WriteString(L"<a:accent3><a:srgbClr val=\"" + XmlUtils::ToString(colors[7].GetLONG_RGB(), L"%06X") + L"\"/></a:accent3>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:accent4><a:srgbClr val=\"" + XmlUtils::IntToString(colors[8].GetLONG_RGB(), L"%06X") + L"\"/></a:accent4>");
|
||||
oStringWriter.WriteString(L"<a:accent4><a:srgbClr val=\"" + XmlUtils::ToString(colors[8].GetLONG_RGB(), L"%06X") + L"\"/></a:accent4>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:accent5><a:srgbClr val=\"" + XmlUtils::IntToString(colors[9].GetLONG_RGB(), L"%06X") + L"\"/></a:accent5>");
|
||||
oStringWriter.WriteString(L"<a:accent5><a:srgbClr val=\"" + XmlUtils::ToString(colors[9].GetLONG_RGB(), L"%06X") + L"\"/></a:accent5>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:accent6><a:srgbClr val=\"" + XmlUtils::IntToString(colors[10].GetLONG_RGB(), L"%06X") + L"\"/></a:accent6>");
|
||||
oStringWriter.WriteString(L"<a:accent6><a:srgbClr val=\"" + XmlUtils::ToString(colors[10].GetLONG_RGB(), L"%06X") + L"\"/></a:accent6>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:hlink><a:srgbClr val=\"" + XmlUtils::IntToString(colors[11].GetLONG_RGB(), L"%06X") + L"\"/></a:hlink>");
|
||||
oStringWriter.WriteString(L"<a:hlink><a:srgbClr val=\"" + XmlUtils::ToString(colors[11].GetLONG_RGB(), L"%06X") + L"\"/></a:hlink>");
|
||||
|
||||
oStringWriter.WriteString(L"<a:folHlink><a:srgbClr val=\"" + XmlUtils::IntToString(colors[12].GetLONG_RGB(), L"%06X") + L"\"/></a:folHlink>");
|
||||
oStringWriter.WriteString(L"<a:folHlink><a:srgbClr val=\"" + XmlUtils::ToString(colors[12].GetLONG_RGB(), L"%06X") + L"\"/></a:folHlink>");
|
||||
|
||||
oStringWriter.WriteString(L"</a:clrScheme>");
|
||||
if (extra)
|
||||
|
||||
@ -34,6 +34,7 @@
|
||||
|
||||
#include "../Reader/Records.h"
|
||||
#include "../../Structures/ColorIndexStruct.h"
|
||||
#include <array>
|
||||
|
||||
namespace PPT_FORMAT
|
||||
{
|
||||
|
||||
@ -256,11 +256,9 @@
|
||||
<ClInclude Include="..\..\..\PptFile\Enums\RecordType.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\Enums\_includer.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\Main\PPTFormatLib.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\Animation.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\BulletsConverter.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\Converter.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\ImageManager.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\ridmanager.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\ShapeWriter.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\StylesWriter.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\TableWriter.h" />
|
||||
@ -484,10 +482,8 @@
|
||||
<ClCompile Include="..\..\..\PptFile\Drawing\TextAttributesEx.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\Enums\RecordType.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\Main\PPTFormatLib.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\PPTXWriter\Animation.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\PPTXWriter\BulletsConverter.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\PPTXWriter\Converter.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\PPTXWriter\ridmanager.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\PPTXWriter\ShapeWriter.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\PPTXWriter\TableWriter.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\PPTXWriter\TxBodyConverter.cpp" />
|
||||
|
||||
@ -735,9 +735,6 @@
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\BulletsConverter.h">
|
||||
<Filter>OOXWriter</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\Animation.h">
|
||||
<Filter>OOXWriter</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\PptFile\Main\PPTFormatLib.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\Enums\_includer.h" />
|
||||
<ClInclude Include="..\..\..\PptFile\Enums\enums.h" />
|
||||
@ -748,9 +745,6 @@
|
||||
<ClInclude Include="..\..\..\PptFile\Reader\ExtXmlUtils.hpp">
|
||||
<Filter>Reader</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\..\..\PptFile\PPTXWriter\ridmanager.h">
|
||||
<Filter>OOXWriter</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\..\PptFile\Reader\PPTDocumentInfoOneUser.cpp">
|
||||
@ -807,13 +801,7 @@
|
||||
<ClCompile Include="..\..\..\PptFile\PPTXWriter\BulletsConverter.cpp">
|
||||
<Filter>OOXWriter</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\PptFile\PPTXWriter\Animation.cpp">
|
||||
<Filter>OOXWriter</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\..\PptFile\Main\PPTFormatLib.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\Enums\RecordType.cpp" />
|
||||
<ClCompile Include="..\..\..\PptFile\PPTXWriter\ridmanager.cpp">
|
||||
<Filter>OOXWriter</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Reference in New Issue
Block a user