Commit 99f0b893 authored by Arturo Espinosa's avatar Arturo Espinosa

Last step of Gnumeric code reorganization finished -miguel

parent 50788413
......@@ -26,15 +26,18 @@ create_ole_server (const GnomeStorageOLE *ole)
GnomeObject *object = GNOME_OBJECT(ole);
POA_GNOME_Storage *servant;
GNOME_Storage corba_storage;
CORBA_Environment ev;
servant = (POA_GNOME_Storage *) g_new0 (GnomeObjectServant, 1);
servant->vepv = &gnome_storage_vepv;
POA_GNOME_Storage__init ((PortableServer_Servant) servant,
&object->ev);
if (object->ev._major != CORBA_NO_EXCEPTION){
CORBA_exception_init (&ev);
POA_GNOME_Storage__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION){
g_free (servant);
CORBA_exception_free (&ev);
return NULL;
}
CORBA_exception_free (&ev);
corba_storage = gnome_object_activate_servant(object, servant);
return gnome_storage_construct(GNOME_STORAGE(ole),
......
......@@ -19,14 +19,18 @@ create_stream_ole_server (const GnomeStreamOLE *stream_ole)
GnomeObject *object = GNOME_OBJECT(stream_ole);
POA_GNOME_Stream *servant;
GNOME_Stream corba_stream;
CORBA_Environment ev;
servant = (POA_GNOME_Stream *) g_new0 (GnomeObjectServant, 1);
servant->vepv = &gnome_stream_vepv;
POA_GNOME_Stream__init ((PortableServer_Servant) servant, &object->ev);
if (object->ev._major != CORBA_NO_EXCEPTION){
CORBA_exception_init (&ev);
POA_GNOME_Stream__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION){
g_free (servant);
CORBA_exception_free (&ev);
return NULL;
}
CORBA_exception_free (&ev);
corba_stream = gnome_object_activate_servant(object, servant);
return GNOME_STREAM(gnome_object_construct(GNOME_OBJECT(stream_ole),
corba_stream));
......
......@@ -203,14 +203,14 @@ gnumeric_libs = \
functions/libfunctions.a
gnumeric_LDADD = \
$(gnumeric_libs) \
$(EXTRA_GNOME_LIBS) \
$(GNOME_XML_LIB) \
$(GUILE_LIBS) \
$(INTLLIBS)
gnumeric_bonobo_LDADD = \
../plugins/excel/libexcel.a \
../plugins/excel/libole2/libole2.a \
$(gnumeric_libs) \
$(EXTRA_GNOME_LIBS) \
$(GNOME_XML_LIB) \
$(GUILE_LIBS) \
......
......@@ -129,15 +129,19 @@ static CORBA_Object
create_embeddable_grid (GnomeObject *object)
{
POA_GNOME_Gnumeric_Grid *servant;
CORBA_Environment ev;
servant = (POA_GNOME_Gnumeric_Grid *) g_new0 (GnomeObjectServant, 1);
servant->vepv = &embeddable_grid_vepv;
POA_GNOME_Gnumeric_Grid__init ((PortableServer_Servant) servant, &object->ev);
if (object->ev._major != CORBA_NO_EXCEPTION){
CORBA_exception_init (&ev);
POA_GNOME_Gnumeric_Grid__init ((PortableServer_Servant) servant, &ev);
if (ev._major != CORBA_NO_EXCEPTION){
g_free (servant);
CORBA_exception_free (&ev);
return CORBA_OBJECT_NIL;
}
CORBA_exception_free (&ev);
return gnome_object_activate_servant (object, servant);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment