Skip to content

O
onlyoffice_core
Commit 04695896 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

X2tConverter добавлен PptFile 

PptFile поправлен под iOs

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62409 954022d7-b5bf-4e40-9824-e11837661b57
parent 0c289e39
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1024 additions and 1026 deletions
ASCOfficePPTFile/PPTFormatLib/Linux/PPTFormatLib.pro
View file @ 04695896
...@@ -37,7 +37,7 @@ INCLUDEPATH += \ ...@@ -37,7 +37,7 @@ INCLUDEPATH += \
/usr/include/libxml2 \ /usr/include/libxml2 \
INCLUDEPATH += \ INCLUDEPATH += \
../../../../DesktopEditor/freetype-2.5.2/include ../../../DesktopEditor/freetype-2.5.2/include
LIBS += -lxml2 LIBS += -lxml2
...@@ -161,38 +161,38 @@ HEADERS += \ ...@@ -161,38 +161,38 @@ HEADERS += \
../Records/Drawing/ShapeContainer.h \ ../Records/Drawing/ShapeContainer.h \
../Records/Drawing/ShapeProperties.h \ ../Records/Drawing/ShapeProperties.h \
../Records/Drawing/TextBox.h \ ../Records/Drawing/TextBox.h \
../../../../ASCPresentationEditor/PPTXWriter/Converter.h \ ../../../ASCPresentationEditor/PPTXWriter/Converter.h \
../../../../ASCPresentationEditor/PPTXWriter/CSS.h \ ../../../ASCPresentationEditor/PPTXWriter/CSS.h \
../../../../ASCPresentationEditor/PPTXWriter/ImageManager.h \ ../../../ASCPresentationEditor/PPTXWriter/ImageManager.h \
../../../../ASCPresentationEditor/PPTXWriter/ShapeWriter.h \ ../../../ASCPresentationEditor/PPTXWriter/ShapeWriter.h \
../../../../ASCPresentationEditor/PPTXWriter/StylesWriter.h \ ../../../ASCPresentationEditor/PPTXWriter/StylesWriter.h \
../../../../ASCOfficeDocFile/pole/pole.h \ ../../../ASCPresentationEditor/OfficeDrawing/Element.h \
../../../../ASCPresentationEditor/OfficeDrawing/Element.h \ ../../../ASCPresentationEditor/OfficeDrawing/ElementProperties.h \
../../../../ASCPresentationEditor/OfficeDrawing/ElementProperties.h \ ../../../ASCPresentationEditor/OfficeDrawing/Elements.h \
../../../../ASCPresentationEditor/OfficeDrawing/Elements.h \ ../../../ASCPresentationEditor/OfficeDrawing/Layout.h \
../../../../ASCPresentationEditor/OfficeDrawing/Layout.h \ ../../../ASCPresentationEditor/OfficeDrawing/Slide.h \
../../../../ASCPresentationEditor/OfficeDrawing/Slide.h \ ../../../ASCPresentationEditor/OfficeDrawing/SVGConverter.h \
../../../../ASCPresentationEditor/OfficeDrawing/SVGConverter.h \ ../../../ASCPresentationEditor/OfficeDrawing/SVGFramework.h \
../../../../ASCPresentationEditor/OfficeDrawing/SVGFramework.h \ ../../../ASCPresentationEditor/OfficeDrawing/SVGTransformer.h \
../../../../ASCPresentationEditor/OfficeDrawing/SVGTransformer.h \ ../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.h \
../../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.h \ ../../../ASCPresentationEditor/OfficeDrawing/TextStructures.h \
../../../../ASCPresentationEditor/OfficeDrawing/TextStructures.h \ ../../../ASCPresentationEditor/OfficeDrawing/Theme.h \
../../../../ASCPresentationEditor/OfficeDrawing/Theme.h \ ../PPTFormatLib.h \
../PPTFormatLib.h ../../../Common/3dParty/pole/pole.h
SOURCES += \ SOURCES += \
../Reader/PPTDocumentInfoOneUser.cpp \ ../Reader/PPTDocumentInfoOneUser.cpp \
../Reader/Records.cpp \ ../Reader/Records.cpp \
../Reader/SlidePersist.cpp \ ../Reader/SlidePersist.cpp \
../Records/Animations/AnimationTypes.cpp \ ../Records/Animations/AnimationTypes.cpp \
../../../../ASCPresentationEditor/PPTXWriter/Converter.cpp \ ../../../ASCPresentationEditor/PPTXWriter/Converter.cpp \
../../../../ASCPresentationEditor/PPTXWriter/ShapeWriter.cpp \ ../../../ASCPresentationEditor/PPTXWriter/ShapeWriter.cpp \
../../../../ASCOfficeDocFile/pole/pole.cpp \ ../../../ASCPresentationEditor/OfficeDrawing/Elements.cpp \
../../../../ASCPresentationEditor/OfficeDrawing/Elements.cpp \ ../../../ASCPresentationEditor/OfficeDrawing/Layout.cpp \
../../../../ASCPresentationEditor/OfficeDrawing/Layout.cpp \ ../../../ASCPresentationEditor/OfficeDrawing/SVGConverter.cpp \
../../../../ASCPresentationEditor/OfficeDrawing/SVGConverter.cpp \ ../../../ASCPresentationEditor/OfficeDrawing/SVGFramework.cpp \
../../../../ASCPresentationEditor/OfficeDrawing/SVGFramework.cpp \ ../../../ASCPresentationEditor/OfficeDrawing/SVGTransformer.cpp \
../../../../ASCPresentationEditor/OfficeDrawing/SVGTransformer.cpp \ ../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.cpp \
../../../../ASCPresentationEditor/OfficeDrawing/TextAttributesEx.cpp \ ../../../ASCPresentationEditor/OfficeDrawing/Theme.cpp \
../../../../ASCPresentationEditor/OfficeDrawing/Theme.cpp \ ../PPTFormatLib.cpp \
../PPTFormatLib.cpp ../../../Common/3dParty/pole/pole.cpp
ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.cpp
View file @ 04695896
...@@ -20,7 +20,7 @@ COfficePPTFile::~COfficePPTFile() ...@@ -20,7 +20,7 @@ COfficePPTFile::~COfficePPTFile()
CloseFile(); CloseFile();
} }
BOOL COfficePPTFile::OpenFile(CString sFileName) bool COfficePPTFile::OpenFile(CString sFileName)
{ {
CloseFile(); CloseFile();
...@@ -46,7 +46,7 @@ BOOL COfficePPTFile::OpenFile(CString sFileName) ...@@ -46,7 +46,7 @@ BOOL COfficePPTFile::OpenFile(CString sFileName)
return TRUE; return TRUE;
} }
BOOL COfficePPTFile::CloseFile() bool COfficePPTFile::CloseFile()
{ {
m_Status = NULLMODE; m_Status = NULLMODE;
...@@ -61,7 +61,7 @@ HRESULT COfficePPTFile::LoadFromFile(CString sSrcFileName, CString sDstPath, CSt ...@@ -61,7 +61,7 @@ HRESULT COfficePPTFile::LoadFromFile(CString sSrcFileName, CString sDstPath, CSt
m_strTempDirectory = FileSystem::Directory::GetTempPath(); m_strTempDirectory = FileSystem::Directory::GetTempPath();
} }
BOOL bRes = OpenFile(sSrcFileName); bool bRes = OpenFile(sSrcFileName);
if (!bRes) if (!bRes)
{ {
CloseFile(); CloseFile();
......
ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h
View file @ 04695896
...@@ -52,9 +52,9 @@ public: ...@@ -52,9 +52,9 @@ public:
HRESULT GetAdditionalParam (CString sParamName, VARIANT* ParamValue); HRESULT GetAdditionalParam (CString sParamName, VARIANT* ParamValue);
private: private:
BOOL OpenFile(CString sFileName); bool OpenFile(CString sFileName);
BOOL CloseFile(); bool CloseFile();
CString GetDirectory(CString strFileName); CString GetDirectory(CString strFileName);
}; };
......
ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfo.h
View file @ 04695896
...@@ -56,7 +56,7 @@ public: ...@@ -56,7 +56,7 @@ public:
CPPTUserInfo* pInfo = new CPPTUserInfo(); CPPTUserInfo* pInfo = new CPPTUserInfo();
pInfo->m_strFileDirectory = m_strFileDirectory; pInfo->m_strFileDirectory = m_strFileDirectory;
BOOL bRes = pInfo->ReadFromStream(&oUserAtom, pStream, strFolderMem); bool bRes = pInfo->ReadFromStream(&oUserAtom, pStream, strFolderMem);
offsetToEdit = pInfo->m_oUser.m_nOffsetLastEdit; offsetToEdit = pInfo->m_oUser.m_nOffsetLastEdit;
...@@ -126,4 +126,4 @@ public: ...@@ -126,4 +126,4 @@ public:
} }
return lRes; return lRes;
} }
}; };
\ No newline at end of file
ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp
View file @ 04695896
...@@ -25,7 +25,7 @@ m_arEmptyPictures() ...@@ -25,7 +25,7 @@ m_arEmptyPictures()
m_nWriteSlideTime = 0.0; m_nWriteSlideTime = 0.0;
m_strFileDirectory = _T(""); m_strFileDirectory = _T("");
m_bIsSetupEmpty = FALSE; m_bIsSetupEmpty = false;
} }
CPPTUserInfo::~CPPTUserInfo() CPPTUserInfo::~CPPTUserInfo()
...@@ -72,7 +72,7 @@ void CPPTUserInfo::Clear() ...@@ -72,7 +72,7 @@ void CPPTUserInfo::Clear()
m_arEmptyPictures.clear(); m_arEmptyPictures.clear();
} }
BOOL CPPTUserInfo::ReadFromStream(CRecordUserEditAtom* pUser, POLE::Stream* pStream, CStringW strFolderMem) bool CPPTUserInfo::ReadFromStream(CRecordUserEditAtom* pUser, POLE::Stream* pStream, CStringW strFolderMem)
{ {
m_oUser.FromAtom(pUser); m_oUser.FromAtom(pUser);
...@@ -85,7 +85,7 @@ BOOL CPPTUserInfo::ReadFromStream(CRecordUserEditAtom* pUser, POLE::Stream* pStr ...@@ -85,7 +85,7 @@ BOOL CPPTUserInfo::ReadFromStream(CRecordUserEditAtom* pUser, POLE::Stream* pStr
if (RECORD_TYPE_PERSISTPTRINCREMENTALBLOCK != oHeader.RecType) if (RECORD_TYPE_PERSISTPTRINCREMENTALBLOCK != oHeader.RecType)
{ {
return FALSE; return false;
} }
CRecordPersistDirectoryAtom oPersist; CRecordPersistDirectoryAtom oPersist;
...@@ -95,14 +95,14 @@ BOOL CPPTUserInfo::ReadFromStream(CRecordUserEditAtom* pUser, POLE::Stream* pStr ...@@ -95,14 +95,14 @@ BOOL CPPTUserInfo::ReadFromStream(CRecordUserEditAtom* pUser, POLE::Stream* pStr
std::map<DWORD, DWORD>::iterator pPair = m_mapOffsetInPIDs.find(m_oUser.m_nDocumentRef); std::map<DWORD, DWORD>::iterator pPair = m_mapOffsetInPIDs.find(m_oUser.m_nDocumentRef);
if (pPair == m_mapOffsetInPIDs.end()) if (pPair == m_mapOffsetInPIDs.end())
return FALSE; return false;
StreamUtils::StreamSeek(pPair->second, pStream); StreamUtils::StreamSeek(pPair->second, pStream);
oHeader.ReadFromStream(pStream); oHeader.ReadFromStream(pStream);
if (RECORD_TYPE_DOCUMENT != oHeader.RecType) if (RECORD_TYPE_DOCUMENT != oHeader.RecType)
{ {
return FALSE; return false;
} }
m_oDocument.ReadFromStream(oHeader, pStream); m_oDocument.ReadFromStream(oHeader, pStream);
...@@ -802,9 +802,9 @@ void CPPTUserInfo::LoadNoMainMaster(DWORD dwMasterID, const LONG& lOriginWidth, ...@@ -802,9 +802,9 @@ void CPPTUserInfo::LoadNoMainMaster(DWORD dwMasterID, const LONG& lOriginWidth,
if (0 == oArraySlideAtoms.size()) if (0 == oArraySlideAtoms.size())
return; return;
BOOL bMasterColorScheme = oArraySlideAtoms[0]->m_bMasterScheme; bool bMasterColorScheme = oArraySlideAtoms[0]->m_bMasterScheme;
BOOL bMasterBackGround = oArraySlideAtoms[0]->m_bMasterBackground; bool bMasterBackGround = oArraySlideAtoms[0]->m_bMasterBackground;
BOOL bMasterObjects = oArraySlideAtoms[0]->m_bMasterObjects; bool bMasterObjects = oArraySlideAtoms[0]->m_bMasterObjects;
DWORD dwID = (DWORD)oArraySlideAtoms[0]->m_nMasterIDRef; DWORD dwID = (DWORD)oArraySlideAtoms[0]->m_nMasterIDRef;
......
ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.h
View file @ 04695896
...@@ -55,8 +55,8 @@ public: ...@@ -55,8 +55,8 @@ public:
std::map<DWORD, CSlideShowSlideInfoAtom> m_mapTransitions; std::map<DWORD, CSlideShowSlideInfoAtom> m_mapTransitions;
// "" - // "" -
std::vector<BOOL> m_arEmptyPictures; std::vector<bool> m_arEmptyPictures;
BOOL m_bIsSetupEmpty; bool m_bIsSetupEmpty;
CString m_strFileDirectory; CString m_strFileDirectory;
...@@ -75,7 +75,7 @@ public: ...@@ -75,7 +75,7 @@ public:
void Clear(); void Clear();
BOOL ReadFromStream(CRecordUserEditAtom* pUser, POLE::Stream* pStream, CStringW strFolderMem); bool ReadFromStream(CRecordUserEditAtom* pUser, POLE::Stream* pStream, CStringW strFolderMem);
void FromDocument(); void FromDocument();
void NormalizeCoords(long lWidth, long lHeight); void NormalizeCoords(long lWidth, long lHeight);
...@@ -119,10 +119,10 @@ public: ...@@ -119,10 +119,10 @@ public:
pPF->spaceBefore = (LONG)0; pPF->spaceBefore = (LONG)0;
pPF->spaceAfter = (LONG)0; pPF->spaceAfter = (LONG)0;
pCF->FontBold = FALSE; pCF->FontBold = false;
pCF->FontItalic = FALSE; pCF->FontItalic = false;
pCF->FontUnderline = FALSE; pCF->FontUnderline = false;
pCF->FontStrikeout = FALSE; pCF->FontStrikeout = false;
pCF->Size = 18; pCF->Size = 18;
pCF->BaseLineOffset = (double)0; pCF->BaseLineOffset = (double)0;
...@@ -281,4 +281,4 @@ public: ...@@ -281,4 +281,4 @@ public:
void AddAnimation (DWORD dwSlideID, double Width, double Height, IElement* pElement); void AddAnimation (DWORD dwSlideID, double Width, double Height, IElement* pElement);
void AddAudioTransition (DWORD dwSlideID, CTransition* pTransition, const CString& strFilePath); void AddAudioTransition (DWORD dwSlideID, CTransition* pTransition, const CString& strFilePath);
}; };
\ No newline at end of file
ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileDefines.h
View file @ 04695896
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#include <atlbase.h> #include <atlbase.h>
#include <atlstr.h> #include <atlstr.h>
#else #else
#include "../../../../DesktopEditor/common/ASCVariant.h" #include "../../../DesktopEditor/common/ASCVariant.h"
#include "../../../../Common/DocxFormat/Source/Base/ASCString.h" #include "../../../Common/DocxFormat/Source/Base/ASCString.h"
#endif #endif
typedef BYTE BOOL1; typedef BYTE BOOL1;
......
ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileReader.h
View file @ 04695896
...@@ -16,7 +16,7 @@ class CPPTFileReader ...@@ -16,7 +16,7 @@ class CPPTFileReader
public: public:
CPPTFileReader(POLE::Storage *pStg, CStringW strTemp): CPPTFileReader(POLE::Storage *pStg, CStringW strTemp):
m_pPowerPointStg(pStg), m_pPowerPointStg(pStg),
m_bIsPPTFile(FALSE), m_bIsPPTFile(false),
m_pDocStream(NULL), m_pDocStream(NULL),
m_pPictureStream(NULL), m_pPictureStream(NULL),
m_lImagesCount(0), m_lImagesCount(0),
...@@ -63,7 +63,7 @@ public: ...@@ -63,7 +63,7 @@ public:
FileSystem::Directory::DeleteDirectory(m_strMemoryForder); FileSystem::Directory::DeleteDirectory(m_strMemoryForder);
} }
BOOL IsPowerPoint() bool IsPowerPoint()
{ {
return m_bIsPPTFile; return m_bIsPPTFile;
} }
...@@ -82,7 +82,7 @@ public: ...@@ -82,7 +82,7 @@ public:
//m_oDocumentInfo.m_arUsers[0]->m_oDocument.GetRecordsByType(&oArrayBSE, true, false); //m_oDocumentInfo.m_arUsers[0]->m_oDocument.GetRecordsByType(&oArrayBSE, true, false);
// ... // ...
BOOL bRes = SavePictures(); bool bRes = SavePictures();
if (m_oDocumentInfo.m_arUsers.size() > 0) if (m_oDocumentInfo.m_arUsers.size() > 0)
...@@ -105,10 +105,10 @@ public: ...@@ -105,10 +105,10 @@ public:
protected: protected:
BOOL ReadCurrentUser(POLE::Stream *pStm) bool ReadCurrentUser(POLE::Stream *pStm)
{ {
SRecordHeader oHeader; SRecordHeader oHeader;
BOOL isPP = FALSE; bool isPP = false;
if( oHeader.ReadFromStream(pStm)) if( oHeader.ReadFromStream(pStm))
{ {
...@@ -169,7 +169,7 @@ protected: ...@@ -169,7 +169,7 @@ protected:
// xml // xml
if ( oHeader.ReadFromStream(pStm) == FALSE ) if ( oHeader.ReadFromStream(pStm) == false )
break; break;
oHeader.ToXmlWriter(&oWriter, pStm); oHeader.ToXmlWriter(&oWriter, pStm);
...@@ -182,13 +182,13 @@ protected: ...@@ -182,13 +182,13 @@ protected:
return 0; return 0;
} }
BOOL SavePictures() bool SavePictures()
{ {
POLE::Stream* pStream = GetPictureStream(); POLE::Stream* pStream = GetPictureStream();
if (NULL == pStream) if (NULL == pStream)
{ {
return FALSE; return false;
} }
SRecordHeader oHeader; SRecordHeader oHeader;
...@@ -210,7 +210,7 @@ protected: ...@@ -210,7 +210,7 @@ protected:
CMetaFileBuffer oMetaFile; CMetaFileBuffer oMetaFile;
if (oHeader.ReadFromStream(pStream) == FALSE ) if (oHeader.ReadFromStream(pStream) == false )
{ {
break; break;
} }
...@@ -457,13 +457,13 @@ private: ...@@ -457,13 +457,13 @@ private:
POLE::Stream * m_pDocStream; POLE::Stream * m_pDocStream;
POLE::Stream * m_pPictureStream; POLE::Stream * m_pPictureStream;
POLE::Storage* m_pPowerPointStg; POLE::Storage* m_pPowerPointStg;
BOOL m_bIsPPTFile; bool m_bIsPPTFile;
public: public:
// //
CStringW m_strMemoryForder; CStringW m_strMemoryForder;
std::vector<BOOL> m_arLoadImageFlags; std::vector<bool> m_arLoadImageFlags;
DWORD m_lImagesCount; DWORD m_lImagesCount;
public: public:
......
ASCOfficePPTFile/PPTFormatLib/Reader/ReadStructures.h
View file @ 04695896
...@@ -11,20 +11,20 @@ using namespace NSPresentationEditor; ...@@ -11,20 +11,20 @@ using namespace NSPresentationEditor;
namespace NSZLib namespace NSZLib
{ {
static BOOL Decompress(const BYTE* pSrcBuffer, const ULONG& lSrcBufferLen, static bool Decompress(const BYTE* pSrcBuffer, const ULONG& lSrcBufferLen,
BYTE* pDstBuffer, ULONG& lDstBufferLen) BYTE* pDstBuffer, ULONG& lDstBufferLen)
{ {
try try
{ {
if (Z_OK == uncompress(pDstBuffer, &lDstBufferLen, pSrcBuffer, lSrcBufferLen)) if (Z_OK == uncompress(pDstBuffer, &lDstBufferLen, pSrcBuffer, lSrcBufferLen))
{ {
return TRUE; return true;
} }
} }
catch(...) catch(...)
{ {
} }
return FALSE; return false;
} }
} }
/************************************************************** /**************************************************************
...@@ -295,7 +295,7 @@ public: ...@@ -295,7 +295,7 @@ public:
class CMetaFileBuffer class CMetaFileBuffer
{ {
public: public:
BOOL m_bIsValid; bool m_bIsValid;
private: private:
BYTE* m_pMetaHeader; BYTE* m_pMetaHeader;
...@@ -307,7 +307,7 @@ private: ...@@ -307,7 +307,7 @@ private:
public: public:
CMetaFileBuffer() CMetaFileBuffer()
{ {
m_bIsValid = FALSE; m_bIsValid = false;
m_pMetaHeader = NULL; m_pMetaHeader = NULL;
m_pMetaFile = NULL; m_pMetaFile = NULL;
...@@ -327,7 +327,7 @@ public: ...@@ -327,7 +327,7 @@ public:
m_lMetaHeaderSize = lSize; m_lMetaHeaderSize = lSize;
} }
void SetData(BYTE* pCompress, LONG lCompressSize, LONG lUncompressSize, BOOL bIsCompressed) void SetData(BYTE* pCompress, LONG lCompressSize, LONG lUncompressSize, bool bIsCompressed)
{ {
if (!bIsCompressed) if (!bIsCompressed)
{ {
...@@ -338,7 +338,7 @@ public: ...@@ -338,7 +338,7 @@ public:
{ {
ULONG lSize = lUncompressSize; ULONG lSize = lUncompressSize;
m_pMetaFile = new BYTE[lUncompressSize]; m_pMetaFile = new BYTE[lUncompressSize];
BOOL bRes = NSZLib::Decompress(pCompress, (ULONG)lCompressSize, m_pMetaFile, lSize); bool bRes = NSZLib::Decompress(pCompress, (ULONG)lCompressSize, m_pMetaFile, lSize);
if (bRes) if (bRes)
{ {
m_lMetaFileSize = (LONG)lSize; m_lMetaFileSize = (LONG)lSize;
...@@ -593,9 +593,9 @@ public: ...@@ -593,9 +593,9 @@ public:
{ {
WORD bulletFlag = StreamUtils::ReadWORD(pStream); WORD bulletFlag = StreamUtils::ReadWORD(pStream);
if (bulletFlag & 0x0F) if (bulletFlag & 0x0F)
m_oRun.hasBullet = (BOOL)(0x01 == (bulletFlag & 0x01)); m_oRun.hasBullet = (bool)(0x01 == (bulletFlag & 0x01));
else else
m_oRun.hasBullet = (BOOL)FALSE; m_oRun.hasBullet = false;
} }
if (bulletChar_) if (bulletChar_)
...@@ -626,7 +626,7 @@ public: ...@@ -626,7 +626,7 @@ public:
m_oRun.bulletColor = oColor; m_oRun.bulletColor = oColor;
} }
if (TRUE) // , if (true) // ,
m_oRun.bulletColor.reset(); m_oRun.bulletColor.reset();
if (textAlignment_) if (textAlignment_)
...@@ -751,13 +751,13 @@ public: ...@@ -751,13 +751,13 @@ public:
WORD fontStyle = StreamUtils::ReadWORD(pStream); WORD fontStyle = StreamUtils::ReadWORD(pStream);
if (0x01 == (0x01 & fontStyle)) if (0x01 == (0x01 & fontStyle))
m_oRun.FontBold = (BOOL)TRUE; m_oRun.FontBold = true;
if (0x02 == (0x02 & fontStyle)) if (0x02 == (0x02 & fontStyle))
m_oRun.FontItalic = (BOOL)TRUE; m_oRun.FontItalic = true;
if (0x04 == (0x04 & fontStyle)) if (0x04 == (0x04 & fontStyle))
m_oRun.FontUnderline = (BOOL)TRUE; m_oRun.FontUnderline = true;
if (0x10 == (0x10 & fontStyle)) if (0x10 == (0x10 & fontStyle))
m_oRun.FontShadow = (BOOL)TRUE; m_oRun.FontShadow = true;
} }
if (typeface_) if (typeface_)
......
ASCOfficePPTFile/PPTFormatLib/Reader/Records.h
View file @ 04695896
...@@ -18,7 +18,7 @@ struct SRecordHeader ...@@ -18,7 +18,7 @@ struct SRecordHeader
RecVersion = RecInstance = RecType = RecLen = 0; RecVersion = RecInstance = RecType = RecLen = 0;
} }
BOOL ReadFromStream(POLE::Stream * pStream) bool ReadFromStream(POLE::Stream * pStream)
{ {
RecVersion = RecInstance = RecType = RecLen = 0; RecVersion = RecInstance = RecType = RecLen = 0;
...@@ -44,23 +44,23 @@ struct SRecordHeader ...@@ -44,23 +44,23 @@ struct SRecordHeader
RecLen = sz; RecLen = sz;
} }
return TRUE; return true;
} }
BOOL IsContainer() bool IsContainer()
{ {
/*if ((RecVersion == PSFLAG_CONTAINER) || ((RecVersion & 0x0F) == 0x0F)) /*if ((RecVersion == PSFLAG_CONTAINER) || ((RecVersion & 0x0F) == 0x0F))
{ {
return TRUE; return TRUE;
}*/ }*/
if (1064 == RecType) if (1064 == RecType)
return FALSE; return false;
if (RecVersion == 0x0F) if (RecVersion == 0x0F)
{ {
return TRUE; return true;
} }
return FALSE; return false;
} }
SRecordHeader& operator =(const SRecordHeader& oSrc) SRecordHeader& operator =(const SRecordHeader& oSrc)
......
ASCOfficePPTFile/PPTFormatLib/Reader/SlideInfo.h
View file @ 04695896
...@@ -51,7 +51,7 @@ public: ...@@ -51,7 +51,7 @@ public:
std::vector<CTextFullSettings> m_arTextPlaceHolders; std::vector<CTextFullSettings> m_arTextPlaceHolders;
std::map<LONG, CElementInfo> m_mapElements; std::map<LONG, CElementInfo> m_mapElements;
//std::unordered_map<LONG, CElementInfo> m_mapElements; //std::unordered_map<LONG, CElementInfo> m_mapElements;
std::vector<BOOL>* m_parEmptyPictures; std::vector<bool>* m_parEmptyPictures;
nullable_base<NSPresentationEditor::CTextStyles> m_pStyles[9]; nullable_base<NSPresentationEditor::CTextStyles> m_pStyles[9];
...@@ -107,4 +107,4 @@ public: ...@@ -107,4 +107,4 @@ public:
} }
return lIndex - lResult; return lIndex - lResult;
} }
}; };
\ No newline at end of file
ASCOfficePPTFile/PPTFormatLib/Reader/SlidePersist.h
View file @ 04695896
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#include <atlbase.h> #include <atlbase.h>
#include <atlstr.h> #include <atlstr.h>
#else #else
#include "../../../../DesktopEditor/common/ASCVariant.h" #include "../../../DesktopEditor/common/ASCVariant.h"
#include "../../../../Common/DocxFormat/Source/Base/ASCString.h" #include "../../../Common/DocxFormat/Source/Base/ASCString.h"
#endif #endif
#include <vector> #include <vector>
......
ASCOfficePPTFile/PPTFormatLib/Records/CurrentUserAtom.h
View file @ 04695896
...@@ -101,7 +101,7 @@ public: ...@@ -101,7 +101,7 @@ public:
return oWriter.GetXmlString(); return oWriter.GetXmlString();
} }
BOOL IsSupported() bool IsSupported()
{ {
return (NO_ENCRYPT == m_nToken); return (NO_ENCRYPT == m_nToken);
} }
......
ASCOfficePPTFile/PPTFormatLib/Records/Drawing/BlipStoreContainer.h
View file @ 04695896
...@@ -14,7 +14,7 @@ public: ...@@ -14,7 +14,7 @@ public:
{ {
} }
void SetUpEmptyInfos(std::vector<BOOL>* pArray) void SetUpEmptyInfos(std::vector<bool>* pArray)
{ {
if (NULL == pArray) if (NULL == pArray)
return; return;
...@@ -29,4 +29,4 @@ public: ...@@ -29,4 +29,4 @@ public:
} }
} }
} }
}; };
\ No newline at end of file
ASCOfficePPTFile/PPTFormatLib/Records/Drawing/GroupShapeContainer.h
View file @ 04695896
...@@ -81,7 +81,7 @@ public: ...@@ -81,7 +81,7 @@ public:
LONG lW2 = m_rcGroupClientAnchor.right - m_rcGroupClientAnchor.left; LONG lW2 = m_rcGroupClientAnchor.right - m_rcGroupClientAnchor.left;
LONG lH2 = m_rcGroupClientAnchor.bottom - m_rcGroupClientAnchor.top; LONG lH2 = m_rcGroupClientAnchor.bottom - m_rcGroupClientAnchor.top;
BOOL bIsRecalc = ((lW1 > 0) && (lH1 > 0) && (lW2 > 0) && (lH2 > 0)); bool bIsRecalc = ((lW1 > 0) && (lH1 > 0) && (lW2 > 0) && (lH2 > 0));
if (bIsRecalc) if (bIsRecalc)
{ {
for (int nIndex = 0; nIndex < oArrayShapes.size(); ++nIndex) for (int nIndex = 0; nIndex < oArrayShapes.size(); ++nIndex)
...@@ -108,7 +108,7 @@ public: ...@@ -108,7 +108,7 @@ public:
LONG lWidthClient = m_rcGroupClientAnchor.right - m_rcGroupClientAnchor.left; LONG lWidthClient = m_rcGroupClientAnchor.right - m_rcGroupClientAnchor.left;
LONG lHeightClient = m_rcGroupClientAnchor.bottom - m_rcGroupClientAnchor.top; LONG lHeightClient = m_rcGroupClientAnchor.bottom - m_rcGroupClientAnchor.top;
BOOL bIsRecalc = ((lWidthClient > 0) && (lHeightClient > 0) && (lWidthClient > 0) && (lHeightGroup > 0)); bool bIsRecalc = ((lWidthClient > 0) && (lHeightClient > 0) && (lWidthClient > 0) && (lHeightGroup > 0));
if (bIsRecalc) if (bIsRecalc)
{ {
...@@ -133,4 +133,4 @@ public: ...@@ -133,4 +133,4 @@ public:
{ {
return CRecordsContainer::ToString(); return CRecordsContainer::ToString();
} }
}; };
\ No newline at end of file
ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.h
View file @ 04695896
...@@ -779,18 +779,18 @@ public: ...@@ -779,18 +779,18 @@ public:
} }
if (bUseItalic) if (bUseItalic)
{ {
pParentShape->m_oText.m_oAttributes.m_oFont.Italic = (BOOL)bItalic; pParentShape->m_oText.m_oAttributes.m_oFont.Italic = bItalic;
//pElemProps->SetAt(CElementProperty::epFontItalic, bItalic); //pElemProps->SetAt(CElementProperty::epFontItalic, bItalic);
} }
if (bUseBold) if (bUseBold)
{ {
pParentShape->m_oText.m_oAttributes.m_oFont.Bold = (BOOL)bBold; pParentShape->m_oText.m_oAttributes.m_oFont.Bold = bBold;
//pElemProps->SetAt(CElementProperty::epFontBold, bBold); //pElemProps->SetAt(CElementProperty::epFontBold, bBold);
} }
if (bUseVertical) if (bUseVertical)
{ {
pParentShape->m_oText.m_bVertical = (true == bVertical) ? TRUE : FALSE; pParentShape->m_oText.m_bVertical = (true == bVertical) ? true : false;
} }
break; break;
} }
...@@ -1065,7 +1065,7 @@ public: ...@@ -1065,7 +1065,7 @@ public:
{ {
// shape // shape
CShapeElement* pShape = new CShapeElement(NSBaseShape::ppt, eType); CShapeElement* pShape = new CShapeElement(NSBaseShape::ppt, eType);
if (TRUE)//if (/* */OOXMLShapes::sptCustom != pShape->m_oShape.m_eType) if (true)//if (/* */OOXMLShapes::sptCustom != pShape->m_oShape.m_eType)
{ {
CExFilesInfo::ExFilesType exType = CExFilesInfo::eftNone; CExFilesInfo::ExFilesType exType = CExFilesInfo::eftNone;
CExFilesInfo* pTextureInfo = pMapIDs->Lock(0xFFFFFFFF, exType); CExFilesInfo* pTextureInfo = pMapIDs->Lock(0xFFFFFFFF, exType);
...@@ -1415,8 +1415,8 @@ protected: ...@@ -1415,8 +1415,8 @@ protected:
// - (.. ) // - (.. )
// - - .. - // - - .. -
// //
BOOL bIsPersistPresentSettings = FALSE; bool bIsPersistPresentSettings = false;
BOOL bIsOwnPresentSettings = FALSE; bool bIsOwnPresentSettings = false;
NSOfficePPT::TextType eTypeMaster = NSOfficePPT::NoPresent; NSOfficePPT::TextType eTypeMaster = NSOfficePPT::NoPresent;
NSOfficePPT::TextType eTypePersist = NSOfficePPT::NoPresent; NSOfficePPT::TextType eTypePersist = NSOfficePPT::NoPresent;
...@@ -1862,7 +1862,7 @@ protected: ...@@ -1862,7 +1862,7 @@ protected:
++nIndexSpan; ++nIndexSpan;
} }
pParagraph->m_arSpans[nIndexSpan].m_oRun.Color = oColor; pParagraph->m_arSpans[nIndexSpan].m_oRun.Color = oColor;
pParagraph->m_arSpans[nIndexSpan].m_oRun.FontUnderline = (BOOL)TRUE; pParagraph->m_arSpans[nIndexSpan].m_oRun.FontUnderline = (bool)true;
pParagraph->m_arSpans[nIndexSpan].m_strText = strText.Mid(lStart_ - lCurrentStart, lEnd_ - lStart_ + 1); pParagraph->m_arSpans[nIndexSpan].m_strText = strText.Mid(lStart_ - lCurrentStart, lEnd_ - lStart_ + 1);
if (lEnd_ < lCurrentEnd) if (lEnd_ < lCurrentEnd)
{ {
......
ASCOfficePPTFile/PPTFormatLib/Records/SlideContainer.h
View file @ 04695896
...@@ -126,7 +126,7 @@ public: ...@@ -126,7 +126,7 @@ public:
return oWriter.GetXmlString(); return oWriter.GetXmlString();
} }
BOOL IsSlide() bool IsSlide()
{ {
for (int nIndex = 0; nIndex < m_arRecords.size(); ++nIndex) for (int nIndex = 0; nIndex < m_arRecords.size(); ++nIndex)
{ {
......
ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
View file @ 04695896
...@@ -95,8 +95,6 @@ SOURCES += pptxformatlib.cpp \ ...@@ -95,8 +95,6 @@ SOURCES += pptxformatlib.cpp \
../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp \ ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp \
../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/FilePosix.cpp \ ../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/FilePosix.cpp \
../../../PPTXFormat/Logic/Controls.cpp ../../../PPTXFormat/Logic/Controls.cpp
#../../../Directory.cpp \
#../../File.cpp
HEADERS += pptxformatlib.h \ HEADERS += pptxformatlib.h \
../../../ASCOfficeDrawingConverter.h \ ../../../ASCOfficeDrawingConverter.h \
......
ASCPresentationEditor/OfficeDrawing/SVGConverter.cpp
View file @ 04695896
...@@ -57,7 +57,7 @@ NSPresentationEditor::CSVGConverter::~CSVGConverter() ...@@ -57,7 +57,7 @@ NSPresentationEditor::CSVGConverter::~CSVGConverter()
HRESULT NSPresentationEditor::CSVGConverter::get_Type(LONG* lType) HRESULT NSPresentationEditor::CSVGConverter::get_Type(LONG* lType)
{ {
if (NULL == lType) if (NULL == lType)
return S_FALSE; return S_FALSE;
*lType = c_nSVGConverter; *lType = c_nSVGConverter;
return S_OK; return S_OK;
...@@ -291,7 +291,7 @@ HRESULT NSPresentationEditor::CSVGConverter::put_BrushAlpha2(const LONG& lAlpha) ...@@ -291,7 +291,7 @@ HRESULT NSPresentationEditor::CSVGConverter::put_BrushAlpha2(const LONG& lAlpha)
} }
HRESULT NSPresentationEditor::CSVGConverter::get_BrushTexturePath(std::wstring* bsPath) HRESULT NSPresentationEditor::CSVGConverter::get_BrushTexturePath(std::wstring* bsPath)
{ {
if (bsPath == NULL) return S_FALSE; if (bsPath == NULL) return S_FALSE;
*bsPath = string2std_string(m_oBrush.TexturePath); *bsPath = string2std_string(m_oBrush.TexturePath);
return S_OK; return S_OK;
} }
...@@ -699,14 +699,14 @@ HRESULT NSPresentationEditor::CSVGConverter::PathCommandText(const std::wstring& ...@@ -699,14 +699,14 @@ HRESULT NSPresentationEditor::CSVGConverter::PathCommandText(const std::wstring&
} }
HRESULT NSPresentationEditor::CSVGConverter::PathCommandTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags) HRESULT NSPresentationEditor::CSVGConverter::PathCommandTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags)
{ {
BOOL bGid = m_oFont.StringGID; bool bGid = m_oFont.StringGID;
if (NULL != bsGidText) if (NULL != bsGidText)
{ {
m_oFont.StringGID = TRUE; m_oFont.StringGID = true;
PathCommandText(bsGidText, x, y, w, h, baselineOffset); PathCommandText(bsGidText, x, y, w, h, baselineOffset);
} }
m_oFont.StringGID = FALSE; m_oFont.StringGID = false;
PathCommandText(bsUnicodeText, x, y, w, h, baselineOffset); PathCommandText(bsUnicodeText, x, y, w, h, baselineOffset);
m_oFont.StringGID = bGid; m_oFont.StringGID = bGid;
...@@ -734,8 +734,8 @@ HRESULT NSPresentationEditor::CSVGConverter::SetCommandParams(double dAngle, dou ...@@ -734,8 +734,8 @@ HRESULT NSPresentationEditor::CSVGConverter::SetCommandParams(double dAngle, dou
if ((dWidth <= 1) || (dHeight <= 1)) if ((dWidth <= 1) || (dHeight <= 1))
lFlags = 0; lFlags = 0;
BOOL bFlipX = (0 != (c_nParamFlipX & lFlags)); bool bFlipX = (0 != (c_nParamFlipX & lFlags));
BOOL bFlipY = (0 != (c_nParamFlipY & lFlags)); bool bFlipY = (0 != (c_nParamFlipY & lFlags));
double m11 = bFlipX ? -1.0 : 1.0; double m11 = bFlipX ? -1.0 : 1.0;
double m22 = bFlipY ? -1.0 : 1.0; double m22 = bFlipY ? -1.0 : 1.0;
......
ASCPresentationEditor/PPTXWriter/ShapeWriter.cpp
View file @ 04695896
...@@ -28,7 +28,7 @@ NSPresentationEditor::CShapeWriter::CShapeWriter() ...@@ -28,7 +28,7 @@ NSPresentationEditor::CShapeWriter::CShapeWriter()
HRESULT NSPresentationEditor::CShapeWriter::get_Type(LONG* lType) HRESULT NSPresentationEditor::CShapeWriter::get_Type(LONG* lType)
{ {
if (NULL == lType) if (NULL == lType)
return S_FALSE; return S_FALSE;
*lType = c_nSVGConverter; *lType = c_nSVGConverter;
return S_OK; return S_OK;
...@@ -462,12 +462,12 @@ HRESULT NSPresentationEditor::CShapeWriter::put_ShadowAlpha(LONG val) ...@@ -462,12 +462,12 @@ HRESULT NSPresentationEditor::CShapeWriter::put_ShadowAlpha(LONG val)
m_oShadow.Alpha = val; m_oShadow.Alpha = val;
return S_OK; return S_OK;
} }
HRESULT NSPresentationEditor::CShapeWriter::get_ShadowVisible(BOOL* val) HRESULT NSPresentationEditor::CShapeWriter::get_ShadowVisible(bool* val)
{ {
*val = m_oShadow.Visible; *val = m_oShadow.Visible;
return S_OK; return S_OK;
} }
HRESULT NSPresentationEditor::CShapeWriter::put_ShadowVisible(BOOL val) HRESULT NSPresentationEditor::CShapeWriter::put_ShadowVisible(bool val)
{ {
m_oShadow.Visible = val; m_oShadow.Visible = val;
return S_OK; return S_OK;
...@@ -524,7 +524,7 @@ HRESULT NSPresentationEditor::CShapeWriter::CommandDrawText(const std::wstring& ...@@ -524,7 +524,7 @@ HRESULT NSPresentationEditor::CShapeWriter::CommandDrawText(const std::wstring&
if (c_nHyperlinkType == m_lCurrentCommandType) if (c_nHyperlinkType == m_lCurrentCommandType)
return S_OK; return S_OK;
if (TRUE) if (true)
{ {
PathCommandEnd(); PathCommandEnd();
BeginCommand(c_nPathType); BeginCommand(c_nPathType);
...@@ -575,7 +575,7 @@ HRESULT NSPresentationEditor::CShapeWriter::CommandString(const LONG& lType, con ...@@ -575,7 +575,7 @@ HRESULT NSPresentationEditor::CShapeWriter::CommandString(const LONG& lType, con
HRESULT NSPresentationEditor::CShapeWriter::CommandDrawTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags) HRESULT NSPresentationEditor::CShapeWriter::CommandDrawTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags)
{ {
if (TRUE) if (true)
{ {
PathCommandEnd(); PathCommandEnd();
BeginCommand(c_nPathType); BeginCommand(c_nPathType);
...@@ -744,14 +744,14 @@ HRESULT NSPresentationEditor::CShapeWriter::PathCommandText(const std::wstring& ...@@ -744,14 +744,14 @@ HRESULT NSPresentationEditor::CShapeWriter::PathCommandText(const std::wstring&
} }
HRESULT NSPresentationEditor::CShapeWriter::PathCommandTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags) HRESULT NSPresentationEditor::CShapeWriter::PathCommandTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags)
{ {
BOOL bGid = m_oFont.StringGID; bool bGid = m_oFont.StringGID;
if (NULL != bsGidText) if (NULL != bsGidText)
{ {
m_oFont.StringGID = TRUE; m_oFont.StringGID = true;
PathCommandText(bsUnicodeText, x, y, w, h, baselineOffset); PathCommandText(bsUnicodeText, x, y, w, h, baselineOffset);
} }
m_oFont.StringGID = FALSE; m_oFont.StringGID = false;
PathCommandText(bsUnicodeText, x, y, w, h, baselineOffset); PathCommandText(bsUnicodeText, x, y, w, h, baselineOffset);
m_oFont.StringGID = bGid; m_oFont.StringGID = bGid;
...@@ -776,8 +776,8 @@ HRESULT NSPresentationEditor::CShapeWriter::SetCommandParams(double dAngle, doub ...@@ -776,8 +776,8 @@ HRESULT NSPresentationEditor::CShapeWriter::SetCommandParams(double dAngle, doub
if ((dWidth <= 1) || (dHeight <= 1)) if ((dWidth <= 1) || (dHeight <= 1))
lFlags = 0; lFlags = 0;
BOOL bFlipX = (0 != (c_nParamFlipX & lFlags)); bool bFlipX = (0 != (c_nParamFlipX & lFlags));
BOOL bFlipY = (0 != (c_nParamFlipY & lFlags)); bool bFlipY = (0 != (c_nParamFlipY & lFlags));
double m11 = bFlipX ? -1.0 : 1.0; double m11 = bFlipX ? -1.0 : 1.0;
double m22 = bFlipY ? -1.0 : 1.0; double m22 = bFlipY ? -1.0 : 1.0;
......
ASCPresentationEditor/PPTXWriter/ShapeWriter.h
View file @ 04695896
...@@ -395,8 +395,8 @@ namespace NSPresentationEditor ...@@ -395,8 +395,8 @@ namespace NSPresentationEditor
HRESULT put_ShadowColor (LONG val); HRESULT put_ShadowColor (LONG val);
HRESULT get_ShadowAlpha (LONG* val); HRESULT get_ShadowAlpha (LONG* val);
HRESULT put_ShadowAlpha (LONG val); HRESULT put_ShadowAlpha (LONG val);
HRESULT get_ShadowVisible (BOOL* val); HRESULT get_ShadowVisible (bool* val);
HRESULT put_ShadowVisible (BOOL val); HRESULT put_ShadowVisible (bool val);
// edge ------------------------------------------------------------------------------------- // edge -------------------------------------------------------------------------------------
HRESULT SetEdgeText (BSTR bsXML); HRESULT SetEdgeText (BSTR bsXML);
HRESULT get_EdgeVisible (LONG* val); HRESULT get_EdgeVisible (LONG* val);
......
Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro
View file @ 04695896
...@@ -64,7 +64,7 @@ SOURCES += docxformatlib.cpp \ ...@@ -64,7 +64,7 @@ SOURCES += docxformatlib.cpp \
../Source/XML/stringcommon.cpp \ ../Source/XML/stringcommon.cpp \
../Source/MathEquation/MathEquation.cpp \ ../Source/MathEquation/MathEquation.cpp \
../Source/Base/unicode_util.cpp \ ../Source/Base/unicode_util.cpp \
../Common/3dParty/pole/pole.cpp ../../3dParty/pole/pole.cpp
HEADERS += docxformatlib.h \ HEADERS += docxformatlib.h \
../Source/Base/Base.h \ ../Source/Base/Base.h \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7