pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-10 16:37:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix bug #75103' (#758) from fix/bug75103 into release/v9.4.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/758
This commit is contained in:
Oleg Korshul
2026-05-08 12:52:14 +00:00
parent 25b30b3a73 f4b2184985
commit 8a4e115384
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OOXML/PPTXFormat/Logic/Runs/Fld.h
View File

@ -30,8 +30,6 @@
*
*/
#pragma once
#ifndef PPTX_LOGIC_FLD_INCLUDE_H_
#define PPTX_LOGIC_FLD_INCLUDE_H_
#include "RunBase.h"
#include "./../RunProperties.h"
@ -60,14 +58,12 @@ namespace PPTX
void SetText(const std::wstring& src);
virtual std::wstring GetText() const;
public:
std::wstring id;
std::wstring id;
nullable_string type;
nullable<RunProperties> rPr;
nullable<TextParagraphPr> pPr;
nullable_string type;
nullable<RunProperties> rPr;
nullable<TextParagraphPr> pPr;
private:
nullable_string text;
@ -76,5 +72,3 @@ namespace PPTX
};
} // namespace Logic
} // namespace PPTX
#endif // PPTX_LOGIC_FLD_INCLUDE_H

23
OOXML/PPTXFormat/Logic/Shape.cpp
View File

@ -247,11 +247,11 @@ namespace PPTX
pWriter->StartNode(name_);
pWriter->StartAttributes();
pWriter->WriteAttribute(L"useBgFill", useBgFill);
pWriter->WriteAttribute2(L"macro", macro);
pWriter->WriteAttribute(L"modelId", modelId);
pWriter->WriteAttribute(L"fLocksText", fLocksText);
pWriter->WriteAttribute(L"useBgFill", useBgFill);
pWriter->WriteAttribute2(L"macro", macro);
pWriter->WriteAttribute(L"modelId", modelId);
pWriter->WriteAttribute(L"fLocksText", fLocksText);
pWriter->WriteAttribute(L"textlink", textlink);
pWriter->EndAttributes();
if (pWriter->m_lDocType == XMLWRITER_DOC_TYPE_DOCX ||
@ -375,10 +375,14 @@ namespace PPTX
switch (_at)
{
case 0:
{
useBgFill = pReader->GetBool();
}break;
case 0:
{
useBgFill = pReader->GetBool();
}break;
case 1:
{
textlink = pReader->GetString2();
}break;
default:
break;
}
@ -499,6 +503,7 @@ namespace PPTX
pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeStart);
pWriter->WriteBool2(0, useBgFill);
pWriter->WriteString2(1, textlink);
pWriter->WriteBYTE(NSBinPptxRW::g_nodeAttributeEnd);
pWriter->WriteRecord1(0, nvSpPr);

7
OOXML/PPTXFormat/Logic/Shape.h
View File

@ -299,7 +299,8 @@ namespace PPTX
WritingElement_ReadAttributes_Read_if( oReader, _T("useBgFill"), useBgFill)
WritingElement_ReadAttributes_Read_else_if(oReader, _T("macro"), macro)
WritingElement_ReadAttributes_Read_else_if(oReader, _T("modelId"), modelId)
WritingElement_ReadAttributes_Read_else_if(oReader, _T("fLocksText"), fLocksText)
WritingElement_ReadAttributes_Read_else_if(oReader, _T("fLocksText"), fLocksText)
WritingElement_ReadAttributes_Read_else_if(oReader, _T("textlink"), textlink)
WritingElement_ReadAttributes_End( oReader )
}
@ -340,8 +341,8 @@ namespace PPTX
nullable_bool useBgFill;
nullable_string macro;
nullable_bool fLocksText;
;;
//-------------------------------------------------------------------------------------------------
nullable_string textlink;
//-------------------------------------------------------------------------------------------------
nullable<OOX::VmlOffice::CSignatureLine> signatureLine;
std::wstring m_sClientDataXml;
protected: