diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp index 6d233dab9..f34fdb430 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.cpp @@ -243,7 +243,7 @@ void CEditorWorksheet::worksheetEditorChanged(QTableWidgetItem * item) { if(temp_content != item->text()) { - current_stack->push(new CUndoWorksheetCommand(table_editor, item, temp_content)); + //current_stack->push(new CUndoWorksheetCommand(table_editor, item, temp_content)); } if(!isWindowModified()) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.h index f25a786ec..2c8539922 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/editor_worksheet.h @@ -80,11 +80,11 @@ public: void redo() { - m_item->setText(m_ccontent); + //m_item->setText(m_ccontent); } void undo() { - m_item->setText(m_ocontent); + //m_item->setText(m_ocontent); } diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.cpp index f2369fc1c..b9411c74e 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/extract_new_sheet_names.cpp @@ -34,7 +34,6 @@ namespace Plugin { bool CSheetWordListBuilder::buildWordList(std::vector &allWords, string workSheetFileName) { SheetExt= toLower(SheetExt); - nlinfo("aaaa"); // verify the directory is correct if(!CFile::isDirectory(SheetPath)) { diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.cpp index 466b57a38..20d7e57c1 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/translation_manager/translation_manager_main_window.cpp @@ -483,7 +483,7 @@ CEditor *CMainWindow::getEditorByWindowFilePath(const QString &fileName) return NULL; } -CEditorWorksheet *CMainWindow::getEditorByWorksheetType(const QString &type = NULL) +CEditorWorksheet *CMainWindow::getEditorByWorksheetType(const QString &type) { Q_FOREACH(QMdiSubWindow *subWindow, _ui.mdiArea->subWindowList()) { @@ -491,16 +491,17 @@ CEditorWorksheet *CMainWindow::getEditorByWorksheetType(const QString &type = NU if(QString(currentEditor->widget()->metaObject()->className()) == "QTableWidget") { CEditorWorksheet *editor = qobject_cast(currentEditor); - if(!type.isNull()) + if(type != NULL) { if(editor->isSheetTable(type)) { return editor; } - else + } else { if(editor->isBotNamesTable()) { return editor; } + } } } return NULL;