diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-16 15:17:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-02-16 15:57:06 +0000 |
| commit | e0ecfb5055568424a1b65212983406a3aa6668d2 (patch) | |
| tree | a937ca50395db30a4c308ef0a7dcf12e539be649 /sc | |
| parent | d698f823c31583cd36dad594d585849dbccbbb4a (diff) | |
nSuppressed is 0 in all existing patterns
Change-Id: If1a85e157840753b48f830ba4cddf5708189575b
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/core/data/funcdesc.cxx | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index 8e8f31bf0aca..9c50709e0acf 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -779,7 +779,6 @@ sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToke } // class ScFuncRes: - ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) : Resource(aRes) { @@ -816,42 +815,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) // Need to read the value from the resource even if nArgs==0 to advance the // resource position pointer, so this can't be in the if(nArgs) block above. sal_uInt16 nSuppressed = GetNum(); - if (nSuppressed) - { - if (nSuppressed > nArgs) - { - SAL_WARN("sc.core", "ScFuncRes: suppressed parameters count mismatch on OpCode " << - nOpCode << ": suppressed " << nSuppressed << " > params " << nArgs); - nSuppressed = nArgs; // sanitize - } - for (sal_uInt16 i = 0; i < nSuppressed; ++i) - { - sal_uInt16 nParam = GetNum(); - if (nParam < nArgs) - { - if (pDesc->nArgCount >= PAIRED_VAR_ARGS && nParam >= nArgs-2) - { - SAL_WARN("sc.core", "ScFuncRes: PAIRED_VAR_ARGS parameters can't be suppressed, on OpCode " << - nOpCode << ": param " << nParam << " >= arg " << nArgs << "-2"); - } - else if (pDesc->nArgCount >= VAR_ARGS && nParam == nArgs-1) - { - SAL_WARN("sc.core", "ScFuncRes: VAR_ARGS parameters can't be suppressed, on OpCode " << - nOpCode << ": param " << nParam << " == arg " << nArgs << "-1"); - } - else - { - pDesc->pDefArgFlags[nParam].bSuppress = true; - pDesc->bHasSuppressedArgs = true; - } - } - else - { - SAL_WARN("sc.core", "ScFuncRes: suppressed parameter exceeds count on OpCode " << - nOpCode << ": param " << nParam << " >= args " << nArgs); - } - } - } + assert(!nSuppressed); (void)nSuppressed; pDesc->pFuncName = new OUString(ScCompiler::GetNativeSymbol(static_cast<OpCode>(nOpCode))); pDesc->pFuncDesc = new OUString( SC_RESSTR(1) ); |