root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level : 2.1 88

Browse Source 
Files correlati     : ba8.exe
Ricompilazione Demo : [ ]
Commento            :

0000215
Nella sezione Body (B1) l'attributo keep_with_next viene inizializzato a 1
causando salti pagina troppo frequenti


git-svn-id: svn://10.65.10.50/trunk@12250 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2004-07-21 10:52:09 +00:00
parent f3ab5bca70
commit 8839356d80
6 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/diction.h
View File

@ -11,7 +11,7 @@
#endif
#ifndef XVT_INCL_XVT
typedef unsigned long WINDOW;
#include <xvt.h>
#endif
TString& txt2xml(const TString& str);
@ -26,6 +26,7 @@ const char* dictionary_translate_macro_header(const char* head);
const char* dictionary_translate_menu_item(const char* menu);
void dictionary_translate_menu(WINDOW win);
void dictionary_translate_menu(MENU_ITEM* menu);
bool dictionary_active();
void dictionary_close();

1
include/mask.cpp
View File

@ -1,4 +1,3 @@
//#include <xvt.h>
#include <xinclude.h>
#include <controls.h>

23
include/real.cpp
View File

@ -1229,6 +1229,17 @@ real abs (
return __tmp_real;
}
// Certified 50%
const char* real::format(const char *picture) const
{
if (*picture == '\0')
return string ();
TString& f = get_tmp_string(32);
dsprintf (f.get_buffer(), (char*)(const char*)picture, ptr());
return (const char *) f;
}
#endif
// Funzioni comuni dei due real
@ -1582,18 +1593,6 @@ const char* real::string(const char *picture) const
return f;
}
// Certified 50%
const char* real::format(const char *picture) const
{
if (*picture == '\0')
return string ();
TString& f = get_tmp_string();
dsprintf (f.get_buffer(), (char*)(const char*)picture, ptr());
return (const char *) f;
}
// Certified 99%
const char* real::stringa (int len, int dec, char pad) const
{

9
include/report.cpp
View File

@ -667,13 +667,10 @@ void TReport_section::load(const TXmlItem& sec)
TReport_section::TReport_section(TReport& r, char t, int l)
: _report(r), _type(t), _level(l), _pos(0,0),
_size(0,0), _page_break(false), _hidden_if_needed(false),
_size(0,0), _page_break(false), _hidden_if_needed(false), _keep_with_next(false),
_repeat(false), _hidden(false), _deactivated(false), _font(NULL),
_bgcolor(COLOR_WHITE), _fgcolor(COLOR_BLACK), _pattern(PAT_HOLLOW),
_border(0), _radius(0)
_border(0), _radius(0)
{ }
TReport_section::~TReport_section()
@ -1537,7 +1534,7 @@ int TReport_field::compare(const TSortable& s) const
TReport_field::TReport_field(TReport_section* sec)
: _section(sec), _id(0), _type('T'), _rct(0,0,1000,100),
_fgcolor(COLOR_BLACK), _bgcolor(COLOR_WHITE), _radius(0), _pattern(PAT_SOLID),
_fgcolor(COLOR_BLACK), _bgcolor(COLOR_WHITE), _radius(0), _pattern(PAT_HOLLOW),
_border(0), _halign('L'), _valign('T'),_dynamic_height(false), _font(NULL),
_hidden(false), _deactivated(false), _hide_zeroes(false), _selected(false),
_draw_hidden(false), _draw_deactivated(false)

14
include/reprint.cpp
View File

@ -520,7 +520,12 @@ bool TPrint_preview_window::on_key(KEY k)
case K_DOWN : do_scroll(0, +1); break;
case 'G' :
case 'g' : dispatch_e_menu(win(), POPUP_GRID); break;
default : ok = TField_window::on_key(k); break;
default :
if (k > K_CTRL)
dispatch_e_char(parent(), k); // Gestione acceleratori
else
ok = TField_window::on_key(k);
break;
};
return ok;
}
@ -1296,7 +1301,7 @@ bool TBook::init()
return error_box(TR("Dimensioni pagina NULLE"));
bool ok = true;
if (_pvr < 150 || _phr < 150)
if (_pvr < 96 || _phr < 96) // Risoluzione di Acrobat Writer
{
ok = yesno_box(TR("Stampante obsoleta o non adeguatamente configurata:\n"
"Risoluzione %ldx%ld. Continuare ugualmente?"), _phr, _pvr);
@ -1410,7 +1415,7 @@ bool TBook::print_or_preview()
}
TBook::TBook(const char* name)
: _out(NULL), _is_temporary(false),
: _out(NULL), _is_temporary(false),
_pw(0), _ph(0), _pvr(0), _phr(0),
_pages(0), _page(0)
{
@ -1722,8 +1727,7 @@ bool TReport_book::add(TReport& rep, bool progind)
TReport_section* fl = _report->find_section('F',1);
if (fl != NULL) // Gestione footer last (se esite)
{
const TReport_section& fp = _report->section('F',0);
const int fy = fp.pos().y;
const int fy = fl->pos().y;
if (fy > 0) // Ha una coordinata y imposta
{
if (fy < _delta.y) // Sono gia' andato oltre quindi salto pagina

26
include/reprint.h
View File

@ -35,19 +35,19 @@ public:
virtual bool close_page();
virtual bool main_loop();
void set_pen(COLOR color, int width = 0, PEN_STYLE style = P_SOLID);
void set_brush(COLOR color, PAT_STYLE pattern = PAT_SOLID);
void set_font(const TReport_font& font);
void set_text_color(COLOR fore, COLOR back = COLOR_WHITE, bool opaque = false);
void set_text_align(char halign ='L', char valign = 'T');
void draw_rectangle(const TRectangle& rect);
void draw_round_rectangle(const TRectangle& rect, int radius);
void draw_ellipse(const TRectangle& rect);
void draw_line(const TRectangle& rect);
void draw_image(const TRectangle& rect, const char* filename);
void draw_text(const TRectangle& rect, const char* text);
void draw_link(const TRectangle& rect, const char* text, const char* link);
void draw_book_pages(const TRectangle& r);
virtual void set_pen(COLOR color, int width = 0, PEN_STYLE style = P_SOLID);
virtual void set_brush(COLOR color, PAT_STYLE pattern = PAT_SOLID);
virtual void set_font(const TReport_font& font);
virtual void set_text_color(COLOR fore, COLOR back = COLOR_WHITE, bool opaque = false);
virtual void set_text_align(char halign ='L', char valign = 'T');
virtual void draw_rectangle(const TRectangle& rect);
virtual void draw_round_rectangle(const TRectangle& rect, int radius);
virtual void draw_ellipse(const TRectangle& rect);
virtual void draw_line(const TRectangle& rect);
virtual void draw_image(const TRectangle& rect, const char* filename);
virtual void draw_text(const TRectangle& rect, const char* text);
virtual void draw_link(const TRectangle& rect, const char* text, const char* link);
virtual void draw_book_pages(const TRectangle& r);
TPoint page_size() const;
TPoint page_res() const;