come quella corrente - void select(int r, bool scrollto = FALSE); + void select(int r, bool scrollto = false); // @cmember Seleziona la riga
e la colonna
come quella corrente - void select(int r, int c, bool scrollto = FALSE); + void select(int r, int c, bool scrollto = false); // @cmember Prenota la selezione della riga
void post_select(int r); @@ -172,9 +173,9 @@ public: void on_idle(); // @cmember Elimina una o tutte le righe - void destroy(int r = -1, bool update_sheet = TRUE); + void destroy(int r = -1, bool update_sheet = true); // @cmember Inserisce una riga - int insert(int r = -1, bool update_sheet = TRUE, bool call_notify = FALSE); + int insert(int r = -1, bool update_sheet = true, bool call_notify = false); // @cmember Forza l'aggiornamento dei dati della riga sullo schermo void force_update(int r = -1); @@ -188,13 +189,13 @@ public: // @cmember Trasforma l'identificatore di un campo
in un numero di colonna logica
int cid2index(short cid) const;
// @cmember Abilita/disabilita una colonna dello spreadsheet (vedi con il valore di
- void set_append(bool on = TRUE)
+ void set_append(bool on = true)
{ _append = on;}
// @cmember Ritorna il valore del membro
bool append() const
diff --git a/include/recset.cpp b/include/recset.cpp
index 597744909..0ffeb9c99 100755
--- a/include/recset.cpp
+++ b/include/recset.cpp
@@ -677,14 +677,14 @@ bool list_custom_files(const char* ext, const char* library, TString_array& file
stringona.cut(0);
for (int i = 0; i < 3 && scan.good(); i++) // Leggo solo le prime righe
stringona << scan.line();
+
get_xml_attr(stringona, "libraries", libraries);
- get_xml_child(stringona, "description", desc);
-
if (library && *library)
ok = libraries.get_pos(library) >= 0;
if (ok)
{
+ get_xml_child(stringona, "description", desc);
TToken_string* riga = new TToken_string;
riga->add(*row);
riga->add(desc);
diff --git a/include/recset.h b/include/recset.h
index 5576c9fc4..d0cdd7416 100755
--- a/include/recset.h
+++ b/include/recset.h
@@ -46,6 +46,7 @@ public: // Absolutely needed methods
virtual bool move_to(TRecnotype pos) pure;
virtual TRecnotype current_row() const pure;
virtual void requery() pure;
+ bool empty() const { return items() == 0; }
virtual bool move_first() { return move_to(0); }
virtual bool move_prev() { return move_to(current_row()-1); }
@@ -69,7 +70,6 @@ public: // Absolutely needed methods
virtual const TToken_string& sheet_head() const;
virtual bool save_as(const char* path, TRecordsetExportFormat fmt = fmt_unknown);
-
void set_parent(const TRecordset* rs) { _parentset = rs; }
TRecordset();
virtual ~TRecordset() { }
diff --git a/include/report.cpp b/include/report.cpp
index 56e56777d..d47d1629a 100755
--- a/include/report.cpp
+++ b/include/report.cpp
@@ -2018,7 +2018,7 @@ bool TReport::evaluate(const char* expr, TVariant& var, TFieldtypes force_type)
const bool ok = get_usr_val(name, var);
if (!ok)
var = name;
- if (var.is_string())
+ if (var.is_string() || var.is_null())
e.setvar(i, var.as_string());
else
{
diff --git a/include/report.h b/include/report.h
index 9f038d9c5..749acba2c 100755
--- a/include/report.h
+++ b/include/report.h
@@ -219,7 +219,7 @@ public:
void hide() { show(false); }
bool deactivated() const { return _deactivated; }
bool active() const { return !deactivated(); }
- void activate(bool on) { _deactivated = !on; }
+ void activate(bool on = true) { _deactivated = !on; }
void deactivate() { activate(false); }
const TString& prescript() const;
diff --git a/include/reprint.cpp b/include/reprint.cpp
index a5dc5fab1..128ff6448 100755
--- a/include/reprint.cpp
+++ b/include/reprint.cpp
@@ -114,7 +114,7 @@ void advanced_draw_paragraph(TWindow& win, TString& para, const RCT& rct,
ky10 = default_10row_height;
const int rct_height = rct.bottom - rct.top;
- int rows = (rct_height * 11) / ky10; // Sto abbondante del 10% (*11/10) altrimenti risulta spesso 0
+ int rows = (rct_height * 11) / ky10; // Sto abbondante del 10% (*11/10) altrimenti risulta spesso 0
if (acapo || rows > 1) // Devo scrivere piu' righe?
{
@@ -243,11 +243,14 @@ public:
PNT TPrint_preview_window::log2dev(long lx, long ly) const
{
+ PNT pnt = { lx, ly };
+
const TPoint res = _book->page_res();
-
- PNT pnt;
- pnt.h = short(lx * _zoom / res.x);
- pnt.v = short(ly * _zoom / res.y);
+ if (res.x > 0 && res.y > 0) // Should always be true :-)
+ {
+ pnt.h = short(lx * _zoom / res.x);
+ pnt.v = short(ly * _zoom / res.y);
+ }
const TPoint orig = origin();
pnt.h -= short(orig.x);
@@ -258,16 +261,19 @@ PNT TPrint_preview_window::log2dev(long lx, long ly) const
void TPrint_preview_window::update_scroll_range()
{
- const TPoint size = _book->page_size();
+ PNT pnt = { 0, 0 };
+
const TPoint res = _book->page_res();
+ if (res.x > 0 && res.y > 0) // Should always be true :-)
+ {
+ const TPoint size = _book->page_size();
+ pnt.h = short(size.x * _zoom / res.x);
+ pnt.v = short(size.y * _zoom / res.y);
- PNT pnt;
- pnt.h = short(size.x * _zoom / res.x);
- pnt.v = short(size.y * _zoom / res.y);
-
- RCT rct; xvt_vobj_get_client_rect(win(), &rct);
- pnt.h -= rct.right; if (pnt.h < 0) pnt.h = 0;
- pnt.v -= rct.bottom; if (pnt.v < 0) pnt.v = 0;
+ RCT rct; xvt_vobj_get_client_rect(win(), &rct);
+ pnt.h -= rct.right; if (pnt.h < 0) pnt.h = 0;
+ pnt.v -= rct.bottom; if (pnt.v < 0) pnt.v = 0;
+ }
update_thumb(0, 0);
set_scroll_max(pnt.h, pnt.v);
@@ -1600,7 +1606,7 @@ long TReport_book::print_section(TReport_section& rs)
rs.load_fields();
// Non sono sicuro se vada prima di load_fields o dopo execute_prescript
- if (rs.condition().not_empty())
+ if (!rs.condition().blank())
{
TVariant var;
_report->evaluate(rs.condition(), var, _nullfld);
diff --git a/include/variant.cpp b/include/variant.cpp
index e2202e598..507c17287 100755
--- a/include/variant.cpp
+++ b/include/variant.cpp
@@ -13,8 +13,8 @@ void TVariant::set_null()
{
switch (_type)
{
- case _alfafld: delete (TString*) _ptr; break;
- case _realfld: delete (real*) _ptr; break;
+ case _alfafld: delete (TString*)_ptr; break;
+ case _realfld: delete (real*)_ptr; break;
default : break;
}
_ptr = NULL;
@@ -153,9 +153,9 @@ bool TVariant::as_string(TString& tmp) const
tmp.cut(0);
switch(_type)
{
- case _alfafld: tmp = *(TString*)_ptr; break;
+ case _alfafld: tmp = *(TString*)_ptr; break;
case _datefld: tmp = as_date().string(); break;
- case _longfld: tmp << as_int(); break;
+ case _longfld: tmp << as_int(); break;
case _realfld: tmp = as_real().string(); break;
default: break;
}
@@ -165,7 +165,9 @@ bool TVariant::as_string(TString& tmp) const
const TString& TVariant::as_string() const
{
if (_type == _alfafld)
- return *(TString*)_ptr;
+ return *(TString*)_ptr; else
+ if (_type == _nullfld)
+ return EMPTY_STRING;
TString& tmp = get_tmp_string();
as_string(tmp);
return tmp;
@@ -178,10 +180,10 @@ void TVariant::convert_to(TFieldtypes ft)
switch (ft)
{
case _alfafld: set(as_string()); break;
- case _datefld: set(as_date()); break;
- case _longfld: set(as_int()); break;
- case _realfld: set(as_real()); break;
- default : set_null(); break;
+ case _datefld: set(as_date()); break;
+ case _longfld: set(as_int()); break;
+ case _realfld: set(as_real()); break;
+ default : set_null(); break;
}
}
}
@@ -190,22 +192,28 @@ void TVariant::copy(const TVariant& var)
{
switch (var._type)
{
- case _datefld: set(var.as_date()); break;
- case _longfld: set(var.as_int()); break;
- case _realfld: set(var.as_real()); break;
+ case _datefld: set(var.as_date()); break;
+ case _longfld: set(var.as_int()); break;
+ case _realfld: set(var.as_real()); break;
case _alfafld: set(var.as_string()); break;
- default : set_null(); break;
+ default : set_null(); break;
}
}
+bool TVariant::is_kind_of(word cid) const
+{
+ return cid == CLASS_VARIANT || TSortable::is_kind_of(cid);
+}
+
int TVariant::compare(const TSortable& s) const
{
+ CHECK(s.is_kind_of(CLASS_VARIANT), "Illegal Variant comparison");
const TVariant& var = (const TVariant&)s;
int cmp = 0;
switch (_type)
{
case _datefld: cmp = as_date() - var.as_date(); break;
- case _longfld: cmp = as_int() - var.as_int(); break;
+ case _longfld: cmp = as_int() - var.as_int(); break;
case _realfld:
{
const real n = as_real() - var.as_real();
@@ -261,7 +269,7 @@ TVariant& TVariant::sub(const TVariant& var)
TVariant& TVariant_stack::peek(int depth)
{
const int sp = _sp-depth-1;
- return sp >= 0 ? (TVariant&)_var[sp] : (TVariant &)NULL_VARIANT;
+ return (sp >= 0 && sp < _var.items()) ? (TVariant&)_var[sp] : (TVariant &)NULL_VARIANT;
}
bool TVariant_stack::drop()
diff --git a/include/variant.h b/include/variant.h
index 77e37964f..e5621b53b 100755
--- a/include/variant.h
+++ b/include/variant.h
@@ -24,6 +24,8 @@ class TVariant : public TSortable
protected:
virtual TObject* dup() const { return new TVariant(*this); }
+ virtual word class_id() const { return CLASS_VARIANT; }
+ virtual bool is_kind_of(word cid) const;
void copy(const TVariant& var);
public:
@@ -80,6 +82,7 @@ class TVariant_stack : public TObject
public:
int items() const { return _sp; }
+ bool empty() const { return _sp <= 0; }
bool drop();
TVariant& pop();
TVariant& peek(int depth = 0);
diff --git a/include/varrec.h b/include/varrec.h
index 5a53c21a2..1b1ba4ebd 100755
--- a/include/varrec.h
+++ b/include/varrec.h
@@ -41,11 +41,11 @@ public:
// @cmember Duplica il campo
virtual TObject* dup() const;
// @cmember segnala che il campo deve essere ricalcolato
- virtual bool dirty() const { return TRUE;}
+ virtual bool dirty() const { return true;}
// @cmember assegna lo stato di campo da ricalcolare
- virtual void set_dirty(bool on = TRUE) {}
+ virtual void set_dirty(bool on = true) {}
// @cmember assegna lo stato di campo da non ricalcolare
- void set_clean() { set_dirty(FALSE);}
+ void set_clean() { set_dirty(false);}
// @cmember assegna il record a cui appartiene il campo
virtual void set_rec(TVariable_rectype * rec) { _rec = rec;}