Skip to content

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

..

parent fdf032d9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 359 additions and 303 deletions
ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertVml.cpp
View file @ 63655a97
...@@ -926,7 +926,7 @@ void OoxConverter::convert(OOX::Vml::CGroup *vml_group) ...@@ -926,7 +926,7 @@ void OoxConverter::convert(OOX::Vml::CGroup *vml_group)
if (vml->m_oSpt.IsInit()) if (vml->m_oSpt.IsInit())
{ {
SimpleTypes::Vml::SptType sptType = static_cast<SimpleTypes::Vml::SptType>(vml->m_oSpt->GetValue()); SimpleTypes::Vml::SptType sptType = static_cast<SimpleTypes::Vml::SptType>(vml->m_oSpt->GetValue());
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType)); odf_context()->drawing_context()->start_shape(OOX::VmlShapeType2PrstShape(sptType));
bSet = true; bSet = true;
} }
else if ((vml->m_oConnectorType.IsInit()) && (vml->m_oConnectorType->GetValue() != SimpleTypes::connectortypeNone)) else if ((vml->m_oConnectorType.IsInit()) && (vml->m_oConnectorType->GetValue() != SimpleTypes::connectortypeNone))
...@@ -955,7 +955,7 @@ void OoxConverter::convert(OOX::Vml::CGroup *vml_group) ...@@ -955,7 +955,7 @@ void OoxConverter::convert(OOX::Vml::CGroup *vml_group)
OOX::Vml::CShapeType * vml = static_cast<OOX::Vml::CShapeType*>(vml_group->m_arrItems[i]); OOX::Vml::CShapeType * vml = static_cast<OOX::Vml::CShapeType*>(vml_group->m_arrItems[i]);
SimpleTypes::Vml::SptType sptType = vml->m_oSpt.IsInit() ? static_cast<SimpleTypes::Vml::SptType>(vml->m_oSpt->GetValue()) : SimpleTypes::Vml::sptNotPrimitive; SimpleTypes::Vml::SptType sptType = vml->m_oSpt.IsInit() ? static_cast<SimpleTypes::Vml::SptType>(vml->m_oSpt->GetValue()) : SimpleTypes::Vml::sptNotPrimitive;
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType)); odf_context()->drawing_context()->start_shape(OOX::VmlShapeType2PrstShape(sptType));
OoxConverter::convert(vml); OoxConverter::convert(vml);
odf_context()->drawing_context()->end_shape(); odf_context()->drawing_context()->end_shape();
}break; }break;
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.cpp
View file @ 63655a97
...@@ -657,12 +657,12 @@ void OoxConverter::convert(OOX::Drawing::CShapeProperties * oox_spPr, OOX::Dra ...@@ -657,12 +657,12 @@ void OoxConverter::convert(OOX::Drawing::CShapeProperties * oox_spPr, OOX::Dra
odf_context()->drawing_context()->start_line_properties(); odf_context()->drawing_context()->start_line_properties();
{ {
if (oox_spPr->m_oLn.IsInit()) if ((oox_sp_style) && (oox_sp_style->m_oLnRef.getType() == OOX::et_a_lnRef))
convert(oox_spPr->m_oLn.GetPointer()); //CLineProperties
else if ((oox_sp_style) && (oox_sp_style->m_oLnRef.getType() == OOX::et_a_lnRef))
{ {
convert(&oox_sp_style->m_oLnRef); convert(&oox_sp_style->m_oLnRef);
} }
if (oox_spPr->m_oLn.IsInit())
convert(oox_spPr->m_oLn.GetPointer()); //CLineProperties
} }
odf_context()->drawing_context()->end_line_properties(); odf_context()->drawing_context()->end_line_properties();
//----------------------------------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------------------------------
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp
View file @ 63655a97
...@@ -2467,7 +2467,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic) ...@@ -2467,7 +2467,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
SimpleTypes::Vml::SptType sptType = oox_pic->m_oShapeType->m_oSpt.IsInit() ? static_cast<SimpleTypes::Vml::SptType>(oox_pic->m_oShapeType->m_oSpt->GetValue()) : SimpleTypes::Vml::sptNotPrimitive; SimpleTypes::Vml::SptType sptType = oox_pic->m_oShapeType->m_oSpt.IsInit() ? static_cast<SimpleTypes::Vml::SptType>(oox_pic->m_oShapeType->m_oSpt->GetValue()) : SimpleTypes::Vml::sptNotPrimitive;
odf_context()->drawing_context()->set_name(std::wstring (L"Custom") + std::to_wstring(sptType)); odf_context()->drawing_context()->set_name(std::wstring (L"Custom") + std::to_wstring(sptType));
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType)); odf_context()->drawing_context()->start_shape(OOX::VmlShapeType2PrstShape(sptType));
OoxConverter::convert(oox_pic->m_oShape.GetPointer()); OoxConverter::convert(oox_pic->m_oShape.GetPointer());
OoxConverter::convert(oox_pic->m_oShapeType.GetPointer()); OoxConverter::convert(oox_pic->m_oShapeType.GetPointer());
...@@ -2486,7 +2486,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic) ...@@ -2486,7 +2486,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
if (sptType != SimpleTypes::Vml::SptType::sptNotPrimitive) if (sptType != SimpleTypes::Vml::SptType::sptNotPrimitive)
{ {
odf_context()->drawing_context()->set_name(std::wstring (L"Custom") + std::to_wstring(sptType)); odf_context()->drawing_context()->set_name(std::wstring (L"Custom") + std::to_wstring(sptType));
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType)); odf_context()->drawing_context()->start_shape(OOX::VmlShapeType2PrstShape(sptType));
bSet = true; bSet = true;
} }
else if ((oox_pic->m_oShape->m_oConnectorType.IsInit()) && (oox_pic->m_oShape->m_oConnectorType->GetValue() != SimpleTypes::connectortypeNone)) else if ((oox_pic->m_oShape->m_oConnectorType.IsInit()) && (oox_pic->m_oShape->m_oConnectorType->GetValue() != SimpleTypes::connectortypeNone))
...@@ -2518,7 +2518,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic) ...@@ -2518,7 +2518,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
if (!bSet && sptType != SimpleTypes::Vml::SptType::sptNotPrimitive) if (!bSet && sptType != SimpleTypes::Vml::SptType::sptNotPrimitive)
{ {
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType)); odf_context()->drawing_context()->start_shape(OOX::VmlShapeType2PrstShape(sptType));
bSet = true; bSet = true;
} }
} }
...@@ -2528,7 +2528,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic) ...@@ -2528,7 +2528,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
if (pos >= 0) if (pos >= 0)
{ {
sptType = (SimpleTypes::Vml::SptType)_wtoi(oox_pic->m_oShape->m_sType->substr(pos + 9, oox_pic->m_oShape->m_sType->length() - pos - 9).c_str()); sptType = (SimpleTypes::Vml::SptType)_wtoi(oox_pic->m_oShape->m_sType->substr(pos + 9, oox_pic->m_oShape->m_sType->length() - pos - 9).c_str());
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType)); odf_context()->drawing_context()->start_shape(OOX::VmlShapeType2PrstShape(sptType));
bSet = true; bSet = true;
} }
} }
...@@ -2578,7 +2578,7 @@ void DocxConverter::convert(OOX::Logic::CObject* oox_obj) ...@@ -2578,7 +2578,7 @@ void DocxConverter::convert(OOX::Logic::CObject* oox_obj)
if (sptType != SimpleTypes::Vml::SptType::sptNotPrimitive) if (sptType != SimpleTypes::Vml::SptType::sptNotPrimitive)
{ {
odf_context()->drawing_context()->set_name(std::wstring (L"Custom") + std::to_wstring(sptType)); odf_context()->drawing_context()->set_name(std::wstring (L"Custom") + std::to_wstring(sptType));
odf_context()->drawing_context()->start_shape(OOX::Spt2ShapeType(sptType)); odf_context()->drawing_context()->start_shape(OOX::VmlShapeType2PrstShape(sptType));
bSet = true; bSet = true;
} }
else if ((oox_obj->m_oShape->m_oConnectorType.IsInit()) && (oox_obj->m_oShape->m_oConnectorType->GetValue() != SimpleTypes::connectortypeNone)) else if ((oox_obj->m_oShape->m_oConnectorType.IsInit()) && (oox_obj->m_oShape->m_oConnectorType->GetValue() != SimpleTypes::connectortypeNone))
......
ASCOfficeOdfFileW/source/Oox2OdfConverter/VmlShapeTypes2Oox.h
View file @ 63655a97
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
namespace OOX namespace OOX
{ {
int static Spt2ShapeType(SimpleTypes::Vml::SptType type) static int VmlShapeType2PrstShape(SimpleTypes::Vml::SptType type)
{ {
switch(type) switch(type)
{ {
...@@ -209,41 +209,41 @@ namespace OOX ...@@ -209,41 +209,41 @@ namespace OOX
//case SimpleTypes::Vml::sptTextInflateTop : return SimpleTypes::shapetypeTextInflateTop ; //case SimpleTypes::Vml::sptTextInflateTop : return SimpleTypes::shapetypeTextInflateTop ;
//case SimpleTypes::Vml::sptTextDeflateTop : return SimpleTypes::shapetypeTextDeflateTop ; //case SimpleTypes::Vml::sptTextDeflateTop : return SimpleTypes::shapetypeTextDeflateTop ;
//case SimpleTypes::Vml::sptTextDeflateInflate : return SimpleTypes::shapetypeTextDeflateInflate ; //case SimpleTypes::Vml::sptTextDeflateInflate : return SimpleTypes::shapetypeTextDeflateInflate ;
//case SimpleTypes::Vml::sptTextDeflateInflateDeflate :return SimpleTypes::shapetypeTextDeflateInflateDeflat ; //case SimpleTypes::Vml::sptTextDeflateInflateDeflate : return SimpleTypes::shapetypeTextDeflateInflateDeflat ;
//case SimpleTypes::Vml::sptTextFadeRight : return SimpleTypes::shapetypeTextFadeRight ; //case SimpleTypes::Vml::sptTextFadeRight : return SimpleTypes::shapetypeTextFadeRight ;
//case SimpleTypes::Vml::sptTextFadeLeft : return SimpleTypes::shapetypeTextFadeLeft ; //case SimpleTypes::Vml::sptTextFadeLeft : return SimpleTypes::shapetypeTextFadeLeft ;
//case SimpleTypes::Vml::sptTextFadeUp : return SimpleTypes::shapetypeTextFadeUp ; //case SimpleTypes::Vml::sptTextFadeUp : return SimpleTypes::shapetypeTextFadeUp ;
//case SimpleTypes::Vml::sptTextFadeDown : return SimpleTypes::shapetypeTextFadeDown ; //case SimpleTypes::Vml::sptTextFadeDown : return SimpleTypes::shapetypeTextFadeDown ;
case SimpleTypes::Vml::sptTextSlantUp : return SimpleTypes::textshapetypeTextSlantUp +2001; case SimpleTypes::Vml::sptTextSlantUp : return SimpleTypes::textshapetypeTextSlantUp +2001;
case SimpleTypes::Vml::sptTextSlantDown : return SimpleTypes::textshapetypeTextSlantDown +2001; case SimpleTypes::Vml::sptTextSlantDown : return SimpleTypes::textshapetypeTextSlantDown +2001;
case SimpleTypes::Vml::sptTextCanUp : return SimpleTypes::textshapetypeTextCanUp +2001; case SimpleTypes::Vml::sptTextCanUp : return SimpleTypes::textshapetypeTextCanUp +2001;
case SimpleTypes::Vml::sptTextCanDown : return SimpleTypes::textshapetypeTextCanDown +2001; case SimpleTypes::Vml::sptTextCanDown : return SimpleTypes::textshapetypeTextCanDown +2001;
case SimpleTypes::Vml::sptFlowChartAlternateProcess :return SimpleTypes::shapetypeFlowChartAlternateProcess ; case SimpleTypes::Vml::sptFlowChartAlternateProcess : return SimpleTypes::shapetypeFlowChartAlternateProcess ;
case SimpleTypes::Vml::sptFlowChartOffpageConnector :return SimpleTypes::shapetypeFlowChartOffpageConnector ; case SimpleTypes::Vml::sptFlowChartOffpageConnector : return SimpleTypes::shapetypeFlowChartOffpageConnector ;
case SimpleTypes::Vml::sptCallout90 : return SimpleTypes::shapetypeCallout1 ; case SimpleTypes::Vml::sptCallout90 : return SimpleTypes::shapetypeCallout1 ;
case SimpleTypes::Vml::sptAccentCallout90 : return SimpleTypes::shapetypeAccentCallout1 ; case SimpleTypes::Vml::sptAccentCallout90 : return SimpleTypes::shapetypeAccentCallout1 ;
case SimpleTypes::Vml::sptBorderCallout90 : return SimpleTypes::shapetypeBorderCallout1; case SimpleTypes::Vml::sptBorderCallout90 : return SimpleTypes::shapetypeBorderCallout1;
case SimpleTypes::Vml::sptAccentBorderCallout90 : return SimpleTypes::shapetypeAccentBorderCallout1 ; case SimpleTypes::Vml::sptAccentBorderCallout90 : return SimpleTypes::shapetypeAccentBorderCallout1 ;
case SimpleTypes::Vml::sptLeftRightUpArrow : return SimpleTypes::shapetypeLeftRightUpArrow ; case SimpleTypes::Vml::sptLeftRightUpArrow : return SimpleTypes::shapetypeLeftRightUpArrow ;
case SimpleTypes::Vml::sptSun : return SimpleTypes::shapetypeSun ; case SimpleTypes::Vml::sptSun : return SimpleTypes::shapetypeSun ;
case SimpleTypes::Vml::sptMoon : return SimpleTypes::shapetypeMoon ; case SimpleTypes::Vml::sptMoon : return SimpleTypes::shapetypeMoon ;
case SimpleTypes::Vml::sptBracketPair : return SimpleTypes::shapetypeBracketPair ; case SimpleTypes::Vml::sptBracketPair : return SimpleTypes::shapetypeBracketPair ;
case SimpleTypes::Vml::sptBracePair : return SimpleTypes::shapetypeBracePair ; case SimpleTypes::Vml::sptBracePair : return SimpleTypes::shapetypeBracePair ;
case SimpleTypes::Vml::sptSeal4 : return SimpleTypes::shapetypeStar4 ; case SimpleTypes::Vml::sptSeal4 : return SimpleTypes::shapetypeStar4 ;
case SimpleTypes::Vml::sptDoubleWave : return SimpleTypes::shapetypeDoubleWave ; case SimpleTypes::Vml::sptDoubleWave : return SimpleTypes::shapetypeDoubleWave ;
case SimpleTypes::Vml::sptActionButtonBlank : return SimpleTypes::shapetypeActionButtonBlank ; case SimpleTypes::Vml::sptActionButtonBlank : return SimpleTypes::shapetypeActionButtonBlank ;
case SimpleTypes::Vml::sptActionButtonHome : return SimpleTypes::shapetypeActionButtonHome ; case SimpleTypes::Vml::sptActionButtonHome : return SimpleTypes::shapetypeActionButtonHome ;
case SimpleTypes::Vml::sptActionButtonHelp : return SimpleTypes::shapetypeActionButtonHelp ; case SimpleTypes::Vml::sptActionButtonHelp : return SimpleTypes::shapetypeActionButtonHelp ;
case SimpleTypes::Vml::sptActionButtonInformation : return SimpleTypes::shapetypeActionButtonInformation ; case SimpleTypes::Vml::sptActionButtonInformation : return SimpleTypes::shapetypeActionButtonInformation ;
case SimpleTypes::Vml::sptActionButtonForwardNext : return SimpleTypes::shapetypeActionButtonForwardNext ; case SimpleTypes::Vml::sptActionButtonForwardNext : return SimpleTypes::shapetypeActionButtonForwardNext ;
case SimpleTypes::Vml::sptActionButtonBackPrevious : return SimpleTypes::shapetypeActionButtonBackPrevious ; case SimpleTypes::Vml::sptActionButtonBackPrevious : return SimpleTypes::shapetypeActionButtonBackPrevious ;
case SimpleTypes::Vml::sptActionButtonEnd : return SimpleTypes::shapetypeActionButtonEnd ; case SimpleTypes::Vml::sptActionButtonEnd : return SimpleTypes::shapetypeActionButtonEnd ;
case SimpleTypes::Vml::sptActionButtonBeginning : return SimpleTypes::shapetypeActionButtonBeginning ; case SimpleTypes::Vml::sptActionButtonBeginning : return SimpleTypes::shapetypeActionButtonBeginning ;
case SimpleTypes::Vml::sptActionButtonReturn : return SimpleTypes::shapetypeActionButtonReturn ; case SimpleTypes::Vml::sptActionButtonReturn : return SimpleTypes::shapetypeActionButtonReturn ;
case SimpleTypes::Vml::sptActionButtonDocument : return SimpleTypes::shapetypeActionButtonDocument ; case SimpleTypes::Vml::sptActionButtonDocument : return SimpleTypes::shapetypeActionButtonDocument ;
case SimpleTypes::Vml::sptActionButtonSound : return SimpleTypes::shapetypeActionButtonSound ; case SimpleTypes::Vml::sptActionButtonSound : return SimpleTypes::shapetypeActionButtonSound ;
case SimpleTypes::Vml::sptActionButtonMovie : return SimpleTypes::shapetypeActionButtonMovie ; case SimpleTypes::Vml::sptActionButtonMovie : return SimpleTypes::shapetypeActionButtonMovie ;
//case SimpleTypes::Vml::sptHostControl : return SimpleTypes::shapetype ; //case SimpleTypes::Vml::sptHostControl : return SimpleTypes::shapetype ;
case SimpleTypes::Vml::sptTextBox : return 2000; case SimpleTypes::Vml::sptTextBox : return 2000;
default: default:
......
ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h
View file @ 63655a97
This diff is collapsed.
ASCOfficeRtfFile/RtfFormatLib/source/Reader/OOXParagraphElementReaders.cpp
View file @ 63655a97
...@@ -874,21 +874,21 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap ...@@ -874,21 +874,21 @@ bool OOXRunReader::Parse( ReaderParameter oParam , RtfParagraph& oOutputParagrap
oOutputParagraph.AddItem( pNewChar ); oOutputParagraph.AddItem( pNewChar );
}break; }break;
case OOX::et_mc_alternateContent: case OOX::et_mc_alternateContent:
{//выбираем всегда более старую версию {
OOX::Logic::CAlternateContent *ooxAlt = dynamic_cast<OOX::Logic::CAlternateContent* >(ooxItem); OOX::Logic::CAlternateContent *ooxAlt = dynamic_cast<OOX::Logic::CAlternateContent* >(ooxItem);
if (!ooxAlt->m_arrChoiceItems.empty()) if (!ooxAlt->m_arrChoiceItems.empty())
{ {
for (size_t i = 0; i < ooxAlt->m_arrFallbackItems.size(); i++) for (size_t i = 0; i < ooxAlt->m_arrChoiceItems.size(); i++)
{ {
Parse(oParam , oOutputParagraph, poStyle, oNewProperty, ooxAlt->m_arrFallbackItems[i]); Parse(oParam , oOutputParagraph, poStyle, oNewProperty, ooxAlt->m_arrChoiceItems[i]);
} }
} }
else else
{ {
for (size_t i = 0; i < ooxAlt->m_arrChoiceItems.size(); i++) for (size_t i = 0; i < ooxAlt->m_arrFallbackItems.size(); i++)
{ {
Parse(oParam , oOutputParagraph, poStyle, oNewProperty, ooxAlt->m_arrChoiceItems[i]); Parse(oParam , oOutputParagraph, poStyle, oNewProperty, ooxAlt->m_arrFallbackItems[i]);
} }
} }
}break; }break;
case OOX::et_w_sym: case OOX::et_w_sym:
......
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