r19945 by jghali - remove unnecessary code: we already know POPPLER_VERSION is defined

scribus-commit scribus-commit at lists.scribus.net
Sun Mar 22 19:58:20 UTC 2015


Author: jghali
Date: Sun Mar 22 19:58:20 2015
New Revision: 19945

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19945
Log:
remove unnecessary code: we already know POPPLER_VERSION is defined

Modified:
    trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp

Modified: trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19945&path=/trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/importpdf.cpp Sun Mar 22 19:58:20 2015
@@ -578,8 +578,6 @@
 									currentLayer = m_Doc->addLayer(UnicodeParsedString(oc->getName()), false);
 								else
 									currentLayer = m_Doc->layerIDFromName(UnicodeParsedString(oc->getName()));
-// POPPLER_VERSION appeared in 0.19.0 first
-#ifdef POPPLER_VERSION
 								if ((oc->getViewState() == OptionalContentGroup::ocUsageOn) || (oc->getViewState() == OptionalContentGroup::ocUsageUnset))
 									m_Doc->setLayerVisible(currentLayer, true);
 								else
@@ -588,18 +586,6 @@
 									m_Doc->setLayerPrintable(currentLayer, true);
 								else
 									m_Doc->setLayerPrintable(currentLayer, false);
-#else
-								if (oc->getState() == OptionalContentGroup::On)
-								{
-									m_Doc->setLayerVisible(currentLayer, true);
-									m_Doc->setLayerPrintable(currentLayer, true);
-								}
-								else
-								{
-									m_Doc->setLayerVisible(currentLayer, false);
-									m_Doc->setLayerPrintable(currentLayer, false);
-								}
-#endif
 								oc->setState(OptionalContentGroup::Off);
 							}
 							dev->layersSetByOCG = true;




More information about the scribus-commit mailing list