Commit 7b2166d0 authored by Morten Welinder's avatar Morten Welinder Committed by Morten Welinder

Handle the no-common rotation case. Fix the no-common indentation case.

2004-12-17  Morten Welinder  <terra@gnome.org>

	* dialog-cell-format.c (fmt_dialog_init_align_page): Handle the
	no-common rotation case.  Fix the no-common indentation case.
parent 83da0b2a
......@@ -16,6 +16,7 @@ Morten:
* Draw rotated text.
* Print rotated text.
* Fix torn off undo/redo crash.
* Fix cell format dialog initialization problems.
--------------------------------------------------------------------------
Gnumeric 1.4.1
......
2004-12-17 Morten Welinder <terra@gnome.org>
* dialog-cell-format.c (fmt_dialog_init_align_page): Handle the
no-common rotation case. Fix the no-common indentation case.
2004-12-14 Morten Welinder <terra@gnome.org>
* dialog-cell-format.c (fmt_dialog_init_align_page): Initialize
......
......@@ -850,7 +850,7 @@ fmt_dialog_init_align_page (FormatState *state)
"toggled",
G_CALLBACK (cb_align_wrap_toggle), state);
if (mstyle_is_element_conflict (state->style, MSTYLE_ALIGN_V) &&
if (mstyle_is_element_conflict (state->style, MSTYLE_INDENT) ||
(h != HALIGN_LEFT && h != HALIGN_RIGHT))
state->align.indent = 0;
else
......@@ -879,7 +879,10 @@ fmt_dialog_init_align_page (FormatState *state)
/* setup the rotation canvas */
state->align.line = NULL;
state->align.text = NULL;
state->align.rotation = mstyle_get_rotation (state->style);
state->align.rotation =
mstyle_is_element_conflict (state->style, MSTYLE_ROTATION)
? 0
: mstyle_get_rotation (state->style);
memset (state->align.rotate_marks, 0,
sizeof (state->align.rotate_marks));
w = glade_xml_get_widget (state->gui, "rotate_spinner");
......
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