Skip to content

O
onlyoffice_core
Commit bb37e348 authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

.

parent 6b5e03df
Show whitespace changes
Inline Side-by-side
Showing with 79 additions and 78 deletions
Common/DocxFormat/Source/DocxFormat/Comments.h
View file @ bb37e348
......@@ -51,14 +51,13 @@ namespace OOX
{
public:
WritingElement_AdditionConstructors(CComment)
CComment()
{
}
virtual ~CComment()
{
}
public:
virtual void fromXML(XmlUtils::CXmlNode& oNode)
{
}
......@@ -75,65 +74,65 @@ namespace OOX
std::wstring sName = oReader.GetName();
WritingElement *pItem = NULL;
/*if ( _T("w:altChunk") == sName )
/*if ( L"w:altChunk" ==sName )
pItem = new Logic::AltChunk( oItem );
else */if ( _T("w:bookmarkEnd") == sName )
else */if ( L"w:bookmarkEnd" ==sName )
pItem = new Logic::CBookmarkEnd( oReader );
else if ( _T("w:bookmarkStart") == sName )
else if ( L"w:bookmarkStart" ==sName )
pItem = new Logic::CBookmarkStart( oReader );
else if ( _T("w:commentRangeEnd") == sName )
else if ( L"w:commentRangeEnd" ==sName )
pItem = new Logic::CCommentRangeEnd( oReader );
else if ( _T("w:commentRangeStart") == sName )
else if ( L"w:commentRangeStart" ==sName )
pItem = new Logic::CCommentRangeStart( oReader );
//else if ( _T("w:customXml") == sName )
//else if ( L"w:customXml" ==sName )
// pItem = new Logic::CCustomXml( oReader );
else if ( _T("w:customXmlDelRangeEnd") == sName )
else if ( L"w:customXmlDelRangeEnd" ==sName )
pItem = new Logic::CCustomXmlDelRangeEnd( oReader );
else if ( _T("w:customXmlDelRangeStart") == sName )
else if ( L"w:customXmlDelRangeStart" ==sName )
pItem = new Logic::CCustomXmlDelRangeStart( oReader );
else if ( _T("w:customXmlInsRangeEnd") == sName )
else if ( L"w:customXmlInsRangeEnd" ==sName )
pItem = new Logic::CCustomXmlInsRangeEnd( oReader );
else if ( _T("w:customXmlInsRangeStart") == sName )
else if ( L"w:customXmlInsRangeStart" ==sName )
pItem = new Logic::CCustomXmlInsRangeStart( oReader );
else if ( _T("w:customXmlMoveFromRangeEnd") == sName )
else if ( L"w:customXmlMoveFromRangeEnd" ==sName )
pItem = new Logic::CCustomXmlMoveFromRangeEnd( oReader );
else if ( _T("w:customXmlMoveFromRangeStart") == sName )
else if ( L"w:customXmlMoveFromRangeStart" ==sName )
pItem = new Logic::CCustomXmlMoveFromRangeStart( oReader );
else if ( _T("w:customXmlMoveToRangeEnd") == sName )
else if ( L"w:customXmlMoveToRangeEnd" ==sName )
pItem = new Logic::CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
else if ( L"w:customXmlMoveToRangeStart" ==sName )
pItem = new Logic::CCustomXmlMoveToRangeStart( oReader );
else if ( _T("w:del") == sName )
else if ( L"w:del" ==sName )
pItem = new Logic::CDel( oReader );
else if ( _T("w:ins") == sName )
else if ( L"w:ins" ==sName )
pItem = new Logic::CIns( oReader );
else if ( _T("w:moveFrom") == sName )
else if ( L"w:moveFrom" ==sName )
pItem = new Logic::CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )
else if ( L"w:moveFromRangeEnd" ==sName )
pItem = new Logic::CMoveFromRangeEnd( oReader );
else if ( _T("w:moveFromRangeStart") == sName )
else if ( L"w:moveFromRangeStart" ==sName )
pItem = new Logic::CMoveFromRangeStart( oReader );
else if ( _T("w:moveTo") == sName )
else if ( L"w:moveTo" ==sName )
pItem = new Logic::CMoveTo( oReader );
else if ( _T("w:moveToRangeEnd") == sName )
else if ( L"w:moveToRangeEnd" ==sName )
pItem = new Logic::CMoveToRangeEnd( oReader );
else if ( _T("w:moveToRangeStart") == sName )
else if ( L"w:moveToRangeStart" ==sName )
pItem = new Logic::CMoveToRangeStart( oReader );
else if ( _T("m:oMath") == sName )
else if ( L"m:oMath" ==sName )
pItem = new Logic::COMath( oReader );
else if ( _T("m:oMathPara") == sName )
else if ( L"m:oMathPara" ==sName )
pItem = new Logic::COMathPara( oReader );
else if ( _T("w:p") == sName )
else if ( L"w:p" ==sName )
pItem = new Logic::CParagraph( oReader );
else if ( _T("w:permEnd") == sName )
else if ( L"w:permEnd" ==sName )
pItem = new Logic::CPermEnd( oReader );
else if ( _T("w:permStart") == sName )
else if ( L"w:permStart" ==sName )
pItem = new Logic::CPermStart( oReader );
else if ( _T("w:proofErr") == sName )
else if ( L"w:proofErr" ==sName )
pItem = new Logic::CProofErr( oReader );
else if ( _T("w:sdt") == sName )
else if ( L"w:sdt" ==sName )
pItem = new Logic::CSdt( oReader );
else if ( _T("w:tbl") == sName )
else if ( L"w:tbl" ==sName )
pItem = new Logic::CTbl( oReader );
if ( pItem )
......@@ -142,7 +141,7 @@ namespace OOX
}
virtual std::wstring toXML() const
{
std::wstring sResult = _T("");
std::wstring sResult = L"";
return sResult;
}
......@@ -160,7 +159,7 @@ namespace OOX
std::wstring getTextArr(const std::list<WritingElement* > & arrItems, bool& bFirstPar) const
{
std::wstring sRes;
for ( std::list<WritingElement *>::const_iterator it = m_arrItems.begin(); it != m_arrItems.end(); it++)
for ( std::list<WritingElement *>::const_iterator it = arrItems.begin(); it != arrItems.end(); it++)
{
WritingElement* item = *it;
if (item == NULL) continue;
......@@ -221,7 +220,7 @@ namespace OOX
if(bFirstPar)
bFirstPar = false;
else
sRes += _T("\n");
sRes += L"\n";
OOX::Logic::CParagraph* pParagraph = static_cast<OOX::Logic::CParagraph*>(item);
sRes += getTextArr(pParagraph->m_arrItems, bFirstPar);
}
......@@ -234,7 +233,7 @@ namespace OOX
break;
case OOX::et_w_cr:
case OOX::et_w_br:
sRes += _T("\n");
sRes += L"\n";
break;
case OOX::et_w_nonBreakHyphen:
{
......@@ -243,7 +242,7 @@ namespace OOX
break;
}
case OOX::et_w_tab:
sRes += _T(" ");
sRes += L" ";
break;
case OOX::et_w_sym:
{
......@@ -271,13 +270,12 @@ namespace OOX
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w:author"), m_oAuthor )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:date"), m_oDate )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("oodata"), m_oOOData )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:id"), m_oId )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:initials"), m_oInitials )
WritingElement_ReadAttributes_Read_if ( oReader, L"w:author", m_oAuthor )
WritingElement_ReadAttributes_Read_else_if( oReader, L"w:date", m_oDate )
WritingElement_ReadAttributes_Read_else_if( oReader, L"oodata", m_oOOData )
WritingElement_ReadAttributes_Read_else_if( oReader, L"w:id", m_oId )
WritingElement_ReadAttributes_Read_else_if( oReader, L"w:initials", m_oInitials )
WritingElement_ReadAttributes_End( oReader )
}
......@@ -309,7 +307,10 @@ namespace OOX
virtual ~CComments()
{
for(size_t i = 0, length = m_arrComments.size(); i < length; ++i)
{
if (m_arrComments[i]) delete m_arrComments[i];
m_arrComments[i] = NULL;
}
m_arrComments.clear();
}
virtual void read(const CPath& oFilePath)
......@@ -325,13 +326,13 @@ namespace OOX
return;
std::wstring sName = oReader.GetName();
if ( _T("w:comments") == sName && !oReader.IsEmptyNode() )
if ( L"w:comments" == sName && !oReader.IsEmptyNode() )
{
int nNumberingDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nNumberingDepth ) )
{
sName = oReader.GetName();
if ( _T("w:comment") == sName )
if ( L"w:comment" == sName )
m_arrComments.push_back( new CComment(oReader) );
}
}
......@@ -379,7 +380,7 @@ namespace OOX
}
virtual std::wstring toXML() const
{
std::wstring sResult = _T("");
std::wstring sResult = L"";
return sResult;
}
......@@ -390,11 +391,10 @@ namespace OOX
private:
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w15:paraId"), m_oParaId )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w15:paraIdParent"), m_oParaIdParent )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w15:done"), m_oDone )
WritingElement_ReadAttributes_Read_if ( oReader, L"w15:paraId", m_oParaId )
WritingElement_ReadAttributes_Read_else_if( oReader, L"w15:paraIdParent", m_oParaIdParent )
WritingElement_ReadAttributes_Read_else_if( oReader, L"w15:done", m_oDone )
WritingElement_ReadAttributes_End( oReader )
}
......@@ -418,7 +418,10 @@ namespace OOX
virtual ~CCommentsExt()
{
for(size_t i = 0, length = m_arrComments.size(); i < length; ++i)
{
if (m_arrComments[i]) delete m_arrComments[i];
m_arrComments[i] = NULL;
}
m_arrComments.clear();
}
virtual void read(const CPath& oFilePath)
......@@ -434,13 +437,13 @@ namespace OOX
return;
std::wstring sName = oReader.GetName();
if ( _T("w15:commentsEx") == sName && !oReader.IsEmptyNode() )
if ( L"w15:commentsEx" == sName && !oReader.IsEmptyNode() )
{
int nNumberingDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nNumberingDepth ) )
{
sName = oReader.GetName();
if ( _T("w15:commentEx") == sName )
if ( L"w15:commentEx" == sName )
m_arrComments.push_back( new CCommentExt(oReader) );
}
}
......@@ -488,7 +491,7 @@ namespace OOX
}
virtual std::wstring toXML() const
{
std::wstring sResult = _T("");
std::wstring sResult = L"";
return sResult;
}
......@@ -499,10 +502,9 @@ namespace OOX
private:
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w15:providerId"), m_oProviderId )
WritingElement_ReadAttributes_Read_else_if( oReader, _T("w15:userId"), m_oUserId )
WritingElement_ReadAttributes_Read_if ( oReader, L"w15:providerId", m_oProviderId )
WritingElement_ReadAttributes_Read_else_if( oReader, L"w15:userId", m_oUserId )
WritingElement_ReadAttributes_End( oReader )
}
......@@ -536,13 +538,13 @@ namespace OOX
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
std::wstring sName = oReader.GetName();
if ( _T("w15:presenceInfo") == sName )
if ( L"w15:presenceInfo" ==sName )
m_oPresenceInfo = oReader;
}
}
virtual std::wstring toXML() const
{
std::wstring sResult = _T("");
std::wstring sResult = L"";
return sResult;
}
......@@ -553,9 +555,8 @@ namespace OOX
private:
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
// Читаем атрибуты
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_Read_if ( oReader, _T("w15:author"), m_oAuthor )
WritingElement_ReadAttributes_Read_if ( oReader, L"w15:author", m_oAuthor )
WritingElement_ReadAttributes_End( oReader )
}
......@@ -592,13 +593,13 @@ namespace OOX
return;
std::wstring sName = oReader.GetName();
if ( _T("w15:people") == sName && !oReader.IsEmptyNode() )
if ( L"w15:people" == sName && !oReader.IsEmptyNode() )
{
int nNumberingDepth = oReader.GetDepth();
while ( oReader.ReadNextSiblingNode( nNumberingDepth ) )
{
sName = oReader.GetName();
if ( _T("w15:person") == sName )
if ( L"w15:person" == sName )
m_arrPeoples.push_back( new CPerson(oReader) );
}
}
......
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