[Libreoffice-commits] .: sc/source

[Michael Meeks]

 sc/source/core/data/funcdesc.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 665f92bdbbaefb2b7a1fb020eed3933300418810
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Mar 22 13:25:53 2011 +0000

    fix mis-merge crash related to mis-aligned func. desc. resource reading

diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index ac7573c..b83dae1 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -815,6 +815,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed )
 {
     rbSuppressed = (bool)GetNum();
     pDesc->nCategory = GetNum();
+    pDesc->sHelpId = ReadByteStringRes();
     pDesc->nArgCount = GetNum();
     sal_uInt16 nArgs = pDesc->nArgCount;
     if (nArgs >= VAR_ARGS)