Patch level : 10.0 225

Files correlati     : ve0.exe
Ricompilazione Demo : [ ]
Commento            :

Rportata la versione 3.2 patch 1314


git-svn-id: svn://10.65.10.50/trunk@18265 c028cbd2-c16b-5b4b-a496-9718f37d4682

include/formed.cpp

@@ -187,7 +187,7 @@ HIDDEN bool font_handler(TMask_field& f, KEY key)
     const char* family = f.get();
     const int MAXSIZES = 16;
     long sizes[MAXSIZES];
-    BOOLEAN scalable;
+    BOOLEAN scalable = FALSE;
     const int num_sizes = (int)xvt_fmap_get_family_sizes(printer().get_printrcd(),
                                                          (char*)family, sizes, &scalable, MAXSIZES);
 

include/lffiles.h

@@ -34,6 +34,7 @@
 #define LF_EFFETTI              31
 #define LF_CESS                 32
 #define LF_DOC                  33
+#define SF_DOC                  "DOC"
 #define LF_RIGHEDOC             34
 #define LF_SCONTI               35
 

include/recset.h

@@ -115,7 +115,8 @@ public:
   virtual const TRecordset_column_info& column_info(unsigned int c) const;
   virtual const TVariant& get(unsigned int column) const;
   virtual const TVariant& get(const char* column_name) const;
-  virtual const TString& driver_version() const;
+  virtual const TVariant& get(int logic, const char* field) const { return get_field(logic, field);}
+  virtual const. TString& driver_version() const;
   virtual const TString& query_text() const { return _use; }
 
   TISAM_recordset(const char* use);

include/report.cpp

@@ -1237,6 +1237,12 @@ void TReport_field::set(const char* str)
   _var.convert_to(var_type());
 }
 
+void TReport_field::set(const TString& str)
+{
+  _var = str;
+  _var.convert_to(var_type());
+}
+
 void TReport_field::set(const TVariant& var)
 {
   _var = var;

include/report.h

@@ -321,6 +321,7 @@ public:
 
   const TVariant& get() const { return _var; }
   void set(const char* str);
+	void set(const TString& str);
   void set(const TVariant& var);
 
   bool load_field();

include/variant.cpp

@@ -351,6 +351,12 @@ void TVariant_stack::push(const char* str)
   push(var);
 }
 
+void TVariant_stack::push(const TString& str)
+{
+  const TVariant var(str);
+  push(var);
+}
+
 void TVariant_stack::reset()
 {
   _sp = 0;

include/variant.h

@@ -45,6 +45,7 @@ public:
 
   TVariant& operator=(const TVariant& var) { copy(var); return *this; }
   TVariant& operator=(const char* str) { set(str); return *this; }
+	TVariant& operator=(const TString& str) { set(str); return *this; }
   TVariant& operator=(const real& r) { set(r); return *this; }
   TVariant& operator=(const long n) { set(n); return *this; }
   TVariant& operator=(const TDate& d) { set(d); return *this; }
@@ -68,6 +69,7 @@ public:
 
   TVariant() : _type(_nullfld), _ptr(NULL) { }
   TVariant(const char* str) : _type(_alfafld), _ptr(new TString(str)) { }
+	TVariant(const TString& str) : _type(_alfafld), _ptr(new TString(str)) { }
   TVariant(const real& num) : _type(_realfld), _ptr(new real(num)) { };
   TVariant(const TDate& d) : _type(_datefld), _ptr((void*)d.date2ansi()) { };
   TVariant(long num) : _type(_longfld), _ptr((void*)num) { };
@@ -95,6 +97,7 @@ public:
   void push(long n);
   void push(const real& n);
   void push(const char* str);
+	void push(const TString& str);
   void reset();
   bool overflow() const;