[goffice] XL formats depend on their position, so we can't split them.

[Andreas J. Guelzow <guelzow src gnome org>]

commit 813423fb15bcb6c0377cf0d2e20e3cd74d456037
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sat May 30 02:49:04 2009 -0600

    XL formats depend on their position, so we can't split them.
    
    2009-05-30  Andreas J. Guelzow  <aguelzow pyrshep ca>
    
    	* goffice/utils/go-format.h (go_format_odf_style_map): simplify
    	  calling convention
    	(gboolean go_format_output_to_odf): add argument
    	* goffice/utils/go-format.c (go_format_odf_style_map): simplify
    	  calling convention
    	(gboolean go_format_output_to_odf): add argument
---
 ChangeLog                 |    9 +++++++++
 goffice/utils/go-format.c |    7 ++-----
 goffice/utils/go-format.h |    5 ++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 76b0933..8169e7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2009-05-30  Andreas J. Guelzow  <aguelzow pyrshep ca>
 
+	* goffice/utils/go-format.h (go_format_odf_style_map): simplify
+	  calling convention
+	(gboolean go_format_output_to_odf): add argument
+	* goffice/utils/go-format.c (go_format_odf_style_map): simplify
+	  calling convention
+	(gboolean go_format_output_to_odf): add argument
+
+2009-05-30  Andreas J. Guelzow  <aguelzow pyrshep ca>
+
 	* goffice/utils/go-format.c (go_format_output_date_to_odf) use
 	  GOFormatDetails
 	(go_format_output_scientific_number_to_odf): ditto
diff --git a/goffice/utils/go-format.c b/goffice/utils/go-format.c
index dbf6b78..a03a69e 100644
--- a/goffice/utils/go-format.c
+++ b/goffice/utils/go-format.c
@@ -5407,7 +5407,7 @@ go_format_locale_currency (void)
 
 #ifdef DEFINE_COMMON
 char *
-go_format_odf_style_map (GOFormat const **conditional_format, GOFormat const *fmt, int i)
+go_format_odf_style_map (GOFormat const *fmt, int i)
 {
 	char const *format_string = NULL;
 
@@ -5417,9 +5417,6 @@ go_format_odf_style_map (GOFormat const **conditional_format, GOFormat const *fm
 	if (i >= fmt->u.cond.n)
 		return NULL;
 
-	if (conditional_format != NULL)
-		*conditional_format = fmt->u.cond.conditions[i].fmt;
-
 	switch (fmt->u.cond.conditions[i].op) {
 	case GO_FMT_COND_EQ:
 		format_string = "value()=%f";
@@ -5772,7 +5769,7 @@ go_format_output_currency_to_odf (GsfXMLOut *xout, GOFormat const *fmt, char con
 
 #ifdef DEFINE_COMMON
 gboolean
-go_format_output_to_odf (GsfXMLOut *xout, GOFormat const *fmt, char const *name)
+go_format_output_to_odf (GsfXMLOut *xout, GOFormat const *fmt, int i, char const *name)
 {
 	gboolean pp = TRUE, result = TRUE;
 	GOFormatDetails dst;
diff --git a/goffice/utils/go-format.h b/goffice/utils/go-format.h
index d31b66e..57996f6 100644
--- a/goffice/utils/go-format.h
+++ b/goffice/utils/go-format.h
@@ -237,9 +237,8 @@ GOFormat *go_format_toggle_1000sep	(GOFormat const *fmt);
 
 /******************* GOFormat ODF Support ********************************/
 
-char *go_format_odf_style_map (GOFormat const **conditional_format, 
-			       GOFormat const *fmt, int i);
-gboolean go_format_output_to_odf (GsfXMLOut *xout, GOFormat const *fmt, 
+char *go_format_odf_style_map (GOFormat const *fmt, int i);
+gboolean go_format_output_to_odf (GsfXMLOut *xout, GOFormat const *fmt, int i, 
 				  char const *name);