From aab0967bb981583c227e7ef53a3c45f0d65c0692 Mon Sep 17 00:00:00 2001 From: jghali Date: Fri, 2 Mar 2012 22:11:35 +0000 Subject: #10614: combo boxes display random characters prior to selecting an option git-svn-id: svn://scribus.net/branches/Version14x/Scribus@17351 11d20701-8431-0410-a711-e3c959e3b870 --- scribus/pdflib_core.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'scribus/pdflib_core.cpp') diff --git a/scribus/pdflib_core.cpp b/scribus/pdflib_core.cpp index aa1e17f..cd4bf31 100644 --- a/scribus/pdflib_core.cpp +++ b/scribus/pdflib_core.cpp @@ -355,7 +355,7 @@ QByteArray PDFLibCore::EncodeUTF16(const QString &in) 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 @@ bool PDFLibCore::PDF_Annotation(PageItem *ite, uint) 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"); -- cgit