diff options
| author | Philipp Lohmann <Philipp.Lohmann@Sun.COM> | 2009-10-09 15:11:54 +0200 |
|---|---|---|
| committer | Philipp Lohmann <Philipp.Lohmann@Sun.COM> | 2009-10-09 15:11:54 +0200 |
| commit | 02a9bf4e43059aeac60b8cc8ae7e98c98df96f92 (patch) | |
| tree | 10942a830640e631ac7eecde28d1f017d57ff8ed /formula | |
| parent | e1afb76c254266da853d88c1bd3b2ccf5cd8cb18 (diff) | |
| parent | 49d596bd5d1b5e0a1e02d74a51aab207410abae4 (diff) | |
merge with m61
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/token.cxx | 21 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 1 | ||||
| -rw-r--r-- | formula/util/makefile.mk | 10 |
3 files changed, 31 insertions, 1 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 3cb3eb10f1eb..ae9848778622 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -900,6 +900,8 @@ inline bool MissingConvention::isRewriteNeeded( OpCode eOp ) const case ocGammaDist: case ocPoissonDist: case ocAddress: + case ocLogNormDist: + case ocNormDist: return true; case ocMissing: case ocLog: @@ -943,6 +945,25 @@ void FormulaMissingContext::AddMoreArgs( FormulaTokenArray *pNewArr, const Missi pNewArr->AddDouble( 1.0 ); // 3rd, Cumulative=TRUE() } break; + case ocNormDist: + if ( mnCurArg == 2 ) + { + pNewArr->AddOpCode( ocSep ); + pNewArr->AddDouble( 1.0 ); // 4th, Cumulative=TRUE() + } + break; + case ocLogNormDist: + if ( mnCurArg == 0 ) + { + pNewArr->AddOpCode( ocSep ); + pNewArr->AddDouble( 0.0 ); // 2nd, mean = 0.0 + } + if ( mnCurArg <= 1 ) + { + pNewArr->AddOpCode( ocSep ); + pNewArr->AddDouble( 1.0 ); // 3rd, standard deviation = 1.0 + } + break; case ocLog: if ( !rConv.isODFF() && mnCurArg == 0 ) { diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 1e5b55b7b67f..37db1d2eb3cb 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1605,6 +1605,7 @@ void FormulaDlg_Impl::Update() { FormEditData* pData = m_pHelper->getFormEditData(); const String sExpression = pMEdit->GetText(); + aOldFormula = String(); UpdateTokenArray(sExpression); FormulaCursorHdl(&aMEFormula); CalcStruct(sExpression); diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk index 6852a53e499d..d1d78c11bbc2 100644 --- a/formula/util/makefile.mk +++ b/formula/util/makefile.mk @@ -98,7 +98,11 @@ SHL2STDLIBS= \ $(CPPUHELPERLIB) \ $(SALLIB) -.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" +.IF "$(GUI)"=="OS2" +SHL2STDLIBS+= \ + $(LB)$/ifor.lib +SHL2DEPN=$(LB)$/i$(TARGET).lib +.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" SHL2STDLIBS+= \ -lfor$(DLLPOSTFIX) SHL2DEPN=$(SHL1TARGETN) @@ -113,6 +117,10 @@ SHL2IMPLIB=i$(TARGET2) SHL2LIBS=$(LIB2TARGET) SHL2DEF=$(MISC)$/$(SHL2TARGET).def DEF2NAME=$(SHL2TARGET) +.IF "$(GUI)"=="OS2" +DEFLIB2NAME=$(TARGET2) +.ENDIF + SHL2USE_EXPORTS=name # SHL2VERSIONMAP=$(TARGET2).map |