summaryrefslogtreecommitdiff
path: root/formula
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-03-05 08:00:32 +0000
committerOliver Bolte <obo@openoffice.org>2009-03-05 08:00:32 +0000
commit8fe063b3659889a8701a75fbd5a68e5556382260 (patch)
treef3b7d0cb6fd4db1434c18bad4f84ec79eb98a8ad /formula
parent592aef19f7a6d1aae9642a6c318c6408e38fb361 (diff)
CWS-TOOLING: integrate CWS calc48
2009-02-06 17:11:50 +0100 nn r267478 : #i98978# enableInput(TRUE) in ScFormulaReferenceHelper dtor 2009-02-04 11:54:45 +0100 nn r267359 : #i98861# abort on failure, not on success 2009-02-02 19:10:10 +0100 nn r267293 : #i98747# use FormulaListBox for keyboard handling 2009-02-02 18:00:26 +0100 nn r267287 : #i98738# handle non-existing recent functions 2009-02-02 18:00:14 +0100 nn r267286 : #i98738# handle non-existing recent functions 2009-02-02 14:16:15 +0100 nn r267265 : #i98657# #i98737# move clean-up code from ScAnyRefDlg dtor to ScFormulaReferenceHelper dtor 2009-01-30 19:46:54 +0100 nn r267231 : #i98658# use ctor with IControlReferenceHandler for RefEdit controls 2009-01-30 19:12:43 +0100 nn r267225 : #i98656# IsRefInputMode: false if no function is edited 2009-01-30 18:48:12 +0100 nn r267224 : #i98655# show function description in description area
Diffstat (limited to 'formula')
-rw-r--r--formula/source/ui/dlg/formula.cxx4
-rw-r--r--formula/source/ui/dlg/funcpage.cxx8
-rw-r--r--formula/source/ui/dlg/funcpage.hxx2
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;