'd' can't appear in the 'added by older versions' compatibility code
I added the code that I remove here in commit22d7827c66(tdf#168569: support date values in string pool, 2025-09-26), but this is section to handle old images, after commit3bcfb1aac1(tdf#143707 - Change strategy to support suffix type characters, 2021-08-10) the suffixes are written in a way that is handled in SbiImage::GetString. Change-Id: Ia2ad05f1e146dc40686f2baf07f178331f1ff4a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191561 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins
This commit is contained in:
@@ -618,7 +618,6 @@ void SbiImage::AddEnum(SbxObject* pObject) // Register enum type
|
||||
rEnums->Insert(pObject, rEnums->Count());
|
||||
}
|
||||
|
||||
// See also: SbiRuntime::StepLOADNC
|
||||
// Note: IDs start with 1
|
||||
OUString SbiImage::GetString( sal_uInt32 nId, SbxDataType *eType ) const
|
||||
{
|
||||
|
||||
@@ -2810,7 +2810,7 @@ void SbiRuntime::StepERROR()
|
||||
}
|
||||
|
||||
// loading a numeric constant (+ID)
|
||||
// See also: SbiImage::GetString
|
||||
|
||||
void SbiRuntime::StepLOADNC( sal_uInt32 nOp1 )
|
||||
{
|
||||
// tdf#143707 - check if the data type character was added after the string termination symbol
|
||||
@@ -2842,8 +2842,6 @@ void SbiRuntime::StepLOADNC( sal_uInt32 nOp1 )
|
||||
case '@': eType = SbxCURRENCY; break;
|
||||
// tdf#142460 - properly handle boolean values in string pool
|
||||
case 'b': eType = SbxBOOL; break;
|
||||
// tdf#168569 - support date values in string pool
|
||||
case 'd': eType = SbxDATE; break; // Not in GetSuffixType
|
||||
}
|
||||
}
|
||||
// tdf#143707 - if the data type character is different from the default value, it was added
|
||||
|
||||
Reference in New Issue
Block a user