From 699680ac4a1b93e12d4936b38ee8d97da6639f42 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Sat, 10 Dec 2016 13:08:39 +0100
Subject: [PATCH] Changed: Use addSlashR to replace \n by \r\n

--HG--
branch : develop
---
 .../leveldesign/georges_dll/base_dialog.cpp      | 16 ++--------------
 .../tools/leveldesign/georges_dll/base_dialog.h  |  2 +-
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/code/ryzom/tools/leveldesign/georges_dll/base_dialog.cpp b/code/ryzom/tools/leveldesign/georges_dll/base_dialog.cpp
index a2cf3c559..de8ccdf68 100644
--- a/code/ryzom/tools/leveldesign/georges_dll/base_dialog.cpp
+++ b/code/ryzom/tools/leveldesign/georges_dll/base_dialog.cpp
@@ -230,21 +230,9 @@ BOOL CBaseDialog::PreTranslateMessage(MSG* pMsg)
 	return CDialog::PreTranslateMessage(pMsg);
 }
 
-void CBaseDialog::setEditTextMultiLine (CEdit &edit, const char *text)
+void CBaseDialog::setEditTextMultiLine (CEdit &edit, const std::string &text)
 {
-	string temp;
-	uint size = strlen (text);
-	temp.reserve (2*size);
-	bool previousR=false;
-	for (uint c=0; c<size; c++)
-	{
-		if ((text[c] == '\n') && (!previousR))
-			temp += "\r\n";
-		else
-			temp += text[c];
-		previousR = (text[c] == '\r');
-	}
-	edit.SetWindowText (temp.c_str ());
+	edit.SetWindowText (utf8ToTStr(addSlashR(text)));
 }	
 
 void CBaseDialog::onOpenSelected() 
diff --git a/code/ryzom/tools/leveldesign/georges_dll/base_dialog.h b/code/ryzom/tools/leveldesign/georges_dll/base_dialog.h
index 5f96d8229..6358697b7 100644
--- a/code/ryzom/tools/leveldesign/georges_dll/base_dialog.h
+++ b/code/ryzom/tools/leveldesign/georges_dll/base_dialog.h
@@ -126,7 +126,7 @@ public:
 	void	registerLastControl ();
 	void	unRegisterLastControl ();
 
-	static void setEditTextMultiLine (CEdit &edit, const char *text);
+	static void setEditTextMultiLine(CEdit &edit, const std::string &text);
 
 	virtual void onOpenSelected ();
 	virtual void setFocusLastWidget ();