Skip to content

O
onlyoffice_core
Commit cf7fae30 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander Trofimov
Browse files
Options

changes 


git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57735 954022d7-b5bf-4e40-9824-e11837661b57
parent cc8e64c2
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 55 deletions
DesktopEditor/Word_Api/Editor_Api.h
View file @ cf7fae30
......@@ -11,10 +11,10 @@ namespace NSEditorApi
class CAscColorSimple
{
public:
BYTE R;
BYTE G;
BYTE B;
BYTE A;
unsigned char R;
unsigned char G;
unsigned char B;
unsigned char A;
public:
CAscColorSimple()
......@@ -76,10 +76,10 @@ namespace NSEditorApi
private:
js_wrapper<int> m_nType; // c_oAscColor_COLOR_TYPE
js_wrapper<BYTE> m_nR;
js_wrapper<BYTE> m_nG;
js_wrapper<BYTE> m_nB;
js_wrapper<BYTE> m_nA;
js_wrapper<unsigned char> m_nR;
js_wrapper<unsigned char> m_nG;
js_wrapper<unsigned char> m_nB;
js_wrapper<unsigned char> m_nA;
js_wrapper<bool> m_bAuto;
......@@ -422,14 +422,14 @@ namespace NSEditorApi
js_wrapper<double> m_dWidth;
js_wrapper<CAscColor> m_oColor;
js_wrapper<BYTE> m_nLineJoin;
js_wrapper<BYTE> m_nLineCap;
js_wrapper<unsigned char> m_nLineJoin;
js_wrapper<unsigned char> m_nLineCap;
js_wrapper<BYTE> m_nLineBeginStyle;
js_wrapper<BYTE> m_nLineBeginSize;
js_wrapper<unsigned char> m_nLineBeginStyle;
js_wrapper<unsigned char> m_nLineBeginSize;
js_wrapper<BYTE> m_nLineEndStyle;
js_wrapper<BYTE> m_nLineEndSize;
js_wrapper<unsigned char> m_nLineEndStyle;
js_wrapper<unsigned char> m_nLineEndSize;
js_wrapper<bool> m_bCanChangeArrows;
......@@ -689,6 +689,11 @@ namespace NSEditorApi
m_sName = L"Times New Roman";
m_nIndex = -1;
}
CAscTextFontFamily(const CAscTextFontFamily& oSrc)
{
m_sName = oSrc.m_sName;
m_nIndex = oSrc.m_nIndex;
}
LINK_PROPERTY_STRING_JS(Name)
LINK_PROPERTY_INT_JS(Index)
......
DesktopEditor/Word_Api/Editor_Defines.h
View file @ cf7fae30
......@@ -582,9 +582,9 @@ namespace NSEditorApi
#define LINK_PROPERTY_INT(memberName) \
inline int get_##memberName() \
{ \
return m_n##memberName; \
return m_n##memberName; \
} \
inline void put_##memberName(const int& newVal) \
inline void put_##memberName(const int& newVal) \
{ \
m_n##memberName = newVal; \
}
......@@ -592,17 +592,17 @@ namespace NSEditorApi
#define LINK_PROPERTY_DOUBLE(memberName) \
inline double get_##memberName() \
{ \
return m_d##memberName; \
return m_d##memberName; \
} \
inline void put_##memberName(const double& newVal) \
inline void put_##memberName(const double& newVal)\
{ \
m_d##memberName = newVal; \
}
#define LINK_PROPERTY_BOOL(memberName) \
inline bool get_##memberName() \
inline bool get_##memberName() \
{ \
return m_b##memberName; \
return m_b##memberName; \
} \
inline void put_##memberName(const bool& newVal) \
{ \
......@@ -610,19 +610,19 @@ namespace NSEditorApi
}
#define LINK_PROPERTY_BYTE(memberName) \
inline BYTE get_##memberName() \
inline unsigned char get_##memberName() \
{ \
return m_n##memberName; \
return m_n##memberName; \
} \
inline void put_##memberName(const BYTE& newVal) \
inline void put_##memberName(const unsigned char& newVal) \
{ \
m_n##memberName = newVal; \
}
#define LINK_PROPERTY_STRING(memberName) \
inline std::wstring get_##memberName() \
inline std::wstring get_##memberName() \
{ \
return m_s##memberName; \
return m_s##memberName; \
} \
inline void put_##memberName(const std::wstring& newVal) \
{ \
......@@ -631,50 +631,50 @@ namespace NSEditorApi
#define LINK_PROPERTY_STRINGA(memberName) \
inline std::string get_##memberName() \
{ \
return m_s##memberName; \
return m_s##memberName; \
} \
inline void put_##memberName(const std::string& newVal) \
inline void put_##memberName(const std::string& newVal) \
{ \
m_s##memberName = newVal; \
}
// JS
#define LINK_PROPERTY_INT_JS(memberName) \
inline js_wrapper<int> get_##memberName() \
inline js_wrapper<int>& get_##memberName() \
{ \
return m_n##memberName; \
return m_n##memberName; \
} \
inline void put_##memberName(const int& newVal) \
inline void put_##memberName(const int& newVal) \
{ \
m_n##memberName = newVal; \
} \
inline void put_##memberName(const js_wrapper<int>& newVal) \
inline void put_##memberName(const js_wrapper<int>& newVal) \
{ \
m_n##memberName = newVal; \
}
#define LINK_PROPERTY_DOUBLE_JS(memberName) \
inline js_wrapper<double> get_##memberName() \
inline js_wrapper<double>& get_##memberName() \
{ \
return m_d##memberName; \
return m_d##memberName; \
} \
inline void put_##memberName(const double& newVal) \
inline void put_##memberName(const double& newVal) \
{ \
m_d##memberName = newVal; \
} \
inline void put_##memberName(const js_wrapper<double>& newVal) \
inline void put_##memberName(const js_wrapper<double>& newVal) \
{ \
m_d##memberName = newVal; \
}
#define LINK_PROPERTY_BOOL_JS(memberName) \
inline js_wrapper<bool> get_##memberName() \
inline js_wrapper<bool>& get_##memberName() \
{ \
return m_b##memberName; \
return m_b##memberName; \
} \
inline void put_##memberName(const bool& newVal) \
{ \
m_b##memberName## = newVal; \
m_b##memberName = newVal; \
} \
inline void put_##memberName(const js_wrapper<bool>& newVal) \
{ \
......@@ -682,23 +682,23 @@ namespace NSEditorApi
}
#define LINK_PROPERTY_BYTE_JS(memberName) \
inline js_wrapper<BYTE> get_##memberName() \
inline js_wrapper<unsigned char>& get_##memberName() \
{ \
return m_n##memberName; \
return m_n##memberName; \
} \
inline void put_##memberName(const BYTE& newVal) \
inline void put_##memberName(const unsigned char& newVal) \
{ \
m_n##memberName = newVal; \
} \
inline void put_##memberName(const js_wrapper<BYTE>& newVal) \
inline void put_##memberName(const js_wrapper<unsigned char>& newVal) \
{ \
m_n##memberName = newVal; \
}
#define LINK_PROPERTY_STRING_JS(memberName) \
inline js_wrapper<std::wstring> get_##memberName() \
inline js_wrapper<std::wstring>& get_##memberName() \
{ \
return m_s##memberName; \
return m_s##memberName; \
} \
inline void put_##memberName(const std::wstring& newVal) \
{ \
......@@ -710,29 +710,29 @@ namespace NSEditorApi
}
#define LINK_PROPERTY_STRINGA_JS(memberName) \
inline js_wrapper<std::string> get_##memberName() \
inline js_wrapper<std::string>& get_##memberName() \
{ \
return m_s##memberName; \
return m_s##memberName; \
} \
inline void put_##memberName(const std::string& newVal) \
inline void put_##memberName(const std::string& newVal) \
{ \
m_s##memberName = newVal; \
} \
inline void put_##memberName(const js_wrapper<std::string>& newVal) \
inline void put_##memberName(const js_wrapper<std::string>& newVal) \
{ \
m_s##memberName = newVal; \
}
#define LINK_PROPERTY_OBJECT_JS(objectType, memberName) \
inline js_wrapper<objectType>& get_##memberName() \
inline js_wrapper<objectType>& get_##memberName() \
{ \
return m_o##memberName; \
return m_o##memberName; \
} \
inline void put_##memberName(const js_wrapper<objectType>& newVal) \
inline void put_##memberName(const js_wrapper<objectType>& newVal)\
{ \
m_o##memberName = newVal; \
} \
inline void put_##memberName(objectType* newVal) \
inline void put_##memberName(objectType* newVal)\
{ \
m_o##memberName = newVal; \
}
......
DesktopEditor/freetype-2.5.2/src/gzip/infblock.c
View file @ cf7fae30
......@@ -15,7 +15,7 @@
#define bits word.what.Bits
/* Table for deflate from PKZIP's appnote.txt. */
local const uInt border[] = { /* Order of the bit length code lengths */
local const uInt __border[] = { /* Order of the bit length code lengths */
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
/*
......@@ -239,11 +239,11 @@ int r )
while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
{
NEEDBITS(3)
s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
s->sub.trees.blens[__border[s->sub.trees.index++]] = (uInt)b & 7;
DUMPBITS(3)
}
while (s->sub.trees.index < 19)
s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
s->sub.trees.blens[__border[s->sub.trees.index++]] = 0;
s->sub.trees.bb = 7;
t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
&s->sub.trees.tb, s->hufts, z);
......
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