Commit 58b4794b authored by Andreas J. Guelzow 's avatar Andreas J. Guelzow

Fix ODF roundtrip of "center accross selection". [#726010]

2014-03-12  Andreas J. Guelzow <aguelzow@pyrshep.ca>

	* openoffice-write.c (odf_write_style_cell_properties):
	GNM_HALIGN_CENTER_ACROSS_SELECTION should be source="fix"
	(odf_write_style_paragraph_properties): use "center" for
	GNM_HALIGN_CENTER_ACROSS_SELECTION
parent 238656c3
......@@ -7,6 +7,7 @@ Andreas:
[part of #725852]
* Fix fill-alignment export/import to and from ODF. [part of #726035]
* Fix distributed-alignment export to ODF. [part of #726035]
* Fix ODF roundtrip of "center accross selection". [#726010]
Morten:
* Support volatile functions. [#305798]
......
2014-03-12 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* openoffice-write.c (odf_write_style_cell_properties):
GNM_HALIGN_CENTER_ACROSS_SELECTION should be source="fix"
(odf_write_style_paragraph_properties): use "center" for
GNM_HALIGN_CENTER_ACROSS_SELECTION
2014-03-12 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* openoffice-read.c (oo_style_prop_cell): read script info
......
......@@ -1318,12 +1318,12 @@ odf_write_style_cell_properties (GnmOOExport *state, GnmStyle const *style)
case GNM_HALIGN_RIGHT:
case GNM_HALIGN_CENTER:
case GNM_HALIGN_JUSTIFY:
case GNM_HALIGN_CENTER_ACROSS_SELECTION:
source = "fix";
break;
case GNM_HALIGN_FILL:
rep_content = TRUE;
case GNM_HALIGN_GENERAL:
case GNM_HALIGN_CENTER_ACROSS_SELECTION:
default:
/* Note that since source is value-type, alignment should be ignored */
/*(but isn't by OOo) */
......@@ -1373,9 +1373,13 @@ odf_write_style_paragraph_properties (GnmOOExport *state, GnmStyle const *style)
gnum_specs = TRUE;
break;
case GNM_HALIGN_FILL:
/* handled by repeat-content */
break;
case GNM_HALIGN_GENERAL:
case GNM_HALIGN_CENTER_ACROSS_SELECTION:
alignment = "center";
gnum_specs = TRUE;
break;
case GNM_HALIGN_GENERAL:
default:
/* Note that since source is value-type, alignment should be ignored */
/*(but isn't by OOo) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment