diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-03-05 07:09:20 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-03-05 07:09:20 +0000 |
| commit | 440302c2865032a2477d86fda22834c3df7cc5ba (patch) | |
| tree | dfddb7a2f2764e22b953ebe1b9242a558b355640 /sc/source | |
| parent | CWS-TOOLING: integrate CWS aw063 (diff) | |
| download | core-440302c2865032a2477d86fda22834c3df7cc5ba.tar.gz core-440302c2865032a2477d86fda22834c3df7cc5ba.zip | |
CWS-TOOLING: integrate CWS cmcfixes54
2009-02-19 17:39:12 +0100 cmc r268301 : revert meant-to-be local-only changes in configure
2009-02-19 17:33:52 +0100 cmc r268300 : revert meant-to-be local-only change in readlicense_oo
2009-02-19 17:31:48 +0100 cmc r268299 : remove config_office dir from workspace, hopefully this doesn't screw things up
2009-02-05 17:38:47 +0100 cmc r267431 : #i98367# snprintf needs stdio.h on gcc4.4
2009-01-27 10:51:54 +0100 cmc r266964 : CWS-TOOLING: rebase CWS cmcfixes54 to trunk@266944 (milestone: DEV300:m40)
2009-01-23 10:05:33 +0100 cmc r266774 : #i98389# fix t602 filter warnings
2009-01-22 16:37:57 +0100 cmc r266740 : #i98367# revert limits.h as its going in elsewhere
2009-01-22 16:36:45 +0100 cmc r266739 : #i98367# remove easy warnings
2009-01-22 16:31:49 +0100 cmc r266738 : #i98366# merge in basic fix of #i96087# to bf_basic
2009-01-22 14:50:24 +0100 cmc r266716 : #i98288# some versions of neon report DAV:Collection instead of Collection
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/core/data/global.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr3.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 4a1babf7e755..3320e9a9a95c 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -1895,7 +1895,7 @@ String ScFunctionMgr::GetCategoryName(sal_uInt32 _nCategoryNumber ) ::std::auto_ptr<ScResourcePublisher> pCategories( new ScResourcePublisher( ScResId( RID_FUNCTION_CATEGORIES ) ) ); return String(ScResId((USHORT)_nCategoryNumber)); } -const sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToken _eToken) const +sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToken _eToken) const { switch(_eToken) { diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 6c17664ad437..e7435c4a1546 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -932,6 +932,7 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, double fB) return 0.0; } if (fX >= 1.0) + { if (fB < 1.0 && fX == 1.0) { SetError(errIllegalArgument); @@ -939,6 +940,7 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, double fB) } else return 0.0; + } // normal cases; result x^(a-1)*(1-x)^(b-1)/Beta(a,b) const double fLogDblMax = log( ::std::numeric_limits<double>::max()); diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 3b0bb68ef5a1..78a8783bb1d5 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -731,7 +731,7 @@ void ScInputHandler::ShowTipCursor() if( nLeftParentPos != STRING_NOTFOUND ) { sal_Unicode c = aSelText.GetChar( nLeftParentPos-1 ); - if( !(c >= 'A' && c<= 'Z' || c>= 'a' && c<= 'z' ) ) + if( !((c >= 'A' && c<= 'Z') || (c>= 'a' && c<= 'z' )) ) continue; nNextFStart = aHelper.GetFunctionStart( aSelText, nLeftParentPos, TRUE); if( aHelper.GetNextFunc( aSelText, FALSE, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) ) @@ -970,7 +970,7 @@ void ScInputHandler::UseFormulaData() break; sal_Unicode c = aFormula.GetChar( nLeftParentPos-1 ); - if( !(c >= 'A' && c<= 'Z' || c>= 'a' && c<= 'z' ) ) + if( !((c >= 'A' && c<= 'Z') || (c>= 'a' && c<= 'z') ) ) continue; nNextFStart = aHelper.GetFunctionStart( aFormula, nLeftParentPos, TRUE); if( aHelper.GetNextFunc( aFormula, FALSE, nNextFStart, &nNextFEnd, &ppFDesc, &aArgs ) ) |