r17351 by jghali - #10614: combo boxes display random characters prior to selecting an option

[scribus-commit]

Author: jghali
Date: Fri Mar  2 22:11:35 2012
New Revision: 17351

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17351
Log:
#10614: combo boxes display random characters prior to selecting an option

Modified:
    branches/Version14x/Scribus/scribus/pdflib_core.cpp

Modified: branches/Version14x/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17351&path=/branches/Version14x/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/pdflib_core.cpp (original)
+++ branches/Version14x/Scribus/scribus/pdflib_core.cpp Fri Mar  2 22:11:35 2012
@@ -355,7 +355,7 @@
 	QString tmp = in;
 	QByteArray cres = ucs2Codec->fromUnicode( tmp );
 #ifndef WORDS_BIGENDIAN
-	// on little endian systems we ned to swap bytes:
+	// on little endian systems we need to swap bytes:
 	uchar sw;
 	for(int d = 0; d < cres.size()-1; d += 2)
 	{
@@ -5799,15 +5799,12 @@
 					break;
 				case 5:
 				case 6:
-					PutDoc("/FT /Ch\n/V (");
-					if (bmst.count() > 0)
-						PutDoc(bmst[0]);
-					PutDoc(")\n/DV ");
-					cnx = "(";
-					if (bmstUtf16.count() > 0)
-						cnx += bmstUtf16[0];
-					cnx += ")";
-					PutDoc(EncStringUTF16(cnx,annotationObj)+"\n");
+					cnx = "(%1)";
+					cnx = cnx.arg((bmstUtf16.count() > 0) ? bmstUtf16[0] : "");
+					cnx = EncStringUTF16(cnx, annotationObj);
+					PutDoc("/FT /Ch\n");
+					PutDoc("/V " + cnx + "\n");
+					PutDoc("/DV " + cnx + "\n");
 					PutDoc("/Opt [ ");
 					for (int bmc = 0; bmc < bmstUtf16.count(); ++bmc)
 						PutDoc(EncStringUTF16("("+bmstUtf16[bmc]+")",annotationObj)+"\n");