1 files changed, 51 insertions, 27 deletions

diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 3737e742b441..f5a94df0bfba 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1110,35 +1110,60 @@ sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
             for (long nCol=0; nCol<nCols; nCol++)
             {
                 const uno::Any& rElement = pColArr[nCol];
-                uno::TypeClass eElemClass = rElement.getValueTypeClass();
-                if ( eElemClass == uno::TypeClass_VOID )
-                {
-                    // void = "no value"
-                    pDoc->SetError( nDocCol, nDocRow, nTab, NOTAVAILABLE );
-                }
-                else if ( eElemClass == uno::TypeClass_BYTE ||
-                            eElemClass == uno::TypeClass_SHORT ||
-                            eElemClass == uno::TypeClass_UNSIGNED_SHORT ||
-                            eElemClass == uno::TypeClass_LONG ||
-                            eElemClass == uno::TypeClass_UNSIGNED_LONG ||
-                            eElemClass == uno::TypeClass_FLOAT ||
-                            eElemClass == uno::TypeClass_DOUBLE )
+                switch( rElement.getValueTypeClass() )
                 {
+                    case uno::TypeClass_VOID:
+                    {
+                        // void = "no value"
+                        pDoc->SetError( nDocCol, nDocRow, nTab, NOTAVAILABLE );
+                    }
+                    break;
+
                     //  #87871# accept integer types because Basic passes a floating point
                     //  variable as byte, short or long if it's an integer number.
-                    double fVal(0.0);
-                    rElement >>= fVal;
-                    pDoc->SetValue( nDocCol, nDocRow, nTab, fVal );
-                }
-                else if ( eElemClass == uno::TypeClass_STRING )
-                {
-                    rtl::OUString aUStr;
-                    rElement >>= aUStr;
-                    if ( aUStr.getLength() )
-                        pDoc->PutCell( nDocCol, nDocRow, nTab, new ScStringCell( aUStr ) );
+                    case uno::TypeClass_BYTE:
+                    case uno::TypeClass_SHORT:
+                    case uno::TypeClass_UNSIGNED_SHORT:
+                    case uno::TypeClass_LONG:
+                    case uno::TypeClass_UNSIGNED_LONG:
+                    case uno::TypeClass_FLOAT:
+                    case uno::TypeClass_DOUBLE:
+                    {
+                        double fVal(0.0);
+                        rElement >>= fVal;
+                        pDoc->SetValue( nDocCol, nDocRow, nTab, fVal );
+                    }
+                    break;
+
+                    case uno::TypeClass_STRING:
+                    {
+                        rtl::OUString aUStr;
+                        rElement >>= aUStr;
+                        if ( aUStr.getLength() )
+                            pDoc->PutCell( nDocCol, nDocRow, nTab, new ScStringCell( aUStr ) );
+                    }
+                    break;
+
+                    // accept Sequence<FormulaToken> for formula cells
+                    case uno::TypeClass_SEQUENCE:
+                    {
+                        uno::Sequence< sheet::FormulaToken > aTokens;
+                        if ( rElement >>= aTokens )
+                        {
+                            ScTokenArray aTokenArray;
+                            ScTokenConversion::ConvertToTokenArray( *pDoc, aTokenArray, aTokens );
+                            ScAddress aPos( nDocCol, nDocRow, nTab );
+                            ScBaseCell* pNewCell = new ScFormulaCell( pDoc, aPos, &aTokenArray );
+                            pDoc->PutCell( aPos, pNewCell );
+                        }
+                        else
+                            bError = true;
+                    }
+                    break;
+
+                    default:
+                        bError = true;      // invalid type
                 }
-                else
-                    bError = sal_True;      // invalid type
 
                 ++nDocCol;
             }
@@ -5907,12 +5932,11 @@ void SAL_CALL ScCellRangeObj::doImport( const uno::Sequence<beans::PropertyValue
         aParam.nRow2 = aRange.aEnd.Row();
 
         //! TODO: could we get passed a valid result set by any means?
-        uno::Reference< sdbc::XResultSet > xResultSet;
 
         pDocSh->GetDBData( aRange, SC_DB_MAKE, SC_DBSEL_FORCE_MARK );       // ggf. Bereich anlegen
 
         ScDBDocFunc aFunc(*pDocSh);                         // Bereich muss angelegt sein
-        aFunc.DoImport( nTab, aParam, xResultSet, NULL, sal_True, sal_False );  //! Api-Flag als Parameter
+        aFunc.DoImport( nTab, aParam, NULL, sal_True );         //! Api-Flag as parameter
     }
 }