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

.

Browse Source
This commit is contained in:
Elena.Subbotina
2022-12-08 18:50:53 +03:00
parent 98175e438f
commit 4673d68387
6 changed files with 239 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RtfFile/OOXml/Reader/OOXAbstractNumReader.cpp
View File

@ -31,6 +31,7 @@
*/ */
#include "OOXAbstractNumReader.h" #include "OOXAbstractNumReader.h"
#include "../../../OOXML/DocxFormat/Numbering.h"
OOXAbstractNumReader::OOXAbstractNumReader(OOX::Numbering::CAbstractNum *ooxAbstractNum) OOXAbstractNumReader::OOXAbstractNumReader(OOX::Numbering::CAbstractNum *ooxAbstractNum)
{ {

9
RtfFile/OOXml/Reader/OOXAbstractNumReader.h
View File

@ -31,7 +31,14 @@
*/ */
#pragma once #pragma once
#include "OOXLevelReader.h" #include "OOXLevelReader.h"
#include "../../OOXML/DocxFormat/Numbering.h"
namespace OOX
{
namespace Numbering
{
class CAbstractNum;
}
}
class OOXAbstractNumReader class OOXAbstractNumReader
{ {

90
RtfFile/OOXml/Reader/OOXLatentStyleReader.cpp
View File

@ -37,55 +37,55 @@ OOXLatentStyleReader::OOXLatentStyleReader()
} }
bool OOXLatentStyleReader::Parse( ReaderParameter oParam ) bool OOXLatentStyleReader::Parse( ReaderParameter oParam )
{ {
XmlUtils::CXmlLiteReader oXmlReader; //XmlUtils::CXmlLiteReader oXmlReader;
if( TRUE == oXmlReader.OpenFromXmlNode(oParam.oNode) ) //if( TRUE == oXmlReader.OpenFromXmlNode(oParam.oNode) )
{ //{
std::wstring nCount = oXmlReader.ReadNodeAttribute( L"w:count" ); // std::wstring nCount = oXmlReader.ReadNodeAttribute( L"w:count" );
if( !nCount.empty() ) // if( !nCount.empty() )
oParam.oRtf->m_oLatentStyleTable.m_nCount = Strings::ToInteger( nCount ); // oParam.oRtf->m_oLatentStyleTable.m_nCount = Strings::ToInteger( nCount );
std::wstring nLocked = oXmlReader.ReadNodeAttribute( L"w:defLockedState" ); // std::wstring nLocked = oXmlReader.ReadNodeAttribute( L"w:defLockedState" );
if( !nLocked.empty() ) // if( !nLocked.empty() )
oParam.oRtf->m_oLatentStyleTable.m_nLocked= Strings::ToInteger( nLocked ); // oParam.oRtf->m_oLatentStyleTable.m_nLocked= Strings::ToInteger( nLocked );
std::wstring nSemiHid = oXmlReader.ReadNodeAttribute( L"w:defSemiHidden" ); // std::wstring nSemiHid = oXmlReader.ReadNodeAttribute( L"w:defSemiHidden" );
if( !nSemiHid.empty() ) // if( !nSemiHid.empty() )
oParam.oRtf->m_oLatentStyleTable.m_nSemiHidden= Strings::ToInteger( nSemiHid ); // oParam.oRtf->m_oLatentStyleTable.m_nSemiHidden= Strings::ToInteger( nSemiHid );
std::wstring nUNhidWU = oXmlReader.ReadNodeAttribute( L"w:defUnhideWhenUsed" ); // std::wstring nUNhidWU = oXmlReader.ReadNodeAttribute( L"w:defUnhideWhenUsed" );
if( !nUNhidWU.empty() ) // if( !nUNhidWU.empty() )
oParam.oRtf->m_oLatentStyleTable.m_nUnHiddenWhenUse= Strings::ToInteger( nUNhidWU ); // oParam.oRtf->m_oLatentStyleTable.m_nUnHiddenWhenUse= Strings::ToInteger( nUNhidWU );
std::wstring nQFormat = oXmlReader.ReadNodeAttribute( L"w:defQFormat" ); // std::wstring nQFormat = oXmlReader.ReadNodeAttribute( L"w:defQFormat" );
if( !nQFormat.empty() ) // if( !nQFormat.empty() )
oParam.oRtf->m_oLatentStyleTable.m_nQFormat= Strings::ToInteger( nQFormat ); // oParam.oRtf->m_oLatentStyleTable.m_nQFormat= Strings::ToInteger( nQFormat );
std::wstring nUIPriority = oXmlReader.ReadNodeAttribute( L"w:defUIPriority" ); // std::wstring nUIPriority = oXmlReader.ReadNodeAttribute( L"w:defUIPriority" );
if( !nUIPriority.empty() ) // if( !nUIPriority.empty() )
oParam.oRtf->m_oLatentStyleTable.m_nPriority= Strings::ToInteger( nUIPriority ); // oParam.oRtf->m_oLatentStyleTable.m_nPriority= Strings::ToInteger( nUIPriority );
oXmlReader.ReadNodeList( L"w:lsdException" ); // oXmlReader.ReadNodeList( L"w:lsdException" );
for (size_t i = 0; i < oXmlReader.GetLengthList(); i++ ) // for (size_t i = 0; i < oXmlReader.GetLengthList(); i++ )
{ // {
RtfStyleException oNewException; // RtfStyleException oNewException;
oNewException.m_sName = oXmlReader.ReadNodeAttribute( L"w:name", L"" ); // oNewException.m_sName = oXmlReader.ReadNodeAttribute( L"w:name", L"" );
std::wstring nPriority = oXmlReader.ReadNodeAttribute( L"w:uiPriority"); // std::wstring nPriority = oXmlReader.ReadNodeAttribute( L"w:uiPriority");
if( !nPriority.empty() ) // if( !nPriority.empty() )
oNewException.m_nPriority = Strings::ToInteger( nPriority ); // oNewException.m_nPriority = Strings::ToInteger( nPriority );
std::wstring nHiddenWhenUse = oXmlReader.ReadNodeAttribute( L"w:unhideWhenUsed"); // std::wstring nHiddenWhenUse = oXmlReader.ReadNodeAttribute( L"w:unhideWhenUsed");
if( !nHiddenWhenUse.empty() ) // if( !nHiddenWhenUse.empty() )
oNewException.m_nHiddenWhenUse = Strings::ToInteger( nHiddenWhenUse ); // oNewException.m_nHiddenWhenUse = Strings::ToInteger( nHiddenWhenUse );
std::wstring nQFormat = oXmlReader.ReadNodeAttribute( L"w:qFormat" ); // std::wstring nQFormat = oXmlReader.ReadNodeAttribute( L"w:qFormat" );
if( !nQFormat.empty() ) // if( !nQFormat.empty() )
oNewException.m_nQFormat = Strings::ToInteger( nQFormat ); // oNewException.m_nQFormat = Strings::ToInteger( nQFormat );
std::wstring nLocked = oXmlReader.ReadNodeAttribute( L"w:locked" ); // std::wstring nLocked = oXmlReader.ReadNodeAttribute( L"w:locked" );
if( !nLocked.empty() ) // if( !nLocked.empty() )
oNewException.m_nLocked = Strings::ToInteger( nLocked ); // oNewException.m_nLocked = Strings::ToInteger( nLocked );
std::wstring nSemiHidden = oXmlReader.ReadNodeAttribute( L"w:semiHidden"); // std::wstring nSemiHidden = oXmlReader.ReadNodeAttribute( L"w:semiHidden");
if( !nSemiHidden.empty() ) // if( !nSemiHidden.empty() )
oNewException.m_nSemiHidden = Strings::ToInteger( nSemiHidden ); // oNewException.m_nSemiHidden = Strings::ToInteger( nSemiHidden );
if( true == oNewException.IsValid() ) // if( true == oNewException.IsValid() )
oParam.oRtf->m_oLatentStyleTable.AddItem( oNewException ); // oParam.oRtf->m_oLatentStyleTable.AddItem( oNewException );
} // }
} //}
return false; return false;
} }

3
RtfFile/OOXml/Reader/OOXLatentStyleReader.h
View File

@ -31,8 +31,7 @@
*/ */
#pragma once #pragma once
#include "../../Format/RtfDocument.h" #include "OOXReaderBasic.h"
#include "../../Format/RtfProperty.h"
class OOXLatentStyleReader class OOXLatentStyleReader
{ {

46
RtfFile/Projects/Windows/Win32/RtfFormatLib.vcxproj
View File

@ -139,11 +139,14 @@
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\..\Format\ConvertationManager.cpp" /> <ClCompile Include="..\..\..\Format\ConvertationManager.cpp" />
<ClCompile Include="..\..\..\Format\DestinationCommand.cpp" /> <ClCompile Include="..\..\..\Format\DestinationCommand.cpp" />
<ClCompile Include="..\..\..\Format\IdGenerator.cpp" />
<ClCompile Include="..\..\..\Format\Ole1FormatReader.cpp" />
<ClCompile Include="..\..\..\Format\RtfBookmark.cpp" /> <ClCompile Include="..\..\..\Format\RtfBookmark.cpp" />
<ClCompile Include="..\..\..\Format\RtfChar.cpp" /> <ClCompile Include="..\..\..\Format\RtfChar.cpp" />
<ClCompile Include="..\..\..\Format\RtfDocument.cpp" /> <ClCompile Include="..\..\..\Format\RtfDocument.cpp" />
<ClCompile Include="..\..\..\Format\RtfField.cpp" /> <ClCompile Include="..\..\..\Format\RtfField.cpp" />
<ClCompile Include="..\..\..\Format\RtfGlobalTables.cpp" /> <ClCompile Include="..\..\..\Format\RtfGlobalTables.cpp" />
<ClCompile Include="..\..\..\Format\RtfLex.cpp" />
<ClCompile Include="..\..\..\Format\RtfMath.cpp" /> <ClCompile Include="..\..\..\Format\RtfMath.cpp" />
<ClCompile Include="..\..\..\Format\RtfOldList.cpp" /> <ClCompile Include="..\..\..\Format\RtfOldList.cpp" />
<ClCompile Include="..\..\..\Format\RtfOle.cpp" /> <ClCompile Include="..\..\..\Format\RtfOle.cpp" />
@ -154,17 +157,60 @@
<ClCompile Include="..\..\..\Format\RtfSection.cpp" /> <ClCompile Include="..\..\..\Format\RtfSection.cpp" />
<ClCompile Include="..\..\..\Format\RtfShape.cpp" /> <ClCompile Include="..\..\..\Format\RtfShape.cpp" />
<ClCompile Include="..\..\..\Format\RtfTable.cpp" /> <ClCompile Include="..\..\..\Format\RtfTable.cpp" />
<ClCompile Include="..\..\..\Format\RtfTableCell.cpp" />
<ClCompile Include="..\..\..\Format\RtfTableRow.cpp" />
<ClCompile Include="..\..\..\Format\RtfToken.cpp" />
<ClCompile Include="..\..\..\Format\RtfWriter.cpp" /> <ClCompile Include="..\..\..\Format\RtfWriter.cpp" />
<ClCompile Include="..\..\..\Format\UniversalConverterUtils.cpp" />
<ClCompile Include="..\..\..\Format\Utils.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXAbstractNumReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXAppReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXBorderReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXcnfStyleReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXColorReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXColorReader2.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXColorSchemeReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXCoreReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXDocDefaultsReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXDocumentReader.cpp" /> <ClCompile Include="..\..\..\OOXml\Reader\OOXDocumentReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXDrawingGraphicReader.cpp" /> <ClCompile Include="..\..\..\OOXml\Reader\OOXDrawingGraphicReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXFontReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXFontSchemeReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXFontTableReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXFootnotesReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXHeaderReader.cpp" /> <ClCompile Include="..\..\..\OOXml\Reader\OOXHeaderReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXLatentStyleReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXLevelReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXMathReader.cpp" /> <ClCompile Include="..\..\..\OOXml\Reader\OOXMathReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXNumberingMapReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXNumberingReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXParagraphElementReaders.cpp" /> <ClCompile Include="..\..\..\OOXml\Reader\OOXParagraphElementReaders.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXPictureAnchorReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXPictureInlineReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXPictureReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXpPrTabReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXReader.cpp" /> <ClCompile Include="..\..\..\OOXml\Reader\OOXReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXShadingReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXShapeReader.cpp" /> <ClCompile Include="..\..\..\OOXml\Reader\OOXShapeReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXStyleReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXStyleTableReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXTableReader.cpp" /> <ClCompile Include="..\..\..\OOXml\Reader\OOXTableReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXtblLookReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXtblpPrReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXtblPrReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXtcPrReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXTextItemReader.cpp" /> <ClCompile Include="..\..\..\OOXml\Reader\OOXTextItemReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Reader\OOXThemeReader.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXCommentsWriter.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXContentTypesWriter.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXDocumentWriter.cpp" /> <ClCompile Include="..\..\..\OOXml\Writer\OOXDocumentWriter.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXFontTableWriter.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXFootnoteWriter.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXNumberingWriter.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXRelsWriter.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXSettingsWriter.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXStylesWriter.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXThemeWriter.cpp" />
<ClCompile Include="..\..\..\OOXml\Writer\OOXWriter.cpp" /> <ClCompile Include="..\..\..\OOXml\Writer\OOXWriter.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

138
RtfFile/Projects/Windows/Win32/RtfFormatLib.vcxproj.filters
View File

@ -97,6 +97,144 @@
<Filter>OOXWriter</Filter> <Filter>OOXWriter</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\Format\ConvertationManager.cpp" /> <ClCompile Include="..\..\..\Format\ConvertationManager.cpp" />
<ClCompile Include="..\..\..\Format\IdGenerator.cpp">
<Filter>Format</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Format\Ole1FormatReader.cpp">
<Filter>Format</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Format\RtfLex.cpp">
<Filter>Format</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Format\RtfTableCell.cpp">
<Filter>Format</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Format\RtfTableRow.cpp">
<Filter>Format</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Format\RtfToken.cpp">
<Filter>Format</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Format\UniversalConverterUtils.cpp">
<Filter>Format</Filter>
</ClCompile>
<ClCompile Include="..\..\..\Format\Utils.cpp">
<Filter>Format</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXAbstractNumReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXAppReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXBorderReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXcnfStyleReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXColorReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXColorReader2.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXColorSchemeReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXCoreReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXDocDefaultsReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXFontReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXFontSchemeReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXFontTableReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXFootnotesReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXLatentStyleReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXLevelReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXNumberingMapReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXNumberingReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXPictureAnchorReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXPictureInlineReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXPictureReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXpPrTabReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXShadingReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXStyleReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXStyleTableReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXtblLookReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXtblpPrReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXtblPrReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXtcPrReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Reader\OOXThemeReader.cpp">
<Filter>OOXReader</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Writer\OOXCommentsWriter.cpp">
<Filter>OOXWriter</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Writer\OOXContentTypesWriter.cpp">
<Filter>OOXWriter</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Writer\OOXFontTableWriter.cpp">
<Filter>OOXWriter</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Writer\OOXFootnoteWriter.cpp">
<Filter>OOXWriter</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Writer\OOXNumberingWriter.cpp">
<Filter>OOXWriter</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Writer\OOXRelsWriter.cpp">
<Filter>OOXWriter</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Writer\OOXSettingsWriter.cpp">
<Filter>OOXWriter</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Writer\OOXStylesWriter.cpp">
<Filter>OOXWriter</Filter>
</ClCompile>
<ClCompile Include="..\..\..\OOXml\Writer\OOXThemeWriter.cpp">
<Filter>OOXWriter</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\Format\Basic.h"> <ClInclude Include="..\..\..\Format\Basic.h">