diff options
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 4 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcpage.cxx | 8 | ||||
| -rw-r--r-- | formula/source/ui/dlg/funcpage.hxx | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index e8e5069844..1aef24b070 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -1060,7 +1060,7 @@ void FormulaDlg_Impl::UpdateFunctionDesc() String aSig = pDesc->getSignature(); aFtFuncName.SetText( aSig ); - aFtFuncDesc.SetText( pDesc->getFunctionName() ); + aFtFuncDesc.SetText( pDesc->getDescription() ); ResizeArgArr( pDesc ); if ( !m_aArguments.empty() ) // noch Argumente da? @@ -1713,7 +1713,7 @@ IMPL_LINK( FormulaDlg_Impl, FuncSelHdl, FuncPage*, EMPTYARG ) String aSig = pDesc->getSignature(); aFtHeadLine.SetText( pDesc->getFunctionName() ); aFtFuncName.SetText( aSig ); - aFtFuncDesc.SetText( pDesc->getFunctionName() ); + aFtFuncDesc.SetText( pDesc->getDescription() ); } } else diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index afe7d5e0fa..5256450a28 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -170,8 +170,12 @@ void FuncPage::UpdateFunctionList() for ( ; aIter != aEnd; ++aIter ) { - aLbFunction.SetEntryData( - aLbFunction.InsertEntry( (*aIter)->getFunctionName() ),(void*)*aIter ); + const IFunctionDescription* pDesc = *aIter; + if (pDesc) // may be null if a function is no longer available + { + aLbFunction.SetEntryData( + aLbFunction.InsertEntry( pDesc->getFunctionName() ), (void*)pDesc ); + } } } diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 954bcfc964..801fda4389 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -80,7 +80,7 @@ private: FixedText aFtCategory; ListBox aLbCategory; FixedText aFtFunction; - ListBox aLbFunction; + FormulaListBox aLbFunction; const IFunctionManager* m_pFunctionManager; |