diff --git a/sc/qa/unit/data/functions/fods/Functions_Excel_2016.fods b/sc/qa/unit/data/functions/fods/Functions_Excel_2016.fods index cd63ba82e6a0..bb106ab21a5c 100644 --- a/sc/qa/unit/data/functions/fods/Functions_Excel_2016.fods +++ b/sc/qa/unit/data/functions/fods/Functions_Excel_2016.fods @@ -1,7 +1,7 @@ - 2016-05-02T17:35:29nl-NL2016-05-25T17:40:44.39664164931PT2H25SLibreOfficeDev/5.2.0.0.alpha1$Linux_X86_64 LibreOffice_project/64ab90d1cb496610240d01dec65893cf2f36b964 + 2016-05-02T17:35:29nl-NL2016-06-13T16:14:17.38271940532PT2H32M42SLibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/d18f46c0aefda2f60a137d7ede1223d8667075f1 0 @@ -13,8 +13,8 @@ view1 - 4 - 24 + 0 + 15 0 0 0 @@ -30,8 +30,8 @@ true - 3 - 35 + 0 + 53 0 2 0 @@ -40,7 +40,7 @@ 0 0 0 - 4 + 32 0 100 60 @@ -65,7 +65,7 @@ Sheet2 - 894 + 1540 0 100 60 @@ -105,11 +105,20 @@ true true true + true + true false 12632256 false Generic Printer + + en + US + + + + nl NL @@ -118,14 +127,12 @@ - true - true 3 1 true 1 true - jAH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAsgAAAAAAAAAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6QTQARHVwbGV4Ok5vbmUAABIAQ09NUEFUX0RVUExFWF9NT0RFCgBEVVBMRVhfT0ZG + jAH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAsgAAAAAAAAAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKRHVwbGV4Ok5vbmUAUGFnZVNpemU6QTQAABIAQ09NUEFUX0RVUExFWF9NT0RFCgBEVVBMRVhfT0ZG true 0 @@ -148,55 +155,55 @@ - + - + - + - - + - + : - + : : - + : - + - + WAAR - + WAAR - + ONWAAR - - + + @@ -446,7 +453,7 @@ - + @@ -464,22 +471,22 @@ - + - + - + - + - + - + @@ -506,12 +513,12 @@ - + - + @@ -523,17 +530,17 @@ - + - + - + @@ -545,118 +552,118 @@ - + - + - + - + + + + + + + + + + + + + + + + + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - + + + @@ -664,7 +671,7 @@ - + @@ -673,12 +680,12 @@ - + - + @@ -711,41 +718,41 @@ - + - + - + - + - + - + - + - + - + - + @@ -769,7 +776,7 @@ ??? (???) - 00-00-0000, 00:00:00 + 00/00/0000, 00:00:00 @@ -824,7 +831,7 @@ result - WAAR + TRUE @@ -847,7 +854,7 @@ 1 - WAAR + TRUE CONCAT @@ -858,7 +865,7 @@ 1 - WAAR + TRUE TEXTJOIN @@ -869,7 +876,7 @@ 1 - WAAR + TRUE IFS @@ -880,7 +887,7 @@ 1 - WAAR + TRUE SWITCH @@ -891,7 +898,7 @@ 1 - WAAR + TRUE MINIFS @@ -902,7 +909,7 @@ 1 - WAAR + TRUE MAXIFS @@ -1018,7 +1025,7 @@ - Fout:502 + Err:502 #VALUE! @@ -1108,7 +1115,7 @@ - Fout:502 + Err:502 #VALUE! @@ -1754,13 +1761,13 @@ - - #N/A + + 0 - - #N/A + + 0 - + WAAR @@ -1777,13 +1784,13 @@ - - #N/A + + 0 - - #N/A + + 0 - + WAAR @@ -1800,13 +1807,13 @@ - - #N/A + + 0 - - #N/A + + 0 - + WAAR @@ -1875,9 +1882,9 @@ - - - + + + @@ -1890,44 +1897,43 @@ + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - diff --git a/sc/source/core/tool/interpr8.cxx b/sc/source/core/tool/interpr8.cxx index dcf43d297088..a94cd032ed02 100644 --- a/sc/source/core/tool/interpr8.cxx +++ b/sc/source/core/tool/interpr8.cxx @@ -1417,11 +1417,15 @@ void ScInterpreter::ScConcat_MS() if ( !aCell.isEmpty() ) { if ( aCell.hasString() ) - aResBuf.append( aCell.getString( pDok ) ); + { + svl::SharedString aSS; + GetCellString( aSS, aCell); + aResBuf.append( aSS.getString()); + } else { if ( !aCell.hasEmptyValue() ) - aResBuf.append( OUString::number( aCell.getValue() ) ); + aResBuf.append( OUString::number( GetCellValue( aAdr, aCell))); } } } @@ -1459,11 +1463,15 @@ void ScInterpreter::ScConcat_MS() if ( !aCell.isEmpty() ) { if ( aCell.hasString() ) - aResBuf.append( aCell.getString( pDok ) ); + { + svl::SharedString aSS; + GetCellString( aSS, aCell); + aResBuf.append( aSS.getString()); + } else { if ( !aCell.hasEmptyValue() ) - aResBuf.append( OUString::number( aCell.getValue() ) ); + aResBuf.append( OUString::number( GetCellValue( aAdr, aCell))); } } } @@ -1537,11 +1545,15 @@ void ScInterpreter::ScTextJoin_MS() if ( !aCell.isEmpty() ) { if ( aCell.hasString() ) - aDelimiters.push_back( aCell.getString( pDok ) ); + { + svl::SharedString aSS; + GetCellString( aSS, aCell); + aDelimiters.push_back( aSS.getString()); + } else { if ( !aCell.hasEmptyValue() ) - aDelimiters.push_back( OUString::number( aCell.getValue() ) ); + aDelimiters.push_back( OUString::number( GetCellValue( aAdr, aCell))); } } } @@ -1579,11 +1591,15 @@ void ScInterpreter::ScTextJoin_MS() if ( !aCell.isEmpty() ) { if ( aCell.hasString() ) - aDelimiters.push_back( aCell.getString( pDok ) ); + { + svl::SharedString aSS; + GetCellString( aSS, aCell); + aDelimiters.push_back( aSS.getString()); + } else { if ( !aCell.hasEmptyValue() ) - aDelimiters.push_back( OUString::number( aCell.getValue() ) ); + aDelimiters.push_back( OUString::number( GetCellValue( aAdr, aCell))); } } else @@ -1682,11 +1698,15 @@ void ScInterpreter::ScTextJoin_MS() if ( !aCell.isEmpty() ) { if ( aCell.hasString() ) - aStr = aCell.getString( pDok ); + { + svl::SharedString aSS; + GetCellString( aSS, aCell); + aStr = aSS.getString(); + } else { if ( !aCell.hasEmptyValue() ) - aStr = OUString::number( aCell.getValue() ); + aStr = OUString::number( GetCellValue( aAdr, aCell)); } } else @@ -1742,11 +1762,15 @@ void ScInterpreter::ScTextJoin_MS() if ( !aCell.isEmpty() ) { if ( aCell.hasString() ) - aStr = aCell.getString( pDok ); + { + svl::SharedString aSS; + GetCellString( aSS, aCell); + aStr = aSS.getString(); + } else { if ( !aCell.hasEmptyValue() ) - aStr = OUString::number( aCell.getValue() ); + aStr = OUString::number( GetCellValue( aAdr, aCell)); } } else @@ -1941,9 +1965,9 @@ void ScInterpreter::ScSwitch_MS() ScRefCellValue aCell( *pDok, aAdr ); isValue = !( aCell.hasString() || aCell.hasEmptyValue() || aCell.isEmpty() ); if ( isValue ) - fRefVal = aCell.getValue(); + fRefVal = GetCellValue( aAdr, aCell); else - aRefStr = aCell.getString( pDok ); + GetCellString( aRefStr, aCell); } break; case svExternalSingleRef: