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

Patch level : 2.1 nopatch

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :

Risolta ambiguita' tra il file MAG e la tabella MAG a favore di quest'ultima


git-svn-id: svn://10.65.10.50/trunk@12184 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2004-06-17 09:18:30 +00:00
parent 8a508c8f59
commit a1c771a534
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/printer.h
View File

@ -544,6 +544,7 @@ public:
// @cmember Setta il numero della pagina logica da stampare
void setcurrentpage(word n)
{ _currentpage = n; }
const TFilename& get_export_file() const { return _exportfile; }
// @cmember Dirige la stampa sul file specificato, preservando gli attributi di formato.
// Se <p header> = TRUE si stampano su file anche gli header
void set_export_file(const char* n, bool header = TRUE, int len = 0)

10
include/recset.cpp
View File

@ -1442,12 +1442,14 @@ TCursor_parser::TCursor_parser(istream& instr, TArray& col)
if (tok.blank())
return;
const int logicnum = table2logic(tok);
int logicnum = table2logic(tok);
if (logicnum == LF_MAG && tok == "MAG") // Faccio prevalere la tabella MAG sul file MAG
logicnum = LF_TAB;
if (logicnum != LF_TAB && logicnum != LF_TABCOM)
_relation = new TRelation(logicnum);
else
if (logicnum == LF_TAB || logicnum == LF_TABCOM)
_relation = new TRelation(tok);
else
_relation = new TRelation(logicnum);
add_column_info(tok, _relation->curr());
int key = 1; // key number

14
include/reprint.cpp
View File

@ -1366,10 +1366,18 @@ bool TBook::preview()
bool TBook::print_or_preview()
{
bool ok = true;
if (printer().printtype() == screenvis)
ok = preview();
else
switch (printer().printtype())
{
case screenvis:
ok = preview();
break;
case exportprinter:
ok = export_text(printer().get_export_file());
break;
default:
ok = print();
break;
}
return ok;
}