Kaydet (Commit) 23075c27 authored tarafından Kohei Yoshida's avatar Kohei Yoshida

Remove a local inline function that's used from only one call site.

Change-Id: I73954b8a1de436b9c4881d803f4f33cff1b79c4f
üst fa5473bb
...@@ -1073,13 +1073,6 @@ static inline void lcl_CreateInterpretProgress( sal_Bool& bProgress, ScDocument* ...@@ -1073,13 +1073,6 @@ static inline void lcl_CreateInterpretProgress( sal_Bool& bProgress, ScDocument*
} }
} }
inline sal_uInt8 GetScriptType( ScDocument* pDoc, ScBaseCell* pCell,
const ScPatternAttr* pPattern,
const SfxItemSet* pCondSet )
{
return pDoc->GetCellScriptType( pCell, pPattern->GetNumberFormat( pDoc->GetFormatTable(), pCondSet ) );
}
inline sal_Bool IsAmbiguousScript( sal_uInt8 nScript ) inline sal_Bool IsAmbiguousScript( sal_uInt8 nScript )
{ {
return ( nScript != SCRIPTTYPE_LATIN && return ( nScript != SCRIPTTYPE_LATIN &&
...@@ -1604,8 +1597,12 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic ) ...@@ -1604,8 +1597,12 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
pPattern = pAltPattern; pPattern = pAltPattern;
} }
sal_uInt8 nScript = GetScriptType( mpDoc, pCell, pPattern, pCondSet ); sal_uInt8 nScript = mpDoc->GetCellScriptType(
if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType(); pCell, pPattern->GetNumberFormat(mpDoc->GetFormatTable(), pCondSet));
if (nScript == 0)
nScript = ScGlobal::GetDefaultScriptType();
if ( pPattern != pOldPattern || pCondSet != pOldCondSet || if ( pPattern != pOldPattern || pCondSet != pOldCondSet ||
nScript != nOldScript || mbSyntaxMode ) nScript != nOldScript || mbSyntaxMode )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment