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

Add custom functions conversion

Browse Source
This commit is contained in:
Viktor Andreev
2024-07-03 19:05:39 +06:00
parent a391316529
commit ce6f6ea256
5 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MsBinaryFile/XlsFile/Format/Logic/Biff_structures/StringPtgParser.cpp
View File

@ -402,13 +402,14 @@ const bool StringPtgParser::parseToPtgs(const std::wstring& assembled_formula, R
}
else
{
SyntaxPtg::extract_CustomFunction(operand_str, number);
func = PtgFuncVar::create(L"USER_DEFINED_FUNCTION", OperandPtg::ptg_REFERENCE);
if(!func)
{
// EXCEPT::LE::WhatIsTheFuck("Ftab_Cetab doesn't contain info about user-defined function (0xFF).", __FUNCTION__);
}
ptg_stack.push(func);
rgce.addPtg(PtgPtr(new PtgNameX(operand_str, OperandPtg::ptg_REFERENCE)));
rgce.addPtg(PtgPtr(new PtgName(number, OperandPtg::ptg_REFERENCE)));
}
}
else if(SyntaxPtg::extract_UndefinedName(it, itEnd)) // Shall be placed strongly after extract_PtgName

14
MsBinaryFile/XlsFile/Format/Logic/Biff_structures/SyntaxPtg.cpp
View File

@ -853,6 +853,20 @@ const bool SyntaxPtg::extract_FutureFunction(const std::wstring &funcName, unsig
return false;
}
// static
const void SyntaxPtg::extract_CustomFunction(const std::wstring &funcName, unsigned int& out_num)
{
auto funcNum = XMLSTUFF::definenames2index(funcName);
if(funcNum != 0xFFFFFFFF)
{
out_num = funcNum;
}
else
{
out_num = XMLSTUFF::AddDefinedName(funcName);
}
}
// static
const void SyntaxPtg::remove_extraSymbols(std::wstring::const_iterator& first, std::wstring::const_iterator& last)
{

1
MsBinaryFile/XlsFile/Format/Logic/Biff_structures/SyntaxPtg.h
View File

@ -87,6 +87,7 @@ public:
static const bool extract_PtgFunc(std::wstring::const_iterator& first, std::wstring::const_iterator last, std::wstring& out_str);
static const bool extract_FutureFunction(const std::wstring &funcName, unsigned int& out_num);
static const void extract_CustomFunction(const std::wstring &funcName, unsigned int& out_num);
static const void remove_extraSymbols(std::wstring::const_iterator& first, std::wstring::const_iterator& last);
};

38
OOXML/XlsxFormat/Workbook/DefinedNames.cpp
View File

@ -248,7 +248,14 @@ namespace OOX
return FunctionsVector;
for(auto i = namesStart; i < XLS::GlobalWorkbookInfo::arDefineNames_static.size(); i++)
{
FunctionsVector.push_back(createFutureFunction(XLS::GlobalWorkbookInfo::arDefineNames_static[i]));
if(XLS::GlobalWorkbookInfo::arDefineNames_static[i].substr(0, 6) == L"_xlfn.")
{
FunctionsVector.push_back(createFutureFunction(XLS::GlobalWorkbookInfo::arDefineNames_static[i]));
}
else
{
FunctionsVector.push_back(createCustomFunction(XLS::GlobalWorkbookInfo::arDefineNames_static[i]));
}
}
return FunctionsVector;
}
@ -294,6 +301,7 @@ namespace OOX
auto ptr(new XLSB::Name);
XLS::BaseObjectPtr objectPtr(ptr);
ptr->chKey = 0;
ptr->fHidden = true;
ptr->fFunc = true;
ptr->fOB = false;
@ -316,5 +324,33 @@ namespace OOX
return objectPtr;
}
XLS::BaseObjectPtr CDefinedNames::createCustomFunction(const std::wstring& funcName)
{
auto ptr(new XLSB::Name);
XLS::BaseObjectPtr objectPtr(ptr);
ptr->chKey = 0;
ptr->fHidden = false;
ptr->fFunc = true;
ptr->fOB = true;
ptr->fProc = true;
ptr->fCalcExp = false;
ptr->fGrp = false;
ptr->fPublished = false;
ptr->fBuiltin = false;
ptr->fWorkbookParam = false;
ptr->itab = 0xFFFFFFFF;
ptr->comment.setSize(0xFFFFFFFF);
ptr->description.setSize(0xFFFFFFFF);
ptr->helpTopic.setSize(0xFFFFFFFF);
ptr->unusedstring1.setSize(0xFFFFFFFF);
ptr->unusedstring2.setSize(0xFFFFFFFF);
ptr->fFutureFunction = false;
ptr->name = funcName;
return objectPtr;
}
} //Spreadsheet
} // namespace OOX

1
OOXML/XlsxFormat/Workbook/DefinedNames.h
View File

@ -109,6 +109,7 @@ namespace OOX
private:
XLS::BaseObjectPtr createFutureFunction(const std::wstring& funcName);
XLS::BaseObjectPtr createCustomFunction(const std::wstring& custom);
void ReadAttributes(XmlUtils::CXmlLiteReader& oReader);
};