diff options
| m--------- | dictionaries | 0 | ||||
| m--------- | helpcontent2 | 0 | ||||
| -rw-r--r-- | sc/source/filter/excel/xlpivot.cxx | 14 |
3 files changed, 12 insertions, 2 deletions
diff --git a/dictionaries b/dictionaries -Subproject 36776c334cf3bae5bdd5929fad8e11a8bdf830a +Subproject 350dc590b04041f15d6c570075ade425e4db93a diff --git a/helpcontent2 b/helpcontent2 -Subproject 341ef992d8fdc702e97274779cf3aa92133c547 +Subproject aab9e88882b7e799b6246caa6c40ca3d46e6220 diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 84a6042afaa1..8a902e09279c 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -86,9 +86,19 @@ void XclPCItem::SetInteger( sal_Int16 nValue ) void XclPCItem::SetError( sal_uInt16 nError ) { meType = EXC_PCITEM_ERROR; - //! TODO convert error to string maText = rtl::OUString(); mnError = nError; + switch( nError ) + { + case 0x00: maText = "#NULL!"; break; + case 0x07: maText = "#DIV/0!"; break; + case 0x0F: maText = "#VALUE!"; break; + case 0x17: maText = "#REF!"; break; + case 0x1D: maText = "#NAME?"; break; + case 0x24: maText = "#NUM!"; break; + case 0x2A: maText = "#N/A"; break; + default: break; + } } void XclPCItem::SetBool( bool bValue ) @@ -125,7 +135,7 @@ bool XclPCItem::IsEmpty() const const rtl::OUString* XclPCItem::GetText() const { - return (meType == EXC_PCITEM_TEXT) ? &maText : 0; + return (meType == EXC_PCITEM_TEXT || meType == EXC_PCITEM_ERROR) ? &maText : NULL; } const double* XclPCItem::GetDouble() const |