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

cells creation : do not use uno calls at loading time

Browse Source
This commit is contained in:
Laurent Godard
2011-12-02 12:28:40 +01:00
committed by Markus Mohrhard
parent 3b0d01a8cb
commit 62ec7f9e82
1 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
sc/source/filter/xml/xmlcelli.cxx
View File

@@ -1078,16 +1078,66 @@ void ScXMLTableRowCellContext::EndElement()
if (!bIsMatrix) if (!bIsMatrix)
{ {
LockSolarMutex(); LockSolarMutex();
ScCellObj* pCellObj =
static_cast<ScCellObj*>(ScCellRangesBase::getImplementation( ScAddress aScAddress;
xCell)); ScUnoConversion::FillScAddress( aScAddress, aCellPos );
if (pCellObj)
ScDocument* pDoc = rXMLImport.GetDocument();
rtl::OUString aText = pOUFormula->first;
rtl::OUString aFormulaNmsp = pOUFormula->second;
::boost::scoped_ptr<ScExternalRefManager::ApiGuard> pExtRefGuard;
pExtRefGuard.reset(new ScExternalRefManager::ApiGuard(pDoc));
ScBaseCell* pNewCell = NULL;
if ( !aText.isEmpty() )
{ {
pCellObj->SetFormulaWithGrammar( pOUFormula->first, pOUFormula->second, eGrammar); if ( aText[0] == '=' && aText.getLength() > 1 )
if (bFormulaTextResult && pOUTextValue && pOUTextValue->getLength()) {
pCellObj->SetFormulaResultString( *pOUTextValue); // temporary formula string as string tokens
ScTokenArray* pCode = new ScTokenArray;
pCode->AddStringXML( aText );
if( (eGrammar == formula::FormulaGrammar::GRAM_EXTERNAL) && (aFormulaNmsp.getLength() > 0) )
pCode->AddStringXML( aFormulaNmsp );
pDoc->IncXMLImportedFormulaCount( aText.getLength() );
pNewCell = new ScFormulaCell( pDoc, aScAddress, pCode, eGrammar, MM_NONE );
delete pCode;
}
else if ( aText[0] == '\'' )
{
// for bEnglish, "'" at the beginning is always interpreted as text
// marker and stripped
pNewCell = ScBaseCell::CreateTextCell( aText.copy( 1 ), pDoc );
}
else else
pCellObj->SetFormulaResultDouble( fValue); {
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
sal_uInt32 nEnglish = pFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US);
double fVal;
if ( pFormatter->IsNumberFormat( aText, nEnglish, fVal ) )
{
pNewCell = new ScValueCell( fVal );
}
else
pNewCell = ScBaseCell::CreateTextCell( aText, pDoc );
// das (englische) Zahlformat wird nicht gesetzt
//! passendes lokales Format suchen und setzen???
}
if (pNewCell)
pDoc->PutCell( aScAddress, pNewCell );
ScBaseCell* pCell = rXMLImport.GetDocument()->GetCell( aScAddress );
if ( pCell && pCell->GetCellType() == CELLTYPE_FORMULA )
{
if (bFormulaTextResult && pOUTextValue && pOUTextValue->getLength())
static_cast<ScFormulaCell*>(pCell)->SetHybridString( *pOUTextValue );
else
static_cast<ScFormulaCell*>(pCell)->SetHybridDouble( fValue );
}
} }
} }
else else