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

Corretti conflitti e TMP stringa globale

Browse Source 
git-svn-id: svn://10.65.10.50/trunk@930 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 1995-01-27 18:04:22 +00:00
parent 1a1ba5b76a
commit 70fffe7256
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cg/cg4400.cpp
View File

@ -5,8 +5,6 @@
#include "cg4400a.h" #include "cg4400a.h"
#include "cg4400b.h" #include "cg4400b.h"
static TString256 TMP;
inline CG4400_application& app() { return (CG4400_application&)main_app(); } inline CG4400_application& app() { return (CG4400_application&)main_app(); }
bool CG4400_application::filter_func (const TRelation * r) bool CG4400_application::filter_func (const TRelation * r)

6
cg/cg4400.h
View File

@ -13,11 +13,9 @@
#include <sheet.h> #include <sheet.h>
#include <config.h> #include <config.h>
#include <prefix.h> #include <prefix.h>
<<<<<<< cg4400.h
#include "conto.h"
=======
#include "conto.h" // CI VOGLIONO LE VIRGOLETTE! CAPITELA! #include "conto.h" // CI VOGLIONO LE VIRGOLETTE! CAPITELA!
>>>>>>> 1.25
#include <nditte.h> #include <nditte.h>
#include <anagr.h> #include <anagr.h>
#include <comuni.h> #include <comuni.h>

2
cg/cg5300.cpp
View File

@ -308,7 +308,7 @@ int CG5300_App::read(TMask& m)
// legge da LIA (si istanziano i campi credito prec. e Freq. Vers // legge da LIA (si istanziano i campi credito prec. e Freq. Vers
// prende le attivita' una per una da _atts e // prende le attivita' una per una da _atts e
// crea le righe sheet // crea le righe sheet
m.autoload(); m.autoload(get_relation());
TSheet_field& sf = (TSheet_field&)m.field(F_SHEET_PLA); TSheet_field& sf = (TSheet_field&)m.field(F_SHEET_PLA);
TToken_string tt(60); TToken_string tt(60);
const TString16 year(m.get(F_YEAR)); const TString16 year(m.get(F_YEAR));