diff options
| -rw-r--r-- | sc/inc/funcdesc.hxx | 2 | ||||
| -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 |
4 files changed, 6 insertions, 4 deletions
diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index 683486286d9a..fa07e663063f 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -172,7 +172,7 @@ public: virtual const formula::IFunctionCategory* getCategory(sal_uInt32 nPos) const; virtual void fillLastRecentlyUsedFunctions(::std::vector< const formula::IFunctionDescription*>& _rLastRUFunctions) const; virtual const formula::IFunctionDescription* getFunctionByName(const ::rtl::OUString& _sFunctionName) const; - virtual const sal_Unicode getSingleToken(const formula::IFunctionManager::EToken _eToken) const; + virtual sal_Unicode getSingleToken(const formula::IFunctionManager::EToken _eToken) const; private: ScFunctionList* pFuncList; List* aCatLists[MAX_FUNCCAT]; 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 ) ) |