From 2af8dc64a0f40c53574fc98ec861ba6598254c17 Mon Sep 17 00:00:00 2001 From: alex Date: Wed, 12 Apr 1995 15:41:50 +0000 Subject: [PATCH] Spezzate descrizioni git-svn-id: svn://10.65.10.50/trunk@1238 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg1100.cpp | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/cg/cg1100.cpp b/cg/cg1100.cpp index f77117239..c76277414 100755 --- a/cg/cg1100.cpp +++ b/cg/cg1100.cpp @@ -54,7 +54,7 @@ class CG1100_application : public TPrintapp TSort* _sort; TRelation* _rel; TMask* _msk; - TParagraph_string * _descr; + TParagraph_string _d1, _d2; // qui const char* _buf; stampe _tipo_stampa; bool _salto_pag,_resetta_righe_stampa; @@ -96,7 +96,7 @@ public: void set_senza_ana (); void init_sort(); const char* descrizione_numero(char, char, int, int); - void setta_righe_descr(TParagraph_string*); + // void setta_righe_descr(TParagraph_string*); int leggo_sottoc(int,int,long); void riempi_record(char,char,const TString&,int,int,int,long,const TString&,char,char,const TString&,int); void set_bil_key(bil_ivd* b, char sezione, char lettera, @@ -107,7 +107,7 @@ public: void process_link(int id, const char* txt); - CG1100_application() : _clivd(8), _clivdo(8) {} + CG1100_application() : _clivd(8), _clivdo(8), _d1("", 30), _d2("", 40) {} }; void CG1100_application::process_link(int id, const char* txt) @@ -570,8 +570,9 @@ void CG1100_application::set_con_IV() if (_num_da_stamp != 0) set_row(_i,"@11g%2d", _num_da_stamp); - *_descr = (const char*) descrizione; - setta_righe_descr(_descr); + _d2 = (const char*) descrizione; + set_row(_i,"@14g#a", &_d2); + // setta_righe_descr(_descr); } } } @@ -598,17 +599,17 @@ void CG1100_application::set_con_IV() _i++; } -void CG1100_application::setta_righe_descr(TParagraph_string* str) -{ +/*void CG1100_application::setta_righe_descr(TParagraph_string* str) + { const char* r; while ((r = str->get()) != NULL) { - set_row (_i,"@14g%s",r); - _i++; + set_row (_i,"@14g%s",r); + _i++; } _i--; -} + } */ void CG1100_application::set_senza_IV() { @@ -695,17 +696,17 @@ void CG1100_application::set_con_ana() set_row (1, "@15g%-40s", "") ; /* TBI */ set_row (1, "@60g$[r]%3d$[n] $[r]%3d$[n] $[r]%6ld$[n]", g, c, s); - TParagraph_string s1(_rec->get (PCN_DESCR), 30); + _d1 = _rec->get (PCN_DESCR); - set_row (1, "@78g%-30s", s1.get()); + set_row (1, "@78g#a", &_d1); - const char * s2 = s1.get(); + /* const char * s2 = s1.get(); - if (s2) - { - reset_row(2); - set_row (2, "@78g%-30s", s2); - } + if (s2) + { + reset_row(2); + set_row (2, "@78g%-30s", s2); + }*/ } void CG1100_application::set_senza_ana() @@ -768,7 +769,7 @@ void CG1100_application::set_completa() // set_row (1, "@16g@50s", FLD(LF_PCON,PCN_DESCR) ); - set_row (i, "@16g%.40s", (const char*) desc); + set_row (i, "@16g%.40s", (const char*) desc); // ??? if (sezione != '0' && sezione != '9') set_row (i, "@58g@1s", FLD(LF_PCON, PCN_SEZIVD) ); @@ -1160,7 +1161,7 @@ bool CG1100_application::user_create() _cur_c2 = add_cursor (NULL); add_file(LF_PCON); - _descr = new TParagraph_string ("",40); + // _descr = new TParagraph_string ("",40); _tipo_stampa = completa; @@ -1176,7 +1177,7 @@ bool CG1100_application::user_destroy() delete _tab; delete _msk; delete _rec; - delete _descr; + // delete _descr; delete _bil; delete _sort; return TRUE;