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

(2.0.0.161): ASCOfficeDocxFile2

Browse Source 
w:ins, w:del на чтение.

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@54684 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Sergey.Konovalov
2014-02-27 11:14:30 +00:00
committed by Alexander Trofimov
parent 59504a0c30
commit e70b94ae0e
20 changed files with 430 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcproj
View File

@ -550,7 +550,7 @@
Name="BinWiter"
>
<File
RelativePath="..\..\TeamlabOffice\trunk\XlsxSerializerCom\Reader\BinaryWriter.h"
RelativePath="..\XlsxSerializerCom\Reader\BinaryWriter.h"
>
</File>
<File

6
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View File

@ -2470,6 +2470,12 @@ namespace BinDocxRW
WriteParagraphContent(pBdo->m_arrItems, NULL);
break;
}
case OOX::et_w_ins:
{
OOX::Logic::CIns* pIns = static_cast<OOX::Logic::CIns*>(item);
WriteParagraphContent(pIns->m_arrItems, NULL);
break;
}
case OOX::et_w_commentRangeStart:
{
OOX::Logic::CCommentRangeStart* pCommentRangeStart = static_cast<OOX::Logic::CCommentRangeStart*>(item);

6
ASCOfficeDocxFile2/version.h
View File

@ -2,6 +2,6 @@
//2
//0
//0
//160
#define INTVER 2,0,0,160
#define STRVER "2,0,0,160\0"
//161
#define INTVER 2,0,0,161
#define STRVER "2,0,0,161\0"

6
Common/DocxFormat/Projects/DocxFormat2005.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1251"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Version="8.00"
Name="DocxFormat"
ProjectGUID="{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
RootNamespace="DocxFormat"
@ -671,6 +671,10 @@
<Filter
Name="Annotations"
>
<File
RelativePath="..\Source\DocxFormat\Logic\Annotations.cpp"
>
</File>
<File
RelativePath="..\Source\DocxFormat\Logic\Annotations.h"
>

8
Common/DocxFormat/Source/DocxFormat/Comments.h
View File

@ -81,10 +81,10 @@ namespace OOX
pItem = new Logic::CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new Logic::CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new Logic::CDel( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new Logic::CIns( oReader );
else if ( _T("w:del") == sName )
pItem = new Logic::CDel( oReader );
else if ( _T("w:ins") == sName )
pItem = new Logic::CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new Logic::CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

10
Common/DocxFormat/Source/DocxFormat/Document.h
View File

@ -151,8 +151,6 @@ namespace OOX
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:altChunk>
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
@ -247,10 +245,10 @@ namespace OOX
pItem = new Logic::CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new Logic::CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new Logic::CDel( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new Logic::CIns( oReader );
else if ( _T("w:del") == sName )
pItem = new Logic::CDel( oReader );
else if ( _T("w:ins") == sName )
pItem = new Logic::CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new Logic::CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

10
Common/DocxFormat/Source/DocxFormat/HeaderFooter.h
View File

@ -17,8 +17,6 @@
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:altChunk>
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
@ -114,10 +112,10 @@ namespace OOX
pItem = new Logic::CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new Logic::CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new Logic::CDel( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new Logic::CIns( oReader );
else if ( _T("w:del") == sName )
pItem = new Logic::CDel( oReader );
else if ( _T("w:ins") == sName )
pItem = new Logic::CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new Logic::CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

218
Common/DocxFormat/Source/DocxFormat/Logic/Annotations.cpp Normal file
View File

@ -0,0 +1,218 @@
#include "Annotations.h"
#include "Bdo.h"
#include "Paragraph.h"
#include "Annotations.h"
#include "Run.h"
#include "FldSimple.h"
#include "Sdt.h"
#include "Hyperlink.h"
#include "SmartTag.h"
#include "Dir.h"
#include "../Math/oMathPara.h"
#include "../Math/oMath.h"
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:customXml>
// <w:moveFrom>
// <w:moveTo>
// <w:subDoc>
namespace OOX
{
namespace Logic
{
void CIns::fromXML(XmlUtils::CXmlNode& oNode)
{
//todo
}
void CIns::fromXML(XmlUtils::CXmlLiteReader& oReader)
{
ReadAttributes( oReader );
if ( oReader.IsEmptyNode() )
return;
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
WritingElement *pItem = NULL;
if ( _T("w:bdo") == sName )
pItem = new CBdo( oReader );
else if ( _T("w:bookmarkEnd") == sName )
pItem = new CBookmarkEnd( oReader );
else if ( _T("w:bookmarkStart") == sName )
pItem = new CBookmarkStart( oReader );
else if ( _T("w:commentRangeEnd") == sName )
pItem = new CCommentRangeEnd( oReader );
else if ( _T("w:commentRangeStart") == sName )
pItem = new CCommentRangeStart( oReader );
//else if ( _T("w:customXml") == sName )
// pItem = new CCustomXml( oReader );
else if ( _T("w:customXmlDelRangeEnd") == sName )
pItem = new CCustomXmlDelRangeEnd( oReader );
else if ( _T("w:customXmlDelRangeStart") == sName )
pItem = new CCustomXmlDelRangeStart( oReader );
else if ( _T("w:customXmlInsRangeEnd") == sName )
pItem = new CCustomXmlInsRangeEnd( oReader );
else if ( _T("w:customXmlInsRangeStart") == sName )
pItem = new CCustomXmlInsRangeStart( oReader );
else if ( _T("w:customXmlMoveFromRangeEnd") == sName )
pItem = new CCustomXmlMoveFromRangeEnd( oReader );
else if ( _T("w:customXmlMoveFromRangeStart") == sName )
pItem = new CCustomXmlMoveFromRangeStart( oReader );
else if ( _T("w:customXmlMoveToRangeEnd") == sName )
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:dir") == sName )
pItem = new CDir( oReader );
else if ( _T("w:fldSimple") == sName )
pItem = new CFldSimple( oReader );
else if ( _T("w:hyperlink") == sName )
pItem = new CHyperlink( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )
pItem = new CMoveToRangeEnd( oReader );
else if ( _T("w:moveFromRangeStart") == sName )
pItem = new CMoveToRangeStart( oReader );
//else if ( _T("w:moveTo") == sName )
// pItem = new CMoveTo( oReader );
else if ( _T("w:moveToRangeEnd") == sName )
pItem = new CMoveToRangeEnd( oReader );
else if ( _T("w:moveToRangeStart") == sName )
pItem = new CMoveToRangeStart( oReader );
else if ( _T("m:oMath") == sName )
pItem = new COMath( oReader );
else if ( _T("m:oMathPara") == sName )
pItem = new COMathPara( oReader );
else if ( _T("w:permEnd") == sName )
pItem = new CPermEnd( oReader );
else if ( _T("w:permStart") == sName )
pItem = new CPermStart( oReader );
else if ( _T("w:proofErr") == sName )
pItem = new CProofErr( oReader );
else if ( _T("w:r") == sName )
pItem = new CRun( oReader );
else if ( _T("w:sdt") == sName )
pItem = new CSdt( oReader );
else if ( _T("w:smartTag") == sName )
pItem = new CSmartTag( oReader );
//else if ( _T("w:subDoc") == sName )
// pItem = new CSubDoc( oReader );
if ( pItem )
m_arrItems.Add( pItem );
}
}
CString CIns::toXML() const
{
//todo
CString sResult = _T("");
return sResult;
}
void CDel::fromXML(XmlUtils::CXmlNode& oNode)
{
//todo
}
void CDel::fromXML(XmlUtils::CXmlLiteReader& oReader)
{
ReadAttributes( oReader );
if ( oReader.IsEmptyNode() )
return;
int nParentDepth = oReader.GetDepth();
while( oReader.ReadNextSiblingNode( nParentDepth ) )
{
CWCharWrapper sName = oReader.GetName();
WritingElement *pItem = NULL;
if ( _T("w:bdo") == sName )
pItem = new CBdo( oReader );
else if ( _T("w:bookmarkEnd") == sName )
pItem = new CBookmarkEnd( oReader );
else if ( _T("w:bookmarkStart") == sName )
pItem = new CBookmarkStart( oReader );
else if ( _T("w:commentRangeEnd") == sName )
pItem = new CCommentRangeEnd( oReader );
else if ( _T("w:commentRangeStart") == sName )
pItem = new CCommentRangeStart( oReader );
//else if ( _T("w:customXml") == sName )
// pItem = new CCustomXml( oReader );
else if ( _T("w:customXmlDelRangeEnd") == sName )
pItem = new CCustomXmlDelRangeEnd( oReader );
else if ( _T("w:customXmlDelRangeStart") == sName )
pItem = new CCustomXmlDelRangeStart( oReader );
else if ( _T("w:customXmlInsRangeEnd") == sName )
pItem = new CCustomXmlInsRangeEnd( oReader );
else if ( _T("w:customXmlInsRangeStart") == sName )
pItem = new CCustomXmlInsRangeStart( oReader );
else if ( _T("w:customXmlMoveFromRangeEnd") == sName )
pItem = new CCustomXmlMoveFromRangeEnd( oReader );
else if ( _T("w:customXmlMoveFromRangeStart") == sName )
pItem = new CCustomXmlMoveFromRangeStart( oReader );
else if ( _T("w:customXmlMoveToRangeEnd") == sName )
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:dir") == sName )
pItem = new CDir( oReader );
else if ( _T("w:fldSimple") == sName )
pItem = new CFldSimple( oReader );
else if ( _T("w:hyperlink") == sName )
pItem = new CHyperlink( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )
pItem = new CMoveToRangeEnd( oReader );
else if ( _T("w:moveFromRangeStart") == sName )
pItem = new CMoveToRangeStart( oReader );
//else if ( _T("w:moveTo") == sName )
// pItem = new CMoveTo( oReader );
else if ( _T("w:moveToRangeEnd") == sName )
pItem = new CMoveToRangeEnd( oReader );
else if ( _T("w:moveToRangeStart") == sName )
pItem = new CMoveToRangeStart( oReader );
else if ( _T("m:oMath") == sName )
pItem = new COMath( oReader );
else if ( _T("m:oMathPara") == sName )
pItem = new COMathPara( oReader );
else if ( _T("w:permEnd") == sName )
pItem = new CPermEnd( oReader );
else if ( _T("w:permStart") == sName )
pItem = new CPermStart( oReader );
else if ( _T("w:proofErr") == sName )
pItem = new CProofErr( oReader );
else if ( _T("w:r") == sName )
pItem = new CRun( oReader );
else if ( _T("w:sdt") == sName )
pItem = new CSdt( oReader );
else if ( _T("w:smartTag") == sName )
pItem = new CSmartTag( oReader );
//else if ( _T("w:subDoc") == sName )
// pItem = new CSubDoc( oReader );
if ( pItem )
m_arrItems.Add( pItem );
}
}
CString CDel::toXML() const
{
//todo
CString sResult = _T("");
return sResult;
}
} // namespace Logic
} // namespace OOX

134
Common/DocxFormat/Source/DocxFormat/Logic/Annotations.h
View File

@ -1383,6 +1383,140 @@ namespace OOX
nullable<SimpleTypes::CProofErr<> > m_oType;
};
} // Logic
namespace Logic
{
class CIns : public WritingElement
{
public:
CIns()
{
}
CIns(XmlUtils::CXmlNode &oNode)
{
fromXML( oNode );
}
CIns(XmlUtils::CXmlLiteReader& oReader)
{
fromXML( oReader );
}
virtual ~CIns()
{
Clear();
}
public:
void Clear()
{
for ( int nIndex = 0; nIndex < m_arrItems.GetSize(); nIndex++ )
{
if ( m_arrItems[nIndex] )
delete m_arrItems[nIndex];
m_arrItems[nIndex] = NULL;
}
m_arrItems.RemoveAll();
}
public:
virtual void fromXML(XmlUtils::CXmlNode& oNode);
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
virtual CString toXML() const;
virtual EElementType getType() const
{
return et_w_ins;
}
private:
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:author"), m_oAuthor )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:date"), m_oDate )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:id"), m_oId )
WritingElement_ReadAttributes_End( oReader )
}
public:
// Attributes
nullable<CString > m_oAuthor;
nullable<SimpleTypes::CDateTime > m_oDate;
nullable<SimpleTypes::CDecimalNumber<> > m_oId;
// Childs
CSimpleArray<WritingElement *> m_arrItems;
};
class CDel : public WritingElement
{
public:
CDel()
{
}
CDel(XmlUtils::CXmlNode &oNode)
{
fromXML( oNode );
}
CDel(XmlUtils::CXmlLiteReader& oReader)
{
fromXML( oReader );
}
virtual ~CDel()
{
Clear();
}
public:
void Clear()
{
for ( int nIndex = 0; nIndex < m_arrItems.GetSize(); nIndex++ )
{
if ( m_arrItems[nIndex] )
delete m_arrItems[nIndex];
m_arrItems[nIndex] = NULL;
}
m_arrItems.RemoveAll();
}
public:
virtual void fromXML(XmlUtils::CXmlNode& oNode);
virtual void fromXML(XmlUtils::CXmlLiteReader& oReader);
virtual CString toXML() const;
virtual EElementType getType() const
{
return et_w_del;
}
private:
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader)
{
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
WritingElement_ReadAttributes_Start( oReader )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:author"), m_oAuthor )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:date"), m_oDate )
WritingElement_ReadAttributes_ReadSingle( oReader, _T("w:id"), m_oId )
WritingElement_ReadAttributes_End( oReader )
}
public:
// Attributes
nullable<CString > m_oAuthor;
nullable<SimpleTypes::CDateTime > m_oDate;
nullable<SimpleTypes::CDecimalNumber<> > m_oId;
// Childs
CSimpleArray<WritingElement *> m_arrItems;
};
} // Logic
// Revisions 17.13.5
} // OOX
#endif /* OOX_LOGIC_RANGE_MURKUP_ELEMENTS_INCLUDE_H_ */

