r24772 by jghali - #16685: Layers not preserved in exported PDF/X-4 files

[scribus-commit]

Author: jghali
Date: Tue Nov 23 22:47:56 2021
New Revision: 24772

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24772
Log:
#16685: Layers not preserved in exported PDF/X-4 files

Modified:
    trunk/Scribus/scribus/pdflib_core.cpp

Modified: trunk/Scribus/scribus/pdflib_core.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24772&path=/trunk/Scribus/scribus/pdflib_core.cpp
==============================================================================
--- trunk/Scribus/scribus/pdflib_core.cpp	(original)
+++ trunk/Scribus/scribus/pdflib_core.cpp	Tue Nov 23 22:47:56 2021
@@ -994,7 +994,7 @@
 		PutDoc("/PageMode /FullScreen\n");
 	else if (Options.displayThumbs)
 		PutDoc("/PageMode /UseThumbs\n");
-	else if ((Options.Version == PDFVersion::PDF_15 || Options.Version == PDFVersion::PDF_16) && (Options.displayLayers))
+	else if (Options.Version.supportsOCGs() && Options.displayLayers)
 		PutDoc("/PageMode /UseOC\n");
 	if (!Options.openAction.isEmpty())
 	{
@@ -11203,8 +11203,7 @@
 	}
 	for (int layc = 0; layc < lay.count(); ++layc)
 	{
-		if (Options.Version != PDFVersion::PDF_X4)
-			PutDoc(lay[layc]);
+		PutDoc(lay[layc]);
 	}
 	PutDoc("]\n");
 	if (Options.Version == PDFVersion::PDF_X4)