[gnumeric] ODF: more header/footer fine-tuning

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

commit f515a5328cfd4b58f51a8e4706acf50c630780e6
Author: Andreas J Guelzow <aguelzow pyrshep ca>
Date:   Mon Jun 20 13:11:54 2011 -0600

    ODF: more header/footer fine-tuning
    
    2011-06-20  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* openoffice-write.c (odf_write_hf): turn the display of
    	header/footer on here, not in
    	(odf_write_hf_region)
    	(odf_write_master_styles): add the display name here, not in
    	(odf_write_table_style)

 plugins/openoffice/ChangeLog          |    8 ++++++++
 plugins/openoffice/openoffice-write.c |    4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/plugins/openoffice/ChangeLog b/plugins/openoffice/ChangeLog
index 12fbe22..a3b1214 100644
--- a/plugins/openoffice/ChangeLog
+++ b/plugins/openoffice/ChangeLog
@@ -1,5 +1,13 @@
 2011-06-20  Andreas J. Guelzow <aguelzow pyrshep ca>
 
+	* openoffice-write.c (odf_write_hf): turn the display of
+	header/footer on here, not in
+	(odf_write_hf_region)
+	(odf_write_master_styles): add the display name here, not in
+	(odf_write_table_style)
+
+2011-06-20  Andreas J. Guelzow <aguelzow pyrshep ca>
+
 	* openoffice-write.c (odf_write_table_style): drop two args and
 	change all callers
 	(odf_render_cell): We want to show the value, not the formula
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index b3a08e1..7676995 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -608,7 +608,6 @@ odf_write_table_style (GnmOOExport *state, Sheet const *sheet)
 	
 	odf_start_style (state->xml, name, "table");
 	gsf_xml_out_add_cstr_unchecked (state->xml, STYLE "master-page-name", mp_name);
-	gsf_xml_out_add_cstr (state->xml, STYLE "display-name", sheet->name_unquoted);
 
 	gsf_xml_out_start_element (state->xml, STYLE "table-properties");
 	odf_add_bool (state->xml, TABLE "display",
@@ -4650,7 +4649,6 @@ odf_write_hf_region (GnmOOExport *state, char const *format, char const *id)
 		return;
 
 	gsf_xml_out_start_element (state->xml, id);
-	odf_add_bool (state->xml, STYLE "display", TRUE);
 	g_object_get (G_OBJECT (state->xml), "pretty-print", &pp, NULL);
 	g_object_set (G_OBJECT (state->xml), "pretty-print", FALSE, NULL);
 	gsf_xml_out_start_element (state->xml, TEXT "p");
@@ -4695,6 +4693,7 @@ odf_write_hf (GnmOOExport *state, PrintHF *hf, char const *id)
 		return;
 
 	gsf_xml_out_start_element (state->xml, id);
+	odf_add_bool (state->xml, STYLE "display", TRUE);
 	odf_write_hf_region (state, hf->left_format, STYLE "region-left");
 	odf_write_hf_region (state, hf->middle_format, STYLE "region-center");
 	odf_write_hf_region (state, hf->right_format, STYLE "region-right");
@@ -4774,6 +4773,7 @@ odf_write_master_styles (GnmOOExport *state)
 
 		gsf_xml_out_start_element (state->xml, STYLE "master-page");
 		gsf_xml_out_add_cstr_unchecked (state->xml, STYLE "name", mp_name);
+		gsf_xml_out_add_cstr (state->xml, STYLE "display-name", sheet->name_unquoted);
 		gsf_xml_out_add_cstr_unchecked (state->xml, STYLE "page-layout-name", 
 						"pl-default");