Kaydet (Commit) 3757128f authored tarafından Markus Mohrhard's avatar Markus Mohrhard

variable can never be NULL in this place

Change-Id: I806a5ce53f1f290d6e37fe4afdd574b52b98fcce
üst 0865c446
......@@ -1542,13 +1542,10 @@ bool ScColumn::ParseString(
if (!aParam.mpNumFormatter->IsNumberFormat(rString, nIndex, nVal))
break;
if ( aParam.mpNumFormatter )
{
// convert back to the original language if a built-in format was detected
const SvNumberformat* pOldFormat = aParam.mpNumFormatter->GetEntry( nOldIndex );
if ( pOldFormat )
nIndex = aParam.mpNumFormatter->GetFormatForLanguageIfBuiltIn( nIndex, pOldFormat->GetLanguage() );
}
// convert back to the original language if a built-in format was detected
const SvNumberformat* pOldFormat = aParam.mpNumFormatter->GetEntry( nOldIndex );
if ( pOldFormat )
nIndex = aParam.mpNumFormatter->GetFormatForLanguageIfBuiltIn( nIndex, pOldFormat->GetLanguage() );
rCell.set(nVal);
if ( nIndex != nOldIndex)
......@@ -1558,7 +1555,6 @@ bool ScColumn::ParseString(
// Exception: If the new format is boolean, always apply it.
bool bOverwrite = false;
const SvNumberformat* pOldFormat = aParam.mpNumFormatter->GetEntry( nOldIndex );
if ( pOldFormat )
{
short nOldType = pOldFormat->GetType() & ~NUMBERFORMAT_DEFINED;
......
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