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

Pass forumlaResult value directly to ScDocument

Browse Source 
- Removed extra call to XCell2 and instead passed formula result directly to ScDocument.

Change-Id: Ifea731e44f12a048b76f8d5a4cc2d0619a56bbbc
This commit is contained in:
Daniel Bankston
2012-05-10 17:01:37 -05:00
committed by Markus Mohrhard
parent 14f23858c6
commit ac409adb19
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
sc/source/filter/oox/worksheethelper.cxx
View File

@@ -56,8 +56,10 @@
#include "oox/helper/propertyset.hxx" #include "oox/helper/propertyset.hxx"
#include "addressconverter.hxx" #include "addressconverter.hxx"
#include "autofilterbuffer.hxx" #include "autofilterbuffer.hxx"
#include "cell.hxx"
#include "commentsbuffer.hxx" #include "commentsbuffer.hxx"
#include "condformatbuffer.hxx" #include "condformatbuffer.hxx"
#include "convuno.hxx"
#include "document.hxx" #include "document.hxx"
#include "drawingfragment.hxx" #include "drawingfragment.hxx"
#include "drawingmanager.hxx" #include "drawingmanager.hxx"
@@ -1551,9 +1553,16 @@ void WorksheetHelper::putValue( const CellAddress& rAddress, double fValue ) con
void WorksheetHelper::putFormulaResult( const CellAddress& rAddress, double fValue ) const void WorksheetHelper::putFormulaResult( const CellAddress& rAddress, double fValue ) const
{ {
Reference< XCell2 > xCell( getCell( rAddress ), UNO_QUERY ); ScDocument& rDoc = getScDocument();
OSL_ENSURE( xCell.is(), "WorksheetHelper::putFormulaResult - missing cell interface" ); ScAddress aCellPos;
if( xCell.is() ) xCell->setFormulaResult( fValue ); ScUnoConversion::FillScAddress( aCellPos, rAddress );
if ( rDoc.GetCellType( aCellPos ) == CELLTYPE_FORMULA )
{
ScFormulaCell* pCell = (ScFormulaCell *)rDoc.GetCell( aCellPos );
pCell->SetHybridDouble( fValue );
pCell->ResetDirty();
pCell->ResetChanged();
}
} }
void WorksheetHelper::putString( const CellAddress& rAddress, const OUString& rText ) const void WorksheetHelper::putString( const CellAddress& rAddress, const OUString& rText ) const