Remove unused global variables

[pspp-builds.git] / src / ui / gui / psppire-output-window.c

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index 1e283bae896a6084183f79878eeebf405871bee5..9d2c73f85e8d4e1092c1a15a28a7a919b09e7300 100644 (file)
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -374,9 +374,8 @@ psppire_output_window_setup (void)
                       SETTINGS_DEVICE_UNFILTERED);
   output_driver_register (d);
 }
+
 \f
-int viewer_length = 16;
-int viewer_width = 59;
 
 /* Callback for the "delete" action (clicking the x on the top right
    hand corner of the window) */
@@ -469,7 +468,7 @@ enum
     n_FT
   };
 
-#define N_EXTENTIONS (n_FT - 1)
+#define N_EXTENSIONS (n_FT - 1)
 
 struct file_types ft[n_FT] = {
   {N_("Infer file type from extension"),  NULL},
@@ -504,7 +503,7 @@ on_combo_change (GtkFileChooser *chooser)
       if ( x != 0 )
        sensitive = TRUE;
 
-      for (i = 1 ; i < N_EXTENTIONS ; ++i)
+      for (i = 1 ; i < N_EXTENSIONS ; ++i)
        {
          if ( g_str_has_suffix (fn, ft[i].ext))
            {
@@ -629,7 +628,7 @@ psppire_output_window_export (PsppireOutputWindow *window)
       if (file_type == FT_AUTO)
        {
          gint i;
-         for (i = 1 ; i < N_EXTENTIONS ; ++i)
+         for (i = 1 ; i < N_EXTENSIONS ; ++i)
            {
              if ( g_str_has_suffix (filename, ft[i].ext))
                {
@@ -1003,7 +1002,7 @@ paginate (GtkPrintOperation *operation,
   if ( window->print_item < window->n_items )
     {
       xr_driver_output_item (window->print_xrd, window->items[window->print_item++]);
-      if (xr_driver_need_new_page (window->print_xrd))
+      while (xr_driver_need_new_page (window->print_xrd))
        {
          xr_driver_next_page (window->print_xrd, NULL);
          window->print_n_pages ++;
@@ -1046,12 +1045,9 @@ draw_page (GtkPrintOperation *operation,
           PsppireOutputWindow *window)
 {
   xr_driver_next_page (window->print_xrd, gtk_print_context_get_cairo_context (context));
-  while ( window->print_item < window->n_items)
-    {
-      xr_driver_output_item (window->print_xrd, window->items [window->print_item++]);
-      if ( xr_driver_need_new_page (window->print_xrd) )
-         break;          
-    }
+  while (!xr_driver_need_new_page (window->print_xrd)
+         && window->print_item < window->n_items)
+    xr_driver_output_item (window->print_xrd, window->items [window->print_item++]);
 }