[Libreoffice-commits] .: sc/source

[David Tardon]

 sc/source/core/tool/interpr5.cxx |    2 +-
 sc/source/core/tool/parclass.cxx |   10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit cb5b062057140c4fbaaf1240b7474925b51d1a85
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Jan 16 17:45:09 2011 +0100

    fix debug build

diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index dfb2e11..f26a21b 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -960,7 +960,7 @@ void ScInterpreter::ScMatInv()
                     ScMatrixRef xR = GetNewMat( nR, nR);
                     if (xR)
                     {
-                        ScMatrix* pR = xR;
+                        ScMatrix* pR = xR.get();
                         lcl_MFastMult( pMat, xY.get(), pR, nR, nR, nR);
                         fprintf( stderr, "\n%s\n", "ScMatInv(): mult-identity");
                         for (SCSIZE i=0; i < nR; ++i)
diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 7248ba7..04447bf 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -45,6 +45,7 @@
 // the documentation thingy
 #include <stdio.h>
 #include <com/sun/star/sheet/FormulaLanguage.hpp>
+#include <rtl/strbuf.hxx>
 #include "compiler.hxx"
 #include "sc.hrc"   // VAR_ARGS
 #endif
@@ -415,9 +416,12 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource()
         }
         if ( nArgs > CommonData::nMaxParams )
         {
-            DBG_ERROR2( "ScParameterClassification::Init: too many arguments in listed function: %s: %d",
-                    ByteString( *(pDesc->pFuncName),
-                        RTL_TEXTENCODING_UTF8).GetBuffer(), nArgs);
+            rtl::OStringBuffer aBuf;
+            aBuf.append("ScParameterClassification::Init: too many arguments in listed function: ");
+            aBuf.append(rtl::OUStringToOString(*(pDesc->pFuncName), RTL_TEXTENCODING_UTF8));
+            aBuf.append(": ");
+            aBuf.append(nArgs);
+            OSL_ENSURE(false, aBuf.getStr());
             nArgs = CommonData::nMaxParams;
             pRun->aData.bRepeatLast = true;
         }