[gnumeric] Tests: test only hourglass and bowtie markers.

[Morten Welinder <mortenw src gnome org>]

commit d957714001789e3ec6fbbf548e97204ceee2ea2f
Author: Morten Welinder <terra gnome org>
Date:   Tue Mar 24 09:27:54 2015 -0400

    Tests: test only hourglass and bowtie markers.

 plugins/excel/xlsx-read-drawing.c |    2 +-
 test/t6516-graph.pl               |    5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index 2a18cbc..53cb6a5 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -2221,7 +2221,7 @@ xlsx_ext_gostyle (GsfXMLIn *xin, xmlChar const **attrs)
                                style->marker.auto_shape = TRUE;
                        } else {
                                style->marker.auto_shape = FALSE;
-                               go_marker_set_shape (style->marker.mark, go_marker_shape_from_str (s));
+                               go_marker_set_shape (state->marker, go_marker_shape_from_str (s));
                        }
                } else if (strcmp (attrs[0], "dashType") == 0) {
                        const char *s = attrs[1];
diff --git a/test/t6516-graph.pl b/test/t6516-graph.pl
index 8b0ae24..c5575f5 100755
--- a/test/t6516-graph.pl
+++ b/test/t6516-graph.pl
@@ -50,15 +50,12 @@ if (&subtest ("biff8")) {
                     'ignore_failure' => 1);
 }
 
-my $xlsx_missing_marker_shapes = "$PERL -p -e 's/\\bshape=\"(hourglass|butterfly)\"/shape=\"diamond\"/;'";
-
-
 if (&subtest ("xlsx")) {
     &message ("Check graph xlsx roundtrip.");
     &test_roundtrip ($file,
                     'format' => 'Gnumeric_Excel:xlsx',
                     'ext' => "xlsx",
                     'resize' => '1048576x16384',
-                    'filter1' => "$xls_drop_pts_size | $xlsx_missing_marker_shapes",
+                    'filter1' => $xls_drop_pts_size,
                     'ignore_failure' => 1);
 }