Commit cce1fca5 authored by Andreas J. Guelzow 's avatar Andreas J. Guelzow

Fix export/import of scaling information to/from ODF.

2016-08-29  Andreas J. Guelzow <aguelzow@pyrshep.ca>

	* openoffice-read.c (odf_page_layout_properties): scaling.percentage.? is in the range 0..100
	* openoffice-write.c (odf_write_page_layout): scaling.percentage.? is in the range 0..100
parent 9346c70f
Gnumeric 1.12.33
Andreas:
* Fix export/import of scaling information to/from ODF.
Morten:
* Speed up sstest part of test suite.
* Bring documentation build into the 21 century.
......
2016-08-29 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* openoffice-read.c (odf_page_layout_properties): scaling.percentage.? is in the range 0..100
* openoffice-write.c (odf_write_page_layout): scaling.percentage.? is in the range 0..100
2016-08-20 Morten Welinder <terra@gnome.org>
* Release 1.12.32
......
......@@ -5918,7 +5918,7 @@ odf_page_layout_properties (GsfXMLIn *xin, xmlChar const **attrs)
pi->scaling.type = PRINT_SCALE_FIT_PAGES;
} else {
pi->scaling.type = PRINT_SCALE_PERCENTAGE;
pi->scaling.percentage.x = pi->scaling.percentage.y = scale_to;
pi->scaling.percentage.x = pi->scaling.percentage.y = scale_to * 100;
}
if (gnm_style_print && pi->comment_placement != GNM_PRINT_COMMENTS_NONE)
......
......@@ -5649,7 +5649,7 @@ odf_write_page_layout (GnmOOExport *state, GnmPrintInformation *pi,
break;
}
case PRINT_SCALE_PERCENTAGE:
odf_add_percent (state->xml, STYLE "scale-to", pi->scaling.percentage.x);
odf_add_percent (state->xml, STYLE "scale-to", pi->scaling.percentage.x/100);
break;
default:
odf_add_percent (state->xml, STYLE "scale-to", 1.);
......
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