core.git: sc/source

[Caolán McNamara (via logerrit)]

 sc/source/core/data/documen6.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit de148aa512e02457e43c6db966472a37059fbb14
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Mar 21 15:24:24 2024 +0000
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Mar 21 20:35:01 2024 +0100

    Related: tdf#160056 replace with wrapper GetFormatTable()
    
    GetFormatTable calls mxPoolHelper->GetFormTable()
    
    but asserts if this happens during threaded calculation
    
    so replace the first with the latter
    
    Change-Id: I7027f66a929159525842bfabbf8cf4ab0e55ed23
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165107
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>

diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx
index 931cb9002bee..96c625eaf9af 100644
--- a/sc/source/core/data/documen6.cxx
+++ b/sc/source/core/data/documen6.cxx
@@ -118,9 +118,9 @@ SvtScriptType ScDocument::GetCellScriptType( const 
ScAddress& rPos, sal_uInt32 n
     const Color* pColor;
     OUString aStr;
     if( pCell )
-        aStr = ScCellFormat::GetString(*pCell, nNumberFormat, &pColor, 
*mxPoolHelper->GetFormTable(), *this);
+        aStr = ScCellFormat::GetString(*pCell, nNumberFormat, &pColor, 
*GetFormatTable(), *this);
     else
-        aStr = ScCellFormat::GetString(*this, rPos, nNumberFormat, &pColor, 
*mxPoolHelper->GetFormTable());
+        aStr = ScCellFormat::GetString(*this, rPos, nNumberFormat, &pColor, 
*GetFormatTable());
 
     SvtScriptType nRet = GetStringScriptType( aStr );
 
@@ -146,7 +146,7 @@ SvtScriptType ScDocument::GetScriptType( SCCOL nCol, SCROW 
nRow, SCTAB nTab, con
     if ( !pPattern->GetItem(ATTR_CONDITIONAL).GetCondFormatData().empty() )
         pCondSet = GetCondResult( nCol, nRow, nTab );
 
-    sal_uInt32 nFormat = pPattern->GetNumberFormat( 
mxPoolHelper->GetFormTable(), pCondSet );
+    sal_uInt32 nFormat = pPattern->GetNumberFormat( GetFormatTable(), pCondSet 
);
 
     return GetCellScriptType(aPos, nFormat, pCell);
 }