r21395 by jghali -

[scribus-commit]

Author: jghali
Date: Tue Jun 28 19:59:55 2016
New Revision: 21395

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21395
Log:
#14188: white spaces in spot color name after PDF export are written as #2320 instead of #20

Modified:
    trunk/Scribus/scribus/pdflib_core.cpp

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21395&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Tue Jun 28 19:59:55 2016
@@ -2493,12 +2493,13 @@
 		ColorList::Iterator itf;
 		for (itf = colorsToUse.begin(); itf != colorsToUse.end(); ++itf)
 		{
-			if ((colorsToUse[itf.key()].isSpotColor()) || (colorsToUse[itf.key()].isRegistrationColor()))
+			const ScColor& colorToUse = itf.value();
+			if ((colorToUse.isSpotColor()) || (colorToUse.isRegistrationColor()))
 			{
 				CMYKColor cmykValues;
 				int cc, cm, cy, ck;
 				PdfSpotC spotD;
-				ScColorEngine::getCMYKValues(colorsToUse[itf.key()], &doc, cmykValues);
+				ScColorEngine::getCMYKValues(colorToUse, &doc, cmykValues);
 				cmykValues.getValues(cc, cm, cy, ck);
 				QByteArray colorDesc = "{\ndup "+FToStr(static_cast<double>(cc) / 255)+"\nmul exch dup ";
 				colorDesc += FToStr(static_cast<double>(cm) / 255)+"\nmul exch dup ";
@@ -2518,7 +2519,7 @@
 				if (colorsToUse[itf.key()].isRegistrationColor())
 					PutDoc("/All");
 				else
-					PutDoc(Pdf::toName(itf.key().simplified().replace("#", "#23").replace( QRegExp("[\\s\\/\\{\\[\\]\\}\\<\\>\\(\\)\\%]"), "#20" )));
+					PutDoc(Pdf::toName(itf.key().simplified()));
 				PutDoc(" /DeviceCMYK "+Pdf::toObjRef(separationFunction)+" ]");
 				writer.endObj(separationColorspace);
 				spotD.ResName = spotNam+Pdf::toPdf(spotCount);