[goffice] Make manual scale really manual. [#700599]

[Jean Bréfort <jbrefort src gnome org>]

commit a89d617470f821a7343abeb825f15021bb6e9839
Author: Jean Brefort <jean brefort normalesup org>
Date:   Sun Apr 12 21:33:38 2015 +0200

    Make manual scale really manual. [#700599]

 ChangeLog                |    5 +++++
 NEWS                     |    1 +
 goffice/graph/gog-axis.c |    9 +++++++--
 3 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2f28e5e..65450d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-12  Jean Brefort  <jean brefort normalesup org>
+
+       * goffice/graph/gog-axis.c (cb_enable_dim): make manual scale really manual
+       even if it matches the auto value. [#700599]
+
 2015-04-11  Morten Welinder  <terra gnome org>
 
        * goffice/math/go-math.c (go_atan2pi): Simplify.
diff --git a/NEWS b/NEWS
index 4c8a102..b12f8b1 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Jean:
        * Protect colored xy and bubble plots against NULL z values.
        * Update circular axis bounds after a unit change. [#746738]
        * Auto fill color made transparent for opened markers. [#691025]
+       * Make manual scale really manual. [#700599]
 
 Johannes Deutsch:
        * Do not draw the line over the arrow head at start. [#745736]
diff --git a/goffice/graph/gog-axis.c b/goffice/graph/gog-axis.c
index 6d8688a..4ad2993 100644
--- a/goffice/graph/gog-axis.c
+++ b/goffice/graph/gog-axis.c
@@ -2741,10 +2741,15 @@ cb_enable_dim (GtkToggleButton *toggle_button, ElemToggleData *closure)
 
        gtk_widget_set_sensitive (closure->editor, !is_auto);
 
-       if (is_auto)
+       if (is_auto) {
                gog_dataset_set_dim (closure->set, closure->dim, NULL, NULL);
+               set_to_auto_value (closure);
+       } else {
+               GogAxis *axis = GOG_AXIS (closure->set);
+               GOData *data = go_data_scalar_val_new (axis->auto_bound[closure->dim]);
+               gog_dataset_set_dim (closure->set, closure->dim, data, NULL);
+       }
 
-       set_to_auto_value (closure);
 }
 
 static void