Commit e5a5b28d authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59056 954022d7-b5bf-4e40-9824-e11837661b57
parent 1fe2fc80
......@@ -40,7 +40,7 @@ namespace NSCustomVML
~CSegment()
{
}
#ifdef WIN32
void Read(IStream* pStream)
{
WORD mem = StreamUtils::ReadWORD(pStream);
......@@ -136,7 +136,7 @@ namespace NSCustomVML
m_nCount = (mem >> 5) & 0x00FF;
}
#endif
void Read(NSOfficeDrawing::CBinaryReader& oReader)
{
WORD mem = oReader.ReadWORD();
......@@ -320,7 +320,7 @@ namespace NSCustomVML
SetParam(m_param_type2, m_param_value2, oFormula.m_eType2, oFormula.m_lParam2);
SetParam(m_param_type3, m_param_value3, oFormula.m_eType3, oFormula.m_lParam3);
}
#ifdef WIN32
void Read(IStream* pStream)
{
WORD ftType = StreamUtils::ReadWORD(pStream);
......@@ -335,7 +335,7 @@ namespace NSCustomVML
m_param_value2 = StreamUtils::ReadWORD(pStream);
m_param_value3 = StreamUtils::ReadWORD(pStream);
}
#endif
void Read(NSOfficeDrawing::CBinaryReader& oReader)
{
WORD ftType = oReader.ReadWORD();
......
......@@ -37,6 +37,8 @@ public:
RELEASEARRAYOBJECTS(m_pOptions);
}
#ifdef WIN32
void FromStream(IStream* pStream)
{
// ...
......@@ -109,7 +111,7 @@ public:
}
}
}
#endif
CString ToString()
{
CString str = _T("");
......@@ -146,7 +148,8 @@ public:
m_lCount = 0;
m_arProperties.clear();
}
#ifdef WIN32
void FromStream(IStream* pStream, long lCount)
{
m_lCount = lCount;
......@@ -163,7 +166,7 @@ public:
m_arProperties[lIndex].ComplexFromStream(pStream);
}
}
#endif
CString ToString()
{
CString str = _T("");
......
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