r22135 by jghali -

[scribus-commit]

Author: jghali
Date: Tue Aug 15 04:05:15 2017
New Revision: 22135

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22135
Log:
#14945: PDF field frames are not highlighted any more

Modified:
    trunk/Scribus/scribus/pageitem_textframe.cpp

Modified: trunk/Scribus/scribus/pageitem_textframe.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22135&path=/trunk/Scribus/scribus/pageitem_textframe.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_textframe.cpp	(original)
+++ trunk/Scribus/scribus/pageitem_textframe.cpp	Tue Aug 15 04:05:15 2017
@@ -1892,7 +1892,7 @@
 				}
 				//set left indentation
 				current.leftIndent = 0.0;
-				if (current.addLeftIndent && (maxDX == 0 || DropCmode || BulNumMode))
+				if (current.addLeftIndent && ((maxDX == 0) || DropCmode || BulNumMode))
 				{
 					current.leftIndent = style.leftMargin() + autoLeftIndent;
 					if (itemText.isBlockStart(a))
@@ -3753,6 +3753,11 @@
 			}
 			if (lineBlendmode() != 0)
 				p->setBlendModeStroke(0);
+		}
+		else if (isAnnotation())
+		{
+			if (annotation().borderColor() == CommonStrings::None)
+				no_stroke = true;
 		}
 	}
 	p->setFillMode(ScPainter::Solid);