AUDIT: r17728 - gnucash/trunk/src/report/report-system - Bug #345980: Fix changed stylesheet option that isn't saved in saved reports

[Christian Stimming]

Author: cstim
Date: 2008-11-26 17:16:20 -0500 (Wed, 26 Nov 2008)
New Revision: 17728
Trac: http://svn.gnucash.org/trac/changeset/17728

Modified:
   gnucash/trunk/src/report/report-system/report.scm
Log:
Bug #345980: Fix changed stylesheet option that isn't saved in saved reports

Patch by andi5.
BP

Modified: gnucash/trunk/src/report/report-system/report.scm
===================================================================
--- gnucash/trunk/src/report/report-system/report.scm	2008-11-26 21:41:04 UTC (rev 17727)
+++ gnucash/trunk/src/report/report-system/report.scm	2008-11-26 22:16:20 UTC (rev 17728)
@@ -252,21 +252,20 @@
                              " " (_ "Stylesheet"))))
            (gnc:get-html-style-sheets)))))
 
-    (if (procedure? generator)
-        (let ((options (gnc:backtrace-if-exception generator)))
-          (if (not options)
-              (begin
-                (gnc:warn "BUG DETECTED: Scheme exception raised in "
-                          "report options generator procedure named "
-                          (procedure-name generator))
-                (set! options (gnc:new-options))))
-          (gnc:register-option options stylesheet)
-          (gnc:register-option options namer)
-          options)
-        (let ((options (gnc:new-options)))
-          (gnc:register-option options stylesheet)
-          (gnc:register-option options namer)
-          options))))
+    (let ((options
+           (if (procedure? generator)
+               (or (gnc:backtrace-if-exception generator)
+                   (begin
+                     (gnc:warn "BUG DETECTED: Scheme exception raised in "
+                               "report options generator procedure named "
+                               (procedure-name generator))
+                     (gnc:new-options)))
+               (gnc:new-options))))
+      (or (gnc:lookup-option options gnc:pagename-general gnc:optname-reportname)
+          (gnc:register-option options namer))
+      (or (gnc:lookup-option options gnc:pagename-general (N_ "Stylesheet"))
+          (gnc:register-option options stylesheet))
+      options)))
 
 ;; A <report> represents an instantiation of a particular report type.
 (define <report>