* src/frontends/qt4/ui/QTabularUi.ui:

[lyx.git] / src / frontends / qt4 / QTabular.C

diff --git a/src/frontends/qt4/QTabular.C b/src/frontends/qt4/QTabular.C
index a07ccb5195c5bf7680216107abfbb54f79e83ed4..0a18307aa56b7443478a7c9c7c9205c334074f15 100644 (file)
--- a/src/frontends/qt4/QTabular.C
+++ b/src/frontends/qt4/QTabular.C
@@ -36,10 +36,10 @@ using std::string;
 namespace lyx {
 namespace frontend {
 
-typedef QController<ControlTabular, QView<QTabularDialog> > base_class;
+typedef QController<ControlTabular, QView<QTabularDialog> > tabular_base_class;
 
 QTabular::QTabular(Dialog & parent)
-       : base_class(parent, lyx::to_utf8(_("Table Settings")))
+       : tabular_base_class(parent, _("Table Settings"))
 {
 }
 
@@ -173,7 +173,7 @@ void QTabular::update_contents()
        update_borders();
 
        LyXLength pwidth;
-       string special;
+       docstring special;
 
        if (multicol) {
                special = tabular.getAlignSpecial(cell, LyXTabular::SET_SPECIAL_MULTI);
@@ -261,7 +261,7 @@ void QTabular::update_contents()
        dialog_->hAlignCB->addItem(qt_("Center"));
        dialog_->hAlignCB->addItem(qt_("Right"));
        if (!multicol && !pwidth.zero())
-               dialog_->hAlignCB->addItem(qt_("Block"));
+               dialog_->hAlignCB->addItem(qt_("Justified"));
 
        int align = 0;
        switch (tabular.getAlignment(cell)) {
@@ -424,8 +424,8 @@ void QTabular::closeGUI()
                        width2 = llen.asString();
 
        // apply the special alignment
-       string const sa1 = fromqstr(dialog_->specialAlignmentED->text());
-       string sa2;
+       docstring const sa1 = qstring_to_ucs4(dialog_->specialAlignmentED->text());
+       docstring sa2;
 
        if (multicol)
                sa2 = tabular.getAlignSpecial(cell, LyXTabular::SET_SPECIAL_MULTI);
@@ -434,9 +434,9 @@ void QTabular::closeGUI()
 
        if (sa1 != sa2) {
                if (multicol)
-                       controller().set(LyXTabular::SET_SPECIAL_MULTI, sa1);
+                       controller().set(LyXTabular::SET_SPECIAL_MULTI, to_utf8(sa1));
                else
-                       controller().set(LyXTabular::SET_SPECIAL_COLUMN, sa1);
+                       controller().set(LyXTabular::SET_SPECIAL_COLUMN, to_utf8(sa1));
        }
 
        if (width != width2) {