3 files changed, 9 insertions, 5 deletions
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index c19383a74f6b..a2a46b74f3a6 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 f056d221ac74..f414cb41fb39 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 dffe65ae8d4b..7fef02bd3c20 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;