10
Common/DocxFormat/Source/DocxFormat/Logic/Bdo.cpp
View File

@ -12,8 +12,6 @@
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
// <w:subDoc>
@ -160,16 +158,16 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:dir") == sName )
pItem = new CDir( oReader );
else if ( _T("w:fldSimple") == sName )
pItem = new CFldSimple( oReader );
else if ( _T("w:hyperlink") == sName )
pItem = new CHyperlink( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

8
Common/DocxFormat/Source/DocxFormat/Logic/Dir.cpp
View File

@ -61,16 +61,16 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:dir") == sName )
pItem = new CDir( oReader );
else if ( _T("w:fldSimple") == sName )
pItem = new CFldSimple( oReader );
else if ( _T("w:hyperlink") == sName )
pItem = new CHyperlink( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

10
Common/DocxFormat/Source/DocxFormat/Logic/FldSimple.cpp
View File

@ -13,8 +13,6 @@
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
// <w:subDoc>
@ -163,16 +161,16 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:dir") == sName )
pItem = new CDir( oReader );
else if ( _T("w:fldSimple") == sName )
pItem = new CFldSimple( oReader );
else if ( _T("w:hyperlink") == sName )
pItem = new CHyperlink( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

10
Common/DocxFormat/Source/DocxFormat/Logic/Hyperlink.cpp
View File

@ -15,8 +15,6 @@
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
// <w:subDoc>
@ -168,16 +166,16 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:dir") == sName )
pItem = new CDir( oReader );
else if ( _T("w:fldSimple") == sName )
pItem = new CFldSimple( oReader );
else if ( _T("w:hyperlink") == sName )
pItem = new CHyperlink( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

10
Common/DocxFormat/Source/DocxFormat/Logic/Paragraph.cpp
View File

@ -14,8 +14,6 @@
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
// <w:subDoc>
@ -168,16 +166,16 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:dir") == sName )
pItem = new CDir( oReader );
else if ( _T("w:fldSimple") == sName )
pItem = new CFldSimple( oReader );
else if ( _T("w:hyperlink") == sName )
pItem = new CHyperlink( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

10
Common/DocxFormat/Source/DocxFormat/Logic/Sdt.cpp
View File

@ -15,8 +15,6 @@
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
// <w:subDoc>
@ -166,16 +164,16 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:dir") == sName )
pItem = new CDir( oReader );
else if ( _T("w:fldSimple") == sName )
pItem = new CFldSimple( oReader );
else if ( _T("w:hyperlink") == sName )
pItem = new CHyperlink( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

10
Common/DocxFormat/Source/DocxFormat/Logic/SmartTag.cpp
View File

@ -15,8 +15,6 @@
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
// <w:subDoc>
@ -164,16 +162,16 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:dir") == sName )
pItem = new CDir( oReader );
else if ( _T("w:fldSimple") == sName )
pItem = new CFldSimple( oReader );
else if ( _T("w:hyperlink") == sName )
pItem = new CHyperlink( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

30
Common/DocxFormat/Source/DocxFormat/Logic/Table.cpp
View File

@ -218,8 +218,6 @@ namespace OOX
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
@ -342,10 +340,10 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )
@ -411,8 +409,6 @@ namespace OOX
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
@ -562,10 +558,10 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )
@ -661,8 +657,6 @@ namespace OOX
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:altChunk>
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
@ -793,10 +787,10 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

10
Common/DocxFormat/Source/DocxFormat/Logic/Vml.cpp
View File

@ -17,8 +17,6 @@ namespace OOX
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:altChunk>
// <w:customXml>
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
namespace Logic
@ -69,10 +67,10 @@ namespace OOX
pItem = new CCustomXmlMoveToRangeEnd( oReader );
else if ( _T("w:customXmlMoveToRangeStart") == sName )
pItem = new CCustomXmlMoveToRangeStart( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
//else if ( _T("w:moveFrom") == sName )
// pItem = new CMoveFrom( oReader );
else if ( _T("w:moveFromRangeEnd") == sName )

10
Common/DocxFormat/Source/DocxFormat/Math/oMath.cpp
View File

@ -1,8 +1,6 @@
#include "oMathPara.h"
// TO DO: <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:
// <w:del>
// <w:ins>
// <w:moveFrom>
// <w:moveTo>
@ -81,8 +79,8 @@ namespace OOX
pItem = new OOX::Logic::CCustomXmlMoveToRangeStart( oReader );
else if ( _T("m:d") == sName )
pItem = new OOX::Logic::CDelimiter( oReader );
//else if ( _T("w:del") == sName )
// pItem = new CDel( oReader );
else if ( _T("w:del") == sName )
pItem = new CDel( oReader );
else if ( _T("m:eqArr") == sName )
pItem = new OOX::Logic::CEqArr( oReader );
else if ( _T("m:f") == sName )
@ -91,8 +89,8 @@ namespace OOX
pItem = new OOX::Logic::CFunc( oReader );
else if ( _T("m:groupChr") == sName )
pItem = new CGroupChr( oReader );
//else if ( _T("w:ins") == sName )
// pItem = new CIns( oReader );
else if ( _T("w:ins") == sName )
pItem = new CIns( oReader );
else if ( _T("m:limLow") == sName )
pItem = new OOX::Logic::CLimLow( oReader );
else if ( _T("m:limUpp") == sName )

4
Common/DocxFormat/Source/DocxFormat/WritingElement.h
View File

@ -490,6 +490,7 @@ namespace OOX
et_w_clrSchemeMapping, // <w:clrSchemeMapping>
et_w_cols, // <w:cols>
et_w_comboBox, // <w:comboBox>
et_w_comment, // <w:comment>
et_w_commentRangeEnd, // <w:commentRangeEnd>
et_w_commentRangeStart, // <w:commentRangeStart>
et_w_commentReference, // <w:commentReference>
@ -511,6 +512,7 @@ namespace OOX
et_w_dayLong, // <w:dayLong>
et_w_dayShort, // <w:dayShort>
et_w_ddList, // <w:ddList>
et_w_del, // <w:del>
et_w_delInstrText, // <w:delInstrText>
et_w_delText, // <w:delText>
et_w_drawing, // <w:drawing>
@ -538,6 +540,7 @@ namespace OOX
et_w_hdrShapeDefaults, // <w:hdrShapeDefaults>
et_w_headers, // <w:headers>
et_w_hyperlink, // <w:hyperlink>
et_w_ins, // <w:ins>
et_w_instrText, // <w:instrText>
et_w_latentStyles, // <w:latentStyles>
et_w_lastRenderedPageBreak, // <w:lastRenderedPageBreak>
@ -620,7 +623,6 @@ namespace OOX
et_w_yearLong, // <w:yearLong>
et_w_yearShort, // <w:yearShort>
et_w_zoom, // <w:zoom>
et_w_comment, // <w:comment>
et_wd_anchorLock, // <wd:anchorLock>
et_wd_borderbottom, // <wd:borderbottom>