From 503e5dc0a0d6e717145e87644aff32d0758fbf13 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 11 Jul 2006 15:08:27 +0000 Subject: [PATCH] Patch level : 4.0 451 Files correlati : Ricompilazione Demo : [ ] Commento : Riportata la versione 3.1 650 git-svn-id: svn://10.65.10.50/trunk@14154 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/report.cpp | 2 +- include/reprint.cpp | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/report.cpp b/include/report.cpp index 88ebcc9aa..e57440d27 100755 --- a/include/report.cpp +++ b/include/report.cpp @@ -10,7 +10,7 @@ #include #include -static const char MAX_STRING[2] = {255, 0}; +static const char MAX_STRING[2] = {(char) 255, 0}; /////////////////////////////////////////////////////////// // TReport_font diff --git a/include/reprint.cpp b/include/reprint.cpp index bca15dc8d..114ccccc4 100755 --- a/include/reprint.cpp +++ b/include/reprint.cpp @@ -127,7 +127,6 @@ bool finisce_per_punto(const TString& str) void advanced_draw_paragraph(TWindow& win, const TString_array& para, const RCT& rct, char halign, char valign, int default_10row_height) { - const bool acapo = para.find("\n") >= 0; int leading, ascent, descent; xvt_dwin_get_font_metrics(win.win(), &leading, &ascent, &descent); @@ -140,14 +139,13 @@ void advanced_draw_paragraph(TWindow& win, const TString_array& para, const RCT& const int rct_height = rct.bottom - rct.top; int rows = (rct_height * 11) / ky10; // Sto abbondante del 10% (*11/10) altrimenti risulta spesso 0 - if (acapo || rows > 1) // Devo scrivere piu' righe? + if (rows > 1 || para.items() >1) // Devo scrivere piu' righe? { const int kx10 = xvt_dwin_get_text_width(win.win(), "MMMMMMMMMM", 10); const unsigned columns = (rct.right - rct.left) * 10 / kx10; - TParagraph_string str(para, columns); - if (str.items() < rows) - rows = str.items(); + if (para.items() < rows) + rows = para.items(); int ybase = rct.top; switch (valign) @@ -162,14 +160,14 @@ void advanced_draw_paragraph(TWindow& win, const TString_array& para, const RCT& RCT rctline = rct; rctline.top = ybase + (ky10 * row) / 10; rctline.bottom = rctline.top + ky10 / 10; - const char* line = str.get(); + const char* line = para.row(row); if (halign == 'J' && (row == rows-1 || strlen(line) < columns/2)) halign = 'L'; advanced_draw_text_line(win, line, rctline, halign, 'T'); } } else - advanced_draw_text_line(win, para, rct, halign, valign); + advanced_draw_text_line(win, para.row(0), rct, halign, valign); } ///////////////////////////////////////////////////////////