diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:31:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 13:31:56 +0000 |
| commit | 9e22a4e6b76a8d910b96e7055e6d5d4be2a3a226 (patch) | |
| tree | fecc0aef4d4430b904a0c55f3819fcc53e0e305c /basic/source/sample | |
| parent | 5983bfb7ae7fe4f24d6b750e47d2dedeb23a9d7a (diff) | |
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).
Diffstat (limited to 'basic/source/sample')
| -rw-r--r-- | basic/source/sample/object.cxx | 24 |
1 files changed, 11 insertions, 13 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 ) { |