Skip to content

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

x2t version up 2.0.3.438

parent 45231b82
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 67 deletions
ASCOfficeDocxFile2/BinWriter/BinWriters.h
View file @ f3a510bd
......@@ -149,8 +149,8 @@ namespace BinDocxRW
switch(border.m_oVal.get().GetValue())
{
case SimpleTypes::bordervalueNone:
case SimpleTypes::bordervalueNil:m_oStream.WriteBYTE(border_None);break;
default:m_oStream.WriteBYTE(border_Single);break;
case SimpleTypes::bordervalueNil: m_oStream.WriteBYTE(border_None); break;
default: m_oStream.WriteBYTE(border_Single); break;
}
}
......@@ -306,8 +306,8 @@ namespace BinDocxRW
m_oStream.WriteBYTE(c_oSerPropLenType::Byte);
switch(Shd.m_oVal.get().GetValue())
{
case SimpleTypes::shdNil: m_oStream.WriteBYTE(shd_Nil);break;
default: m_oStream.WriteBYTE(shd_Clear);break;
case SimpleTypes::shdNil: m_oStream.WriteBYTE(shd_Nil);break;
default: m_oStream.WriteBYTE(shd_Clear);break;
}
}
//Value
......@@ -538,7 +538,9 @@ namespace BinDocxRW
case SimpleTypes::themeMinorBidi:
case SimpleTypes::themeMinorEastAsia:
case SimpleTypes::themeMinorHAnsi:sFontAscii = m_poTheme->GetMinorFont();break;
}
default:
break;
}
}
else if(oFont.m_sAscii.IsInit())
sFontAscii = oFont.m_sAscii.get();
......@@ -556,7 +558,9 @@ namespace BinDocxRW
case SimpleTypes::themeMinorBidi:
case SimpleTypes::themeMinorEastAsia:
case SimpleTypes::themeMinorHAnsi:sFontHAnsi = m_poTheme->GetMinorFont();break;
}
default:
break;
}
}
else if(oFont.m_sHAnsi.IsInit())
sFontHAnsi = oFont.m_sHAnsi.get();
......@@ -573,7 +577,8 @@ namespace BinDocxRW
case SimpleTypes::themeMinorBidi:
case SimpleTypes::themeMinorEastAsia:
case SimpleTypes::themeMinorHAnsi:sFontCS = m_poTheme->GetMinorFont();break;
}
default: break;
}
}
else if(oFont.m_sCs.IsInit())
sFontCS = oFont.m_sCs.get();
......@@ -590,7 +595,8 @@ namespace BinDocxRW
case SimpleTypes::themeMinorBidi:
case SimpleTypes::themeMinorEastAsia:
case SimpleTypes::themeMinorHAnsi:sFontAE = m_poTheme->GetMinorFont();break;
}
default: break;
}
}
else if(oFont.m_sEastAsia.IsInit())
sFontAE = oFont.m_sEastAsia.get();
......@@ -1394,7 +1400,8 @@ namespace BinDocxRW
{
case SimpleTypes::pageorientPortrait: Orientation = orientation_Portrait;break;
case SimpleTypes::pageorientLandscape: Orientation = orientation_Landscape;break;
}
default: break;
}
}
}
//W
......@@ -3049,6 +3056,8 @@ namespace BinDocxRW
OOX::Logic::CBdo* pBdo = static_cast<OOX::Logic::CBdo*>(item);
WriteDocumentContent(pBdo->m_arrItems);
}break;
default:
break;
}
}
//SectPr & Background
......@@ -3236,6 +3245,8 @@ namespace BinDocxRW
m_oBcw.WriteItemEnd(nCurPos);
break;
}
default:
break;
}
}
}
......@@ -3268,7 +3279,9 @@ namespace BinDocxRW
case OOX::et_w_commentRangeEnd: nCurPos = m_oBcw.WriteItemStart(c_oSerParType::CommentEnd); break;
case OOX::et_w_commentReference: nCurPos = m_oBcw.WriteItemStart(c_oSerRunType::CommentReference);break;
}
default:
break;
}
int nCurPos2 = m_oBcw.WriteItemStart(c_oSer_CommentsType::Id);
m_oBcw.m_oStream.WriteLONG(oId->GetValue());
......@@ -3738,6 +3751,8 @@ namespace BinDocxRW
m_oBcw.WriteItemEnd(nCurPos);
break;
}
default:
break;
}
}
}
......@@ -4062,6 +4077,8 @@ namespace BinDocxRW
m_oBcw.WriteItemEnd(nCurPos);
break;
}
default:
break;
}
}
}
......@@ -4179,7 +4196,9 @@ namespace BinDocxRW
m_oBcw.WriteItemEnd(nCurPos);
break;
}
}
default:
break;
}
}
}
void WriteMathFName(const OOX::Logic::CFName &pFName)
......@@ -4414,7 +4433,9 @@ namespace BinDocxRW
m_oBcw.WriteItemEnd(nCurPos);
break;
}
}
default:
break;
}
}
}
void WriteMathMaxDist(const OOX::Logic::CMaxDist &pMaxDist)
......@@ -5123,7 +5144,9 @@ namespace BinDocxRW
case SimpleTypes::brtypeColumn: nBreakType = c_oSerRunType::columnbreak; break;
case SimpleTypes::brtypePage: nBreakType = c_oSerRunType::pagebreak; break;
case SimpleTypes::brtypeTextWrapping: nBreakType = c_oSerRunType::linebreak; break;
}
default:
break;
}
if(-1 != nBreakType)
{
m_oBcw.m_oStream.WriteBYTE(nBreakType);
......@@ -5351,6 +5374,8 @@ namespace BinDocxRW
m_oBcw.WriteItemEnd(nCurPos);
break;
}
default:
break;
}
}
}
......@@ -6913,7 +6938,9 @@ namespace BinDocxRW
m_oBcw.WriteItemEnd(nCurPos);
break;
}
}
default:
break;
}
}
}
void WriteColorSchemeMapping(const OOX::Settings::CColorSchemeMapping& oColorSchemeMapping)
......
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXShapeReader.cpp
View file @ f3a510bd
......@@ -108,6 +108,7 @@ bool ParseStyle(RtfShapePtr pShape, SimpleTypes::Vml::CCssProperty* prop)
case SimpleTypes::Vml::cssflipY: pShape->m_bFlipV = true; break;
case SimpleTypes::Vml::cssflipXY: pShape->m_bFlipH = true; pShape->m_bFlipV = true; break;
case SimpleTypes::Vml::cssflipYX : pShape->m_bFlipH = true; pShape->m_bFlipV = true; break;
default: break;
}
break;
case SimpleTypes::Vml::cssptWidth :
......@@ -300,7 +301,8 @@ bool ParseStyle(RtfShapePtr pShape, SimpleTypes::Vml::CCssProperty* prop)
case SimpleTypes::Vml::cssptVTextReverse : break;
case SimpleTypes::Vml::cssptVTextSpacingMode : break;
case SimpleTypes::Vml::cssptVTextSpacing : break;
}
default: break;
}
return true;
}
......@@ -575,7 +577,8 @@ bool OOXShapeReader::ParseVmlChild( ReaderParameter oParam , RtfShapePtr& pOutpu
}
}break;
}
default: break;
}
}
//проверяем на inline
if((PROP_DEF == pOutput->m_nLeft/* || 0 == pOutput->m_nLeft */) && ( PROP_DEF == pOutput->m_nTop/* || 0 == pOutput->m_nTop */) &&
......@@ -630,7 +633,8 @@ bool OOXShapeReader::Parse(ReaderParameter oParam, int indexSchemeColor, BYTE& u
result = theme->m_oThemeElements.m_oClrScheme.m_oFolHlink.tryGetRgb(ucR, ucG, ucB, ucA); break;
case SimpleTypes::shemecolorvalHlink:
result = theme->m_oThemeElements.m_oClrScheme.m_oHlink.tryGetRgb(ucR, ucG, ucB, ucA); break;
}
default: break;
}
return result;
}
void OOXShapeReader::Parse(ReaderParameter oParam, OOX::Drawing::CSchemeColor *oox_ShemeClr, unsigned int & nColor, _CP_OPT(double) &opacity)
......@@ -662,7 +666,8 @@ void OOXShapeReader::Parse(ReaderParameter oParam, OOX::Drawing::CColor *oox_col
case OOX::Drawing::colorScRgb: Parse(oParam, &oox_color->m_oScrgbClr, nColor, opacity); break;
case OOX::Drawing::colorSRgb: Parse(oParam, &oox_color->m_oSrgbClr, nColor, opacity); break;
case OOX::Drawing::colorSys: Parse(oParam, &oox_color->m_oSysClr, nColor, opacity); break;
}
default: break;
}
}
void OOXShapeReader::Parse(ReaderParameter oParam, OOX::Drawing::Colors::CColorTransform *oox_Clr, unsigned int & nColor, _CP_OPT(double) &opacity)
{
......@@ -684,7 +689,8 @@ void OOXShapeReader::Parse(ReaderParameter oParam, OOX::Drawing::CSolidColorFill
case OOX::Drawing::colorScRgb: Parse(oParam, &oox_solid_fill->m_oScrgbClr, nColor, opacity); break;
case OOX::Drawing::colorSRgb: Parse(oParam, &oox_solid_fill->m_oSrgbClr, nColor, opacity); break;
case OOX::Drawing::colorSys: Parse(oParam, &oox_solid_fill->m_oSysClr, nColor, opacity); break;
}
default: break;
}
}
//-----------------------------------------------------------------------------------------------------------------
void OOXShapeReader::Parse(ReaderParameter oParam, RtfShapePtr& pOutput, OOX::Drawing::CSolidColorFillProperties *oox_solid_fill, std::wstring *change_sheme_color)
......@@ -908,7 +914,8 @@ void OOXShapeReader::Parse(ReaderParameter oParam, RtfShapePtr& pOutput, OOX::Dr
}break;
case OOX::Drawing::filltypeNo:
pOutput->m_bLine = false; break;
}
default: break;
}
if (oox_line_prop->m_oW.IsInit())
{
pOutput->m_nLineWidth = oox_line_prop->m_oW->ToPoints() * 12700;
......@@ -945,7 +952,8 @@ void OOXShapeReader::Parse(ReaderParameter oParam, RtfShapePtr& pOutput, OOX::Dr
case SimpleTypes::presetlinedashvalSysDashDotDot: pOutput->m_nLineDashing = 4; break;
case SimpleTypes::presetlinedashvalSysDot : pOutput->m_nLineDashing = 2; break;
case SimpleTypes::presetlinedashvalSolid : break;
}
default: break;
}
}
//nullable<SimpleTypes::CPenAlignment<>> m_oAlgn;
//nullable<SimpleTypes::CLineCap<>> m_oCap;
......@@ -985,7 +993,8 @@ void OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput, OOX::D
case OOX::Drawing::filltypeNo:
pOutput->m_bFilled = false;
break;
}
default: break;
}
}
else if (fmt_index > 1000 && ((fmt_index-1000) < theme->m_oThemeElements.m_oFmtScheme.m_oBgFillStyleLst.m_arrItems.size()))
{
......@@ -1003,7 +1012,8 @@ void OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput, OOX::D
case OOX::Drawing::filltypeNo:
pOutput->m_bFilled = false;
break;
}
default: break;
}
}
}
......@@ -1066,7 +1076,8 @@ bool OOXShapeReader::Parse( ReaderParameter oParam, RtfShapePtr& pOutput)
case SimpleTypes::shapetypeRoundRect: pOutput->m_nShapeType = NSOfficeDrawing::sptRoundRectangle; break;
case SimpleTypes::shapetypeLine: pOutput->m_nShapeType = NSOfficeDrawing::sptLine; break;
case SimpleTypes::shapetypeArc: pOutput->m_nShapeType = NSOfficeDrawing::sptArc; break;
}
default: break;
}
if (pOutput->m_nShapeType == PROP_DEF)
{
......@@ -1335,7 +1346,8 @@ bool OOXShapeReader::ParseVml( ReaderParameter oParam , RtfShapePtr& pOutput)
case SimpleTypes::connectortypeElbow : pOutput->m_nConnectorStyle = 1; break;
case SimpleTypes::connectortypeNone : pOutput->m_nConnectorStyle = 3; break;
case SimpleTypes::connectortypeStraight: pOutput->m_nConnectorStyle = 0; break;
}
default: break;
}
}
//---------------------
......
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXTextItemReader.h
View file @ f3a510bd
......@@ -112,7 +112,9 @@ public:
}
}break;
}
default:
break;
}
return true;
}
};
\ No newline at end of file
};
ASCOfficeRtfFile/RtfFormatLib/source/RtfProperty.h
View file @ f3a510bd
......@@ -547,7 +547,8 @@ public:
case 13: return L"red";
case 14: return L"white";
case 15: return L"yellow";
}
default: break;
}
return L"none";
}
private:
......@@ -1719,7 +1720,8 @@ public:
case stCharacter : sResult += L"{\\*\\cs" + std::to_wstring( m_nID); break;
case stSection : sResult += L"{\\*\\ds" + std::to_wstring( m_nID); break;
case stTable : sResult += L"{\\*\\ts" + std::to_wstring( m_nID) + L"\\tsrowd"; break;
}
default: break;
}
return sResult;
}
std::wstring RenderToRtfEnd( RenderParameter oRenderParameter );
......@@ -2129,14 +2131,16 @@ public:
{
case RtfTableProperty::hr_phmrg: m_eHRef = hr_phmrg;break;
case RtfTableProperty::hr_phpg: m_eHRef = hr_phpg;break;
case RtfTableProperty::hr_phcol: m_eHRef = hr_phcol;break;
}
case RtfTableProperty::hr_phcol: m_eHRef = hr_phcol;break;
default: break;
}
switch ( oProp.m_eVRef )
{
case RtfTableProperty::vr_pvmrg: m_eVRef = vr_pvmrg;break;
case RtfTableProperty::vr_pvpg: m_eVRef = vr_pvpg;break;
case RtfTableProperty::vr_pvpara: m_eVRef = vr_pvpara;break;
}
default: break;
}
switch ( oProp.m_eHPos )
{
case RtfTableProperty::hp_posxc: m_eHPos = hp_posxc;break;
......@@ -2144,7 +2148,8 @@ public:
case RtfTableProperty::hp_posxo: m_eHPos = hp_posxo;break;
case RtfTableProperty::hp_posxl: m_eHPos = hp_posxl;break;
case RtfTableProperty::hp_posxr: m_eHPos = hp_posxr;break;
}
default: break;
}
switch ( oProp.m_eVPos )
{
case RtfTableProperty::vp_posyc: m_eVPos = vp_posyc;break;
......@@ -2152,7 +2157,8 @@ public:
case RtfTableProperty::vp_posyout: m_eVPos = vp_posyout;break;
case RtfTableProperty::vp_posyt: m_eVPos = vp_posyt;break;
case RtfTableProperty::vp_posyb: m_eVPos = vp_posyb;break;
}
default: break;
}
}
};
......
X2tConverter/build/Qt/X2tConverter.pri
View file @ f3a510bd
......@@ -7,7 +7,7 @@
QT -= core
QT -= gui
VERSION = 2.0.3.436
VERSION = 2.0.3.438
DEFINES += INTVER=$$VERSION
TARGET = x2t
......
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