sc/source/core/data/formulacell.cxx | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit d249282d5165a7a4e05847a6b974d5a6df2363d7
Author: Eike Rathke <er...@redhat.com>
Date: Thu Dec 18 21:51:18 2014 +0100
line-break that into something slightly more readable within 120 columns
Change-Id: I3b97cc4b0f108c0cc6e0aa1397cf6243b7c734b0
diff --git a/sc/source/core/data/formulacell.cxx
b/sc/source/core/data/formulacell.cxx
index 6c6c3d4..a7f4813 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -1844,12 +1844,15 @@ void ScFormulaCell::InterpretTail(
ScInterpretTailParameter eTailParam )
(eNew == svDouble && aResult.GetDouble() !=
aNewResult.GetDouble()) ||
(eNew == svString && aResult.GetString() !=
aNewResult.GetString()));
- // #i102616# handle special cases of initial results after loading
(only if the sheet is still marked unchanged)
+ // #i102616# handle special cases of initial results after loading
+ // (only if the sheet is still marked unchanged)
if ( bChanged && !bContentChanged &&
pDocument->IsStreamValid(aPos.Tab()) )
{
- if ( ( eOld == svUnknown && ( eNew == svError || ( eNew ==
svDouble && aNewResult.GetDouble() == 0.0 ) ) ) ||
- ( (eOld == svHybridCell || eOld == svHybridValueCell) &&
eNew == svString && aResult.GetString() == aNewResult.GetString() ) ||
- ( eOld == svDouble && eNew == svDouble &&
rtl::math::approxEqual( aResult.GetDouble(), aNewResult.GetDouble() ) ) )
+ if ((eOld == svUnknown && (eNew == svError || (eNew ==
svDouble && aNewResult.GetDouble() == 0.0))) ||
+ ((eOld == svHybridCell || eOld == svHybridValueCell) &&
+ eNew == svString && aResult.GetString() ==
aNewResult.GetString()) ||
+ (eOld == svDouble && eNew == svDouble &&
+ rtl::math::approxEqual( aResult.GetDouble(),
aNewResult.GetDouble())))
{
// no change, see above
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
