From 922adaa9764f049fd8d7059cead129aa31495c67 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 11 Jul 2006 19:02:07 +0000 Subject: [PATCH] Patch level : 4.0 451 Files correlati : Ricompilazione Demo : [ ] Commento : Riportata la versione 3.1 650 git-svn-id: svn://10.65.10.50/trunk@14163 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- cg/cg2100.cpp | 2 -- cg/cg6900.cpp | 5 ++--- cg/cg6900.h | 4 ++-- cg/cg6902.cpp | 5 +++-- cg/cglib02.cpp | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/cg/cg2100.cpp b/cg/cg2100.cpp index cf026825d..fa142815e 100755 --- a/cg/cg2100.cpp +++ b/cg/cg2100.cpp @@ -1813,8 +1813,6 @@ bool TPrimanota_application::link_intra(const TMask& m, const char* action) const bool bModify = xvt_str_compare_ignoring_case(action, "Modify") == 0; - const bool bModify = xvt_str_compare_ignoring_case(action, "Modify") == 0; - TFilename intrini; intrini.tempdir(); intrini.add("ActIntra.ini"); diff --git a/cg/cg6900.cpp b/cg/cg6900.cpp index a21d54387..3523e12f4 100755 --- a/cg/cg6900.cpp +++ b/cg/cg6900.cpp @@ -1051,11 +1051,10 @@ void TInv_cont::crea_record_controllo(TMask& m) _tras_file.close(); } -const char* TInv_cont::cerca_provincia(const TString& comcf) const +void TInv_cont::cerca_provincia(const TString& comcf, TString& provincia) const { TString8 k; k << " |" << comcf; - return cache().get(LF_COMUNI, k, COM_PROVCOM); - + provincia = cache().get(LF_COMUNI, k, COM_PROVCOM); } bool TInv_cont::invio_tempfile(TMask& m) diff --git a/cg/cg6900.h b/cg/cg6900.h index 2a137351e..da88782b3 100755 --- a/cg/cg6900.h +++ b/cg/cg6900.h @@ -137,8 +137,8 @@ public: void calcola_totale_record(); void scrivi_telefono(TString& app); - const TString& cerca_provincia(const TString& comcf) const; - void cerca_dencom(TString& comcf,TString& dencom); + void cerca_provincia(const TString& comcf, TString& provincia) const; + void cerca_dencom(const TString& comcf, TString& dencom) const; static bool setta_maschera_hnd(TMask_field& f, KEY k); static bool messaggio_hnd (TMask_field& f, KEY k); diff --git a/cg/cg6902.cpp b/cg/cg6902.cpp index fc4ccc43d..3eccbfcfe 100755 --- a/cg/cg6902.cpp +++ b/cg/cg6902.cpp @@ -701,8 +701,9 @@ bool TInv_cont::invio_clifo() str.format("%-.20s", (const char*) localita); record.overwrite(str,133); //Localita' - const TString4 provincia = cerca_provincia(comcf); - + TString4 provincia; + + cerca_provincia(comcf, provincia); str.format("%-2s", (const char*) provincia); record.overwrite(str,153); //Provincia diff --git a/cg/cglib02.cpp b/cg/cglib02.cpp index 5705934f8..c8c7b40f4 100755 --- a/cg/cglib02.cpp +++ b/cg/cglib02.cpp @@ -261,8 +261,8 @@ bool TSaldo::data_limite_bilancio(int bilancio, int g, int c, long s, const TDat _saldo -= importo; } -#ifdef __LONGDOUBLE__ - _saldo.round(TCurrency::get_firm_dec()); +#ifdef DBG + xvtil_statbar_refresh(); #endif return _movimentato;