pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #76151

Browse Source
This commit is contained in:
Elena Subbotina
2025-07-29 17:21:32 +03:00
parent eb3daff8d6
commit 91f27bf771
3 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OOXML/Common/ComplexTypes.h
View File

@ -419,10 +419,10 @@ namespace ComplexTypes
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader);
public:
nullable<SimpleTypes::CThemeColor > m_oThemeColor;
nullable<SimpleTypes::CUcharHexNumber > m_oThemeShade;
nullable<SimpleTypes::CUcharHexNumber > m_oThemeTint;
nullable<SimpleTypes::CHexColor > m_oVal;
nullable<SimpleTypes::CThemeColor> m_oThemeColor;
nullable<SimpleTypes::CUcharHexNumber> m_oThemeShade;
nullable<SimpleTypes::CUcharHexNumber> m_oThemeTint;
nullable<SimpleTypes::CHexColor> m_oVal;
};
//--------------------------------------------------------------------------------

2
OOXML/Common/SimpleTypes_Word.cpp
View File

@ -1808,7 +1808,7 @@ namespace SimpleTypes
EHexColor CHexColor::FromString(const std::wstring &sValueSrc)
{
if ( L"auto" == sValueSrc || L"none" == sValueSrc )
if (L"automatic" == sValueSrc || L"auto" == sValueSrc || L"none" == sValueSrc )
this->m_eValue = hexcolorAuto;
else
{

72
OOXML/DocxFormat/Logic/RunProperty.h
View File

@ -129,63 +129,63 @@ namespace OOX
nullable<ComplexTypes::Word::COnOff2> m_oBold;
nullable<ComplexTypes::Word::COnOff2> m_oBoldCs;
nullable<ComplexTypes::Word::CBorder> m_oBdr;
nullable<ComplexTypes::Word::CBorder> m_oBdr;
nullable<ComplexTypes::Word::COnOff2> m_oCaps;
nullable<ComplexTypes::Word::CColor> m_oColor;
nullable<ComplexTypes::Word::CColor> m_oColor;
nullable<ComplexTypes::Word::COnOff2> m_oCs;
nullable<ComplexTypes::Word::CTrackChange> m_oDel;
nullable<ComplexTypes::Word::CTrackChange> m_oDel;
nullable<ComplexTypes::Word::COnOff2> m_oDStrike;
nullable<ComplexTypes::Word::CEastAsianLayout> m_oEastAsianLayout;
nullable<ComplexTypes::Word::CTextEffect> m_oEffect;
nullable<ComplexTypes::Word::CEm> m_oEm;
nullable<ComplexTypes::Word::CEastAsianLayout> m_oEastAsianLayout;
nullable<ComplexTypes::Word::CTextEffect> m_oEffect;
nullable<ComplexTypes::Word::CEm> m_oEm;
nullable<ComplexTypes::Word::COnOff2> m_oEmboss;
nullable<ComplexTypes::Word::CFitText> m_oFitText;
nullable<ComplexTypes::Word::CHighlight> m_oHighlight;
nullable<ComplexTypes::Word::CTrackChange> m_oIns;
nullable<ComplexTypes::Word::CFitText> m_oFitText;
nullable<ComplexTypes::Word::CHighlight> m_oHighlight;
nullable<ComplexTypes::Word::CTrackChange> m_oIns;
nullable<ComplexTypes::Word::COnOff2> m_oItalic;
nullable<ComplexTypes::Word::COnOff2> m_oItalicCs;
nullable<ComplexTypes::Word::COnOff2> m_oImprint;
nullable<ComplexTypes::Word::CHpsMeasure> m_oKern;
nullable<ComplexTypes::Word::CLanguage> m_oLang;
nullable<ComplexTypes::Word::CHpsMeasure> m_oKern;
nullable<ComplexTypes::Word::CLanguage> m_oLang;
nullable<ComplexTypes::Word::COnOff2> m_oNoProof;
nullable<ComplexTypes::Word::COnOff2> m_oMath;
nullable<ComplexTypes::Word::CTrackChange> m_oMoveFrom;
nullable<ComplexTypes::Word::CTrackChange> m_oMoveTo;
nullable<ComplexTypes::Word::CTrackChange> m_oMoveFrom;
nullable<ComplexTypes::Word::CTrackChange> m_oMoveTo;
nullable<ComplexTypes::Word::COnOff2> m_oOutline;
nullable<ComplexTypes::Word::CSignedHpsMeasure> m_oPosition;
nullable<ComplexTypes::Word::CFonts> m_oRFonts;
nullable<OOX::Logic::CRPrChange> m_oRPrChange;
nullable<ComplexTypes::Word::String> m_oRStyle;
nullable<ComplexTypes::Word::CSignedHpsMeasure> m_oPosition;
nullable<ComplexTypes::Word::CFonts> m_oRFonts;
nullable<OOX::Logic::CRPrChange> m_oRPrChange;
nullable<ComplexTypes::Word::String> m_oRStyle;
nullable<ComplexTypes::Word::COnOff2> m_oRtL;
nullable<ComplexTypes::Word::COnOff2> m_oShadow;
nullable<ComplexTypes::Word::CShading> m_oShd;
nullable<ComplexTypes::Word::CShading> m_oShd;
nullable<ComplexTypes::Word::COnOff2> m_oSmallCaps;
nullable<ComplexTypes::Word::COnOff2> m_oSnapToGrid;
nullable<ComplexTypes::Word::CSignedTwipsMeasure> m_oSpacing;
nullable<ComplexTypes::Word::CSignedTwipsMeasure> m_oSpacing;
nullable<ComplexTypes::Word::COnOff2> m_oSpecVanish;
nullable<ComplexTypes::Word::COnOff2> m_oStrike;
nullable<ComplexTypes::Word::CHpsMeasure> m_oSz;
nullable<ComplexTypes::Word::CHpsMeasure> m_oSzCs;
nullable<ComplexTypes::Word::CUnderline> m_oU;
nullable<ComplexTypes::Word::CHpsMeasure> m_oSz;
nullable<ComplexTypes::Word::CHpsMeasure> m_oSzCs;
nullable<ComplexTypes::Word::CUnderline> m_oU;
nullable<ComplexTypes::Word::COnOff2> m_oVanish;
nullable<ComplexTypes::Word::CVerticalAlignRun> m_oVertAlign;
nullable<ComplexTypes::Word::CTextScale> m_oW;
nullable<ComplexTypes::Word::CVerticalAlignRun> m_oVertAlign;
nullable<ComplexTypes::Word::CTextScale> m_oW;
nullable<ComplexTypes::Word::COnOff2> m_oWebHidden;
//ext
PPTX::Logic::UniFill m_oTextFill;
nullable<PPTX::Logic::Ln> m_oTextOutline;
nullable<ComplexTypes::Word::CLigatures> m_oLigatures;
nullable<ComplexTypes::Word::CNumSpacing> m_oNumSpacing;
nullable<ComplexTypes::Word::CNumForm> m_oNumForm;
nullable<CStylisticSets> m_oStylisticSets;
PPTX::Logic::UniFill m_oTextFill;
nullable<PPTX::Logic::Ln> m_oTextOutline;
nullable<ComplexTypes::Word::CLigatures> m_oLigatures;
nullable<ComplexTypes::Word::CNumSpacing> m_oNumSpacing;
nullable<ComplexTypes::Word::CNumForm> m_oNumForm;
nullable<CStylisticSets> m_oStylisticSets;
nullable<ComplexTypes::Word::COnOff2> m_oCntxtAlts;
nullable<PPTX::Logic::Reflection> m_oReflection;
nullable<PPTX::Logic::Glow> m_oGlow;
nullable<PPTX::Logic::OuterShdw> m_oShadowExt;
nullable<PPTX::Logic::Sp3d> m_oProps3d;
nullable<PPTX::Logic::Scene3d> m_oScene3d;
nullable<PPTX::Logic::Reflection> m_oReflection;
nullable<PPTX::Logic::Glow> m_oGlow;
nullable<PPTX::Logic::OuterShdw> m_oShadowExt;
nullable<PPTX::Logic::Sp3d> m_oProps3d;
nullable<PPTX::Logic::Scene3d> m_oScene3d;
OOX::WritingElement* m_pText = NULL; //temp ... for Run object -> XpertdocOnlineDemoEn.docx
OOX::WritingElement* m_pText = NULL; //temp ... for Run object -> XpertdocOnlineDemoEn.docx
};
} // namespace Logic