Skip to content

O
onlyoffice_core
Commit 60f4381b authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov
Browse files
Options

linux build 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59148 954022d7-b5bf-4e40-9824-e11837661b57
parent c9696f4f
Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 78 deletions
ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
View file @ 60f4381b
......@@ -79,8 +79,8 @@ SOURCES += pptxformatlib.cpp \
../../../Editor/BinaryFileReaderWriter.cpp \
../../../Editor/FontPicker.cpp \
../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.cpp \
../../../Directory.cpp \
../../File.cpp
#../../../Directory.cpp \
#../../File.cpp
HEADERS += pptxformatlib.h \
../../../ASCOfficeDrawingConverter.h \
......@@ -500,8 +500,8 @@ HEADERS += pptxformatlib.h \
../../../../Common/DocxFormat/Source/SystemUtility/File.h \
../../../../Common/DocxFormat/Source/SystemUtility/FileSystem/FileSystem.h \
../../../../Common/DocxFormat/Source/SystemUtility/SystemUtility.h \
../../Directory.h \
../../File.h \
#../../Directory.h \
#../../File.h \
../../Settings.h \
../../../../ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/ppt2pptxshapeconverter.h
......
Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user
View file @ 60f4381b
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.1.1, 2014-10-22T16:04:23. -->
<!-- Written by QtCreator 3.1.1, 2014-10-22T20:20:07. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
......
Common/DocxFormat/Source/Common/SimpleTypes_Drawing.h
View file @ 60f4381b
......@@ -991,12 +991,12 @@ namespace SimpleTypes
void SetValue(int nValue)
{
this->m_eValue = min( 5400000, max( -5400000, nValue ) );
this->m_eValue = std::min( 5400000, std::max( -5400000, nValue ) );
}
virtual int FromString(CString &sValue)
{
this->m_eValue = min( 5400000, max( -5400000, _wtoi( sValue.GetString() ) ) );
this->m_eValue = std::min( 5400000, std::max( -5400000, _wtoi( sValue.GetString() ) ) );
return this->m_eValue;
}
......@@ -1036,7 +1036,7 @@ namespace SimpleTypes
void SetValue(double dValue)
{
m_dValue = min( 100, max( -100, dValue ) );
m_dValue = std::min( 100.0, std::max( -100.0, dValue ) );
}
virtual double FromString(CString &sValue)
......@@ -1048,14 +1048,14 @@ namespace SimpleTypes
if ( -1 == nPos )
{
// 12.1.2.1 Part4
int nValue = min( 100000, max( -100000, _wtoi( sValue ) ) );
int nValue = std::min( 100000, std::max( -100000, _wtoi( sValue ) ) );
m_dValue = nValue / 1000.0;
}
else
m_dValue = 0;
}
else
m_dValue = min( 100, max( -100, _wtof( sValue.Mid( 0, nLen - 1 ) ) ) );
m_dValue = std::min( 100.0, std::max( -100.0, _wtof( sValue.Mid( 0, nLen - 1 ) ) ) );
return m_dValue;
}
......@@ -1141,12 +1141,12 @@ namespace SimpleTypes
void SetValue(int nValue)
{
this->m_eValue = min( 10800000, max( 0, nValue ) );
this->m_eValue = std::min( 10800000, std::max( 0, nValue ) );
}
virtual int FromString(CString &sValue)
{
this->m_eValue = min( 10800000, max( 0, _wtoi( sValue.GetString() ) ) );
this->m_eValue = std::min( 10800000, std::max( 0, _wtoi( sValue.GetString() ) ) );
return this->m_eValue;
}
......@@ -2048,12 +2048,12 @@ namespace SimpleTypes
void SetValue(int nValue)
{
this->m_eValue = min( 21600000, max( 0, nValue ) );
this->m_eValue = std::min( 21600000, std::max( 0, nValue ) );
}
virtual int FromString(CString &sValue)
{
this->m_eValue = min( 21600000, max( 0, _wtoi( sValue.GetString() ) ) );
this->m_eValue = std::min( 21600000, std::max( 0, _wtoi( sValue.GetString() ) ) );
return this->m_eValue;
}
......@@ -2090,7 +2090,7 @@ namespace SimpleTypes
void SetValue(double dValue)
{
m_dValue = min( 100, max( 0, dValue ) );
m_dValue = std::min( 100.0, std::max( 0.0, dValue ) );
}
virtual double FromString(CString &sValue)
......@@ -2102,14 +2102,14 @@ namespace SimpleTypes
if ( -1 == nPos )
{
// 12.1.2.3 (Part4)
int nValue = max( 0, min( 100000, _wtoi( sValue ) ) );
int nValue = std::max( 0, std::min( 100000, _wtoi( sValue ) ) );
m_dValue = nValue / 1000.0;
}
else
m_dValue = 0;
}
else
m_dValue = min( 100, max( 0, _wtof( sValue.Mid( 0, nLen - 1 ) ) ) );
m_dValue = std::min( 100.0, std::max( 0.0, _wtof( sValue.Mid( 0, nLen - 1 ) ) ) );
return m_dValue;
}
......@@ -2144,7 +2144,7 @@ namespace SimpleTypes
void SetValue(double dValue)
{
m_dValue = max( 0, dValue );
m_dValue = std::max( 0.0, dValue );
}
virtual double FromString(CString &sValue)
......@@ -2156,14 +2156,14 @@ namespace SimpleTypes
if ( -1 == nPos )
{
// 12.1.2.4 (Part4)
int nValue = max( 0, _wtoi( sValue ) );
int nValue = std::max( 0, _wtoi( sValue ) );
m_dValue = nValue / 1000.0;
}
return
m_dValue;
}
else
m_dValue = max( 0, _wtof( sValue.Mid( 0, nLen - 1 ) ) );
m_dValue = std::max( 0.0, _wtof( sValue.Mid( 0, nLen - 1 ) ) );
return m_dValue;
}
......@@ -4869,7 +4869,7 @@ namespace SimpleTypes
virtual void SetValue (unsigned char unValue)
{
this->m_eValue = min( 16, max( 1, unValue ) );
this->m_eValue = std::min( 16, std::max( 1, (int) unValue ) );
}
virtual unsigned char FromString(CString &sValue)
{
......@@ -4988,7 +4988,7 @@ namespace SimpleTypes
if ( -1 == nPos )
{
// 12.1.2.5 (Part4)
int nValue = min( 100000, max( 1000, _wtoi( sValue ) ) );
int nValue = std::min( 100000, std::max( 1000, _wtoi( sValue ) ) );
m_dValue = nValue / 1000.0;
}
return
......@@ -5441,7 +5441,7 @@ namespace SimpleTypes
if ( -1 == nPos )
{
// 12.1.2.7 (Part4)
int nValue = min( 13200000, max( 0, _wtoi( sValue ) ) );
int nValue = std::min( 13200000, std::max( 0, _wtoi( sValue ) ) );
m_dValue = nValue / 1000.0;
}
return m_dValue;
......
Common/DocxFormat/Source/Common/SimpleTypes_Shared.h
View file @ 60f4381b
......@@ -625,7 +625,7 @@ namespace SimpleTypes
if ( m_sValue.GetLength() < 20 )
return 0;
nIndex = max( 0, min( 9, nIndex ) );
nIndex = std::max( 0, std::min( 9, nIndex ) );
unsigned int unChar1 = XmlUtils::GetDigit( m_sValue[2 * nIndex] );
unsigned int unChar2 = XmlUtils::GetDigit( m_sValue[2 * nIndex + 1] );
......
Common/DocxFormat/Source/Common/SimpleTypes_Vml.h
View file @ 60f4381b
......@@ -2675,12 +2675,12 @@ namespace SimpleTypes
void SetValue(double dValue)
{
m_dValue = max( 0, min( 1, dValue) );
m_dValue = std::max( 0.0, std::min( 1.0, dValue) );
}
void SetValue(int nValue)
{
m_dValue = max( 0, min( 65536, nValue) ) / 65536.0;
m_dValue = std::max( 0.0, std::min( 65536.0, (double) nValue) ) / 65536.0;
}
virtual double FromString(CString &sValue)
......@@ -4742,16 +4742,16 @@ namespace SimpleTypes
void SetValue(double dValue)
{
m_dValue = max( 0, min( 1, dValue) );
m_dValue = std::max( 0.0, std::min( 1.0, dValue) );
}
void SetValue(int nValue)
{
m_dValue = max( 0, min( 65536, nValue) ) / 65536.0;
m_dValue = std::max( 0.0, std::min( 65536.0, (double) nValue) ) / 65536.0;
}
void SetPercentage(double dValue)
{
m_dValue = max( 0, min( 100, dValue ) ) / 100.0;
m_dValue = std::max( 0.0, std::min( 100.0, dValue ) ) / 100.0;
}
virtual double FromString(CString &sValue)
......
Common/DocxFormat/Source/Common/SimpleTypes_Word.h
View file @ 60f4381b
#pragma once
#include "SimpleTypes_Base.h"
#include <algorithm>
// Word Office Open Xml (17.18)
namespace SimpleTypes
......@@ -5803,14 +5804,14 @@ namespace SimpleTypes
virtual void SetValue(int nValue)
{
this->m_eValue = min( 600, max( 0, nValue ) );
this->m_eValue = std::min( 600, std::max( 0, nValue ) );
}
virtual int FromString(CString &sValue)
{
this->m_eValue = _wtoi( sValue );
this->m_eValue = min( 600, max( 0, this->m_eValue ) );
this->m_eValue = std::min( 600, std::max( 0, this->m_eValue ) );
return this->m_eValue;
}
......@@ -6626,7 +6627,7 @@ namespace SimpleTypes
void Parse(CString &sValue)
{
int nLen = min( sValue.GetLength(), 12 );
int nLen = std::min( sValue.GetLength(), 12 );
for ( int nIndex = 0, nMult = 1; nIndex < nLen; nIndex++, nMult <<= 1 )
{
......
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingColors.h
View file @ 60f4381b
......@@ -9,6 +9,8 @@
#include "../WritingElement.h"
#include "../RId.h"
#include <algorithm>
namespace OOX
{
namespace Drawing
......@@ -1640,7 +1642,7 @@ namespace OOX
double dVal = pAlphaTr->m_oVal.GetValue() / 100.0;
int nA = (int)max( 0, min( 255, 255 * dVal ) );
int nA = (int)std::max( 0.0, std::min( 255.0, 255 * dVal ) );
m_unA = static_cast<unsigned char>(nA);
break;
......@@ -1651,7 +1653,7 @@ namespace OOX
double dVal = pAlphaTr->m_oVal.GetValue() / 100.0;
int nA = (int)max( 0, min( 255, m_unA * dVal ) );
int nA = (int)std::max( 0.0, std::min( 255.0, m_unA * dVal ) );
m_unA = static_cast<unsigned char>(nA);
break;
......@@ -1662,7 +1664,7 @@ namespace OOX
double dVal = pAlphaTr->m_oVal.GetValue() / 100.0;
int nA = (int)max( 0, min( 255, m_unA + 255 * dVal ) );
int nA = (int)std::max( 0.0, std::min( 255.0, m_unA + 255 * dVal ) );
m_unA = static_cast<unsigned char>(nA);
break;
......@@ -1673,7 +1675,7 @@ namespace OOX
double dVal = pBlueTr->m_oVal.GetValue() / 100.0;
int nB = (int)max( 0, min( 255, 255 * dVal ) );
int nB = (int)std::max( 0.0, std::min( 255.0, 255 * dVal ) );
m_unB = static_cast<unsigned char>(nB);
break;
......@@ -1684,7 +1686,7 @@ namespace OOX
double dVal = pBlueTr->m_oVal.GetValue() / 100.0;
int nB = (int)max( 0, min( 255, m_unB * dVal ) );
int nB = (int)std::max( 0.0, std::min( 255.0, m_unB * dVal ) );
m_unB = static_cast<unsigned char>(nB);
break;
......@@ -1695,7 +1697,7 @@ namespace OOX
double dVal = pBlueTr->m_oVal.GetValue() / 100.0;
int nB = (int)max( 0, min( 255, m_unB + 255 * dVal ) );
int nB = (int)std::max( 0.0, std::min( 255.0, m_unB + 255 * dVal ) );
m_unB = static_cast<unsigned char>(nB);
break;
......@@ -1729,7 +1731,7 @@ namespace OOX
double dVal = pGreenTr->m_oVal.GetValue() / 100.0;
int nG = (int)max( 0, min( 255, 255 * dVal ) );
int nG = (int)std::max( 0.0, std::min( 255.0, 255 * dVal ) );
m_unG = static_cast<unsigned char>(nG);
break;
......@@ -1740,7 +1742,7 @@ namespace OOX
double dVal = pGreenTr->m_oVal.GetValue() / 100.0;
int nG = (int)max( 0, min( 255, m_unG * dVal ) );
int nG = (int)std::max( 0.0, std::min( 255.0, m_unG * dVal ) );
m_unG = static_cast<unsigned char>(nG);
break;
......@@ -1751,7 +1753,7 @@ namespace OOX
double dVal = pGreenTr->m_oVal.GetValue() / 100.0;
int nG = (int)max( 0, min( 255, m_unG + 255 * dVal ) );
int nG = (int)std::max( 0.0, std::min( 255.0, m_unG + 255 * dVal ) );
m_unG = static_cast<unsigned char>(nG);
break;
......@@ -1764,7 +1766,7 @@ namespace OOX
double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dH = max( 0, min( 1, dVal ) );
dH = std::max( 0.0, std::min( 1.0, dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
......@@ -1778,7 +1780,7 @@ namespace OOX
double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dH = max( 0, min( 1, dH * dVal ) );
dH = std::max( 0.0, std::min( 1.0, dH * dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
......@@ -1792,7 +1794,7 @@ namespace OOX
double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dH = max( 0, min( 1, dH + dVal ) );
dH = std::max( 0.0, std::min( 1.0, dH + dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
......@@ -1818,7 +1820,7 @@ namespace OOX
double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dL = max( 0, min( 1, dVal ) );
dL = std::max( 0.0, std::min( 1.0, dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
......@@ -1832,7 +1834,7 @@ namespace OOX
double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dL = max( 0, min( 1, dL * dVal ) );
dL = std::max( 0.0, std::min( 1.0, dL * dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
......@@ -1846,7 +1848,7 @@ namespace OOX
double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dL = max( 0, min( 1, dL + dVal ) );
dL = std::max( 0.0, std::min( 1.0, dL + dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
......@@ -1858,7 +1860,7 @@ namespace OOX
double dVal = pRedTr->m_oVal.GetValue() / 100.0;
int nR = (int)max( 0, min( 255, 255 * dVal ) );
int nR = (int)std::max( 0.0, std::min( 255.0, 255 * dVal ) );
m_unR = static_cast<unsigned char>(nR);
break;
......@@ -1869,7 +1871,7 @@ namespace OOX
double dVal = pRedTr->m_oVal.GetValue() / 100.0;
int nR = (int)max( 0, min( 255, m_unR * dVal ) );
int nR = (int)std::max( 0.0, std::min( 255.0, m_unR * dVal ) );
m_unR = static_cast<unsigned char>(nR);
break;
......@@ -1880,7 +1882,7 @@ namespace OOX
double dVal = pRedTr->m_oVal.GetValue() / 100.0;
int nR = (int)max( 0, min( 255, m_unR + 255 * dVal ) );
int nR = (int)std::max( 0.0, std::min( 255.0, m_unR + 255 * dVal ) );
m_unR = static_cast<unsigned char>(nR);
break;
......@@ -1893,7 +1895,7 @@ namespace OOX
double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dS = max( 0, min( 1, dVal ) );
dS = std::max( 0.0, std::min( 1.0, dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
......@@ -1907,7 +1909,7 @@ namespace OOX
double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dS = max( 0, min( 1, dS * dVal ) );
dS = std::max( 0.0, std::min( 1.0, dS * dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
......@@ -1921,7 +1923,7 @@ namespace OOX
double dH, dS, dL;
RGB2HSL( m_unR, m_unG, m_unB, dH, dS, dL );
dS = max( 0, min( 1, dS + dVal ) );
dS = std::max( 0.0, std::min( 1.0, dS + dVal ) );
HSL2RGB( dH, dS, dL, m_unR, m_unG, m_unB );
......@@ -1957,13 +1959,13 @@ namespace OOX
private:
inline void RGB2HSL(unsigned char unR, unsigned char unG, unsigned char unB, double& dH, double& dS, double& dL)
{
int nMin = min( unR, min( unG, unB ) );
int nMax = max( unR, max( unG, unB ) );
int nDelta = nMax - nMin;
double dMax = ( nMax + nMin ) / 255.0;
int nmin = std::min( unR, std::min( unG, unB ) );
int nmax = std::max( unR, std::max( unG, unB ) );
int nDelta = nmax - nmin;
double dmax = ( nmax + nmin ) / 255.0;
double dDelta = nDelta / 255.0;
dL = dMax / 2.0;
dL = dmax / 2.0;
if ( 0 == nDelta ) //This is a gray, no chroma...
{
......@@ -1972,18 +1974,18 @@ namespace OOX
}
else //Chromatic data...
{
if ( dL < 0.5 ) dS = dDelta / dMax;
else dS = dDelta / ( 2.0 - dMax );
if ( dL < 0.5 ) dS = dDelta / dmax;
else dS = dDelta / ( 2.0 - dmax );
dDelta = dDelta * 1530.0;
double dR = ( nMax - unR ) / dDelta;
double dG = ( nMax - unG ) / dDelta;
double dB = ( nMax - unB ) / dDelta;
double dR = ( nmax - unR ) / dDelta;
double dG = ( nmax - unG ) / dDelta;
double dB = ( nmax - unB ) / dDelta;
if ( unR == nMax ) dH = dB - dG;
else if ( unG == nMax ) dH = c_d_1_3 + dR - dB;
else if ( unB == nMax ) dH = c_d_2_3 + dG - dR;
if ( unR == nmax ) dH = dB - dG;
else if ( unG == nmax ) dH = c_d_1_3 + dR - dB;
else if ( unB == nmax ) dH = c_d_2_3 + dG - dR;
if ( dH < 0.0 ) dH += 1.0;
if ( dH > 1.0 ) dH -= 1.0;
......@@ -2270,9 +2272,9 @@ namespace OOX
double dG = m_oG.GetValue() / 100.0;
double dB = m_oB.GetValue() / 100.0;
unsigned char unR = (unsigned char)min( 255, max( 0, 255 * dR ) );
unsigned char unG = (unsigned char)min( 255, max( 0, 255 * dG ) );
unsigned char unB = (unsigned char)min( 255, max( 0, 255 * dB ) );
unsigned char unR = (unsigned char)std::min( 255.0, std::max( 0.0, 255 * dR ) );
unsigned char unG = (unsigned char)std::min( 255.0, std::max( 0.0, 255 * dG ) );
unsigned char unB = (unsigned char)std::min( 255.0, std::max( 0.0, 255 * dB ) );
SetRGBA( unR, unG, unB );
}
......
Common/DocxFormat/Source/DocxFormat/IFileContainer.cpp
View file @ 60f4381b
......@@ -272,7 +272,7 @@ namespace OOX
void IFileContainer::Add(const OOX::RId& rId, const smart_ptr<OOX::File>& pFile)
{
m_lMaxRid = max( m_lMaxRid, rId.getNumber() );
m_lMaxRid = std::max( m_lMaxRid, rId.getNumber() );
m_mContainer [rId.get()] = pFile;
}
smart_ptr<OOX::File> IFileContainer::Find(const FileType& oType) const
......
Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp
View file @ 60f4381b
......@@ -65,7 +65,7 @@ namespace FileSystem {
return stringUtf8ToWString (sDir);
}
bool Directory::CreateDirectory_(LPCTSTR path)
bool Directory::CreateDirectory (LPCTSTR path)
{
bool directoryCreated = false;
......@@ -78,15 +78,15 @@ namespace FileSystem {
return directoryCreated;
}
bool Directory::CreateDirectory_(const String& path)
bool Directory::CreateDirectory (const String& path)
{
return CreateDirectory(path.c_str());
return Directory::CreateDirectory(path.c_str());
}
bool CreateDirectory_(String strFolderPathRoot, String strFolderName)
bool Directory::CreateDirectory (String strFolderPathRoot, String strFolderName)
{
String strFolder = strFolderPathRoot;
strFolder =+ _T("/");
strFolder =+ strFolderName;
strFolder += _T("/");
strFolder += strFolderName;
return CreateDirectory(strFolder);
}
bool Directory::CreateDirectories(LPCTSTR path)
......@@ -199,12 +199,15 @@ namespace FileSystem {
return tempPath;
}
static bool PathIsDirectory(CString pathName)
{
struct stat s;
if (stat(pathName, &s) == 0)
std::string sPathNameUtf8 = stringWstingToUtf8String (pathName);
if (stat(sPathNameUtf8.c_str(), &s) == 0)
{
if (s.st_mode & S_IFDR)return true;
if (s.st_mode & S_IFDIR)return true;
else return false;
}
......
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