diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:53:24 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-03-06 14:53:24 +0000 |
commit | c0350e1704c7179e8e8d2ea95aa712f278e1d52f (patch) | |
tree | e122fc7dfe3d9edb6e7524f927e506658cd8313b /sc | |
parent | d15aa5e14b75c1229eca4117b743700cf1605ade (diff) |
INTEGRATION: CWS odff (1.6.60); FILE MERGED
2008/02/27 18:33:45 er 1.6.60.2: RESYNC: (1.6-1.7); FILE MERGED
2007/12/19 20:05:23 er 1.6.60.1: #i32341# renamed some ugly German opcodes of functions touched for ocUnion
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/filter/qpro/qproform.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index 91abc578b6bb..b82ac74499af 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.cxx @@ -4,9 +4,9 @@ * * $RCSfile: qproform.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: vg $ $Date: 2008-01-28 14:13:42 $ + * last change: $Author: kz $ $Date: 2008-03-06 15:53:24 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -139,7 +139,7 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr IncToken( eParam[ 1 ] ); break; - case ocIKV: + case ocIRR: nPush = eParam[ 0 ]; eParam[ 0 ] = eParam[ 1 ]; eParam[ 1 ] = nPush; @@ -501,10 +501,10 @@ static const struct { ocMin, FT_FuncVar }, { ocMax, FT_FuncVar }, { ocVLookup, FT_FuncFix3 }, - { ocNBW, FT_FuncFix2 }, + { ocNPV, FT_FuncFix2 }, { ocVar, FT_FuncVar }, { ocNormDist, FT_FuncVar }, - { ocIKV, FT_FuncFix2 }, + { ocIRR, FT_FuncFix2 }, { ocHLookup, FT_FuncFix3 }, { ocDBSum, FT_FuncFix3 }, { ocDBAverage, FT_FuncFix3 }, @@ -558,7 +558,7 @@ static const struct { ocNoName, FT_NotImpl }, { ocNoName, FT_NotImpl }, { ocGetActDate, FT_FuncFix0 }, - { ocNBW, FT_FuncFix2 }, + { ocNPV, FT_FuncFix2 }, { ocNoName, FT_NotImpl }, // 0x90 { ocNoName, FT_NotImpl }, { ocNoName, FT_NOP }, @@ -605,11 +605,11 @@ DefTokenId QProToSc::IndexToDLLId( sal_uInt16 nIndex ) break; case 0x0024: - eId = ocGGT; + eId = ocGCD; break; case 0x0025: - eId = ocKGV; + eId = ocLCM; break; case 0x0027: |