diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:32 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:04:32 +0200 |
commit | c9ac7489ec5fd4652f0cff09722561ba5a27bcda (patch) | |
tree | e9fb41b01f699d5a4202e719d5dc7e087fa701c1 /sc/source/core/tool/interpr3.cxx | |
parent | 69bb367315288b644439dc46d34743a2575a3527 (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 5e369f0d3b306be13606c1558ecf7d0aac0048f4 (tag: refs/tags/libreoffice-3.3.0.4)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:15 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 2df81fdef39f29be15dc0a6e12031916de963f08
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:18:07 2011 -0500
Reverting the merge commit 0fe55349b05fae496a86a3fa958d184f0453916c.
I created a patch between before and after the merge commit, and
reverse-applied it. This is because if you revert a merge commit
in git you are denying all future merges from that branch. I wasn't
sure if we really wanted that.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/inc/document.hxx | 22 +------
sc/inc/drwlayer.hxx | 2 +-
sc/inc/table.hxx | 16 +-----
sc/source/core/data/document.cxx | 7 +--
sc/source/core/data/drwlayer.cxx | 6 +-
sc/source/core/data/table1.cxx | 38 ++++--------
sc/source/core/data/table2.cxx | 91 ++++++------------------------
sc/source/core/data/table3.cxx | 71 +----------------------
sc/source/filter/xml/xmlrowi.cxx | 17 +----
sc/source/ui/docshell/externalrefmgr.cxx | 7 +-
sc/source/ui/view/dbfunc.cxx | 5 +-
sc/source/ui/view/tabvwshe.cxx | 4 +-
12 files changed, 52 insertions(+), 234 deletions(-)
commit 9ce94f52e8c404a5e19154d38c18a44281d961f0
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Thu Jan 13 11:04:14 2011 -0500
Revert "This is also part of the merge."
This reverts commit 0fe55349b05fae496a86a3fa958d184f0453916c.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
sc/source/core/data/table3.cxx | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
commit 1e03f54cc4f8939867869a3570f56d0645b515f5
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:36 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: calc_libreoffice-3.3.0.4
Diffstat (limited to 'sc/source/core/tool/interpr3.cxx')
-rw-r--r-- | sc/source/core/tool/interpr3.cxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 0b702777d8e8..08f048147769 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -755,7 +755,7 @@ double ScInterpreter::GetChiSqDistPDF(double fX, double fDF) else // fDF is small in most cases, we can iterate { if (fmod(fDF,2.0)<0.5) - { + { // even fValue = 0.5; fCount = 2.0; @@ -863,7 +863,7 @@ double ScInterpreter::GetBeta(double fAlpha, double fBeta) fResult *= fLanczos; return fResult; } - + // Same as GetBeta but with logarithm double ScInterpreter::GetLogBeta(double fAlpha, double fBeta) { @@ -939,7 +939,7 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, double fB) if (fB < 1.0 && fX == 1.0) { SetError(errIllegalArgument); - return HUGE_VAL; + return HUGE_VAL; } else return 0.0; @@ -1125,7 +1125,7 @@ double ScInterpreter::GetBetaDist(double fXin, double fAlpha, double fBeta) return; } } - + void ScInterpreter::ScPhi() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPhi" ); @@ -1345,7 +1345,7 @@ void ScInterpreter::ScB() } } else - { + { if ( bIsValidX ) // not(0<p<1) { if ( p == 0.0 ) @@ -1353,7 +1353,7 @@ void ScInterpreter::ScB() else if ( p == 1.0 ) PushDouble( (xe == n) ? 1.0 : 0.0 ); else - PushIllegalArgument(); + PushIllegalArgument(); } else PushIllegalArgument(); @@ -1536,7 +1536,7 @@ void ScInterpreter::ScLogNormDist() //expanded, see #i100119# { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLogNormDist" ); BYTE nParamCount = GetByte(); - if ( !MustHaveParamCount( nParamCount, 1, 4)) + if ( !MustHaveParamCount( nParamCount, 1, 4)) return; bool bCumulative = nParamCount == 4 ? GetBool() : true; // cumulative double sigma = nParamCount >= 3 ? GetDouble() : 1.0; // standard deviation @@ -3014,7 +3014,7 @@ bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double& vSum,std:: short nParamCount = GetByte(); if ( !MustHaveParamCountMin( nParamCount, 1 ) ) return false; - + fSum = 0.0; fCount = 0.0; vSum = 0.0; @@ -3303,9 +3303,9 @@ void ScInterpreter::CalculateSmallLarge(BOOL bSmall) } SCSIZE k = static_cast<SCSIZE>(f); vector<double> aSortArray; - /* TODO: using nth_element() is best for one single value, but LARGE/SMALL - * actually are defined to return an array of values if an array of - * positions was passed, in which case, depending on the number of values, + /* TODO: using nth_element() is best for one single value, but LARGE/SMALL + * actually are defined to return an array of values if an array of + * positions was passed, in which case, depending on the number of values, * we may or will need a real sorted array again, see #i32345. */ //GetSortArray(1, aSortArray); GetNumberSequenceArray(1, aSortArray); @@ -3324,7 +3324,7 @@ void ScInterpreter::CalculateSmallLarge(BOOL bSmall) void ScInterpreter::ScLarge() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLarge" ); - CalculateSmallLarge(FALSE); + CalculateSmallLarge(FALSE); } void ScInterpreter::ScSmall() @@ -3948,7 +3948,7 @@ void ScInterpreter::ScProbability() void ScInterpreter::ScCorrel() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCorrel" ); - // This is identical to ScPearson() + // This is identical to ScPearson() ScPearson(); } @@ -3958,12 +3958,12 @@ void ScInterpreter::ScCovar() CalculatePearsonCovar(FALSE,FALSE); } -void ScInterpreter::ScPearson() +void ScInterpreter::ScPearson() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPearson" ); CalculatePearsonCovar(TRUE,FALSE); } -void ScInterpreter::CalculatePearsonCovar(BOOL _bPearson,BOOL _bStexy) +void ScInterpreter::CalculatePearsonCovar(BOOL _bPearson,BOOL _bStexy) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculatePearsonCovar" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) @@ -4074,7 +4074,7 @@ void ScInterpreter::ScRSQ() void ScInterpreter::ScSTEXY() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSTEXY" ); - CalculatePearsonCovar(TRUE,TRUE); + CalculatePearsonCovar(TRUE,TRUE); } void ScInterpreter::CalculateSlopeIntercept(BOOL bSlope) { |