From 4d0aaa727aa8bf66c59bfeded66c6a2ed9ab6d63 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Mon, 9 Jun 2003 18:04:04 +0000
Subject: [PATCH] * src/TextDoc.py: Added name property to style sheets *
 src/StyleEditor.py: Add name property to edited style sheets * src/RelLib.py:
 Fix for witness event under ZODB * src/docgen/OpenDrawDoc.py: change name to
 OpenOffice.org * src/docgen/OpenOfficeDoc.py: change name to OpenOffice.org

svn: r1677
---
 src/RelLib.py               | 10 +++++-----
 src/StyleEditor.py          |  1 +
 src/TextDoc.py              |  9 +++++++++
 src/docgen/OpenDrawDoc.py   |  2 +-
 src/docgen/OpenOfficeDoc.py |  2 +-
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/RelLib.py b/src/RelLib.py
index f14a9bb3f..aaedab96d 100644
--- a/src/RelLib.py
+++ b/src/RelLib.py
@@ -1360,13 +1360,13 @@ class Event(DataObj):
             self.description = source.description
             self.name = source.name
             self.cause = source.cause
-            if source.witness:
-                # old ZODB database may not have this element
-                try:
+            # old ZODB database may not have this element
+            try:
+                if source.witness:
                     self.witness = source.witness[:]
-                except:
+                else:
                     self.witness = None
-            else:
+            except:
                 self.witness = None
         else:
             self.place = None
diff --git a/src/StyleEditor.py b/src/StyleEditor.py
index c31233e15..71e70ca52 100644
--- a/src/StyleEditor.py
+++ b/src/StyleEditor.py
@@ -289,6 +289,7 @@ class StyleEditor:
         name = self.top.get_widget("style_name").get_text()
 
         self.save_paragraph(p)
+        self.style.set_name(name)
         self.parent.sheetlist.set_style_sheet(name,self.style)
         self.parent.redraw()
         Utils.destroy_passed_object(obj)
diff --git a/src/TextDoc.py b/src/TextDoc.py
index 26557720a..aa359e964 100644
--- a/src/TextDoc.py
+++ b/src/TextDoc.py
@@ -709,6 +709,7 @@ class StyleSheetList:
         file - XML file that contains style definitions
         defstyle - default style
         """
+        defstyle.set_name('default')
         self.map = { "default" : defstyle }
         self.file = os.path.expanduser("~/.gramps/" + file)
         self.parse()
@@ -748,6 +749,7 @@ class StyleSheetList:
         name - name assocated with the StyleSheet to add or replace.
         style - definition of the StyleSheet
         """
+        style.set_name(name)
         if name != "default":
             self.map[name] = style
 
@@ -822,11 +824,18 @@ class StyleSheet:
               obj, instead of creating an empty StyleSheet
         """
         self.style_list = {}
+        self.name = ""
         if obj != None:
             for style_name in obj.style_list.keys():
                 style = obj.style_list[style_name]
                 self.style_list[style_name] = ParagraphStyle(style)
 
+    def set_name(self,name):
+        self.name = name
+
+    def get_name(self):
+        return self.name
+
     def clear(self):
         "Removes all paragraph styles from the StyleSheet"
         self.style_list = {}
diff --git a/src/docgen/OpenDrawDoc.py b/src/docgen/OpenDrawDoc.py
index de76eaf80..e27894a80 100644
--- a/src/docgen/OpenDrawDoc.py
+++ b/src/docgen/OpenDrawDoc.py
@@ -560,4 +560,4 @@ class OpenDrawDoc(DrawDoc.DrawDoc):
 # Register document generator
 #
 #-------------------------------------------------------------------------
-Plugins.register_draw_doc(_("OpenOffice/StarOffice 6"),OpenDrawDoc,1,1,".sxd");
+Plugins.register_draw_doc(_("OpenOffice.org/StarOffice 6"),OpenDrawDoc,1,1,".sxd");
diff --git a/src/docgen/OpenOfficeDoc.py b/src/docgen/OpenOfficeDoc.py
index dd288590c..038b42745 100644
--- a/src/docgen/OpenOfficeDoc.py
+++ b/src/docgen/OpenOfficeDoc.py
@@ -595,4 +595,4 @@ class OpenOfficeDoc(TextDoc.TextDoc):
 	self.f.write('</office:document-meta>\n')
 	self.f.close()
 
-Plugins.register_text_doc(_("OpenOffice/StarOffice 6"),OpenOfficeDoc,1,1,1,".sxw")
+Plugins.register_text_doc(_("OpenOffice.org/StarOffice 6"),OpenOfficeDoc,1,1,1,".sxw")