diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-10-29 02:00:44 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-10-30 16:28:55 +0100 |
| commit | 3757128f488bf47c51c2064daea90155601242b2 (patch) | |
| tree | 40a8ec718b55b9fa9f46bda405912baf3dcfa073 | |
| parent | 0865c446c2ac3facd75f03020e934e71403429e1 (diff) | |
variable can never be NULL in this place
Change-Id: I806a5ce53f1f290d6e37fe4afdd574b52b98fcce
| -rw-r--r-- | sc/source/core/data/column3.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index da5cdbbabc18..e1cb2a1ba8e0 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -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; |