X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput%2Fspv%2Fspv-output.c;h=8006f85eb26d09256ca206638acc4b85f95dfcd9;hb=29917c4f5908454803e663d2ad78bca4bc35e805;hp=cb4964a7f1d7bdf9d4c33b6fd661e366769684dd;hpb=26bad54c73bdb354262a2434de93e632a286b0d3;p=pspp

diff --git a/src/output/spv/spv-output.c b/src/output/spv/spv-output.c
index cb4964a7f1..8006f85eb2 100644
--- a/src/output/spv/spv-output.c
+++ b/src/output/spv/spv-output.c
@@ -20,7 +20,7 @@
 
 #include "output/pivot-table.h"
 #include "output/spv/spv.h"
-#include "output/text-item.h"
+#include "output/output-item.h"
 
 #include "gl/xalloc.h"
 
@@ -28,25 +28,11 @@ void
 spv_text_submit (const struct spv_item *in)
 {
   enum spv_item_class class = spv_item_get_class (in);
-  enum text_item_type type
-    = (class == SPV_CLASS_HEADINGS ? TEXT_ITEM_TITLE
-       : class == SPV_CLASS_PAGETITLE ? TEXT_ITEM_PAGE_TITLE
-       : TEXT_ITEM_LOG);
-  const struct pivot_value *value = spv_item_get_text (in);
-  char *text = pivot_value_to_string (value, SETTINGS_VALUE_SHOW_DEFAULT,
-                                      SETTINGS_VALUE_SHOW_DEFAULT);
-  char *label = in->label ? xstrdup (in->label) : NULL;
-  struct text_item *item = text_item_create_nocopy (type, text, label);
-  const struct font_style *font = value->font_style;
-  if (font)
-    {
-      item->bold = font->bold;
-      item->italic = font->italic;
-      item->underline = font->underline;
-      item->markup = font->markup;
-      if (font->typeface)
-        item->typeface = xstrdup (font->typeface);
-      item->size = font->size;
-    }
-  text_item_submit (item);
+  struct output_item *item = text_item_create_value (
+    (class == SPV_CLASS_HEADINGS ? TEXT_ITEM_TITLE
+     : class == SPV_CLASS_PAGETITLE ? TEXT_ITEM_PAGE_TITLE
+     : TEXT_ITEM_LOG),
+    pivot_value_clone (spv_item_get_text (in)),
+    xstrdup_if_nonnull (in->label));
+  output_item_submit (item);
 }