r24975 by craig - #16762: Further fix, slightly differently applied

[scribus-commit]

Author: craig
Date: Wed Mar  2 19:35:01 2022
New Revision: 24975

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24975
Log:
#16762: Further fix, slightly differently applied

Modified:
    trunk/Scribus/scribus/pdfwriter.cpp
    trunk/Scribus/scribus/pdfwriter.h
    trunk/Scribus/scribus/scxmlstreamwriter.h

Modified: trunk/Scribus/scribus/pdfwriter.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24975&path=/trunk/Scribus/scribus/pdfwriter.cpp
==============================================================================
--- trunk/Scribus/scribus/pdfwriter.cpp	(original)
+++ trunk/Scribus/scribus/pdfwriter.cpp	Wed Mar  2 19:35:01 2022
@@ -329,7 +329,7 @@
 		return QByteArray::number(v);
 	}
 
-#if !defined(Q_OS_WIN) && !defined(Q_PROCESSOR_X86_32)
+#if !defined(Q_OS_WIN) && (Q_PROCESSOR_WORDSIZE != 4)
 	QByteArray toPdf(size_t v)
 	{
 		return QByteArray::number(v);

Modified: trunk/Scribus/scribus/pdfwriter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24975&path=/trunk/Scribus/scribus/pdfwriter.h
==============================================================================
--- trunk/Scribus/scribus/pdfwriter.h	(original)
+++ trunk/Scribus/scribus/pdfwriter.h	Wed Mar  2 19:35:01 2022
@@ -83,7 +83,7 @@
 	/**
 	 Cf. PDF32000-2008, 7.3.3
 	 */
-#if !defined(Q_OS_WIN) && !defined(Q_PROCESSOR_X86_32)
+#if !defined(Q_OS_WIN) && (Q_PROCESSOR_WORDSIZE != 4)
 	QByteArray toPdf(size_t v);
 #endif
 	

Modified: trunk/Scribus/scribus/scxmlstreamwriter.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24975&path=/trunk/Scribus/scribus/scxmlstreamwriter.h
==============================================================================
--- trunk/Scribus/scribus/scxmlstreamwriter.h	(original)
+++ trunk/Scribus/scribus/scxmlstreamwriter.h	Wed Mar  2 19:35:01 2022
@@ -26,7 +26,7 @@
 	void writeAttribute(const QString & name, qint64 value)    { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
 	void writeAttribute(const QString & name, uint value)   { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
 	void writeAttribute(const QString & name, quint64 value)   { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && (Q_PROCESSOR_WORDSIZE != 4)
 	void writeAttribute(const QString & name, size_t value)   { QXmlStreamWriter::writeAttribute(name, QString::number(value)); }
 #endif
 	void writeAttribute(const QString & name, double value) { QXmlStreamWriter::writeAttribute(name, QString::number(value, 'g', 15)); }