diff options
author | Eike Rathke <erack@redhat.com> | 2024-08-29 17:50:41 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2024-09-03 09:01:44 +0200 |
commit | 5a9f5931134a4062f90860f1dc76717d81a8d6b2 (patch) | |
tree | 1514e848f2118ed7c8ccc8d219b59bffdee628a0 /sc | |
parent | 4b0ff8ae2a8b9d3945cd0f23535c7ef354a9b3d4 (diff) |
Resolves: tdf#161599 Write Add-In CompatibilityName (if any) to OOXML
First "en-US" (preferred) or "en" or any first if no "en-US" nor "en".
Change-Id: Ifdb60547b588f224ee9ddca39af2352a87385bd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172604
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 044980edc41544dd5973d5aa57f134d4bfe6d0e7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172682
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/compiler.hxx | 1 | ||||
-rw-r--r-- | sc/source/core/tool/compiler.cxx | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sc/inc/compiler.hxx b/sc/inc/compiler.hxx index d0305bf474e2..33fe7ca97361 100644 --- a/sc/inc/compiler.hxx +++ b/sc/inc/compiler.hxx @@ -533,6 +533,7 @@ private: virtual void CreateStringFromMatrix( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const override; virtual void CreateStringFromIndex( OUStringBuffer& rBuffer, const formula::FormulaToken* pToken ) const override; virtual void LocalizeString( OUString& rName ) const override; // modify rName - input: exact name + virtual bool GetExcelName( OUString& rName ) const override; // modify rName - input: exact name virtual formula::ParamClass GetForceArrayParameter( const formula::FormulaToken* pToken, sal_uInt16 nParam ) const override; diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 53bb6d556c4b..652bc14d17fe 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.cxx @@ -5599,6 +5599,11 @@ void ScCompiler::LocalizeString( OUString& rName ) const ScGlobal::GetAddInCollection()->LocalizeString( rName ); } +bool ScCompiler::GetExcelName( OUString& rName ) const +{ + return ScGlobal::GetAddInCollection()->GetExcelName( rName, LANGUAGE_ENGLISH_US, rName); +} + FormulaTokenRef ScCompiler::ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2 ) { return extendRangeReference( rDoc.GetSheetLimits(), rTok1, rTok2, aPos, true/*bReuseDoubleRef*/ ); |