INTEGRATION: CWS sb59 (1.4.24); FILE MERGED

2006/08/11 15:04:31 sb 1.4.24.1: #i67487# Made code warning-free (wntmsci10).

2 files changed, 14 insertions, 16 deletions

diff --git a/basic/source/sample/object.cxx b/basic/source/sample/object.cxx
index f325ebf6287d..1ffb0f5d9c71 100644
--- a/basic/source/sample/object.cxx
+++ b/basic/source/sample/object.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: object.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 10:07:29 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 14:31:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -54,8 +54,6 @@
 
 #include "object.hxx"
 #include "collelem.hxx"
-// Makro MEMBER()
-#include "macfix.hxx"
 
 // Das Sample-Objekt hat folgende Elemente:
 // 1) Properties:
@@ -110,23 +108,23 @@
 
 SampleObject::Methods SampleObject::aMethods[] = {
 // Eine Sample-Methode (der Returnwert ist SbxNULL)
-{ "Display",    SbxEMPTY,       1 | _FUNCTION, MEMBER(SampleObject::Display) },
+{ "Display", SbxEMPTY, &SampleObject::Display, 1 | _FUNCTION },
     // Ein Named Parameter
-    { "message",SbxSTRING, 0,NULL },
+    { "message", SbxSTRING, NULL, 0 },
 // Eine Sample-Funktion
-{ "Square",     SbxDOUBLE,      1 | _FUNCTION, MEMBER(SampleObject::Square)  },
+{ "Square", SbxDOUBLE, &SampleObject::Square, 1 | _FUNCTION },
     // Ein Named Parameter
-    { "value",  SbxDOUBLE, 0,NULL },
+    { "value", SbxDOUBLE, NULL, 0 },
 //  Basic-Callback
-{ "Event",      SbxEMPTY,       1 | _FUNCTION, MEMBER(SampleObject::Event)   },
+{ "Event", SbxEMPTY, &SampleObject::Event, 1 | _FUNCTION },
     // Ein Named Parameter
-    { "event",  SbxSTRING, 0,NULL },
+    { "event", SbxSTRING, NULL, 0 },
 //  Element erzeugen
-{ "Create",     SbxEMPTY,       1 | _FUNCTION, MEMBER(SampleObject::Create)  },
+{ "Create", SbxEMPTY, &SampleObject::Create, 1 | _FUNCTION },
     // Ein Named Parameter
-    { "name",  SbxSTRING, 0,NULL },
+    { "name", SbxSTRING, NULL, 0 },
 
-{ NULL,     SbxNULL,            -1, NULL }};  // Tabellenende
+{ NULL, SbxNULL, NULL, -1 }};  // Tabellenende
 
 SampleObject::SampleObject( const String& rClass ) : SbxObject( rClass )
 {
diff --git a/basic/source/sbx/sbxarray.cxx b/basic/source/sbx/sbxarray.cxx
index 568aad5b6f47..b1e3e9d3e098 100644
--- a/basic/source/sbx/sbxarray.cxx
+++ b/basic/source/sbx/sbxarray.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: sbxarray.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 10:07:42 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 14:31:56 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -798,7 +798,7 @@ UINT32 SbxDimArray::Offset32( SbxArray* pPar )
         SetError( SbxERR_BOUNDS ); return 0;
     }
     UINT32 nPos = 0;
-    UINT32 nOff = 1;    // Nicht Element 0!
+    USHORT nOff = 1;    // Nicht Element 0!
     for( SbxDim* p = pFirst; p && !IsError(); p = p->pNext )
     {
         INT32 nIdx = pPar->Get( nOff++ )->GetLong();