dia r4168 - in trunk: . app objects/SISSI sheets/SISSI
- From: hans svn gnome org
- To: svn-commits-list gnome org
- Subject: dia r4168 - in trunk: . app objects/SISSI sheets/SISSI
- Date: Fri, 2 Jan 2009 14:01:16 +0000 (UTC)
Author: hans
Date: Fri Jan 2 14:01:16 2009
New Revision: 4168
URL: http://svn.gnome.org/viewvc/dia?rev=4168&view=rev
Log:
2009-01-02 Hans Breuer <hans breuer org>
Patch from Sameer D. Sahasrabuddhe fixing bug #565720
En passant fixing bug #564799 and bug #564916
* objects/SISSI/sissi.[ch] : introduced a new local function that
returns the correct sheets directory for SISSI
* objects/SISSI/site.c objects/SISSI/faraday.c objects/SISSI/area.c
objects/SISSI/room.c objects/SISSI/sissi_object.c : use it
* sheets/SISSI/*.xml : relative path removed from
<sissi:attribute name="file_image"/>
* app/create_object.c : don't crash if object creation fails
(bug #565567, Sameer D. Sahasrabuddhe)
Modified:
trunk/ChangeLog
trunk/app/create_object.c
trunk/objects/SISSI/area.c
trunk/objects/SISSI/faraday.c
trunk/objects/SISSI/room.c
trunk/objects/SISSI/sissi.c
trunk/objects/SISSI/sissi.h
trunk/objects/SISSI/sissi_object.c
trunk/objects/SISSI/site.c
trunk/sheets/SISSI/1.xml
trunk/sheets/SISSI/10.xml
trunk/sheets/SISSI/11.xml
trunk/sheets/SISSI/12.xml
trunk/sheets/SISSI/13.xml
trunk/sheets/SISSI/14.xml
trunk/sheets/SISSI/15.xml
trunk/sheets/SISSI/16.xml
trunk/sheets/SISSI/17.xml
trunk/sheets/SISSI/18.xml
trunk/sheets/SISSI/19.xml
trunk/sheets/SISSI/2.xml
trunk/sheets/SISSI/20.xml
trunk/sheets/SISSI/21.xml
trunk/sheets/SISSI/22.xml
trunk/sheets/SISSI/23.xml
trunk/sheets/SISSI/28.xml
trunk/sheets/SISSI/29.xml
trunk/sheets/SISSI/3.xml
trunk/sheets/SISSI/30.xml
trunk/sheets/SISSI/31.xml
trunk/sheets/SISSI/32.xml
trunk/sheets/SISSI/33.xml
trunk/sheets/SISSI/34.xml
trunk/sheets/SISSI/35.xml
trunk/sheets/SISSI/36.xml
trunk/sheets/SISSI/37.xml
trunk/sheets/SISSI/38.xml
trunk/sheets/SISSI/39.xml
trunk/sheets/SISSI/4.xml
trunk/sheets/SISSI/40.xml
trunk/sheets/SISSI/41.xml
trunk/sheets/SISSI/42.xml
trunk/sheets/SISSI/43.xml
trunk/sheets/SISSI/44.xml
trunk/sheets/SISSI/45.xml
trunk/sheets/SISSI/46.xml
trunk/sheets/SISSI/47.xml
trunk/sheets/SISSI/48.xml
trunk/sheets/SISSI/5.xml
trunk/sheets/SISSI/50.xml
trunk/sheets/SISSI/51.xml
trunk/sheets/SISSI/52.xml
trunk/sheets/SISSI/53.xml
trunk/sheets/SISSI/54.xml
trunk/sheets/SISSI/55.xml
trunk/sheets/SISSI/56.xml
trunk/sheets/SISSI/57.xml
trunk/sheets/SISSI/58.xml
trunk/sheets/SISSI/59.xml
trunk/sheets/SISSI/6.xml
trunk/sheets/SISSI/60.xml
trunk/sheets/SISSI/61.xml
trunk/sheets/SISSI/62.xml
trunk/sheets/SISSI/63.xml
trunk/sheets/SISSI/7.xml
trunk/sheets/SISSI/70.xml
trunk/sheets/SISSI/71.xml
trunk/sheets/SISSI/75.xml
trunk/sheets/SISSI/76.xml
trunk/sheets/SISSI/8.xml
trunk/sheets/SISSI/9.xml
Modified: trunk/app/create_object.c
==============================================================================
--- trunk/app/create_object.c (original)
+++ trunk/app/create_object.c Fri Jan 2 14:01:16 2009
@@ -27,6 +27,7 @@
#include "highlight.h"
#include "textedit.h"
#include "parent.h"
+#include "message.h"
static void create_object_button_press(CreateObjectTool *tool, GdkEventButton *event,
DDisplay *ddisp);
@@ -62,6 +63,15 @@
tool->user_data,
&handle1, &handle2);
+ tool->obj = obj; /* ensure that tool->obj is initialised in case we
+ return early. */
+ if (!obj) {
+ tool->moving = FALSE;
+ tool->handle = NULL;
+ message_error(_("'%s' creation failed"), tool->objtype->name);
+ return;
+ }
+
diagram_add_object(ddisp->diagram, obj);
/* Try a connect */
@@ -81,8 +91,6 @@
}
diagram_select(ddisp->diagram, obj);
- tool->obj = obj;
-
/* Connect first handle if possible: */
if ((handle1!= NULL) &&
(handle1->connect_type != HANDLE_NONCONNECTABLE)) {
Modified: trunk/objects/SISSI/area.c
==============================================================================
--- trunk/objects/SISSI/area.c (original)
+++ trunk/objects/SISSI/area.c Fri Jan 2 14:01:16 2009
@@ -153,14 +153,10 @@
int i,num;
DiaFont* action_font;
Point pos;
- gchar *filename;
xmlDocPtr doc;
- xmlNsPtr namespace;
/* DiagramData *data; */
xmlNodePtr diagramdata,composite;
AttributeNode attr;
- char composition_filename[255];
- int fd;
SISSI_Property_Menace *properties_menaces;
SISSI_Property *properties_others;
Url_Docs *url_doc;
@@ -198,57 +194,21 @@
}
object_sissi->type_element = g_strdup("security area");
-/* start of read XML file */
-if (GPOINTER_TO_INT(user_data)!=0)
-{
- sprintf(composition_filename,"sheets/SISSI/%d.xml",GPOINTER_TO_INT(user_data));
-
- filename = g_strdup(dia_get_data_directory(composition_filename));
-
- if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
- message_error(_("You must specify a file, not a directory.\n"));
- return FALSE;
- }
-
- fd = open(filename, O_RDONLY);
- if (fd==-1) {
- message_error(_("Couldn't open: '%s' for reading.\n"),
- dia_message_filename(filename));
- return FALSE;
- }
- /* Note that this closing and opening means we can't read from a pipe */
- close(fd);
-
- doc = xmlDiaParseFile(filename);
- if (doc == NULL){
- message_error(_("Error loading diagram %s.\nUnknown file type."),
- dia_message_filename(filename));
- return FALSE;
- }
-
- if (doc->xmlRootNode == NULL) {
- message_error(_("Error loading diagram %s.\nUnknown file type."),
- dia_message_filename(filename));
- xmlFreeDoc (doc);
- return FALSE;
- }
-
- namespace = xmlSearchNs(doc, doc->xmlRootNode, (const xmlChar *)"sissi");
- if (xmlStrcmp (doc->xmlRootNode->name, (const xmlChar *)"diagram") || (namespace == NULL)){
- message_error(_("Error loading diagram %s.\nNot a Dia file."),
- dia_message_filename(filename));
- xmlFreeDoc (doc);
- return FALSE;
- }
-
- diagramdata = find_node_named (doc->xmlRootNode->xmlChildrenNode, "object");
-
+ if (GPOINTER_TO_INT(user_data)!=0) {
+ doc = sissi_read_object_from_xml(GPOINTER_TO_INT(user_data));
+ if (!doc) {
+ g_free(object_sissi);
+ return NULL;
+ }
+
+ diagramdata = find_node_named (doc->xmlRootNode->xmlChildrenNode, "object");
+
/* load paper information from diagram object section */
- attr = composite_find_attribute(diagramdata, "nb_others_fixes");
- if (attr != NULL) {
- object_sissi->nb_others_fixes = data_int ( attribute_first_data(attr) );
- }
-
+ attr = composite_find_attribute(diagramdata, "nb_others_fixes");
+ if (attr != NULL) {
+ object_sissi->nb_others_fixes = data_int ( attribute_first_data(attr) );
+ }
+
/**** read the other properties *******/
attr = object_find_attribute(diagramdata, "properties");
num = attribute_num_data(attr);
Modified: trunk/objects/SISSI/faraday.c
==============================================================================
--- trunk/objects/SISSI/faraday.c (original)
+++ trunk/objects/SISSI/faraday.c Fri Jan 2 14:01:16 2009
@@ -149,14 +149,10 @@
int i,num;
DiaFont* action_font;
Point /* defaultlen = {1.0,0.0}, */pos;
- gchar *filename;
xmlDocPtr doc;
- xmlNsPtr namespace;
/* DiagramData *data; */
xmlNodePtr diagramdata,composite;
AttributeNode attr;
- char composition_filename[255];
- int fd;
SISSI_Property_Menace *properties_menaces;
SISSI_Property *properties_others;
Url_Docs *url_doc;
@@ -198,50 +194,14 @@
object_sissi->type_element = g_strdup("faraday");
-/* start of read XML file */
-if (GPOINTER_TO_INT(user_data)!=0)
-{
- sprintf(composition_filename,"sheets/SISSI/%d.xml",GPOINTER_TO_INT(user_data));
-
- filename = g_strdup(dia_get_data_directory(composition_filename));
-
- if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
- message_error(_("You must specify a file, not a directory.\n"));
- return FALSE;
- }
-
- fd = open(filename, O_RDONLY);
- if (fd==-1) {
- message_error(_("Couldn't open: '%s' for reading.\n"),
- dia_message_filename(filename));
- return FALSE;
- }
- /* Note that this closing and opening means we can't read from a pipe */
- close(fd);
-
- doc = xmlDiaParseFile(filename);
- if (doc == NULL){
- message_error(_("Error loading diagram %s.\nUnknown file type."),
- dia_message_filename(filename));
- return FALSE;
- }
-
- if (doc->xmlRootNode == NULL) {
- message_error(_("Error loading diagram %s.\nUnknown file type."),
- dia_message_filename(filename));
- xmlFreeDoc (doc);
- return FALSE;
- }
-
- namespace = xmlSearchNs(doc, doc->xmlRootNode, (const xmlChar *)"sissi");
- if (xmlStrcmp (doc->xmlRootNode->name, (const xmlChar *)"diagram") || (namespace == NULL)){
- message_error(_("Error loading diagram %s.\nNot a Dia file."),
- dia_message_filename(filename));
- xmlFreeDoc (doc);
- return FALSE;
- }
-
- diagramdata = find_node_named (doc->xmlRootNode->xmlChildrenNode, "object");
+ if (GPOINTER_TO_INT(user_data)!=0) {
+ doc = sissi_read_object_from_xml(GPOINTER_TO_INT(user_data));
+ if (!doc) {
+ g_free(object_sissi);
+ return NULL;
+ }
+
+ diagramdata = find_node_named (doc->xmlRootNode->xmlChildrenNode, "object");
/* load paper information from diagram object section */
attr = composite_find_attribute(diagramdata, "nb_others_fixes");
@@ -319,8 +279,11 @@
object_sissi=object_sissi_load(obj_node, version, filename, object_sissi,elem,obj);
- file_name= g_strdup(object_sissi->file);
- object_sissi->image = dia_image_load((gchar *)dia_get_data_directory(file_name));
+ if (object_sissi->file) {
+ gchar *filename = sissi_get_sheets_directory(object_sissi->file);
+ object_sissi->image = dia_image_load(filename);
+ g_free (filename);
+ }
if (object_sissi->image) {
elem->width = (elem->width*(float)dia_image_width(object_sissi->image))/
Modified: trunk/objects/SISSI/room.c
==============================================================================
--- trunk/objects/SISSI/room.c (original)
+++ trunk/objects/SISSI/room.c Fri Jan 2 14:01:16 2009
@@ -151,14 +151,10 @@
int i,num;
DiaFont* action_font;
Point pos;
- gchar *filename;
xmlDocPtr doc;
- xmlNsPtr namespace;
/* DiagramData *data; */
xmlNodePtr diagramdata,composite;
AttributeNode attr;
- char composition_filename[255];
- int fd;
SISSI_Property_Menace *properties_menaces;
SISSI_Property *properties_others;
Url_Docs *url_doc;
@@ -198,52 +194,16 @@
action_font = dia_font_new_from_style(TEXT_FONT,TEXT_FONT_HEIGHT);
object_sissi->text = new_text("",action_font, TEXT_FONT_HEIGHT, &pos, &color_black, ALIGN_LEFT);
-/* start of read XML file */
-if (GPOINTER_TO_INT(user_data)!=0)
-{
- sprintf(composition_filename,"sheets/SISSI/%d.xml",GPOINTER_TO_INT(user_data));
-
- filename = g_strdup(dia_get_data_directory(composition_filename));
-
- if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
- message_error(_("You must specify a file, not a directory.\n"));
- return FALSE;
- }
-
- fd = open(filename, O_RDONLY);
- if (fd==-1) {
- message_error(_("Couldn't open: '%s' for reading.\n"),
- dia_message_filename(filename));
- return FALSE;
- }
- /* Note that this closing and opening means we can't read from a pipe */
- close(fd);
-
- doc = xmlDiaParseFile(filename);
- if (doc == NULL){
- message_error(_("Error loading diagram %s.\nUnknown file type."),
- dia_message_filename(filename));
- return FALSE;
- }
-
- if (doc->xmlRootNode == NULL) {
- message_error(_("Error loading diagram %s.\nUnknown file type."),
- dia_message_filename(filename));
- xmlFreeDoc (doc);
- return FALSE;
- }
-
- namespace = xmlSearchNs(doc, doc->xmlRootNode, (const xmlChar *)"sissi");
- if (xmlStrcmp (doc->xmlRootNode->name, (const xmlChar *)"diagram") || (namespace == NULL)){
- message_error(_("Error loading diagram %s.\nNot a Dia file."),
- dia_message_filename(filename));
- xmlFreeDoc (doc);
- return FALSE;
- }
-
- diagramdata = find_node_named (doc->xmlRootNode->xmlChildrenNode, "object");
-
- /* load paper information from diagram object section */
+ if (GPOINTER_TO_INT(user_data)!=0) {
+ doc = sissi_read_object_from_xml(GPOINTER_TO_INT(user_data));
+ if (!doc) {
+ g_free(object_sissi);
+ return NULL;
+ }
+
+ diagramdata = find_node_named (doc->xmlRootNode->xmlChildrenNode, "object");
+
+ /* load paper information from diagram object section */
attr = composite_find_attribute(diagramdata, "nb_others_fixes");
if (attr != NULL) {
object_sissi->nb_others_fixes = data_int ( attribute_first_data(attr) );
@@ -315,8 +275,11 @@
object_sissi=object_sissi_load(obj_node, version, filename, object_sissi,elem,obj);
object_sissi->show_background=1;
- file_name= g_strdup(object_sissi->file);
- object_sissi->image = dia_image_load(dia_get_data_directory(file_name));
+ if (object_sissi->file) {
+ gchar *filename = sissi_get_sheets_directory(object_sissi->file);
+ object_sissi->image = dia_image_load(filename);
+ g_free (filename);
+ }
if (object_sissi->image) {
elem->width = (elem->width*(float)dia_image_width(object_sissi->image))/
Modified: trunk/objects/SISSI/sissi.c
==============================================================================
--- trunk/objects/SISSI/sissi.c (original)
+++ trunk/objects/SISSI/sissi.c Fri Jan 2 14:01:16 2009
@@ -39,8 +39,10 @@
#include "message.h"
#include "connpoint_line.h"
#include "color.h"
-#include <string.h>
+#include "dia_xml_libxml.h"
+#include <string.h>
+#include <glib/gprintf.h>
#define DEFAULT_WIDTH 1.0
#define DEFAULT_HEIGHT 1.0
@@ -423,10 +425,10 @@
object_sissi->name = g_strdup(object_sissi_origin->name);
object_sissi->type_element = g_strdup(object_sissi_origin->type_element);
- object_sissi->file =g_strdup(object_sissi_origin->file);
- if (object_sissi->file) {
- char *filename = dia_get_data_directory(object_sissi->file);
- object_sissi->image = dia_image_load(filename);
+ object_sissi->file =g_strdup(object_sissi_origin->file);
+ if (object_sissi->file) {
+ gchar *filename = sissi_get_sheets_directory(object_sissi->file);
+ object_sissi->image = dia_image_load(filename);
g_free (filename);
}
for (i=0;i<NUM_CONNECTIONS;i++) {
@@ -877,3 +879,71 @@
p = p->next;
return p;
}
+
+/* FIXME: This whole thing about loading SISSI data from the sheets
+ directory is rather undesirable. The function below also does not
+ hunt through multiple sheet directories. */
+gchar *
+sissi_get_sheets_directory(const gchar* subdir)
+{
+ gchar *sheets_path;
+ gchar *filename;
+
+ /* We don't own sheets_env. */
+ const gchar *sheets_env = g_getenv("DIA_SHEET_PATH");
+ if (sheets_env) {
+ gchar **dirs = g_strsplit(sheets_env,G_SEARCHPATH_SEPARATOR_S,2);
+ sheets_path = g_strdup(dirs[0]);
+ g_strfreev(dirs);
+ } else {
+ sheets_path = dia_get_data_directory("sheets");
+ }
+
+ filename = g_build_filename((const gchar*)sheets_path, "SISSI", subdir, NULL);
+ g_free(sheets_path);
+ return filename;
+}
+
+xmlDocPtr
+sissi_read_object_from_xml(int data)
+{
+ gchar *filename;
+ gchar buffer[16];
+ xmlDocPtr doc = NULL;
+ xmlNsPtr namespace;
+
+ g_sprintf(buffer, "%d.xml", data);
+ filename = sissi_get_sheets_directory(buffer);
+
+ if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
+ message_error(_("Error loading object.\nNot a regular file: %s"),
+ dia_message_filename(filename));
+ } else {
+ doc = xmlDiaParseFile(filename);
+ if (!doc){
+ message_error(_("Error loading object.\nIncorrect file type: %s"),
+ dia_message_filename(filename));
+ } else {
+ if (!doc->xmlRootNode) {
+ message_error(_("Error loading object.\nIncorrect file type: %s"),
+ dia_message_filename(filename));
+ xmlFreeDoc(doc);
+ doc = NULL;
+ } else {
+ namespace = xmlSearchNs(doc, doc->xmlRootNode, (const xmlChar *)"sissi");
+ if (xmlStrcmp (doc->xmlRootNode->name, (const xmlChar *)"diagram")
+ || (namespace == NULL)) {
+ message_error(_("Error loading object.\nNot a Dia file: %s"),
+ dia_message_filename(filename));
+ xmlFreeDoc(doc);
+ doc = NULL;
+ } else {
+ /* Everything is fine; we are ready to return the xmlDoc. */
+ }
+ }
+ }
+ }
+
+ g_free(filename);
+ return doc;
+}
Modified: trunk/objects/SISSI/sissi.h
==============================================================================
--- trunk/objects/SISSI/sissi.h (original)
+++ trunk/objects/SISSI/sissi.h Fri Jan 2 14:01:16 2009
@@ -213,6 +213,9 @@
extern void gestion_specificite(ObjetSISSI *object_sissi,int user_data);
extern xmlNodePtr find_node_named (xmlNodePtr p, const char *name);
+gchar *sissi_get_sheets_directory(const gchar* subdir);
+xmlDocPtr sissi_read_object_from_xml(int data);
+
/************* creation of variable repeat for each object based on EBIOS method */
static SISSI_Property property_classification_data[] = {
Modified: trunk/objects/SISSI/sissi_object.c
==============================================================================
--- trunk/objects/SISSI/sissi_object.c (original)
+++ trunk/objects/SISSI/sissi_object.c Fri Jan 2 14:01:16 2009
@@ -195,47 +195,12 @@
if (GPOINTER_TO_INT(user_data)!=0)
{
- /* start of read XML file */
- sprintf(composition_filename,"sheets/SISSI/%d.xml",GPOINTER_TO_INT(user_data));
- filename = g_strdup(dia_get_data_directory(composition_filename));
- if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
- message_error(_("You must specify a file, not a directory.\n"));
- return FALSE;
+ doc = sissi_read_object_from_xml(GPOINTER_TO_INT(user_data));
+ if (!doc) {
+ g_free(object_sissi);
+ return NULL;
}
-
-
- fd = open(filename, O_RDONLY);
- if (fd==-1) {
- message_error(_("Couldn't open: '%s' for reading.\n"),
- dia_message_filename(filename));
- return FALSE;
- }
-
- /* Note that this closing and opening means we can't read from a pipe */
- close(fd);
-
- doc = xmlDiaParseFile(filename);
- if (doc == NULL){
- message_error(_("Error loading diagram %s.\nUnknown file type."),
- dia_message_filename(filename));
- return FALSE;
- }
-
- if (doc->xmlRootNode == NULL) {
- message_error(_("Error loading diagram %s.\nUnknown file type."),
- dia_message_filename(filename));
- xmlFreeDoc (doc);
- return FALSE;
- }
-
- namespace = xmlSearchNs(doc, doc->xmlRootNode, (const xmlChar *)"sissi");
- if (xmlStrcmp (doc->xmlRootNode->name, (const xmlChar *)"diagram") || (namespace == NULL)){
- message_error(_("Error loading diagram %s.\nNot a Dia file."),
- dia_message_filename(filename));
- xmlFreeDoc (doc);
- return FALSE;
- }
-
+
diagramdata = find_node_named (doc->xmlRootNode->xmlChildrenNode, "object");
/* load paper information from diagram object section */
@@ -316,7 +281,11 @@
/* end of XML reading */
- object_sissi->image = dia_image_load(dia_get_data_directory(object_sissi->file));
+ if (object_sissi->file) {
+ gchar *filename = sissi_get_sheets_directory(object_sissi->file);
+ object_sissi->image = dia_image_load(filename);
+ g_free (filename);
+ }
if (object_sissi->image) {
elem->width = (elem->width*(float)dia_image_width(object_sissi->image))/(float)dia_image_height(object_sissi->image);
@@ -361,8 +330,11 @@
object_sissi=object_sissi_load(obj_node, version, filename, object_sissi,elem,obj);
- file_name= g_strdup(object_sissi->file); /* this line could add url of file to the dia_get_data_directory() function */
- object_sissi->image = dia_image_load(dia_get_data_directory(object_sissi->file));
+ if (object_sissi->file) {
+ gchar *filename = sissi_get_sheets_directory(object_sissi->file);
+ object_sissi->image = dia_image_load(filename);
+ g_free (filename);
+ }
object_sissi_update_data(object_sissi, ANCHOR_MIDDLE, ANCHOR_MIDDLE);
Modified: trunk/objects/SISSI/site.c
==============================================================================
--- trunk/objects/SISSI/site.c (original)
+++ trunk/objects/SISSI/site.c Fri Jan 2 14:01:16 2009
@@ -156,14 +156,10 @@
int i,num;
DiaFont* action_font;
Point pos;
- gchar *filename;
xmlDocPtr doc;
- xmlNsPtr namespace;
/* DiagramData *data; */
xmlNodePtr diagramdata,composite;
AttributeNode attr;
- char composition_filename[255];
- int fd;
SISSI_Property_Menace *properties_menaces;
SISSI_Property *properties_others;
Url_Docs *url_doc;
@@ -201,51 +197,15 @@
object_sissi->entity=g_strdup("");
object_sissi->entity_type=g_strdup("PHYSIC");
-/* start of read XML file */
-if (GPOINTER_TO_INT(user_data)!=0)
-{
- sprintf(composition_filename,"sheets/SISSI/%d.xml",GPOINTER_TO_INT(user_data));
-
- filename = g_strdup(dia_get_data_directory(composition_filename));
-
- if (g_file_test (filename, G_FILE_TEST_IS_DIR)) {
- message_error(_("You must specify a file, not a directory.\n"));
- return FALSE;
- }
-
- fd = open(filename, O_RDONLY);
- if (fd==-1) {
- message_error(_("Couldn't open: '%s' for reading.\n"),
- dia_message_filename(filename));
- return FALSE;
- }
- /* Note that this closing and opening means we can't read from a pipe */
- close(fd);
-
- doc = xmlDiaParseFile(filename);
- if (doc == NULL){
- message_error(_("Error loading diagram %s.\nUnknown file type."),
- dia_message_filename(filename));
- return FALSE;
- }
-
- if (doc->xmlRootNode == NULL) {
- message_error(_("Error loading diagram %s.\nUnknown file type."),
- dia_message_filename(filename));
- xmlFreeDoc (doc);
- return FALSE;
- }
-
- namespace = xmlSearchNs(doc, doc->xmlRootNode, (const xmlChar *)"sissi");
- if (xmlStrcmp (doc->xmlRootNode->name, (const xmlChar *)"diagram") || (namespace == NULL)){
- message_error(_("Error loading diagram %s.\nNot a Dia file."),
- dia_message_filename(filename));
- xmlFreeDoc (doc);
- return FALSE;
- }
-
- diagramdata = find_node_named (doc->xmlRootNode->xmlChildrenNode, "object");
-
+ if (GPOINTER_TO_INT(user_data)!=0) {
+ doc = sissi_read_object_from_xml(GPOINTER_TO_INT(user_data));
+ if (!doc) {
+ g_free(object_sissi);
+ return NULL;
+ }
+
+ diagramdata = find_node_named (doc->xmlRootNode->xmlChildrenNode, "object");
+
/* load paper information from diagram object section */
attr = composite_find_attribute(diagramdata, "nb_others_fixes");
if (attr != NULL) {
Modified: trunk/sheets/SISSI/1.xml
==============================================================================
--- trunk/sheets/SISSI/1.xml (original)
+++ trunk/sheets/SISSI/1.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/pc.png#</sissi:string>
+ <sissi:string>#pc.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/10.xml
==============================================================================
--- trunk/sheets/SISSI/10.xml (original)
+++ trunk/sheets/SISSI/10.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/cellular_phone.png#</sissi:string>
+ <sissi:string>#cellular_phone.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/11.xml
==============================================================================
--- trunk/sheets/SISSI/11.xml (original)
+++ trunk/sheets/SISSI/11.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/hub.png#</sissi:string>
+ <sissi:string>#hub.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/12.xml
==============================================================================
--- trunk/sheets/SISSI/12.xml (original)
+++ trunk/sheets/SISSI/12.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/modem.png#</sissi:string>
+ <sissi:string>#modem.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/13.xml
==============================================================================
--- trunk/sheets/SISSI/13.xml (original)
+++ trunk/sheets/SISSI/13.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/key.png#</sissi:string>
+ <sissi:string>#key.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/14.xml
==============================================================================
--- trunk/sheets/SISSI/14.xml (original)
+++ trunk/sheets/SISSI/14.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/diskette.png#</sissi:string>
+ <sissi:string>#diskette.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/15.xml
==============================================================================
--- trunk/sheets/SISSI/15.xml (original)
+++ trunk/sheets/SISSI/15.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/file.png#</sissi:string>
+ <sissi:string>#file.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/16.xml
==============================================================================
--- trunk/sheets/SISSI/16.xml (original)
+++ trunk/sheets/SISSI/16.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/personne.xpm#</sissi:string>
+ <sissi:string>#personne.xpm#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/17.xml
==============================================================================
--- trunk/sheets/SISSI/17.xml (original)
+++ trunk/sheets/SISSI/17.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/meuble.xpm#</sissi:string>
+ <sissi:string>#meuble.xpm#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/18.xml
==============================================================================
--- trunk/sheets/SISSI/18.xml (original)
+++ trunk/sheets/SISSI/18.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/safe.png#</sissi:string>
+ <sissi:string>#safe.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/19.xml
==============================================================================
--- trunk/sheets/SISSI/19.xml (original)
+++ trunk/sheets/SISSI/19.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/sauvegarde.xpm#</sissi:string>
+ <sissi:string>#sauvegarde.xpm#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/2.xml
==============================================================================
--- trunk/sheets/SISSI/2.xml (original)
+++ trunk/sheets/SISSI/2.xml Fri Jan 2 14:01:16 2009
@@ -11,7 +11,7 @@
<sissi:color val="#ffffff"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/relational_database.png#</sissi:string>
+ <sissi:string>#relational_database.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="id_db">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/20.xml
==============================================================================
--- trunk/sheets/SISSI/20.xml (original)
+++ trunk/sheets/SISSI/20.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/logiciel.xpm#</sissi:string>
+ <sissi:string>#logiciel.xpm#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/21.xml
==============================================================================
--- trunk/sheets/SISSI/21.xml (original)
+++ trunk/sheets/SISSI/21.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/analyse.xpm#</sissi:string>
+ <sissi:string>#analyse.xpm#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/22.xml
==============================================================================
--- trunk/sheets/SISSI/22.xml (original)
+++ trunk/sheets/SISSI/22.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/si.xpm#</sissi:string>
+ <sissi:string>#si.xpm#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/23.xml
==============================================================================
--- trunk/sheets/SISSI/23.xml (original)
+++ trunk/sheets/SISSI/23.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/info.xpm#</sissi:string>
+ <sissi:string>#info.xpm#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/28.xml
==============================================================================
--- trunk/sheets/SISSI/28.xml (original)
+++ trunk/sheets/SISSI/28.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/barriere.png#</sissi:string>
+ <sissi:string>#barriere.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/29.xml
==============================================================================
--- trunk/sheets/SISSI/29.xml (original)
+++ trunk/sheets/SISSI/29.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/camera_interphone.png#</sissi:string>
+ <sissi:string>#camera_interphone.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/3.xml
==============================================================================
--- trunk/sheets/SISSI/3.xml (original)
+++ trunk/sheets/SISSI/3.xml Fri Jan 2 14:01:16 2009
@@ -17,7 +17,7 @@
<sissi:color val="#ffffff"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/ibm_mini.png#</sissi:string>
+ <sissi:string>#ibm_mini.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="disponibility_level">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/30.xml
==============================================================================
--- trunk/sheets/SISSI/30.xml (original)
+++ trunk/sheets/SISSI/30.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/capteur_brise_glace.png#</sissi:string>
+ <sissi:string>#capteur_brise_glace.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/31.xml
==============================================================================
--- trunk/sheets/SISSI/31.xml (original)
+++ trunk/sheets/SISSI/31.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/capteur_faisceau.png#</sissi:string>
+ <sissi:string>#capteur_faisceau.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/32.xml
==============================================================================
--- trunk/sheets/SISSI/32.xml (original)
+++ trunk/sheets/SISSI/32.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/condensateur.png#</sissi:string>
+ <sissi:string>#condensateur.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/33.xml
==============================================================================
--- trunk/sheets/SISSI/33.xml (original)
+++ trunk/sheets/SISSI/33.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_alimentation.png#</sissi:string>
+ <sissi:string>#detecteur_alimentation.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/34.xml
==============================================================================
--- trunk/sheets/SISSI/34.xml (original)
+++ trunk/sheets/SISSI/34.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_courant.png#</sissi:string>
+ <sissi:string>#detecteur_courant.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/35.xml
==============================================================================
--- trunk/sheets/SISSI/35.xml (original)
+++ trunk/sheets/SISSI/35.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_enthalpie.png#</sissi:string>
+ <sissi:string>#detecteur_enthalpie.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/36.xml
==============================================================================
--- trunk/sheets/SISSI/36.xml (original)
+++ trunk/sheets/SISSI/36.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_fumee.png#</sissi:string>
+ <sissi:string>#detecteur_fumee.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/37.xml
==============================================================================
--- trunk/sheets/SISSI/37.xml (original)
+++ trunk/sheets/SISSI/37.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_humidite.png#</sissi:string>
+ <sissi:string>#detecteur_humidite.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/38.xml
==============================================================================
--- trunk/sheets/SISSI/38.xml (original)
+++ trunk/sheets/SISSI/38.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_lumiere.png#</sissi:string>
+ <sissi:string>#detecteur_lumiere.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/39.xml
==============================================================================
--- trunk/sheets/SISSI/39.xml (original)
+++ trunk/sheets/SISSI/39.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_mouvement.png#</sissi:string>
+ <sissi:string>#detecteur_mouvement.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/4.xml
==============================================================================
--- trunk/sheets/SISSI/4.xml (original)
+++ trunk/sheets/SISSI/4.xml Fri Jan 2 14:01:16 2009
@@ -38,7 +38,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/laptop.png#</sissi:string>
+ <sissi:string>#laptop.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/40.xml
==============================================================================
--- trunk/sheets/SISSI/40.xml (original)
+++ trunk/sheets/SISSI/40.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_mouvement_video.png#</sissi:string>
+ <sissi:string>#detecteur_mouvement_video.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/41.xml
==============================================================================
--- trunk/sheets/SISSI/41.xml (original)
+++ trunk/sheets/SISSI/41.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_niveau.png#</sissi:string>
+ <sissi:string>#detecteur_niveau.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/42.xml
==============================================================================
--- trunk/sheets/SISSI/42.xml (original)
+++ trunk/sheets/SISSI/42.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_pression.png#</sissi:string>
+ <sissi:string>#detecteur_pression.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/43.xml
==============================================================================
--- trunk/sheets/SISSI/43.xml (original)
+++ trunk/sheets/SISSI/43.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_qualite_air.png#</sissi:string>
+ <sissi:string>#detecteur_qualite_air.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/44.xml
==============================================================================
--- trunk/sheets/SISSI/44.xml (original)
+++ trunk/sheets/SISSI/44.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_tension.png#</sissi:string>
+ <sissi:string>#detecteur_tension.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/45.xml
==============================================================================
--- trunk/sheets/SISSI/45.xml (original)
+++ trunk/sheets/SISSI/45.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_vehicule.png#</sissi:string>
+ <sissi:string>#detecteur_vehicule.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/46.xml
==============================================================================
--- trunk/sheets/SISSI/46.xml (original)
+++ trunk/sheets/SISSI/46.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/detecteur_vibration.png#</sissi:string>
+ <sissi:string>#detecteur_vibration.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/47.xml
==============================================================================
--- trunk/sheets/SISSI/47.xml (original)
+++ trunk/sheets/SISSI/47.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/digi_code.png#</sissi:string>
+ <sissi:string>#digi_code.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/48.xml
==============================================================================
--- trunk/sheets/SISSI/48.xml (original)
+++ trunk/sheets/SISSI/48.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/extracteur_humidite.png#</sissi:string>
+ <sissi:string>#extracteur_humidite.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/5.xml
==============================================================================
--- trunk/sheets/SISSI/5.xml (original)
+++ trunk/sheets/SISSI/5.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/pda.png#</sissi:string>
+ <sissi:string>#pda.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/50.xml
==============================================================================
--- trunk/sheets/SISSI/50.xml (original)
+++ trunk/sheets/SISSI/50.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/filtre_air.png#</sissi:string>
+ <sissi:string>#filtre_air.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/51.xml
==============================================================================
--- trunk/sheets/SISSI/51.xml (original)
+++ trunk/sheets/SISSI/51.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/lecteur_badge_clavier.png#</sissi:string>
+ <sissi:string>#lecteur_badge_clavier.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/52.xml
==============================================================================
--- trunk/sheets/SISSI/52.xml (original)
+++ trunk/sheets/SISSI/52.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/lecteur_badge.png#</sissi:string>
+ <sissi:string>#lecteur_badge.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/53.xml
==============================================================================
--- trunk/sheets/SISSI/53.xml (original)
+++ trunk/sheets/SISSI/53.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/lecteur_biometrique.png#</sissi:string>
+ <sissi:string>#lecteur_biometrique.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/54.xml
==============================================================================
--- trunk/sheets/SISSI/54.xml (original)
+++ trunk/sheets/SISSI/54.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/pompe.png#</sissi:string>
+ <sissi:string>#pompe.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/55.xml
==============================================================================
--- trunk/sheets/SISSI/55.xml (original)
+++ trunk/sheets/SISSI/55.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/pompe_rotative.png#</sissi:string>
+ <sissi:string>#pompe_rotative.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/56.xml
==============================================================================
--- trunk/sheets/SISSI/56.xml (original)
+++ trunk/sheets/SISSI/56.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/porte_tambour.png#</sissi:string>
+ <sissi:string>#porte_tambour.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/57.xml
==============================================================================
--- trunk/sheets/SISSI/57.xml (original)
+++ trunk/sheets/SISSI/57.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/ventilateur_axial.png#</sissi:string>
+ <sissi:string>#ventilateur_axial.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/58.xml
==============================================================================
--- trunk/sheets/SISSI/58.xml (original)
+++ trunk/sheets/SISSI/58.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/ventilateur_centrifuge.png#</sissi:string>
+ <sissi:string>#ventilateur_centrifuge.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/59.xml
==============================================================================
--- trunk/sheets/SISSI/59.xml (original)
+++ trunk/sheets/SISSI/59.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/ventilateur.png#</sissi:string>
+ <sissi:string>#ventilateur.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/6.xml
==============================================================================
--- trunk/sheets/SISSI/6.xml (original)
+++ trunk/sheets/SISSI/6.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/storage_array.png#</sissi:string>
+ <sissi:string>#storage_array.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/60.xml
==============================================================================
--- trunk/sheets/SISSI/60.xml (original)
+++ trunk/sheets/SISSI/60.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/extincteur.png#</sissi:string>
+ <sissi:string>#extincteur.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/61.xml
==============================================================================
--- trunk/sheets/SISSI/61.xml (original)
+++ trunk/sheets/SISSI/61.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/onduleur.png#</sissi:string>
+ <sissi:string>#onduleur.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/62.xml
==============================================================================
--- trunk/sheets/SISSI/62.xml (original)
+++ trunk/sheets/SISSI/62.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/aircooler.png#</sissi:string>
+ <sissi:string>#aircooler.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/63.xml
==============================================================================
--- trunk/sheets/SISSI/63.xml (original)
+++ trunk/sheets/SISSI/63.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/alarm_center.png#</sissi:string>
+ <sissi:string>#alarm_center.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/7.xml
==============================================================================
--- trunk/sheets/SISSI/7.xml (original)
+++ trunk/sheets/SISSI/7.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/router.png#</sissi:string>
+ <sissi:string>#router.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/70.xml
==============================================================================
--- trunk/sheets/SISSI/70.xml (original)
+++ trunk/sheets/SISSI/70.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/router.png#</sissi:string>
+ <sissi:string>#router.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/71.xml
==============================================================================
--- trunk/sheets/SISSI/71.xml (original)
+++ trunk/sheets/SISSI/71.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/router.png#</sissi:string>
+ <sissi:string>#router.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/75.xml
==============================================================================
--- trunk/sheets/SISSI/75.xml (original)
+++ trunk/sheets/SISSI/75.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/router.png#</sissi:string>
+ <sissi:string>#router.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/76.xml
==============================================================================
--- trunk/sheets/SISSI/76.xml (original)
+++ trunk/sheets/SISSI/76.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/router.png#</sissi:string>
+ <sissi:string>#router.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/8.xml
==============================================================================
--- trunk/sheets/SISSI/8.xml (original)
+++ trunk/sheets/SISSI/8.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/cloud.png#</sissi:string>
+ <sissi:string>#cloud.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
Modified: trunk/sheets/SISSI/9.xml
==============================================================================
--- trunk/sheets/SISSI/9.xml (original)
+++ trunk/sheets/SISSI/9.xml Fri Jan 2 14:01:16 2009
@@ -53,7 +53,7 @@
<sissi:real val="0"/>
</sissi:attribute>
<sissi:attribute name="file_image">
- <sissi:string>#sheets/SISSI/phone.png#</sissi:string>
+ <sissi:string>#phone.png#</sissi:string>
</sissi:attribute>
<sissi:attribute name="confidentiality">
<sissi:string>##</sissi:string>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
