summaryrefslogtreecommitdiff
path: root/riscos/print.c
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2005-04-09 09:47:37 +0000
committerJames Bursa <james@netsurf-browser.org>2005-04-09 09:47:37 +0000
commit2920bca14adbf145d64754b1ef8e6b888c7995ee (patch)
treedb57b9169d89bf0bc79e06c1cde68db60adf2462 /riscos/print.c
parent8728712699ff8ff80bfce53308e073898c958c11 (diff)
downloadnetsurf-2920bca14adbf145d64754b1ef8e6b888c7995ee.tar.gz
netsurf-2920bca14adbf145d64754b1ef8e6b888c7995ee.tar.bz2
[project @ 2005-04-09 09:47:36 by bursa]
Move HTML contents almost fully over to talloc(), simplifying code. Improvements to title attributes, broken forms, cellpadding. Reorder functions in box_construct.c. svn path=/import/netsurf/; revision=1608
Diffstat (limited to 'riscos/print.c')
-rw-r--r--riscos/print.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/riscos/print.c b/riscos/print.c
index 0e4eef004..f136fe100 100644
--- a/riscos/print.c
+++ b/riscos/print.c
@@ -471,7 +471,6 @@ bool print_document(struct gui_window *g, const char *filename)
int left, right, top, bottom, width, height;
int saved_width;
int yscroll = 0, sheets = print_max_sheets;
- struct box *box = 0;
struct content *c = g->bw->current_content;
const char *error_message;
pdriver_features features;
@@ -484,9 +483,6 @@ bool print_document(struct gui_window *g, const char *filename)
return false;
}
- if (c->type == CONTENT_HTML)
- box = c->data.html.layout;
-
/* read printer driver features */
error = xpdriver_info(0, 0, 0, &features, 0, 0, 0, 0);
if (error) {
@@ -511,7 +507,7 @@ bool print_document(struct gui_window *g, const char *filename)
/* layout the document to the correct width */
saved_width = c->width;
if (c->type == CONTENT_HTML)
- layout_document(box, width, c->data.html.box_pool);
+ layout_document(c, width);
/* open printer file */
error = xosfind_openoutw(osfind_NO_PATH | osfind_ERROR_IF_DIR |
@@ -648,7 +644,7 @@ bool print_document(struct gui_window *g, const char *filename)
/* restore document layout */
if (c->type == CONTENT_HTML)
- layout_document(box, saved_width, c->data.html.box_pool);
+ layout_document(c, saved_width);
return true;
@@ -666,7 +662,7 @@ error:
/* restore document layout */
if (c->type == CONTENT_HTML)
- layout_document(box, saved_width, c->data.html.box_pool);
+ layout_document(c, saved_width);
return false;
}