[Libreoffice-commits] .: 2 commits - sc/qa sc/source

Tor Lillqvist tml at kemper.freedesktop.org
Tue Jan 25 11:09:37 PST 2011


 sc/qa/unit/makefile.mk           |    1 +
 sc/source/core/tool/parclass.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8397c3d0a1150aa6fb3c447317d08d05e07a1731
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 25 20:56:38 2011 +0200

    Minor type tweak to fix x64 Windows compilation error

diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx
index 04447bf..b882da1 100644
--- a/sc/source/core/tool/parclass.cxx
+++ b/sc/source/core/tool/parclass.cxx
@@ -408,7 +408,7 @@ void ScParameterClassification::MergeArgumentsFromFunctionResource()
             continue;   // not an internal opcode or already done
 
         RunData* pRun = &pData[ pDesc->nFIndex ];
-        USHORT nArgs = pDesc->GetSuppressedArgCount();
+        sal_Int32 nArgs = pDesc->GetSuppressedArgCount();
         if ( nArgs >= VAR_ARGS )
         {
             nArgs -= VAR_ARGS - 1;
commit e0124f67b4d4c3e12b58926f2147b29a735e0f4f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 25 20:55:37 2011 +0200

    Add an informative message

diff --git a/sc/qa/unit/makefile.mk b/sc/qa/unit/makefile.mk
index f74d80e..0020c4d 100644
--- a/sc/qa/unit/makefile.mk
+++ b/sc/qa/unit/makefile.mk
@@ -111,6 +111,7 @@ STAR_RESOURCEPATH:=$(PWD)/$(BIN)$(PATH_SEPERATOR)$(SOLARBINDIR)
 test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/types.rdb $(MISC)/$(TARGET)/udkapi.rdb
     @echo ----------------------------------------------------------
     @echo - start unit test \#1 on library $(SHL1TARGETN)
+    @echo In the environment: STAR_RESOURCEPATH=$$STAR_RESOURCEPATH
     @echo ----------------------------------------------------------
     $(CPPUNITTESTER) $(SHL1TARGETN) -headless -invisible \
         -env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \


More information about the Libreoffice-commits mailing list