strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve ODF sheet saving performance

Browse source 
GetODFSaneDefaultVersion() is surprisingly hot, mostly because it is
called from every ScXMLExport::WriteCell call, so cache it

Change-Id: Ibc54c007f4979315487badc23889eb264b11d4ca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174671
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2024-10-08 14:44:27 +02:00
parent 9f95e65730
commit 94738e6def
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
xmloff/source/core/xmlexp.cxx
View file

@ -247,7 +247,7 @@ public:
uno::Reference< embed::XStorage > mxTargetStorage;
std::optional<SvtSaveOptions::ODFSaneDefaultVersion> m_oOverrideODFVersion;
std::optional<SvtSaveOptions::ODFSaneDefaultVersion> m_oODFVersion;
/// name of stream in package, e.g., "content.xml"
OUString mStreamName;
@ -420,12 +420,12 @@ void SvXMLExport::DetermineModelType_()
{
case SvtSaveOptions::ODFSVER_013_EXTENDED:
SAL_INFO("xmloff.core", "tdf#138209 force form export to ODF 1.2");
mpImpl->m_oOverrideODFVersion = SvtSaveOptions::ODFSVER_012_EXTENDED;
mpImpl->m_oODFVersion = SvtSaveOptions::ODFSVER_012_EXTENDED;
maUnitConv.overrideSaneDefaultVersion(SvtSaveOptions::ODFSVER_012_EXTENDED);
break;
case SvtSaveOptions::ODFSVER_013:
SAL_INFO("xmloff.core", "tdf#138209 force form export to ODF 1.2");
mpImpl->m_oOverrideODFVersion = SvtSaveOptions::ODFSVER_012;
mpImpl->m_oODFVersion = SvtSaveOptions::ODFSVER_012;
maUnitConv.overrideSaneDefaultVersion(SvtSaveOptions::ODFSVER_012);
break;
default:
@ -2326,11 +2326,10 @@ uno::Reference< embed::XStorage > const & SvXMLExport::GetTargetStorage() const
SvtSaveOptions::ODFSaneDefaultVersion SvXMLExport::getSaneDefaultVersion() const
{
if (mpImpl->m_oOverrideODFVersion)
{
return *mpImpl->m_oOverrideODFVersion;
}
return GetODFSaneDefaultVersion();
// cache this because it is surprising expensive when used extensively from ScXMLExport::WriteCell
if (!mpImpl->m_oODFVersion)
mpImpl->m_oODFVersion = GetODFSaneDefaultVersion();
return *mpImpl->m_oODFVersion;
}
void