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

linux build

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59428 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Elen.Subbotina
2014-11-05 09:43:20 +00:00
committed by Alexander Trofimov
parent b262b13a66
commit 930003a82d
9 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/CustomGeomShape.h
View File

@ -409,7 +409,7 @@ namespace NSCustomVML
private:
RulesType m_ePath;
std::vector<POINT> m_arVertices;
std::vector<Aggplus::POINT> m_arVertices;
std::vector<CSegment> m_arSegments;
std::vector<CGuide> m_arGuides;
std::vector<LONG>* m_pAdjustValues;
@ -494,7 +494,7 @@ namespace NSCustomVML
for (WORD lIndex = 0; lIndex < lCount; ++lIndex)
{
POINT oPoint;
Aggplus::POINT oPoint;
if (pProperty->m_bIsTruncated)
{
oPoint.x = (LONG)oReader.ReadWORD();

14
ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/Formula.h
View File

@ -10,8 +10,8 @@
#include "./../../../../../Common/DocxFormat/Source/XML/xmlutils.h"
//#include "./../../../../../DesktopEditor/cximage/CxImage/ximadef.h"
#include "../../../../../ASCOfficePPTXFile/PPTXFormat/Logic/rectdef.h"
//#include "../../../../../ASCOfficePPTXFile/PPTXFormat/Logic/rectdef.h"
#include "./../../../../../DesktopEditor/graphics/aggplustypes.h"
namespace NSGuidesVML
{
enum FormulaType
@ -185,25 +185,25 @@ namespace NSGuidesVML
struct SHandle
{
POINT gdRef;
Aggplus::POINT gdRef;
SPointType gdRefType;
SPointExist bRefExist;
SPointExist bRefPolarExist;
POINT Max;
Aggplus::POINT Max;
SPointType MaxType;
SPointExist bMaxExist;
SPointExist bMaxPolarExist;
POINT Min;
Aggplus::POINT Min;
SPointType MinType;
SPointExist bMinExist;
SPointExist bMinPolarExist;
POINT Pos;
Aggplus::POINT Pos;
SPointType PosType;
POINT PolarCentre;
Aggplus::POINT PolarCentre;
SPointType PolarCentreType;
};

14
ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTShape/ppt2pptxshapeconverter.h
View File

@ -1831,7 +1831,7 @@ namespace NSGuidesVML
{
public:
RulesType m_eRuler;
std::vector<POINT> m_arPoints;
std::vector<Aggplus::POINT> m_arPoints;
std::vector<SPointType> m_arPointsType;
private:
@ -1849,7 +1849,7 @@ namespace NSGuidesVML
long lPoint = m_nCountElementsPoint % 2;
if (0 == lPoint)
{
POINT point;
Aggplus::POINT point;
SPointType pointType;
point.x = lParam;
@ -1885,11 +1885,11 @@ namespace NSGuidesVML
CString strSign;
CString strFrmla;
CString strResult;
POINT pCurPoint;
Aggplus::POINT pCurPoint;
SPointType pCurPointType;
POINT pCurPoint1;
Aggplus::POINT pCurPoint1;
SPointType pCurPointType1;
POINT pTmpPoint;
Aggplus::POINT pTmpPoint;
CFormParam m_oParam;
public:
@ -2811,7 +2811,7 @@ namespace NSGuidesVML
ptType = ptValue;
return (LONG)XmlUtils::GetInteger(strParam);
}
void ConvertQuadrX(POINT pPoint, SPointType pPointType)
void ConvertQuadrX(Aggplus::POINT pPoint, SPointType pPointType)
{
LONG nIndex = m_arIndexDst[m_lIndexSrc];
@ -2850,7 +2850,7 @@ namespace NSGuidesVML
return;
}
void ConvertQuadrY(POINT pPoint, SPointType pPointType)
void ConvertQuadrY(Aggplus::POINT pPoint, SPointType pPointType)
{
LONG nIndex = m_arIndexDst[m_lIndexSrc];

10
ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/PPTXShape/pptx2pptshapeconverter.h
View File

@ -11,7 +11,7 @@ namespace NSGuidesVML
{
public:
RulesType m_eRuler;
std::vector<POINT> m_arPoints;
std::vector<Aggplus::POINT> m_arPoints;
std::vector<SPointType> m_arPointsType;
private:
@ -29,7 +29,7 @@ namespace NSGuidesVML
long lPoint = m_nCountElementsPoint % 2;
if (0 == lPoint)
{
POINT point;
Aggplus::POINT point;
SPointType pointType;
point.x = lParam;
@ -62,9 +62,9 @@ namespace NSGuidesVML
SPointType pPointType1;
SPointType pPointType2;
SPointType pPointType3;
POINT pPoint1;
POINT pPoint2;
POINT pPoint3;
Aggplus::POINT pPoint1;
Aggplus::POINT pPoint2;
Aggplus::POINT pPoint3;
LONG m_lPPTX2PPT;
LONG m_lPPT2PPTX;

10
ASCPresentationEditor/OfficeDrawing/Shapes/BaseShape/Path.h
View File

@ -214,7 +214,7 @@ namespace NSPresentationEditor
{
public:
RulesType m_eRuler;
std::vector<POINT> m_arPoints;
std::vector<Aggplus::POINT> m_arPoints;
private:
int m_nCountElementsPoint;
@ -231,7 +231,7 @@ namespace NSPresentationEditor
long lPoint = m_nCountElementsPoint % 2;
if (0 == lPoint)
{
POINT point;
Aggplus::POINT point;
point.x = lParam;
point.y = 0;
m_arPoints.push_back(point);
@ -256,7 +256,7 @@ namespace NSPresentationEditor
Node.GetNodes(_T("pt"), list);
for(long i = 0; i < GetCountPoints(m_eRuler); i++)
{
POINT lpoint;
Aggplus::POINT lpoint;
XmlUtils::CXmlNode pt;
list.GetAt(i, pt);
lpoint.x = (long)(pManager.GetValue(pt.GetAttribute(_T("x")))*WidthKoef);
@ -266,7 +266,7 @@ namespace NSPresentationEditor
}
else
{
POINT size;
Aggplus::POINT size;
size.x = (long)(pManager.GetValue(Node.GetAttribute(_T("wR")))*WidthKoef);
size.y = (long)(pManager.GetValue(Node.GetAttribute(_T("hR")))*HeightKoef);
m_arPoints.push_back(size);
@ -274,7 +274,7 @@ namespace NSPresentationEditor
double swAng = pManager.GetValue(Node.GetAttribute(_T("swAng")));
double stAng2 = atan2(HeightKoef * sin(stAng * RadKoef), WidthKoef * cos(stAng * RadKoef));
double swAng2 = atan2(HeightKoef * sin((stAng + swAng) * RadKoef), WidthKoef * cos((stAng + swAng) * RadKoef)) - stAng2;
POINT angle;
Aggplus::POINT angle;
angle.x = (long)(stAng2/RadKoef);//pManager.GetValue(Node.GetAttribute(_T("stAng")));
angle.y = (long)(swAng2/RadKoef);//pManager.GetValue(Node.GetAttribute(_T("swAng")));
if((angle.y > 0) && (swAng < 0)) angle.y = angle.y - 21600000;

5
ASCPresentationEditor/OfficeDrawing/TextAttributesEx.h
View File

@ -4,7 +4,8 @@
#ifndef WIN32
//#include "./../../DesktopEditor/cximage/CxImage/ximadef.h"
#include "../../ASCOfficePPTXFile/PPTXFormat/Logic/rectdef.h"
//#include "../../ASCOfficePPTXFile/PPTXFormat/Logic/rectdef.h"
#include "../../DesktopEditor/graphics/aggplustypes.h"
#endif
namespace NSPresentationEditor
{
@ -20,7 +21,7 @@ namespace NSPresentationEditor
LONG m_lPlaceholderID;
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
RECT m_oBounds;
Aggplus::RECT m_oBounds;
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>-<2D><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
CTextAttributes m_oAttributes;

1
Common/DocxFormat/Source/Base/Base.h
View File

@ -124,3 +124,4 @@ typedef wchar_t WCHAR;
#define AVSINLINE inline
#endif
#endif

13
Common/DocxFormat/Source/DocxFormat/Rels.h
View File

@ -192,7 +192,9 @@ namespace OOX
#else
XmlUtils::CXmlNode oNode;
if ( oNode.FromXmlFile2( oFilePath.GetPath() ) && _T("Relationships") == oNode.GetName() )
CString nameNode = oNode.GetName() ;
if ( oNode.FromXmlFile2( oFilePath.GetPath() ) && _T("Relationships") == nameNode )
{
XmlUtils::CXmlNodes oNodes;
if ( oNode.GetNodes( _T("Relationship"), oNodes ) )
@ -285,8 +287,13 @@ namespace OOX
const CPath CreateFileName(const CPath& oFilePath) const
{
CString strTemp = oFilePath.GetDirectory() + _T("\\_rels\\");
if ( _T("") == oFilePath.GetFilename() )
CString strTemp;
#ifdef _WIN32
strTemp = oFilePath.GetDirectory() + _T("\\_rels\\");
#else
strTemp = oFilePath.GetDirectory() + _T("/_rels/");
#endif
if ( _T("") == oFilePath.GetFilename() )
strTemp += _T(".rels");
else
strTemp += ( oFilePath.GetFilename() + _T(".rels") );

7
DesktopEditor/graphics/aggplustypes.h
View File

@ -15,6 +15,13 @@ typedef struct tagRECT
long bottom;
} RECT, *PRECT;
typedef struct tagPOINT
{
long x;
long y;
} POINT, *PPOINT;
#define REAL_MAX FLT_MAX
#define REAL_MIN FLT_MIN
#define REAL_TOLERANCE (FLT_MIN * 100)