basic/source/classes/image.cxx | 1 - basic/source/runtime/runtime.cxx | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-)
New commits: commit 8323fcc8287b3e7aa596bf60111be861c40ae39b Author: Mike Kaganski <[email protected]> AuthorDate: Sat Sep 27 15:16:12 2025 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sat Sep 27 13:32:11 2025 +0200 'd' can't appear in the 'added by older versions' compatibility code I added the code that I remove here in commit 22d7827c6695358e11ee06a5599b72a92ff0b2ac (tdf#168569: support date values in string pool, 2025-09-26), but this is section to handle old images, after commit 3bcfb1aac1f43f16c579486264103ebd4f3f829b (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 <[email protected]> Tested-by: Jenkins diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 01695e6b4939..e1b37fd926c0 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -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 { diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 17a09b190046..93775a086554 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -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
