From 2aed67fa1d876e56604666f50bab67ec5a3bc5fe Mon Sep 17 00:00:00 2001
From: guy <guy@c028cbd2-c16b-5b4b-a496-9718f37d4682>
Date: Thu, 4 Dec 2008 10:20:51 +0000
Subject: [PATCH] Patch level         : 10.0 Files correlati     : ve0, lv3
 Ricompilazione Demo : [ ] Commento            : Corretti metodi row2mask e
 mask2row utilizzando la corretta maschera di riga

git-svn-id: svn://10.65.10.50/trunk@17802 c028cbd2-c16b-5b4b-a496-9718f37d4682
---
 include/msksheet.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/msksheet.cpp b/include/msksheet.cpp
index 13b577da0..e2aa1b119 100755
--- a/include/msksheet.cpp
+++ b/include/msksheet.cpp
@@ -3008,7 +3008,7 @@ void TSheet_field::on_idle()
 // Ricopia i campi della maschera nel record dato 
 void TSheet_field::mask2row(int n, TToken_string & rec)
 {
-  const TMask& m = sheet_mask();
+  const TMask& m = sheet_row_mask(n);
 
   rec.cut(0);
   const TSpreadsheet& s = (const TSpreadsheet&)*_ctl;
@@ -3062,10 +3062,9 @@ void TSheet_field::row2mask(int n, TToken_string& r, int mode)
 {
   TString val(80);   
   
-  TMask& m = sheet_mask();
+  TMask& m = sheet_row_mask(n);
   const int campi = m.fields();
   const TSpreadsheet& s = (const TSpreadsheet&)*_ctl;
-  int i;  // Contatore di tutti i cicli successivi
   
   for (short id = FIRST_FIELD; id <= _last_column_id; id++)
   {                                 
@@ -3084,7 +3083,7 @@ void TSheet_field::row2mask(int n, TToken_string& r, int mode)
 
   if (mode > 0)
   {
-    for (i = 0; i < campi; i++)
+    for (int i = 0; i < campi; i++)
     {
       TMask_field& f = m.fld(i);
       const short id = f.dlg();
@@ -3102,14 +3101,14 @@ void TSheet_field::row2mask(int n, TToken_string& r, int mode)
     }
   }  
   
-  for (i = 0; i < campi; i++)
+  for (int i = 0; i < campi; i++)
   {
     TMask_field& f = m.fld(i);
     if (f.dirty() == TRUE)
       f.set_dirty(FALSE);
   }
   
-  val.format("Riga %d", n+1);
+  val = TR("Riga"); val << ' ' << (n+1);
   m.set_caption(val);
 }