#include <config.h>
#include "FormTabular.h"
-#include "ControlTabular.h"
#include "forms/form_tabular.h"
#include "xforms_helpers.h"
#include "xformsBC.h"
#include "controllers/ButtonController.h"
+#include "controllers/ControlTabular.h"
#include "controllers/helper_funcs.h"
+#include "support/convert.h"
#include "support/lstrings.h"
#include "lyx_forms.h"
#include <boost/bind.hpp>
-using lyx::support::contains;
-using lyx::support::getStringFromVector;
-using lyx::support::isStrDbl;
-
using boost::bind;
using std::string;
using std::vector;
+namespace lyx {
+
+using support::contains;
+using support::getStringFromVector;
+using support::isStrDbl;
+
+namespace frontend {
namespace {
FormTabular::FormTabular(Dialog & parent)
: base_class(parent, _("Table Settings"), scalableTabfolders),
- closing_(false), actCell_(-1)
+ closing_(false), actCell_(LyXTabular::npos)
{
}
LyXTabular const & tabular = controller().tabular();
int align;
- char buf[12];
LyXLength pwidth;
string special;
- int const cell = controller().getActiveCell();
+ LyXTabular::idx_type const cell = controller().getActiveCell();
actCell_ = cell;
- int column = tabular.column_of_cell(cell) + 1;
+ LyXTabular::col_type column = tabular.column_of_cell(cell) + 1;
clearMessage();
fl_activate_object(column_options_->input_special_alignment);
fl_activate_object(cell_options_->input_special_multialign);
fl_activate_object(column_options_->input_column_width);
fl_activate_object(column_options_->choice_value_column_width);
- sprintf(buf, "%d", column);
- fl_set_input(dialog_->input_tabular_column, buf);
+ fl_set_input(dialog_->input_tabular_column,
+ convert<string>(column).c_str());
fl_deactivate_object(dialog_->input_tabular_column);
- int row = tabular.row_of_cell(cell);
- sprintf(buf, "%d", row + 1);
- fl_set_input(dialog_->input_tabular_row, buf);
+ LyXTabular::row_type row = tabular.row_of_cell(cell);
+ fl_set_input(dialog_->input_tabular_row,
+ convert<string>(row + 1).c_str());
fl_deactivate_object(dialog_->input_tabular_row);
if (tabular.isMultiColumn(cell)) {
fl_set_button(cell_options_->check_multicolumn, 1);
LyXTabular const & tabular = controller().tabular();
- int const cell = controller().getActiveCell();
+ LyXTabular::idx_type const cell = controller().getActiveCell();
// ugly hack to auto-apply the stuff that hasn't been
// yet. don't let this continue to exist ...
return LyXTabular::LAST_ACTION;
}
+
+} // namespace frontend
+} // namespace lyx