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