diff options
| author | Eike Rathke <erack@redhat.com> | 2020-05-29 15:45:12 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-06-05 17:03:53 +0200 |
| commit | 9bbee72fc90e4449cb67dd9caa06a0ccf8f4883e (patch) | |
| tree | 413fafecc2893bf32f35504439057e1386391735 /formula | |
| parent | 69d99ea0a10cb54e67d20f155c81346064f26631 (diff) | |
Related: tdf#131423 CHOOSE() supports only 30 jump targets, limit in dialog
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95149
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 92a87f9f128cf91f6af1fc7c61a85a10d659334d)
Merge conflicts:
sc/source/core/data/funcdesc.cxx
Change-Id: Ic3506ee6194ac4e74e572a10db96f100bc9e6ac2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95124
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/ui/dlg/FormulaHelper.cxx | 1 | ||||
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 09bfe09ed67d..5c4f08441e99 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -48,6 +48,7 @@ namespace formula virtual bool isHidden() const override { return false; } virtual sal_uInt32 getParameterCount() const override { return 0; } virtual sal_uInt32 getVarArgsStart() const override { return 0; } + virtual sal_uInt32 getVarArgsLimit() const override { return 0; } virtual OUString getParameterName(sal_uInt32 ) const override { return OUString(); } virtual OUString getParameterDescription(sal_uInt32 ) const override { return OUString(); } virtual bool isParameterOptional(sal_uInt32 ) const override { return false; } diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index ff70b3bee55f..ec1f92464fe6 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -322,6 +322,8 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) } nArgs = pFuncDesc->getSuppressedArgumentCount(); nMaxArgs = std::min( nArgs, kMaxArgCount); + if (sal_uInt16 nVarArgsLimit = pFuncDesc->getVarArgsLimit()) + nMaxArgs = std::min( nVarArgsLimit, nMaxArgs); pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping); m_xSlider->set_vpolicy(VclPolicyType::NEVER); m_xSlider->set_size_request(-1, -1); |