[gnumeric] Fix xlsx import of plot area manual layout. [#748016]

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

commit a6dc409e9038b7141baaea62691eb6e92c25e0cb
Author: Jean Brefort <jean brefort normalesup org>
Date:   Fri Apr 17 08:12:37 2015 +0200

    Fix xlsx import of plot area manual layout. [#748016]

 NEWS                              |    3 +++
 plugins/excel/ChangeLog           |    5 +++++
 plugins/excel/xlsx-read-drawing.c |    3 ++-
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --git a/NEWS b/NEWS
index f29b535..33c0157 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 Gnumeric 1.12.23
 
+Jean:
+       * Fix xlsx import of plot area manual layout. [#748016]
+
 --------------------------------------------------------------------------
 Gnumeric 1.12.22
 
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index 8d2d837..4a79277 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-17  Jean Brefort  <jean brefort normalesup org>
+
+       * xlsx-read-drawing.c (xlsx_chart_layout_manual): fix plot area manual
+       layout import. [#748016]
+
 2015-04-16  Morten Welinder <terra gnome org>
 
        * Release 1.12.22
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index ca4b6e3..9a5f1c4 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -2145,7 +2145,8 @@ xlsx_chart_layout_manual (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *blob)
        alloc.y = state->chart_pos[2];
        alloc.h = state->chart_pos[3];
 
-       if (GOG_IS_GRID (state->cur_obj)) {
+       if (state->cur_obj == NULL) {
+               /* plot area position, see xlsx_plot_area() and #748016 */
 
                if (0 && state->chart_pos_mode[0]) {
                        alloc.x = 0;