mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-04-07 13:55:33 +08:00
RtfFormatReader/Writer - конвертация математических формул
This commit is contained in:
ElenaSubbotina
committed by
Alexander Trofimov
Alexander Trofimov
parent
c896774be6
commit
1a1b7c624c
@ -63,18 +63,17 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
rtfMath->m_oVal.AddItem( oChar );
|
||||
}
|
||||
}break;
|
||||
//case OOX::et_m_t:
|
||||
//{
|
||||
// OOX::Logic::CMText *ooxTextMath = dynamic_cast<OOX::Logic::CMText *>(m_ooxElem->m_arrItems[i]);
|
||||
// if (ooxTextMath)
|
||||
// {
|
||||
// RtfCharPtr oChar = RtfCharPtr(new RtfChar);
|
||||
//
|
||||
// oChar->m_oProperty = oCurrentProp;
|
||||
// oChar->setText( ooxTextMath->m_sText );
|
||||
// rtfMath->m_oVal.AddItem( oChar );
|
||||
// }
|
||||
//}break;
|
||||
case OOX::et_m_t:
|
||||
{//??? не нужно ващето ...
|
||||
OOX::Logic::CMText *ooxTextMath = dynamic_cast<OOX::Logic::CMText *>(ooxMath);
|
||||
if (ooxTextMath)
|
||||
{
|
||||
RtfCharPtr oChar = RtfCharPtr(new RtfChar);
|
||||
|
||||
oChar->setText( ooxTextMath->m_sText );
|
||||
rtfMath->m_oVal.AddItem( oChar );
|
||||
}
|
||||
}break;
|
||||
case OOX::et_m_oMathParaPr:
|
||||
{
|
||||
OOX::Logic::COMathParaPr *ooxSubMath = dynamic_cast<OOX::Logic::COMathParaPr *>(ooxMath);
|
||||
@ -82,10 +81,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
{
|
||||
RtfMathPtr oSubMath;
|
||||
if (ParseElement(oParam, ooxSubMath->m_oMJc.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_jc);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
}
|
||||
}break;
|
||||
case OOX::et_m_acc:
|
||||
@ -162,17 +158,11 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
{
|
||||
RtfMathPtr oSubMath;
|
||||
if (ParseElement(oParam, ooxSubMath->m_oBegChr.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_begChr);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oEndChr.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_endChr);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oCtrlPr.GetPointer(), oSubMath))
|
||||
@ -180,10 +170,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oSepChr.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_sepChr);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oShp.GetPointer(), oSubMath))
|
||||
@ -292,10 +279,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oChr.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_chr);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
}
|
||||
}break;
|
||||
case OOX::et_m_groupChr:
|
||||
@ -401,17 +385,11 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
{
|
||||
RtfMathPtr oSubMath;
|
||||
if (ParseElement(oParam, ooxSubMath->m_oCount.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_count);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oMcJc.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_mcJc);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
}
|
||||
}break;
|
||||
case OOX::et_m_mPr:
|
||||
@ -485,10 +463,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
{
|
||||
RtfMathPtr oSubMath;
|
||||
if (ParseElement(oParam, ooxSubMath->m_oChr.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_chr);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oCtrlPr.GetPointer(), oSubMath))
|
||||
@ -496,30 +471,18 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oGrow.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_grow);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oLimLoc.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_limLoc);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oSubHide.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_subHide);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oSupHide.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_supHide);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
}
|
||||
}break;
|
||||
case OOX::et_m_phantPr:
|
||||
@ -533,38 +496,23 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oShow.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_show);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oTransp.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_transp);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oZeroAsc.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_zeroAsc);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oZeroDesc.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_zeroDesc);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oZeroWid.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_zeroWid);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
}
|
||||
}break;
|
||||
case OOX::et_m_phant:
|
||||
@ -592,10 +540,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oDegHide.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_degHide);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
}
|
||||
}break;
|
||||
case OOX::et_m_rad:
|
||||
@ -623,45 +568,27 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
{
|
||||
RtfMathPtr oSubMath;
|
||||
if (ParseElement(oParam, ooxSubMath->m_oAln.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_aln);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oBrk.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_brk);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oLit.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_lit);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oNor.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_nor);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oScr.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_scr);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
|
||||
oSubMath.reset();
|
||||
if (ParseElement(oParam, ooxSubMath->m_oSty.GetPointer(), oSubMath))
|
||||
{
|
||||
oSubMath->SetOOXType(OOX::et_m_sty);
|
||||
rtfMath->AddItem(oSubMath);
|
||||
}
|
||||
}
|
||||
}break;
|
||||
case OOX::et_m_sPrePr:
|
||||
@ -812,43 +739,84 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CInteger255<>>* ooxElemInt255 =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CInteger255<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CLimLoc<>>* ooxElemLim =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CLimLoc<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CUnSignedInteger<>>* ooxElemUnSignInt =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CUnSignedInteger<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CTopBot<>>* ooxElemTopBot =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CTopBot<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CFType<>>* ooxElemFType =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CFType<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CStyle<>>* ooxElemStyle =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CStyle<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CShp<>>* ooxElemShp =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CShp<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CScript<>>* ooxElemScript =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CScript<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CSpacingRule<>>* ooxElemSpacingRule =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CSpacingRule<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CXAlign<>>* ooxElemXAlign =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CXAlign<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CMJc<>>* ooxElemMJc =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CMJc<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CInteger2<>>* ooxElemInteger2 =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CInteger2<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CYAlign<>>* ooxElemYAlign =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CYAlign<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CBreakBin<>>* ooxElemBreakBin =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CBreakBin<>>*>(ooxMath);
|
||||
|
||||
OOX::Logic::CMathBottomNodes<SimpleTypes::CBreakBinSub<>>* ooxElemBreakBinSub =
|
||||
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CBreakBinSub<>>*>(ooxMath);
|
||||
|
||||
OOX::WritingElementWithChilds<OOX::WritingElement>* ooxElemArray =
|
||||
dynamic_cast<OOX::WritingElementWithChilds<OOX::WritingElement>*>(ooxMath);
|
||||
//----------------------------------
|
||||
nullable<CString> sVal;
|
||||
if ((ooxElemBool) && (ooxElemBool->m_val.IsInit())) sVal = ooxElemBool->m_val->ToString2(SimpleTypes::onofftostringOn);
|
||||
else if ((ooxElemChar) && (ooxElemChar->m_val.IsInit())) sVal = ooxElemChar->m_val->GetValue();
|
||||
else if ((ooxElemMeasure) && (ooxElemMeasure->m_val.IsInit())) sVal = ooxElemMeasure->m_val->ToString();
|
||||
else if ((ooxElemInt255) && (ooxElemInt255->m_val.IsInit())) sVal = ooxElemInt255->m_val->ToString();
|
||||
else if ((ooxElemLim) && (ooxElemLim->m_val.IsInit())) sVal = ooxElemLim->m_val->ToString();
|
||||
else if ((ooxElemUnSignInt) && (ooxElemUnSignInt->m_val.IsInit())) sVal = ooxElemUnSignInt->m_val->ToString();
|
||||
else if ((ooxElemTopBot) && (ooxElemTopBot->m_val.IsInit())) sVal = ooxElemTopBot->m_val->ToString();
|
||||
else if ((ooxElemFType) && (ooxElemFType->m_val.IsInit())) sVal = ooxElemFType->m_val->ToString();
|
||||
else if ((ooxElemStyle) && (ooxElemStyle->m_val.IsInit())) sVal = ooxElemStyle->m_val->ToString();
|
||||
else if ((ooxElemShp) && (ooxElemShp->m_val.IsInit())) sVal = ooxElemShp->m_val->ToString();
|
||||
else if ((ooxElemScript) && (ooxElemScript->m_val.IsInit())) sVal = ooxElemScript->m_val->ToString();
|
||||
else if ((ooxElemSpacingRule) && (ooxElemSpacingRule->m_val.IsInit())) sVal = ooxElemSpacingRule->m_val->ToString();
|
||||
else if ((ooxElemXAlign) && (ooxElemXAlign->m_val.IsInit())) sVal = ooxElemXAlign->m_val->ToString();
|
||||
else if ((ooxElemMJc) && (ooxElemMJc->m_val.IsInit())) sVal = ooxElemMJc->m_val->ToString();
|
||||
else if ((ooxElemInteger2) && (ooxElemInteger2->m_val.IsInit())) sVal = ooxElemInteger2->m_val->ToString();
|
||||
else if ((ooxElemYAlign) && (ooxElemYAlign->m_val.IsInit())) sVal = ooxElemYAlign->m_val->ToString();
|
||||
else if ((ooxElemBreakBin) && (ooxElemBreakBin->m_val.IsInit())) sVal = ooxElemBreakBin->m_val->ToString();
|
||||
else if ((ooxElemBreakBinSub) && (ooxElemBreakBinSub->m_val.IsInit())) sVal = ooxElemBreakBinSub->m_val->ToString();
|
||||
//----------------------------------------------
|
||||
|
||||
if ((ooxElemBool) && (ooxElemBool->m_val.IsInit()))
|
||||
{
|
||||
rtfMath->m_bIsVal = true;
|
||||
RtfCharPtr oChar = RtfCharPtr(new RtfChar);
|
||||
oChar->setText( ooxElemBool->m_val->ToString2(SimpleTypes::onofftostringOn) );
|
||||
rtfMath->m_oVal.AddItem( oChar );
|
||||
}
|
||||
else if ((ooxElemChar) && (ooxElemChar->m_val.IsInit()))
|
||||
{
|
||||
rtfMath->m_bIsVal = true;
|
||||
RtfCharPtr oChar = RtfCharPtr(new RtfChar);
|
||||
oChar->setText( ooxElemChar->m_val->GetValue() );
|
||||
rtfMath->m_oVal.AddItem( oChar );
|
||||
}
|
||||
else if ((ooxElemMeasure) && (ooxElemMeasure->m_val.IsInit()))
|
||||
{
|
||||
rtfMath->m_bIsVal = true;
|
||||
RtfCharPtr oChar = RtfCharPtr(new RtfChar);
|
||||
oChar->setText( ooxElemMeasure->m_val->ToString() );
|
||||
rtfMath->m_oVal.AddItem( oChar );
|
||||
}
|
||||
else if (ooxElemInt255)
|
||||
{
|
||||
rtfMath->m_bIsVal = true;
|
||||
RtfCharPtr oChar = RtfCharPtr(new RtfChar);
|
||||
oChar->setText( ooxElemInt255->m_val->ToString() );
|
||||
rtfMath->m_oVal.AddItem( oChar );
|
||||
}
|
||||
else if (ooxElemArray)
|
||||
if (ooxElemArray)
|
||||
{
|
||||
OOXMathReader oMathReader(ooxElemArray);
|
||||
bool res = oMathReader.Parse( oParam, (*rtfMath) );
|
||||
}
|
||||
else if (sVal.IsInit())
|
||||
{
|
||||
rtfMath->m_bIsVal = true;
|
||||
RtfCharPtr oChar = RtfCharPtr(new RtfChar);
|
||||
oChar->setText( *sVal );
|
||||
rtfMath->m_oVal.AddItem( oChar );
|
||||
}
|
||||
else
|
||||
{
|
||||
//todoooo
|
||||
|
||||
@ -3,6 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00
|
||||
# Visual Studio 2005
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatLib", "..\RtfFormatLib\Win32\RtfFormatLib.vcproj", "{AF2D00A7-A351-4700-AE88-C1D9ADE29345}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
|
||||
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
@ -15,21 +16,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\Common\Doc
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
|
||||
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
|
||||
{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
|
||||
{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
|
||||
{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
|
||||
{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
|
||||
{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
|
||||
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
|
||||
{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
|
||||
{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
|
||||
{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
|
||||
{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
|
||||
@ -54,9 +55,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeUtilsLib", "..\..\Off
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatTest", "..\RtfFormatTest\win32\RtfFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
|
||||
{AF2D00A7-A351-4700-AE88-C1D9ADE29345} = {AF2D00A7-A351-4700-AE88-C1D9ADE29345}
|
||||
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
|
||||
{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
|
||||
@ -205,69 +205,88 @@ namespace OOX
|
||||
nullable<TMathBottomType> m_val;
|
||||
};
|
||||
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CAln;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CAlnScr;
|
||||
typedef CMathBottomNodes<SimpleTypes::CInteger2<>> CArgSz;
|
||||
typedef CMathBottomNodes<SimpleTypes::CYAlign<>> CBaseJc;
|
||||
typedef CMathBottomNodes<SimpleTypes::CMChar> CBegChr;
|
||||
typedef CMathBottomNodes<SimpleTypes::CBreakBin<>> CBrkBin;
|
||||
typedef CMathBottomNodes<SimpleTypes::CBreakBinSub<>> CBrkBinSub;
|
||||
typedef CMathBottomNodes<SimpleTypes::CUnSignedInteger<>> CCGp;
|
||||
typedef CMathBottomNodes<SimpleTypes::CSpacingRule<>> CCGpRule;
|
||||
typedef CMathBottomNodes<SimpleTypes::CMChar> CChr;
|
||||
typedef CMathBottomNodes<SimpleTypes::CInteger255<>> CCount;
|
||||
typedef CMathBottomNodes<SimpleTypes::CUnSignedInteger<>> CCSp;
|
||||
typedef CMathBottomNodes<SimpleTypes::CMJc<>> CDefJc;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CDegHide;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CDiff;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CDispDef;
|
||||
typedef CMathBottomNodes<SimpleTypes::CMChar> CEndChr;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CGrow;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CHideBot;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CHideLeft;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CHideRight;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CHideTop;
|
||||
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CInterSp;
|
||||
typedef CMathBottomNodes<SimpleTypes::CLimLoc<>> CIntLim;
|
||||
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CIntraSp;
|
||||
typedef CMathBottomNodes<SimpleTypes::CMJc<>> CMJc;
|
||||
typedef CMathBottomNodes<SimpleTypes::CLimLoc<>> CLimLoc;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CLit;
|
||||
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CLMargin;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CMaxDist;
|
||||
typedef CMathBottomNodes<SimpleTypes::CXAlign<>> CMcJc;
|
||||
typedef CMathBottomNodes<SimpleTypes::CLimLoc<>> CNaryLim;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CNoBreak;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CNor;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CObjDist;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> COpEmu;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CPlcHide;
|
||||
typedef CMathBottomNodes<SimpleTypes::CTopBot<>> CPos;
|
||||
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CPostSp;
|
||||
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CPreSp;
|
||||
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CRMargin;
|
||||
typedef CMathBottomNodes<SimpleTypes::CUnSignedInteger<>> CRSp;
|
||||
typedef CMathBottomNodes<SimpleTypes::CSpacingRule<>> CRSpRule;
|
||||
typedef CMathBottomNodes<SimpleTypes::CScript<>> CScr;
|
||||
typedef CMathBottomNodes<SimpleTypes::CMChar> CSepChr;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CShow;
|
||||
typedef CMathBottomNodes<SimpleTypes::CShp<>> CShp;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CSmallFrac;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CStrikeBLTR;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CStrikeH;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CStrikeTLBR;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CStrikeV;
|
||||
typedef CMathBottomNodes<SimpleTypes::CStyle<>> CSty;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CSubHide;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CSupHide;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CTransp;
|
||||
typedef CMathBottomNodes<SimpleTypes::CFType<>> CType;
|
||||
typedef CMathBottomNodes<SimpleTypes::CTopBot<>> CVertJc;
|
||||
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CWrapIndent;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CWrapRight;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CZeroAsc;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CZeroDesc;
|
||||
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CZeroWid;
|
||||
|
||||
template <typename TMathBottomType, EElementType EnumType = OOX::et_Unknown>
|
||||
class CMathBottomNodesEx : public CMathBottomNodes<TMathBottomType>
|
||||
{
|
||||
public:
|
||||
CMathBottomNodesEx(XmlUtils::CXmlNode& oNode)
|
||||
{
|
||||
fromXML( oNode );
|
||||
}
|
||||
CMathBottomNodesEx(XmlUtils::CXmlLiteReader& oReader)
|
||||
{
|
||||
fromXML( oReader );
|
||||
}
|
||||
virtual EElementType getType() const
|
||||
{
|
||||
return EnumType;
|
||||
}
|
||||
};
|
||||
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_aln> CAln;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_alnScr> CAlnScr;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CInteger2<>, OOX::et_m_argSz> CArgSz;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CYAlign<>, OOX::et_m_baseJc> CBaseJc;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CMChar, OOX::et_m_begChr> CBegChr;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CBreakBin<>, OOX::et_m_brkBin> CBrkBin;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CBreakBinSub<>, OOX::et_m_brkBinSub>CBrkBinSub;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CUnSignedInteger<>, OOX::et_m_cGp> CCGp;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CSpacingRule<>, OOX::et_m_cGpRule> CCGpRule;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CMChar, OOX::et_m_chr> CChr;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CInteger255<>, OOX::et_m_count> CCount;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CUnSignedInteger<>, OOX::et_m_cSp> CCSp;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CMJc<>, OOX::et_m_defJc> CDefJc;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_degHide> CDegHide;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_diff> CDiff;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_dispDef> CDispDef;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CMChar, OOX::et_m_endChr> CEndChr;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_grow> CGrow;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_hideBot> CHideBot;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_hideLeft> CHideLeft;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_hideRight>CHideRight;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_hideTop> CHideTop;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_interSp> CInterSp;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CLimLoc<>, OOX::et_m_intLim> CIntLim;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_intraSp> CIntraSp;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CMJc<>, OOX::et_m_jc> CMJc;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CLimLoc<>, OOX::et_m_limLoc> CLimLoc;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_lit> CLit;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_lMargin> CLMargin;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_maxDist> CMaxDist;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CXAlign<>, OOX::et_m_mcJc> CMcJc;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CLimLoc<>, OOX::et_m_naryLim> CNaryLim;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_noBreak> CNoBreak;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_nor> CNor;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_objDist> CObjDist;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_opEmu> COpEmu;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_plcHide> CPlcHide;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CTopBot<>, OOX::et_m_pos> CPos;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_postSp> CPostSp;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_preSp> CPreSp;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_rMargin> CRMargin;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CUnSignedInteger<>, OOX::et_m_rSp> CRSp;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CSpacingRule<>, OOX::et_m_rSpRule> CRSpRule;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CScript<>, OOX::et_m_scr> CScr;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CMChar, OOX::et_m_sepChr> CSepChr;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_show> CShow;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CShp<>, OOX::et_m_shp> CShp;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_smallFrac>CSmallFrac;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_strikeBLTR>CStrikeBLTR;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_strikeH> CStrikeH;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_strikeTLBR>CStrikeTLBR;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_strikeV> CStrikeV;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CStyle<>, OOX::et_m_sty> CSty;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_subHide> CSubHide;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_supHide> CSupHide;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_transp> CTransp;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CFType<>, OOX::et_m_type> CType;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CTopBot<>, OOX::et_m_vertJc> CVertJc;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_wrapIndent>CWrapIndent;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_wrapRight>CWrapRight;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_zeroAsc> CZeroAsc;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_zeroDesc> CZeroDesc;
|
||||
typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_zeroWid> CZeroWid;
|
||||
|
||||
}// Logic
|
||||
}//OOX
|
||||
Reference in New Issue
Block a user