X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Fspv%2Fspv-table-look.c;h=6b3c6d23459c34d8b09c7065a6c37a029a6fc95e;hb=df1d194af32e35739355981252785e768f21ebb0;hp=3e5f962bd3b08be527cbe6f1f029bf1410fe9a57;hpb=c8d4730341536ea6120a273100b0333327bf880a;p=pspp

diff --git a/src/output/spv/spv-table-look.c b/src/output/spv/spv-table-look.c
index 3e5f962bd3..6b3c6d2345 100644
--- a/src/output/spv/spv-table-look.c
+++ b/src/output/spv/spv-table-look.c
@@ -28,7 +28,6 @@
 #include "output/spv/structure-xml-parser.h"
 #include "output/spv/tlo-parser.h"
 #include "output/pivot-table.h"
-#include "output/table.h"
 
 #include "gl/read-file.h"
 #include "gl/xalloc.h"
@@ -131,14 +130,14 @@ spv_table_look_decode (const struct spvsx_table_properties *in,
   struct pivot_table_look *out = pivot_table_look_new_builtin_default ();
   char *error = NULL;
 
-  out->name = in->name ? xstrdup (in->name) : NULL;
+  out->name = xstrdup_if_nonnull (in->name);
 
   const struct spvsx_general_properties *g = in->general_properties;
   out->omit_empty = g->hide_empty_rows != 0;
-  out->width_ranges[TABLE_HORZ][0] = optional_pt (g->minimum_column_width, -1);
-  out->width_ranges[TABLE_HORZ][1] = optional_pt (g->maximum_column_width, -1);
-  out->width_ranges[TABLE_VERT][0] = optional_pt (g->minimum_row_width, -1);
-  out->width_ranges[TABLE_VERT][1] = optional_pt (g->maximum_row_width, -1);
+  out->col_heading_width_range[0] = optional_pt (g->minimum_column_width, -1);
+  out->col_heading_width_range[1] = optional_pt (g->maximum_column_width, -1);
+  out->row_heading_width_range[0] = optional_pt (g->minimum_row_width, -1);
+  out->row_heading_width_range[1] = optional_pt (g->maximum_row_width, -1);
   out->row_labels_in_corner
     = g->row_dimension_labels != SPVSX_ROW_DIMENSION_LABELS_NESTED;
 
@@ -381,17 +380,17 @@ tlo_decode (const struct tlo_table_look *in)
   out->row_labels_in_corner = !in->tl->nested_row_labels;
   if (in->v2_styles)
     {
-      out->width_ranges[TABLE_HORZ][0] = in->v2_styles->min_col_width;
-      out->width_ranges[TABLE_HORZ][1] = in->v2_styles->max_col_width;
-      out->width_ranges[TABLE_VERT][0] = in->v2_styles->min_row_height;
-      out->width_ranges[TABLE_VERT][1] = in->v2_styles->max_row_height;
+      out->col_heading_width_range[0] = in->v2_styles->min_col_heading_width;
+      out->col_heading_width_range[1] = in->v2_styles->max_col_heading_width;
+      out->row_heading_width_range[0] = in->v2_styles->min_row_heading_width;
+      out->row_heading_width_range[1] = in->v2_styles->max_row_heading_width;
     }
   else
     {
-      out->width_ranges[TABLE_HORZ][0] = 36;
-      out->width_ranges[TABLE_HORZ][1] = 72;
-      out->width_ranges[TABLE_VERT][0] = 36;
-      out->width_ranges[TABLE_VERT][1] = 120;
+      out->col_heading_width_range[0] = 36;
+      out->col_heading_width_range[1] = 72;
+      out->row_heading_width_range[0] = 36;
+      out->row_heading_width_range[1] = 120;
     }
 
   out->show_numeric_markers = flags & 0x04;
@@ -622,11 +621,12 @@ spv_table_look_write (const char *filename, const struct pivot_table_look *look)
 
   start_elem (xml, "generalProperties");
   write_attr_bool (xml, "hideEmptyRows", look->omit_empty);
-  const int (*wr)[2] = look->width_ranges;
-  write_attr_format (xml, "maximumColumnWidth", "%d", wr[TABLE_HORZ][1]);
-  write_attr_format (xml, "maximumRowWidth", "%d", wr[TABLE_VERT][1]);
-  write_attr_format (xml, "minimumColumnWidth", "%d", wr[TABLE_HORZ][0]);
-  write_attr_format (xml, "minimumRowWidth", "%d", wr[TABLE_VERT][0]);
+  const int *chwr = look->col_heading_width_range;
+  const int *rhwr = look->row_heading_width_range;
+  write_attr_format (xml, "maximumColumnWidth", "%d", chwr[1]);
+  write_attr_format (xml, "maximumRowWidth", "%d", rhwr[1]);
+  write_attr_format (xml, "minimumColumnWidth", "%d", chwr[0]);
+  write_attr_format (xml, "minimumRowWidth", "%d", rhwr[0]);
   write_attr (xml, "rowDimensionLabels",
               look->row_labels_in_corner ? "inCorner" : "nested");
   end_elem (xml);
@@ -647,8 +647,8 @@ spv_table_look_write (const char *filename, const struct pivot_table_look *look)
 
       start_elem (xml, pivot_area_names[a]);
       if (a == PIVOT_AREA_DATA
-          && (!cell_color_equal (&font->fg[0], &font->fg[1])
-              || !cell_color_equal (&font->bg[0], &font->bg[1])))
+          && (!cell_color_equal (font->fg[0], font->fg[1])
+              || !cell_color_equal (font->bg[0], font->bg[1])))
         {
           write_attr_color (xml, "alternatingColor", &font->bg[1]);
           write_attr_color (xml, "alternatingTextColor", &font->fg[1]);