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

Patch level :

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :
Corretta compattazione righe vuote degli spreadsheet:
ora non elimina le celle che valgono "0"
che potrebbero essere elementi di un listbox!


git-svn-id: svn://10.65.10.50/branches/R_10_00@22438 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
guy 2011-09-30 16:15:11 +00:00
parent c4376d1cab
commit 67cf6dcf15
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/dongle.cpp
View File

@ -1402,11 +1402,15 @@ bool Tdninst::decode(const TString& f) const
TEnigma_machine em; TEnigma_machine em;
o << em.year_assist() << endl; o << em.year_assist() << endl;
size_t nlines = 0;
TString256 l; TString256 l;
while (em.line(l)) while (em.line(l))
{
o << l << endl; o << l << endl;
nlines++;
}
return em.ok(); return nlines > 0;
} }
bool Tdninst::encode(const TString& f) const bool Tdninst::encode(const TString& f) const

1
include/dongle.h
View File

@ -115,6 +115,7 @@ protected:
bool compare_cmdline(const TString& cmdline, const TString& pattern) const; bool compare_cmdline(const TString& cmdline, const TString& pattern) const;
public: public:
virtual bool ok() const { return _year_assist >= 2091; }
int assist_year() const { return _year_assist; } int assist_year() const { return _year_assist; }
int solar_year() const { return assistance_year2solar(_year_assist); } int solar_year() const { return assistance_year2solar(_year_assist); }
int test_cmdline(const TString& cmdline, bool key_must_exist, TString& msg) const; int test_cmdline(const TString& cmdline, bool key_must_exist, TString& msg) const;

4
include/msksheet.cpp
View File

@ -1592,9 +1592,7 @@ bool TSpreadsheet::event_handler(XI_OBJ* itf, XI_EVENT *xiev)
const TList_field& lst = (const TList_field&)(*_edit_field); const TList_field& lst = (const TList_field&)(*_edit_field);
const int sel = xvtil_drop_down_list(&cell, lst.get_codes(), lst.get_values()); const int sel = xvtil_drop_down_list(&cell, lst.get_codes(), lst.get_values());
if (sel >= 0) if (sel >= 0)
{ copy_cell2field(&cell);
const char* val = copy_cell2field();
}
} }
else // edit_field else // edit_field
{ {

2
include/strings.cpp
View File

@ -1957,7 +1957,7 @@ TToken_string& TToken_string::pack()
trim(); trim();
for (int src = 0; _str[src]; src++) for (int src = 0; _str[src]; src++)
{ {
if ((_str[src] == ' ' || _str[src] == '0') && if ((_str[src] == ' ') &&
(_str[src+1] == sep || _str[src+1] == '\0') && (_str[src+1] == sep || _str[src+1] == '\0') &&
(src == 0 || _str[src-1] == sep)) (src == 0 || _str[src-1] == sep))
{ {