Skip to content

O
onlyoffice_core
Commit bae49492 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@58888 954022d7-b5bf-4e40-9824-e11837661b57
parent c464bf2a
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 19 deletions
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.h
View file @ bae49492
......@@ -298,6 +298,7 @@ namespace NSBinPptxRW
}
}
#ifdef _WIN32
template<typename T>
void WriteRecordArray(int type, int subtype, const CAtlArray<T>& val)
{
......@@ -311,6 +312,7 @@ namespace NSBinPptxRW
EndRecord();
}
#endif #ifdef _WIN32
template<typename T>
void WriteRecordArray(int type, int subtype, const std::vector<T>& val)
{
......
ASCOfficePPTXFile/PPTXFormat/Limit/BaseLimit.h
View file @ bae49492
......@@ -6,17 +6,25 @@
#ifndef _WIN32
#include "../../../DesktopEditor/common/Types.h"
#endif
#define _USE_STRING_OPERATOR \
virtual void operator=(const CString& value) \
{ \
set(value); \
}
#else
#define _USE_STRING_OPERATOR \
virtual void operator=(const CString& value) \
{ \
set(value); \
} \
virtual void operator=(const BSTR& value) \
{ \
set((CString)value); \
}
virtual void operator=(const CString& value) \
{ \
set(value); \
} \
virtual void operator=(const BSTR& value) \
{ \
set((CString)value); \
}
#endif // #ifndef _WIN32
namespace PPTX
{
......
ASCPresentationEditor/OfficeDrawing/XmlWriter.h
View file @ bae49492
......@@ -3,15 +3,15 @@
namespace NSPresentationEditor
{
static _bstr_t g_bstr_nodeopen = L"<";
static _bstr_t g_bstr_nodeclose = L">";
static _bstr_t g_bstr_nodeopen_slash = L"</";
static _bstr_t g_bstr_nodeclose_slash = L"/>";
static _bstr_t g_bstr_node_space = L" ";
static _bstr_t g_bstr_node_equal = L"=";
static _bstr_t g_bstr_node_quote = L"\"";
static _bstr_t g_bstr_boolean_true = L"true";
static _bstr_t g_bstr_boolean_false = L"false";
static std::wstring g_bstr_nodeopen = L"<";
static std::wstring g_bstr_nodeclose = L">";
static std::wstring g_bstr_nodeopen_slash = L"</";
static std::wstring g_bstr_nodeclose_slash = L"/>";
static std::wstring g_bstr_node_space = L" ";
static std::wstring g_bstr_node_equal = L"=";
static std::wstring g_bstr_node_quote = L"\"";
static std::wstring g_bstr_boolean_true = L"true";
static std::wstring g_bstr_boolean_false = L"false";
inline static double FABS(double dVal)
{
......@@ -342,4 +342,4 @@ namespace NSPresentationEditor
return TRUE;
}
};
}
\ No newline at end of file
}
DesktopEditor/common/ASCVariant.h 0 → 100644
View file @ bae49492
#ifndef _ASCVARIANT_H_
#define _ASCVARIANT_H_
#include "Types.h"
#include "../../Common/DocxFormat/Source/Base/ASCString.h" // TODO: move ASCString to DecktopEditor/commmon directory
// VARIANT
#ifndef _WIN32
// 0 == FALSE, -1 == TRUE
typedef short VARIANT_BOOL;
#define VARIANT_TRUE ((VARIANT_BOOL)-1)
#define VARIANT_FALSE ((VARIANT_BOOL)0)
enum VARENUM
{ VT_EMPTY = 0,
VT_NULL = 1,
VT_I2 = 2,
VT_I4 = 3,
VT_R4 = 4,
VT_R8 = 5,
VT_CY = 6,
VT_DATE = 7,
VT_BSTR = 8,
VT_DISPATCH = 9,
VT_ERROR = 10,
VT_BOOL = 11,
VT_VARIANT = 12,
VT_UNKNOWN = 13,
VT_DECIMAL = 14,
VT_I1 = 16,
VT_UI1 = 17,
VT_UI2 = 18,
VT_UI4 = 19,
VT_I8 = 20,
VT_UI8 = 21,
VT_INT = 22,
VT_UINT = 23,
VT_VOID = 24,
VT_HRESULT = 25,
VT_PTR = 26,
VT_SAFEARRAY = 27,
VT_CARRAY = 28,
VT_USERDEFINED = 29,
VT_LPSTR = 30,
VT_LPWSTR = 31,
VT_RECORD = 36,
VT_INT_PTR = 37,
VT_UINT_PTR = 38,
VT_FILETIME = 64,
VT_BLOB = 65,
VT_STREAM = 66,
VT_STORAGE = 67,
VT_STREAMED_OBJECT = 68,
VT_STORED_OBJECT = 69,
VT_BLOB_OBJECT = 70,
VT_CF = 71,
VT_CLSID = 72,
VT_VERSIONED_STREAM = 73,
VT_BSTR_BLOB = 0xfff,
VT_VECTOR = 0x1000,
VT_ARRAY = 0x2000,
VT_BYREF = 0x4000,
VT_RESERVED = 0x8000,
VT_ILLEGAL = 0xffff,
VT_ILLEGALMASKED = 0xfff,
VT_TYPEMASK = 0xfff
} ;
typedef VARIANT_BOOL _VARIANT_BOOL;
typedef unsigned short VARTYPE;
struct VARIANT
{
VARTYPE vt;
LONG64 llVal;//LONGLONG llVal;
LONG lVal;
BYTE bVal;
SHORT iVal;
FLOAT fltVal;
BSTR bstrVal;
double dblVal;
};
/*
struct tagVARIANT
{
union
{
struct __tagVARIANT
{
VARTYPE vt;
WORD wReserved1;
WORD wReserved2;
WORD wReserved3;
union
{
LONGLONG llVal;
LONG lVal;
BYTE bVal;
SHORT iVal;
FLOAT fltVal;
DOUBLE dblVal;
VARIANT_BOOL boolVal;
_VARIANT_BOOL bool;
SCODE scode;
CY cyVal;
DATE date;
BSTR bstrVal;
IUnknown *punkVal;
IDispatch *pdispVal;
SAFEARRAY *parray;
BYTE *pbVal;
SHORT *piVal;
LONG *plVal;
LONGLONG *pllVal;
FLOAT *pfltVal;
DOUBLE *pdblVal;
VARIANT_BOOL *pboolVal;
_VARIANT_BOOL *pbool;
SCODE *pscode;
CY *pcyVal;
DATE *pdate;
BSTR *pbstrVal;
IUnknown **ppunkVal;
IDispatch **ppdispVal;
SAFEARRAY **pparray;
VARIANT *pvarVal;
PVOID byref;
CHAR cVal;
USHORT uiVal;
ULONG ulVal;
ULONGLONG ullVal;
INT intVal;
UINT uintVal;
DECIMAL *pdecVal;
CHAR *pcVal;
USHORT *puiVal;
ULONG *pulVal;
ULONGLONG *pullVal;
INT *pintVal;
UINT *puintVal;
struct __tagBRECORD
{
PVOID pvRecord;
IRecordInfo *pRecInfo;
} __VARIANT_NAME_4;
} __VARIANT_NAME_3;
} __VARIANT_NAME_2;
DECIMAL decVal;
} __VARIANT_NAME_1;
} ;
*/
typedef VARIANT *LPVARIANT;
typedef VARIANT VARIANTARG;
typedef VARIANT *LPVARIANTARG;
#endif // #ifndef _WIN32
#endif //_ASCVARIANT_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