[orca] Fix for bgo#620055 - Orca insists vehemently that you be told about margin-related text attributes i

[Joanmarie Diggs <joanied src gnome org>]

commit 79b9717824d1118831fae5a233b4a9b0bc329b24
Author: Joanmarie Diggs <joanmarie diggs gmail com>
Date:   Sat May 29 20:02:32 2010 -0400

    Fix for bgo#620055 - Orca insists vehemently that you be told about margin-related text attributes in OOo

 src/orca/scripts/apps/soffice/script.py |   22 +++++++---------------
 1 files changed, 7 insertions(+), 15 deletions(-)
---
diff --git a/src/orca/scripts/apps/soffice/script.py b/src/orca/scripts/apps/soffice/script.py
index 7c5d2ca..6011606 100644
--- a/src/orca/scripts/apps/soffice/script.py
+++ b/src/orca/scripts/apps/soffice/script.py
@@ -116,15 +116,6 @@ class Script(default.Script):
         #
         self.commFailureAttemptLimit = 1
 
-        # Additional default set of text attributes to present to the
-        # user. The only difference over the default set in
-        # settings.py is to add in "left-margin:" and "right-margin:".
-        #
-        self.additionalBrailledTextAttributes = \
-          " left-margin:0mm; right-margin:0mm;"
-        self.additionalSpokenTextAttributes = \
-          " left-margin:0mm; right-margin:0mm;"
-
     def activate(self):
         """Called when this script is activated."""
         self.savedreadTableCellRow = settings.readTableCellRow
@@ -132,17 +123,18 @@ class Script(default.Script):
 
         self.savedEnabledBrailledTextAttributes = \
             settings.enabledBrailledTextAttributes
-        settings.enabledBrailledTextAttributes += \
-            self.additionalBrailledTextAttributes
 
         self.savedEnabledSpokenTextAttributes = \
             settings.enabledSpokenTextAttributes
-        settings.enabledSpokenTextAttributes += \
-            self.additionalSpokenTextAttributes
 
-        # Account for the differences in how OOo expresses indent and
-        # strikethrough.
+        # Account for the differences in how OOo expresses indent, 
+        # strikethrough, and margins.
         #
+        settings.allTextAttributes = \
+            settings.allTextAttributes.replace(
+            "margin:;",
+            "margin:0mm;")
+
         settings.enabledBrailledTextAttributes = \
             settings.enabledBrailledTextAttributes.replace(
             "strikethrough:false;",