r20238 by jghali - #13214: Crash when reopening field properties dialog

[scribus-commit]

Author: jghali
Date: Wed Jul  8 22:13:25 2015
New Revision: 20238

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20238
Log:
#13214: Crash when reopening field properties dialog

Modified:
    trunk/Scribus/scribus/ui/annot.cpp

Modified: trunk/Scribus/scribus/ui/annot.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20238&path=/trunk/Scribus/scribus/ui/annot.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/annot.cpp (original)
+++ trunk/Scribus/scribus/ui/annot.cpp Wed Jul  8 22:13:25 2015
@@ -1114,6 +1114,8 @@
 		annotation.addToFlag(Annotation::Flag_PushButton);
 		if (item->Pfile.isEmpty())
 			annotation.setUseIcons(false);
+		annotation.setFormat(0);
+		annotation.setF_act(QString());
 	}
 	else
 	{
@@ -1128,12 +1130,24 @@
 	if (annotation.Type() == Annotation::RadioButton)
 	{
 		annotation.addToFlag(Annotation::Flag_Radio | Annotation::Flag_NoToggleToOff);
+		annotation.setFormat(0);
+		annotation.setF_act(QString());
+	}
+	if (annotation.Type() == Annotation::Checkbox)
+	{
+		annotation.setFormat(0);
+		annotation.setF_act(QString());
 	}
 	if (annotation.Type() == Annotation::Combobox)
 	{
 		annotation.addToFlag(Annotation::Flag_Combo);
 		if (CanEdit->isChecked())
 			annotation.addToFlag(Annotation::Flag_Edit);
+	}
+	if (annotation.Type() == Annotation::Listbox)
+	{
+		annotation.setFormat(0);
+		annotation.setF_act(QString());
 	}
 	if (annotation.Type() == Annotation::Textfield)
 	{