pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

x2t linux build version up

Browse Source
This commit is contained in:
ElenaSubbotina
2016-06-26 18:07:39 +03:00
parent 286f15c106
commit 9405b0680c
8 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.cpp
View File

@ -34,6 +34,13 @@
#include "OpenXmlPackage.h"
#include "Converter.h"
#include "NumberingMapping.h"
#include "CommentsMapping.h"
#include "EndnotesMapping.h"
#include "FootnotesMapping.h"
#include "FooterMapping.h"
#include "HeaderMapping.h"
#include "MainDocumentMapping.h"
#include "OleObjectMapping.h"
#include "VMLPictureMapping.h"

2
ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.cpp
View File

@ -404,7 +404,7 @@ namespace DocFileFormat
case sprmSLnc :
{
SLncOperand mode = (SLncOperand)FormatUtils::BytesToUChar (iter->Arguments, 0, iter->argumentsSize);
mode = (SLncOperand)min(max(mode,lncPerPage),lncContinue);
mode = (SLncOperand)(std::min)((std::max)(mode,lncPerPage),lncContinue);
appendValueAttribute (&lnNumType, _T("w:restart"), LineNumberRestart[mode].c_str() );
}

4
ASCOfficeDocFile/DocDocxConverter/StringTable.h
View File

@ -64,9 +64,9 @@ namespace DocFileFormat
}
StringTable( VirtualStreamReader *reader, int code_page_ ):
code_page(code_page_), fExtend(false), cData(0), cbExtra(0)
code_page(code_page_), fExtend(false), cbData(0), cbExtra(0)
{
parse( reader, (unsigned int)reader->GetPosition() );
parse( reader, (unsigned int)reader->GetPosition() );
}
StringTable( POLE::Stream* tableStream, unsigned int fc, unsigned int lcb, bool older ) :

8
ASCOfficeDocFile/DocDocxConverter/TableCellPropertiesMapping.cpp
View File

@ -89,7 +89,7 @@ namespace DocFileFormat
int cc = tdef.numberOfColumns;
this->_tGrid = tdef.rgdxaCenter;
this->_tcDef = tdef.rgTc80[min(_cellIndex, (int)tdef.rgTc80.size() - 1)]; // NOTE: fix for crash
this->_tcDef = tdef.rgTc80[(std::min)(_cellIndex, (int)tdef.rgTc80.size() - 1)]; // NOTE: fix for crash
appendValueElement( this->_tcPr, _T( "textDirection" ), FormatUtils::MapValueToWideString( this->_tcDef.textFlow, &Global::TextFlowMap[0][0], 6, 6 ).c_str(), false );
@ -114,8 +114,8 @@ namespace DocFileFormat
appendValueElement( _tcPr, _T( "noWrap" ), _T( "" ), true );
}
nComputedCellWidth = (short)( tdef.rgdxaCenter[(size_t)min(_cellIndex, (int)tdef.rgTc80.size() - 1) + 1] -
tdef.rgdxaCenter[min(_cellIndex, (int)tdef.rgTc80.size() - 1)] ); // NOTE: fix for crash
nComputedCellWidth = (short)( tdef.rgdxaCenter[(size_t)(std::min)(_cellIndex, (int)tdef.rgTc80.size() - 1) + 1] -
tdef.rgdxaCenter[(std::min)(_cellIndex, (int)tdef.rgTc80.size() - 1)] ); // NOTE: fix for crash
//borders
if (!IsTableBordersDefined(tapx->grpprl))
@ -413,4 +413,4 @@ namespace DocFileFormat
return false;
}
}
}

5
ASCOfficeDocFile/DocDocxConverter/TextboxMapping.cpp
View File

@ -30,10 +30,13 @@
*
*/
#include "Converter.h"
#include "TextboxMapping.h"
#include "TableMapping.h"
#include "FooterMapping.h"
#include "HeaderMapping.h"
#include "MainDocumentMapping.h"
namespace DocFileFormat
{

2
ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp
View File

@ -424,7 +424,7 @@ namespace DocFileFormat
{
if (m_sTempFolder.empty())
{
m_sTempFolder = FileSystem::Directory::GetTempPathW().GetBuffer();
m_sTempFolder = FileSystem::Directory::GetTempPath().GetBuffer();
}
m_sTempDecryptFileName = m_sTempFolder + FILE_SEPARATOR_STR + L"~tempFile.doc";

7
ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro
View File

@ -92,8 +92,8 @@ QMAKE_MAC_SDK = macosx10.11
SOURCES += \
../DocFormatLib.cpp \
../../Common/MD4/md4c.cpp \
../../../Common/3dParty/pole/pole.cpp
../../../Common/3dParty/pole/pole.cpp \
../../DocDocxConverter/EncryptionHeader.cpp
build_fast {
SOURCES += \
@ -328,7 +328,8 @@ HEADERS += \
../../DocDocxConverter/OfficeDrawing/Shapetypes/SunType.h \
../../DocDocxConverter/OfficeDrawing/Shapetypes/TextboxType.h \
../../DocDocxConverter/OfficeDrawing/Shapetypes/TrapezoidType.h \
../../../Common/3dParty/pole/pole.h
../../../Common/3dParty/pole/pole.h \
../../DocDocxConverter/EncryptionHeader.h

2
X2tConverter/build/Qt/X2tConverter.pro
View File

@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.0.2.375
VERSION = 2.0.2.376
DEFINES += INTVER=$$VERSION
mac {