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

Fix builf

Browse Source
This commit is contained in:
Oleg.Korshul
2023-07-27 14:56:35 +03:00
parent f1236fd01e
commit cbf1c9eb16
2 changed files with 53 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
Common/3dParty/html/css/src/StyleProperties.cpp
View File

@ -23,94 +23,6 @@ namespace NSCSS
return true;
}
template<typename T>
CValue<T>::CValue(const T& oValue, unsigned int unLevel, bool bImportant)
: m_oValue(oValue), m_unLevel(unLevel), m_bImportant(bImportant)
{}
template<typename T>
void CValue<T>::Equation(CValue &oFirstValue, CValue &oSecondValue)
{
if (oFirstValue.m_bImportant && !oSecondValue.m_bImportant && oFirstValue.Empty())
oSecondValue.Clear();
else if (oSecondValue.m_bImportant && !oFirstValue.m_bImportant && !oSecondValue.Empty())
oFirstValue.Clear();
else if (!oSecondValue.Empty())
{
if (oFirstValue.m_unLevel < oSecondValue.m_unLevel)
oFirstValue.Clear();
else
oSecondValue.Clear();
}
}
template<typename T>
bool CValue<T>::operator==(const T &oValue) const
{
return m_oValue == oValue;
}
template<typename T>
bool CValue<T>::operator>=(const T &oValue) const
{
return m_oValue >= oValue;
}
template<typename T>
bool CValue<T>::operator<=(const T &oValue) const
{
return m_oValue <= oValue;
}
template<typename T>
bool CValue<T>::operator>(const T &oValue) const
{
return m_oValue > oValue;
}
template<typename T>
bool CValue<T>::operator<(const T &oValue) const
{
return m_oValue < oValue;
}
template<typename T>
CValue<T>& CValue<T>::operator=(const CValue &oValue)
{
m_oValue = oValue.m_oValue;
m_unLevel = oValue.m_unLevel;
m_bImportant = oValue.m_bImportant;
return *this;
}
template<typename T>
CValue<T>& CValue<T>::operator=(const T &oValue)
{
// m_oValue = oValue.m_oValue;
return *this;
}
template<typename T>
CValue<T> &CValue<T>::operator+=(const CValue<T> &oValue)
{
if (m_unLevel > oValue.m_unLevel || (m_bImportant && !oValue.m_bImportant) || oValue.Empty())
return *this;
m_oValue = oValue.m_oValue;
m_unLevel = std::max(m_unLevel, oValue.m_unLevel);
m_bImportant = std::max(m_bImportant, oValue.m_bImportant);
return *this;
}
template<typename T>
bool CValue<T>::operator==(const CValue<T> &oValue) const
{
return m_oValue == oValue.m_oValue;
}
CString::CString()
: CValue(L"", 0, false)
{}

64
Common/3dParty/html/css/src/StyleProperties.h
View File

@ -26,7 +26,10 @@ namespace NSCSS
unsigned int m_unLevel;
bool m_bImportant;
public:
CValue(const T& oValue, unsigned int unLevel, bool bImportant);
CValue(const T& oValue, unsigned int unLevel, bool bImportant) :
m_oValue(oValue), m_unLevel(unLevel), m_bImportant(bImportant)
{
}
virtual bool SetValue(const std::wstring& wsValue, unsigned int unLevel, bool bHardMode) = 0;
@ -36,19 +39,58 @@ namespace NSCSS
virtual double ToDouble() const = 0;
virtual std::wstring ToWString() const = 0;
static void Equation(CValue &oFirstValue, CValue &oSecondValue);
static void Equation(CValue &oFirstValue, CValue &oSecondValue)
{
if (oFirstValue.m_bImportant && !oSecondValue.m_bImportant && oFirstValue.Empty())
oSecondValue.Clear();
else if (oSecondValue.m_bImportant && !oFirstValue.m_bImportant && !oSecondValue.Empty())
oFirstValue.Clear();
else if (!oSecondValue.Empty())
{
if (oFirstValue.m_unLevel < oSecondValue.m_unLevel)
oFirstValue.Clear();
else
oSecondValue.Clear();
}
}
bool operator==(const T& oValue) const;
bool operator>=(const T& oValue) const;
bool operator<=(const T& oValue) const;
bool operator> (const T& oValue) const;
bool operator< (const T& oValue) const;
bool operator==(const T& oValue) const { return m_oValue == oValue; }
bool operator>=(const T& oValue) const { return m_oValue >= oValue; }
bool operator<=(const T& oValue) const { return m_oValue <= oValue; }
bool operator> (const T& oValue) const { return m_oValue > oValue; }
bool operator< (const T& oValue) const { return m_oValue < oValue; }
virtual CValue& operator =(const CValue& oValue);
CValue& operator =(const T& oValue);
virtual CValue& operator =(const CValue& oValue)
{
m_oValue = oValue.m_oValue;
m_unLevel = oValue.m_unLevel;
m_bImportant = oValue.m_bImportant;
CValue& operator+=(const CValue& oValue);
bool operator==(const CValue& oValue) const;
return *this;
}
CValue& operator =(const T& oValue)
{
//m_oValue = oValue.m_oValue;
return *this;
}
CValue& operator+=(const CValue& oValue)
{
if (m_unLevel > oValue.m_unLevel || (m_bImportant && !oValue.m_bImportant) || oValue.Empty())
return *this;
m_oValue = oValue.m_oValue;
m_unLevel = std::max(m_unLevel, oValue.m_unLevel);
m_bImportant = std::max(m_bImportant, oValue.m_bImportant);
return *this;
}
bool operator==(const CValue& oValue) const
{
return m_oValue == oValue.m_oValue;
}
};
class CString : public CValue<std::wstring>