You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2012/02/02 16:32:58 UTC
svn commit: r1239673 -
/incubator/ooo/trunk/main/sc/source/core/data/cell2.cxx
Author: hdu
Date: Thu Feb 2 15:32:58 2012
New Revision: 1239673
URL: http://svn.apache.org/viewvc?rev=1239673&view=rev
Log:
#i118735# prevent endless loop if vlookup/hlookup doesn't find anything
Modified:
incubator/ooo/trunk/main/sc/source/core/data/cell2.cxx
Modified: incubator/ooo/trunk/main/sc/source/core/data/cell2.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/core/data/cell2.cxx?rev=1239673&r1=1239672&r2=1239673&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/core/data/cell2.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/core/data/cell2.cxx Thu Feb 2 15:32:58 2012
@@ -444,11 +444,9 @@ const ScMatrix* ScFormulaCell::GetMatrix
{
if ( pDocument->GetAutoCalc() )
{
+ if( IsDirtyOrInTableOpDirty()
// Was stored !bDirty but an accompanying matrix cell was bDirty?
- // => we need to get the matrix.
- if (!bDirty && cMatrixFlag == MM_FORMULA && !aResult.GetMatrix().Is())
- bDirty = sal_True;
- if ( IsDirtyOrInTableOpDirty() )
+ || (!bDirty && cMatrixFlag == MM_FORMULA && !aResult.GetMatrix().Is()))
Interpret();
}
return aResult.GetMatrix();