diff --git a/include/reprint.cpp b/include/reprint.cpp index d41e73b46..185556ec1 100755 --- a/include/reprint.cpp +++ b/include/reprint.cpp @@ -1406,9 +1406,9 @@ bool TBook::print_page(TWindow& win, size_t page) xvt_dwin_draw_roundrect(w, &rct, rad, rad); continue; } - if (str.starts_with("")) { - TString stringona(512); // Testo completo di un campo + paragrafo.destroy(); while (!ifs.eof()) { ifs.getline(buffer, str.size()); @@ -1424,8 +1424,14 @@ bool TBook::print_page(TWindow& win, size_t page) } if (str.starts_with("", - &_horizontal_alignment, &_vertical_alignment); +#if _MSC_VER >= 1400 + sscanf_s(str, "", + &_horizontal_alignment, sizeof(_horizontal_alignment), + &_vertical_alignment, sizeof(_vertical_alignment)); +#else + sscanf(str, "", + &_horizontal_alignment, &_vertical_alignment); +#endif continue; } if (str.starts_with("", - &_horizontal_alignment, &_vertical_alignment); - continue; +#if _MSC_VER >= 1400 + sscanf_s(str, "", + &_horizontal_alignment, sizeof(_horizontal_alignment), + &_vertical_alignment, sizeof(_vertical_alignment)); +#else + sscanf(str, "", + &_horizontal_alignment, &_vertical_alignment); +#endif } } @@ -1725,7 +1736,7 @@ void TBook::join_file(int pps) if (str.starts_with(" 0) { long x, y, dx, dy; - sscanf(str, "", &x, &y, &dx, &dy); + SAFE_SCAN(str, "", &x, &y, &dx, &dy); str.format("", x, y+off_page, dx, dy); } else if (str.starts_with("