Skip to content

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

got rid of __forceinline 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58895 954022d7-b5bf-4e40-9824-e11837661b57
parent d77e1ac6
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 25 deletions
ASCPresentationEditor/OfficeDrawing/XmlWriter.h
View file @ f7c65a4a
...@@ -45,7 +45,7 @@ namespace NSPresentationEditor ...@@ -45,7 +45,7 @@ namespace NSPresentationEditor
RELEASEMEM(m_pData); RELEASEMEM(m_pData);
} }
__forceinline void AddSize(size_t nSize) AVSINLINE void AddSize(size_t nSize)
{ {
if (NULL == m_pData) if (NULL == m_pData)
{ {
...@@ -85,7 +85,7 @@ namespace NSPresentationEditor ...@@ -85,7 +85,7 @@ namespace NSPresentationEditor
public: public:
__forceinline void WriteString(const wchar_t* pString, size_t& nLen) AVSINLINE void WriteString(const wchar_t* pString, size_t& nLen)
{ {
AddSize(nLen); AddSize(nLen);
// memcpy(m_pDataCur, pString, nLen * sizeof(wchar_t)); // memcpy(m_pDataCur, pString, nLen * sizeof(wchar_t));
...@@ -96,18 +96,18 @@ namespace NSPresentationEditor ...@@ -96,18 +96,18 @@ namespace NSPresentationEditor
m_lSizeCur += nLen; m_lSizeCur += nLen;
} }
#ifdef _WIN32 #ifdef _WIN32
__forceinline void WriteString(_bstr_t& bsString) AVSINLINE void WriteString(_bstr_t& bsString)
{ {
size_t nLen = bsString.length(); size_t nLen = bsString.length();
WriteString(bsString.GetBSTR(), nLen); WriteString(bsString.GetBSTR(), nLen);
} }
#endif // #ifdef _WIN32 #endif // #ifdef _WIN32
__forceinline void WriteString(std::wstring& wString) AVSINLINE void WriteString(std::wstring& wString)
{ {
size_t nLen = wString.length(); size_t nLen = wString.length();
WriteString(wString.c_str(), nLen); WriteString(wString.c_str(), nLen);
} }
__forceinline void WriteString(const CString& sString) AVSINLINE void WriteString(const CString& sString)
{ {
size_t nLen = (size_t)sString.GetLength(); size_t nLen = (size_t)sString.GetLength();
...@@ -120,12 +120,12 @@ namespace NSPresentationEditor ...@@ -120,12 +120,12 @@ namespace NSPresentationEditor
#endif #endif
} }
__forceinline size_t GetCurSize() AVSINLINE size_t GetCurSize()
{ {
return m_lSizeCur; return m_lSizeCur;
} }
__forceinline void Write(CStringWriter& oWriter) AVSINLINE void Write(CStringWriter& oWriter)
{ {
WriteString(oWriter.m_pData, oWriter.m_lSizeCur); WriteString(oWriter.m_pData, oWriter.m_lSizeCur);
} }
...@@ -190,36 +190,36 @@ namespace NSPresentationEditor ...@@ -190,36 +190,36 @@ namespace NSPresentationEditor
} }
// write value // write value
__forceinline void WriteString(CString strValue) AVSINLINE void WriteString(CString strValue)
{ {
m_oWriter.WriteString(strValue); m_oWriter.WriteString(strValue);
} }
__forceinline void WriteDouble(const double& val) AVSINLINE void WriteDouble(const double& val)
{ {
CString str = _T(""); CString str = _T("");
str.Format(_T("%lf"), val); str.Format(_T("%lf"), val);
m_oWriter.WriteString(str); m_oWriter.WriteString(str);
} }
__forceinline void WriteLONG(const long& val) AVSINLINE void WriteLONG(const long& val)
{ {
CString str = _T(""); CString str = _T("");
str.Format(_T("%d"), val); str.Format(_T("%d"), val);
m_oWriter.WriteString(str); m_oWriter.WriteString(str);
} }
__forceinline void WriteDWORD(const DWORD& val) AVSINLINE void WriteDWORD(const DWORD& val)
{ {
CString str = _T(""); CString str = _T("");
str.Format(_T("%u"), val); str.Format(_T("%u"), val);
m_oWriter.WriteString(str); m_oWriter.WriteString(str);
} }
__forceinline void WriteDWORD_hex(const DWORD& val) AVSINLINE void WriteDWORD_hex(const DWORD& val)
{ {
CString str = _T(""); CString str = _T("");
str.Format(_T("%x"), val); str.Format(_T("%x"), val);
m_oWriter.WriteString(str); m_oWriter.WriteString(str);
} }
// write attribute // write attribute
__forceinline void WriteAttributeString(const CString& strAttributeName, const CString& val) AVSINLINE void WriteAttributeString(const CString& strAttributeName, const CString& val)
{ {
m_oWriter.WriteString(g_bstr_node_space); m_oWriter.WriteString(g_bstr_node_space);
m_oWriter.WriteString(strAttributeName); m_oWriter.WriteString(strAttributeName);
...@@ -228,7 +228,7 @@ namespace NSPresentationEditor ...@@ -228,7 +228,7 @@ namespace NSPresentationEditor
m_oWriter.WriteString(val); m_oWriter.WriteString(val);
m_oWriter.WriteString(g_bstr_node_quote); m_oWriter.WriteString(g_bstr_node_quote);
} }
__forceinline void WriteAttributeDouble(const CString& strAttributeName, const double& val) AVSINLINE void WriteAttributeDouble(const CString& strAttributeName, const double& val)
{ {
m_oWriter.WriteString(g_bstr_node_space); m_oWriter.WriteString(g_bstr_node_space);
m_oWriter.WriteString(strAttributeName); m_oWriter.WriteString(strAttributeName);
...@@ -237,7 +237,7 @@ namespace NSPresentationEditor ...@@ -237,7 +237,7 @@ namespace NSPresentationEditor
WriteDouble(val); WriteDouble(val);
m_oWriter.WriteString(g_bstr_node_quote); m_oWriter.WriteString(g_bstr_node_quote);
} }
__forceinline void WriteAttributeLONG(const CString& strAttributeName, const LONG& val) AVSINLINE void WriteAttributeLONG(const CString& strAttributeName, const LONG& val)
{ {
m_oWriter.WriteString(g_bstr_node_space); m_oWriter.WriteString(g_bstr_node_space);
m_oWriter.WriteString(strAttributeName); m_oWriter.WriteString(strAttributeName);
...@@ -246,7 +246,7 @@ namespace NSPresentationEditor ...@@ -246,7 +246,7 @@ namespace NSPresentationEditor
WriteLONG(val); WriteLONG(val);
m_oWriter.WriteString(g_bstr_node_quote); m_oWriter.WriteString(g_bstr_node_quote);
} }
__forceinline void WriteAttributeDWORD(const CString& strAttributeName, const DWORD& val) AVSINLINE void WriteAttributeDWORD(const CString& strAttributeName, const DWORD& val)
{ {
m_oWriter.WriteString(g_bstr_node_space); m_oWriter.WriteString(g_bstr_node_space);
m_oWriter.WriteString(strAttributeName); m_oWriter.WriteString(strAttributeName);
...@@ -255,7 +255,7 @@ namespace NSPresentationEditor ...@@ -255,7 +255,7 @@ namespace NSPresentationEditor
WriteDWORD(val); WriteDWORD(val);
m_oWriter.WriteString(g_bstr_node_quote); m_oWriter.WriteString(g_bstr_node_quote);
} }
__forceinline void WriteAttributeDWORD_hex(const CString& strAttributeName, const DWORD& val) AVSINLINE void WriteAttributeDWORD_hex(const CString& strAttributeName, const DWORD& val)
{ {
m_oWriter.WriteString(g_bstr_node_space); m_oWriter.WriteString(g_bstr_node_space);
m_oWriter.WriteString(strAttributeName); m_oWriter.WriteString(strAttributeName);
...@@ -265,7 +265,7 @@ namespace NSPresentationEditor ...@@ -265,7 +265,7 @@ namespace NSPresentationEditor
m_oWriter.WriteString(g_bstr_node_quote); m_oWriter.WriteString(g_bstr_node_quote);
} }
// document methods // document methods
__forceinline void WriteNodeBegin(CString strNodeName, BOOL bAttributed = FALSE) AVSINLINE void WriteNodeBegin(CString strNodeName, BOOL bAttributed = FALSE)
{ {
m_oWriter.WriteString(g_bstr_nodeopen); m_oWriter.WriteString(g_bstr_nodeopen);
m_oWriter.WriteString(strNodeName); m_oWriter.WriteString(strNodeName);
...@@ -273,7 +273,7 @@ namespace NSPresentationEditor ...@@ -273,7 +273,7 @@ namespace NSPresentationEditor
if (!bAttributed) if (!bAttributed)
m_oWriter.WriteString(g_bstr_nodeclose); m_oWriter.WriteString(g_bstr_nodeclose);
} }
__forceinline void WriteNodeEnd(CString strNodeName, BOOL bEmptyNode = FALSE, BOOL bEndNode = TRUE) AVSINLINE void WriteNodeEnd(CString strNodeName, BOOL bEmptyNode = FALSE, BOOL bEndNode = TRUE)
{ {
if (bEmptyNode) if (bEmptyNode)
{ {
...@@ -290,13 +290,13 @@ namespace NSPresentationEditor ...@@ -290,13 +290,13 @@ namespace NSPresentationEditor
} }
} }
// write node values // write node values
__forceinline void WriteNodeValueString(const CString& strNodeName, const CString& val) AVSINLINE void WriteNodeValueString(const CString& strNodeName, const CString& val)
{ {
WriteNodeBegin(strNodeName); WriteNodeBegin(strNodeName);
WriteString(val); WriteString(val);
WriteNodeEnd(strNodeName); WriteNodeEnd(strNodeName);
} }
__forceinline void WriteNodeValueBool(const CString& strNodeName, const bool& val) AVSINLINE void WriteNodeValueBool(const CString& strNodeName, const bool& val)
{ {
WriteNodeBegin(strNodeName); WriteNodeBegin(strNodeName);
...@@ -307,25 +307,25 @@ namespace NSPresentationEditor ...@@ -307,25 +307,25 @@ namespace NSPresentationEditor
WriteNodeEnd(strNodeName); WriteNodeEnd(strNodeName);
} }
__forceinline void WriteNodeValueDouble(const CString& strNodeName, const double& val) AVSINLINE void WriteNodeValueDouble(const CString& strNodeName, const double& val)
{ {
WriteNodeBegin(strNodeName); WriteNodeBegin(strNodeName);
WriteDouble(val); WriteDouble(val);
WriteNodeEnd(strNodeName); WriteNodeEnd(strNodeName);
} }
__forceinline void WriteNodeValueLONG(const CString& strNodeName, const LONG& val) AVSINLINE void WriteNodeValueLONG(const CString& strNodeName, const LONG& val)
{ {
WriteNodeBegin(strNodeName); WriteNodeBegin(strNodeName);
WriteLONG(val); WriteLONG(val);
WriteNodeEnd(strNodeName); WriteNodeEnd(strNodeName);
} }
__forceinline void WriteNodeValueDWORD(const CString& strNodeName, const DWORD& val) AVSINLINE void WriteNodeValueDWORD(const CString& strNodeName, const DWORD& val)
{ {
WriteNodeBegin(strNodeName); WriteNodeBegin(strNodeName);
WriteDWORD(val); WriteDWORD(val);
WriteNodeEnd(strNodeName); WriteNodeEnd(strNodeName);
} }
__forceinline void WriteNodeValueDWORD_hex(const CString& strNodeName, const DWORD& val) AVSINLINE void WriteNodeValueDWORD_hex(const CString& strNodeName, const DWORD& val)
{ {
WriteNodeBegin(strNodeName); WriteNodeBegin(strNodeName);
WriteDWORD_hex(val); WriteDWORD_hex(val);
......
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