summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-12-16 01:37:31 +0100
committerAndras Timar <andras.timar@collabora.com>2014-12-18 22:51:39 +0100
commit04a9c1c90cc2e2d969b712b3b7a255d286d19b84 (patch)
tree2e1803918cfb9067bd60747b8b381a1e1e4f1d66
parent0fbcd7b60d87924660369fcdb0569ee9670736ac (diff)
fdo#79249 call formula compiler with error string
... instead of attempting to stringize a NaN coded error value. Regression introduced with 30a20743ae17e6e02183a65603d38968253b3ffb (cherry picked from commit 994607b55104b9ae4554554c13b001b8d5d513b6) construct grouped ScFormulaCell with bDirty=true, fdo#79249 related Noticed when loading https://bugs.freedesktop.org/attachment.cgi?id=99844 with fdo#79249 fix where oox::xls::applyCellFormulas() groups the consecutive =#N/A formulas. Only A1 result was displayed, other cells were displayed empty. (cherry picked from commit a1dc5e97da273bf35d58d54e625149022569a993) correct error string, #N/A instead of #NA (cherry picked from commit 758755e31b3d9e1ed2eab522d4794282178346ac) Change-Id: Ia7a8ca39938820ac75db169404446fa696c6ee1b 3a541f74d3d25e1515a1c6d47f02ec6a8e817c93 15019072b6e812b9ffe29d3ee6afacd9ab526948
-rw-r--r--sc/source/core/data/formulacell.cxx2
-rw-r--r--sc/source/filter/oox/sheetdatabuffer.cxx7
-rw-r--r--sc/source/filter/oox/unitconverter.cxx2
3 files changed, 8 insertions, 3 deletions
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index a1ab35a084ba..d64ed2da0e09 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -683,7 +683,7 @@ ScFormulaCell::ScFormulaCell(
nSeenInIteration(0),
cMatrixFlag ( cInd ),
nFormatType(xGroup->mnFormatType),
- bDirty(false),
+ bDirty(true),
bChanged( false ),
bRunning( false ),
bCompile( false ),
diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx
index b3963df1ec09..60987c95ce9d 100644
--- a/sc/source/filter/oox/sheetdatabuffer.cxx
+++ b/sc/source/filter/oox/sheetdatabuffer.cxx
@@ -209,11 +209,16 @@ void SheetDataBuffer::setBooleanCell( const CellModel& rModel, bool bValue )
void SheetDataBuffer::setErrorCell( const CellModel& rModel, const OUString& rErrorCode )
{
- setErrorCell( rModel, getUnitConverter().calcBiffErrorCode( rErrorCode ) );
+ // Using the formula compiler now we can simply pass on the error string.
+ getFormulaBuffer().setCellFormula( rModel.maCellAddr, rErrorCode);
+ setCellFormat( rModel );
}
void SheetDataBuffer::setErrorCell( const CellModel& rModel, sal_uInt8 nErrorCode )
{
+ assert(!"stringizing any NaN will only give 'nan'");
+ /* FIXME: map nErrorCode to error string and call setErrorCell() above. */
+
OUStringBuffer aBuf;
aBuf.append('{');
aBuf.append(BiffHelper::calcDoubleFromError(nErrorCode));
diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx
index 55ba77fe15e3..108b248caa94 100644
--- a/sc/source/filter/oox/unitconverter.cxx
+++ b/sc/source/filter/oox/unitconverter.cxx
@@ -120,7 +120,7 @@ UnitConverter::UnitConverter( const WorkbookHelper& rHelper ) :
addErrorCode( BIFF_ERR_REF, "#REF!" );
addErrorCode( BIFF_ERR_NAME, "#NAME?" );
addErrorCode( BIFF_ERR_NUM, "#NUM!" );
- addErrorCode( BIFF_ERR_NA, "#NA" );
+ addErrorCode( BIFF_ERR_NA, "#N/A" );
}
void UnitConverter::finalizeImport()