r19352 by craig - #12405: Enable item decoration even for PDF items

[scribus-commit]

Author: craig
Date: Wed Jul 16 23:04:09 2014
New Revision: 19352

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19352
Log:
#12405: Enable item decoration even for PDF items

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19352&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp (original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp Wed Jul 16 23:04:09 2014
@@ -3958,8 +3958,8 @@
 
 void PageItem_TextFrame::DrawObj_Decoration(ScPainter *p)
 {
-	if (isAnnotation() && ((annotation().Type() > 1) && (annotation().Type() < 7)) && (annotation().Bwid() > 0))
-		return;
+	//#12405 if (isAnnotation() && ((annotation().Type() > 1) && (annotation().Type() < 7)) && (annotation().Bwid() > 0))
+	//	return;
 	p->save();
 	p->setAntialiasing(false);
 	if (!isEmbedded)
@@ -3997,7 +3997,10 @@
 		}
 		if ((m_Doc->guidesPrefs().colBordersShown) && (!m_Doc->drawAsPreview))
 			drawColumnBorders(p);
-		if ((m_Doc->guidesPrefs().layerMarkersShown) && (m_Doc->layerCount() > 1) && (!m_Doc->layerOutline(LayerID)) && (!m_Doc->drawAsPreview))
+		if ((m_Doc->guidesPrefs().layerMarkersShown) &&
+			(m_Doc->layerCount() > 1) &&
+			(!m_Doc->layerOutline(LayerID)) &&
+			(!m_Doc->drawAsPreview))
 		{
 			p->setPen(Qt::black, 0, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin);
 			p->setPenOpacity(1.0);