mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix #119514#:Item lists are incorrectly imported"

Browse Source 
This reverts commit 2d3f9fb97857fd8cfc732d3f5aa8f20b01e1cb35.
This commit is contained in:
Xisco Fauli 2013-03-27 01:18:50 +01:00
parent 2d3f9fb978
commit 664dd908af
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dictionaries

@ -1 +1 @@
Subproject commit 350dc590b04041f15d6c570075ade425e4db93ad
Subproject commit 36776c334cf3bae5bdd5929fad8e11a8bdf830a4

2
helpcontent2

@ -1 +1 @@
Subproject commit aab9e88882b7e799b6246caa6c40ca3d46e6220d
Subproject commit 341ef992d8fdc702e97274779cf3aa92133c547b

14
sc/source/filter/excel/xlpivot.cxx
View File

@ -86,19 +86,9 @@ 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 )
@ -135,7 +125,7 @@ bool XclPCItem::IsEmpty() const
const rtl::OUString* XclPCItem::GetText() const
{
return (meType == EXC_PCITEM_TEXT || meType == EXC_PCITEM_ERROR) ? &maText : NULL;
return (meType == EXC_PCITEM_TEXT) ? &maText : 0;
}
const double* XclPCItem::GetDouble() const