r18243 by jghali -

[scribus-commit]

Author: jghali
Date: Sat Apr 13 17:01:42 2013
New Revision: 18243

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18243
Log: (empty)

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18243&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Sat Apr 13 17:01:42 2013
@@ -4059,8 +4059,12 @@
 	}
 	int oldPos = itemText.cursorPosition(); // 15-mar-2004 jjsa for cursor movement with Shift + Arrow key
 	int kk = k->key();
-	int as = k->text()[0].unicode();
 	QString uc = k->text();
+#ifdef Q_OS_HAIKU
+	if (kk == Qt::Key_Return)
+		uc = "\r";
+#endif
+	int as = uc[0].unicode();
 	QString cr, Tcha, Twort;
 	uint Tcoun;
 	int len, pos;
@@ -4076,7 +4080,7 @@
 	//<< ISO 14755
 	//Check if we are trying to enter Unicode sequence mode first
 	QKeySequence currKeySeq = QKeySequence(k->key() | keyModifiers);
-	if(currKeySeq.matches(doc()->scMW()->scrActions["specialUnicodeSequenceBegin"]->shortcut())==QKeySequence::ExactMatch)
+	if (currKeySeq.matches(doc()->scMW()->scrActions["specialUnicodeSequenceBegin"]->shortcut())==QKeySequence::ExactMatch)
 	{
 		unicodeTextEditMode = true;
 		unicodeInputCount = 0;