Skip to content

O
onlyoffice_core
Commit 1a1b7c62 authored by ElenaSubbotina's avatar ElenaSubbotina Committed by Alexander Trofimov
Browse files
Options

RtfFormatReader/Writer - конвертация математических формул

parent c896774b
Hide whitespace changes
Inline Side-by-side
Showing with 172 additions and 184 deletions
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXMathReader.cpp
View file @ 1a1b7c62
...@@ -63,18 +63,17 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -63,18 +63,17 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
rtfMath->m_oVal.AddItem( oChar ); rtfMath->m_oVal.AddItem( oChar );
} }
}break; }break;
//case OOX::et_m_t: case OOX::et_m_t:
//{ {//??? не нужно ващето ...
// OOX::Logic::CMText *ooxTextMath = dynamic_cast<OOX::Logic::CMText *>(m_ooxElem->m_arrItems[i]); OOX::Logic::CMText *ooxTextMath = dynamic_cast<OOX::Logic::CMText *>(ooxMath);
// if (ooxTextMath) if (ooxTextMath)
// { {
// RtfCharPtr oChar = RtfCharPtr(new RtfChar); RtfCharPtr oChar = RtfCharPtr(new RtfChar);
//
// oChar->m_oProperty = oCurrentProp; oChar->setText( ooxTextMath->m_sText );
// oChar->setText( ooxTextMath->m_sText ); rtfMath->m_oVal.AddItem( oChar );
// rtfMath->m_oVal.AddItem( oChar ); }
// } }break;
//}break;
case OOX::et_m_oMathParaPr: case OOX::et_m_oMathParaPr:
{ {
OOX::Logic::COMathParaPr *ooxSubMath = dynamic_cast<OOX::Logic::COMathParaPr *>(ooxMath); OOX::Logic::COMathParaPr *ooxSubMath = dynamic_cast<OOX::Logic::COMathParaPr *>(ooxMath);
...@@ -82,10 +81,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -82,10 +81,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
{ {
RtfMathPtr oSubMath; RtfMathPtr oSubMath;
if (ParseElement(oParam, ooxSubMath->m_oMJc.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oMJc.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_jc);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
} }
}break; }break;
case OOX::et_m_acc: case OOX::et_m_acc:
...@@ -162,17 +158,11 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -162,17 +158,11 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
{ {
RtfMathPtr oSubMath; RtfMathPtr oSubMath;
if (ParseElement(oParam, ooxSubMath->m_oBegChr.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oBegChr.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_begChr);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oEndChr.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oEndChr.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_endChr);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oCtrlPr.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oCtrlPr.GetPointer(), oSubMath))
...@@ -180,10 +170,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -180,10 +170,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oSepChr.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oSepChr.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_sepChr);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oShp.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oShp.GetPointer(), oSubMath))
...@@ -292,10 +279,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -292,10 +279,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oChr.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oChr.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_chr);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
} }
}break; }break;
case OOX::et_m_groupChr: case OOX::et_m_groupChr:
...@@ -401,17 +385,11 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -401,17 +385,11 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
{ {
RtfMathPtr oSubMath; RtfMathPtr oSubMath;
if (ParseElement(oParam, ooxSubMath->m_oCount.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oCount.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_count);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oMcJc.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oMcJc.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_mcJc);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
} }
}break; }break;
case OOX::et_m_mPr: case OOX::et_m_mPr:
...@@ -485,10 +463,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -485,10 +463,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
{ {
RtfMathPtr oSubMath; RtfMathPtr oSubMath;
if (ParseElement(oParam, ooxSubMath->m_oChr.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oChr.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_chr);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oCtrlPr.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oCtrlPr.GetPointer(), oSubMath))
...@@ -496,30 +471,18 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -496,30 +471,18 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oGrow.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oGrow.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_grow);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oLimLoc.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oLimLoc.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_limLoc);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oSubHide.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oSubHide.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_subHide);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oSupHide.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oSupHide.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_supHide);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
} }
}break; }break;
case OOX::et_m_phantPr: case OOX::et_m_phantPr:
...@@ -533,38 +496,23 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -533,38 +496,23 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oShow.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oShow.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_show);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oTransp.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oTransp.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_transp);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oZeroAsc.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oZeroAsc.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_zeroAsc);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oZeroDesc.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oZeroDesc.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_zeroDesc);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oZeroWid.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oZeroWid.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_zeroWid);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
} }
}break; }break;
case OOX::et_m_phant: case OOX::et_m_phant:
...@@ -592,10 +540,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -592,10 +540,7 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oDegHide.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oDegHide.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_degHide);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
} }
}break; }break;
case OOX::et_m_rad: case OOX::et_m_rad:
...@@ -623,45 +568,27 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -623,45 +568,27 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
{ {
RtfMathPtr oSubMath; RtfMathPtr oSubMath;
if (ParseElement(oParam, ooxSubMath->m_oAln.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oAln.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_aln);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oBrk.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oBrk.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_brk);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oLit.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oLit.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_lit);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oNor.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oNor.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_nor);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oScr.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oScr.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_scr);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
oSubMath.reset(); oSubMath.reset();
if (ParseElement(oParam, ooxSubMath->m_oSty.GetPointer(), oSubMath)) if (ParseElement(oParam, ooxSubMath->m_oSty.GetPointer(), oSubMath))
{
oSubMath->SetOOXType(OOX::et_m_sty);
rtfMath->AddItem(oSubMath); rtfMath->AddItem(oSubMath);
}
} }
}break; }break;
case OOX::et_m_sPrePr: case OOX::et_m_sPrePr:
...@@ -812,43 +739,84 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement * ...@@ -812,43 +739,84 @@ bool OOXMathReader::ParseElement(ReaderParameter oParam , OOX::WritingElement *
OOX::Logic::CMathBottomNodes<SimpleTypes::CInteger255<>>* ooxElemInt255 = OOX::Logic::CMathBottomNodes<SimpleTypes::CInteger255<>>* ooxElemInt255 =
dynamic_cast<OOX::Logic::CMathBottomNodes<SimpleTypes::CInteger255<>>*>(ooxMath); 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 = OOX::WritingElementWithChilds<OOX::WritingElement>* ooxElemArray =
dynamic_cast<OOX::WritingElementWithChilds<OOX::WritingElement>*>(ooxMath); 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())) if (ooxElemArray)
{ {
rtfMath->m_bIsVal = true; OOXMathReader oMathReader(ooxElemArray);
RtfCharPtr oChar = RtfCharPtr(new RtfChar); bool res = oMathReader.Parse( oParam, (*rtfMath) );
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) else if (sVal.IsInit())
{ {
rtfMath->m_bIsVal = true; rtfMath->m_bIsVal = true;
RtfCharPtr oChar = RtfCharPtr(new RtfChar); RtfCharPtr oChar = RtfCharPtr(new RtfChar);
oChar->setText( ooxElemInt255->m_val->ToString() ); oChar->setText( *sVal );
rtfMath->m_oVal.AddItem( oChar ); rtfMath->m_oVal.AddItem( oChar );
} }
else if (ooxElemArray)
{
OOXMathReader oMathReader(ooxElemArray);
bool res = oMathReader.Parse( oParam, (*rtfMath) );
}
else else
{ {
//todoooo //todoooo
......
ASCOfficeRtfFile/Win32/ASCOfficeRtfFile.sln
View file @ 1a1b7c62
...@@ -3,6 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00 ...@@ -3,6 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatLib", "..\RtfFormatLib\Win32\RtfFormatLib.vcproj", "{AF2D00A7-A351-4700-AE88-C1D9ADE29345}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatLib", "..\RtfFormatLib\Win32\RtfFormatLib.vcproj", "{AF2D00A7-A351-4700-AE88-C1D9ADE29345}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
EndProjectSection EndProjectSection
EndProject EndProject
...@@ -15,21 +16,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\Common\Doc ...@@ -15,21 +16,21 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\Common\Doc
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3} {0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
ProjectSection(ProjectDependencies) = postProject 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} {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 EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}" 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 ...@@ -54,9 +55,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeUtilsLib", "..\..\Off
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatTest", "..\RtfFormatTest\win32\RtfFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RtfFormatTest", "..\RtfFormatTest\win32\RtfFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
ProjectSection(ProjectDependencies) = postProject 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} {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 EndProjectSection
EndProject EndProject
Global Global
......
Common/DocxFormat/Source/DocxFormat/Math/oMathBottomNodes.h
View file @ 1a1b7c62
...@@ -205,69 +205,88 @@ namespace OOX ...@@ -205,69 +205,88 @@ namespace OOX
nullable<TMathBottomType> m_val; nullable<TMathBottomType> m_val;
}; };
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CAln;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CAlnScr; template <typename TMathBottomType, EElementType EnumType = OOX::et_Unknown>
typedef CMathBottomNodes<SimpleTypes::CInteger2<>> CArgSz; class CMathBottomNodesEx : public CMathBottomNodes<TMathBottomType>
typedef CMathBottomNodes<SimpleTypes::CYAlign<>> CBaseJc; {
typedef CMathBottomNodes<SimpleTypes::CMChar> CBegChr; public:
typedef CMathBottomNodes<SimpleTypes::CBreakBin<>> CBrkBin; CMathBottomNodesEx(XmlUtils::CXmlNode& oNode)
typedef CMathBottomNodes<SimpleTypes::CBreakBinSub<>> CBrkBinSub; {
typedef CMathBottomNodes<SimpleTypes::CUnSignedInteger<>> CCGp; fromXML( oNode );
typedef CMathBottomNodes<SimpleTypes::CSpacingRule<>> CCGpRule; }
typedef CMathBottomNodes<SimpleTypes::CMChar> CChr; CMathBottomNodesEx(XmlUtils::CXmlLiteReader& oReader)
typedef CMathBottomNodes<SimpleTypes::CInteger255<>> CCount; {
typedef CMathBottomNodes<SimpleTypes::CUnSignedInteger<>> CCSp; fromXML( oReader );
typedef CMathBottomNodes<SimpleTypes::CMJc<>> CDefJc; }
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CDegHide; virtual EElementType getType() const
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CDiff; {
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CDispDef; return EnumType;
typedef CMathBottomNodes<SimpleTypes::CMChar> CEndChr; }
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CGrow; };
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CHideBot;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CHideLeft; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_aln> CAln;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CHideRight; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_alnScr> CAlnScr;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CHideTop; typedef CMathBottomNodesEx<SimpleTypes::CInteger2<>, OOX::et_m_argSz> CArgSz;
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CInterSp; typedef CMathBottomNodesEx<SimpleTypes::CYAlign<>, OOX::et_m_baseJc> CBaseJc;
typedef CMathBottomNodes<SimpleTypes::CLimLoc<>> CIntLim; typedef CMathBottomNodesEx<SimpleTypes::CMChar, OOX::et_m_begChr> CBegChr;
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CIntraSp; typedef CMathBottomNodesEx<SimpleTypes::CBreakBin<>, OOX::et_m_brkBin> CBrkBin;
typedef CMathBottomNodes<SimpleTypes::CMJc<>> CMJc; typedef CMathBottomNodesEx<SimpleTypes::CBreakBinSub<>, OOX::et_m_brkBinSub>CBrkBinSub;
typedef CMathBottomNodes<SimpleTypes::CLimLoc<>> CLimLoc; typedef CMathBottomNodesEx<SimpleTypes::CUnSignedInteger<>, OOX::et_m_cGp> CCGp;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CLit; typedef CMathBottomNodesEx<SimpleTypes::CSpacingRule<>, OOX::et_m_cGpRule> CCGpRule;
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CLMargin; typedef CMathBottomNodesEx<SimpleTypes::CMChar, OOX::et_m_chr> CChr;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CMaxDist; typedef CMathBottomNodesEx<SimpleTypes::CInteger255<>, OOX::et_m_count> CCount;
typedef CMathBottomNodes<SimpleTypes::CXAlign<>> CMcJc; typedef CMathBottomNodesEx<SimpleTypes::CUnSignedInteger<>, OOX::et_m_cSp> CCSp;
typedef CMathBottomNodes<SimpleTypes::CLimLoc<>> CNaryLim; typedef CMathBottomNodesEx<SimpleTypes::CMJc<>, OOX::et_m_defJc> CDefJc;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CNoBreak; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_degHide> CDegHide;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CNor; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_diff> CDiff;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CObjDist; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_dispDef> CDispDef;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> COpEmu; typedef CMathBottomNodesEx<SimpleTypes::CMChar, OOX::et_m_endChr> CEndChr;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CPlcHide; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_grow> CGrow;
typedef CMathBottomNodes<SimpleTypes::CTopBot<>> CPos; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_hideBot> CHideBot;
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CPostSp; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_hideLeft> CHideLeft;
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CPreSp; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_hideRight>CHideRight;
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CRMargin; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_hideTop> CHideTop;
typedef CMathBottomNodes<SimpleTypes::CUnSignedInteger<>> CRSp; typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_interSp> CInterSp;
typedef CMathBottomNodes<SimpleTypes::CSpacingRule<>> CRSpRule; typedef CMathBottomNodesEx<SimpleTypes::CLimLoc<>, OOX::et_m_intLim> CIntLim;
typedef CMathBottomNodes<SimpleTypes::CScript<>> CScr; typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_intraSp> CIntraSp;
typedef CMathBottomNodes<SimpleTypes::CMChar> CSepChr; typedef CMathBottomNodesEx<SimpleTypes::CMJc<>, OOX::et_m_jc> CMJc;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CShow; typedef CMathBottomNodesEx<SimpleTypes::CLimLoc<>, OOX::et_m_limLoc> CLimLoc;
typedef CMathBottomNodes<SimpleTypes::CShp<>> CShp; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_lit> CLit;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CSmallFrac; typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_lMargin> CLMargin;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CStrikeBLTR; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_maxDist> CMaxDist;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CStrikeH; typedef CMathBottomNodesEx<SimpleTypes::CXAlign<>, OOX::et_m_mcJc> CMcJc;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CStrikeTLBR; typedef CMathBottomNodesEx<SimpleTypes::CLimLoc<>, OOX::et_m_naryLim> CNaryLim;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CStrikeV; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_noBreak> CNoBreak;
typedef CMathBottomNodes<SimpleTypes::CStyle<>> CSty; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_nor> CNor;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CSubHide; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_objDist> CObjDist;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CSupHide; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_opEmu> COpEmu;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CTransp; typedef CMathBottomNodesEx<SimpleTypes::COnOff<>, OOX::et_m_plcHide> CPlcHide;
typedef CMathBottomNodes<SimpleTypes::CFType<>> CType; typedef CMathBottomNodesEx<SimpleTypes::CTopBot<>, OOX::et_m_pos> CPos;
typedef CMathBottomNodes<SimpleTypes::CTopBot<>> CVertJc; typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_postSp> CPostSp;
typedef CMathBottomNodes<SimpleTypes::CTwipsMeasure> CWrapIndent; typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_preSp> CPreSp;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CWrapRight; typedef CMathBottomNodesEx<SimpleTypes::CTwipsMeasure, OOX::et_m_rMargin> CRMargin;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CZeroAsc; typedef CMathBottomNodesEx<SimpleTypes::CUnSignedInteger<>, OOX::et_m_rSp> CRSp;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CZeroDesc; typedef CMathBottomNodesEx<SimpleTypes::CSpacingRule<>, OOX::et_m_rSpRule> CRSpRule;
typedef CMathBottomNodes<SimpleTypes::COnOff<>> CZeroWid; 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 }// Logic
}//OOX }//OOX
\ No newline at end of file
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