From 8ad55aae3640a9d30ef509c23e858fe73f345025 Mon Sep 17 00:00:00 2001
From: cemycc <cemycc@gmail.com>
Date: Wed, 13 Jul 2011 10:39:39 +0300
Subject: [PATCH] Changed: #1307 Fixing a bug with the extraction options

--HG--
branch : gsoc2011-translationovqt
---
 .../src/plugins/translation_manager/editor_worksheet.cpp   | 2 +-
 .../src/plugins/translation_manager/editor_worksheet.h     | 4 ++--
 .../translation_manager/extract_new_sheet_names.cpp        | 1 -
 .../translation_manager_main_window.cpp                    | 7 ++++---
 4 files changed, 7 insertions(+), 7 deletions(-)

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<string> &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<CEditorWorksheet *>(currentEditor);
-			if(!type.isNull())
+			if(type != NULL) {
 				if(editor->isSheetTable(type))
 				{
 					return editor;
 				}
-			else
+			} else {
 				if(editor->isBotNamesTable())
 				{
 					return editor;
 				}
+			}
 		}
     }
     return NULL;