r19053 by fschmid - Fixed Bug #12230: Convert to > Symbol crashes Scribus if no document is opened

[scribus-commit]

Author: fschmid
Date: Sun Apr 20 09:39:41 2014
New Revision: 19053

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19053
Log:
Fixed Bug #12230: Convert to > Symbol crashes Scribus if no document is opened

Modified:
    trunk/Scribus/scribus/appmodehelper.cpp
    trunk/Scribus/scribus/scribus.cpp

Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19053&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Sun Apr 20 09:39:41 2014
@@ -518,6 +518,14 @@
 #ifdef HAVE_OSG
 	(*scrActions)["toolsPDFAnnot3D"]->setEnabled(false);
 #endif
+	(*scrActions)["itemConvertToBezierCurve"]->setEnabled(false);
+	(*scrActions)["itemConvertToImageFrame"]->setEnabled(false);
+	(*scrActions)["itemConvertToOutlines"]->setEnabled(false);
+	(*scrActions)["itemConvertToPolygon"]->setEnabled(false);
+	(*scrActions)["itemConvertToTextFrame"]->setEnabled(false);
+	(*scrActions)["itemConvertToSymbolFrame"]->setEnabled(false);
+	(*scrActions)["itemLock"]->setEnabled(false);
+	(*scrActions)["itemLockSize"]->setEnabled(false);
 }
 
 void AppModeHelper::setPreviewMode(bool b)

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19053&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Sun Apr 20 09:39:41 2014
@@ -9600,6 +9600,8 @@
 
 void ScribusMainWindow::PutToInline(QString buffer)
 {
+	if (!HaveDoc)
+		return;
 	Selection tempSelection(*doc->m_Selection);
 	bool savedAlignGrid = doc->SnapGrid;
 	bool savedAlignGuides = doc->SnapGuides;
@@ -9659,6 +9661,8 @@
 
 void ScribusMainWindow::PutToInline()
 {
+	if (!HaveDoc)
+		return;
 	Selection tempSelection(*doc->m_Selection);
 	bool savedAlignGrid = doc->SnapGrid;
 	bool savedAlignGuides = doc->SnapGuides;
@@ -9721,6 +9725,8 @@
 
 void ScribusMainWindow::PutToPatterns()
 {
+	if (!HaveDoc)
+		return;
 	QString patternName = "Pattern_"+doc->m_Selection->itemAt(0)->itemName();
 	patternName = patternName.trimmed().simplified().replace(" ", "_");
 	bool savedAlignGrid = doc->SnapGrid;
@@ -9861,6 +9867,8 @@
 
 void ScribusMainWindow::ConvertToSymbol()
 {
+	if (!HaveDoc)
+		return;
 	int z;
 	uint docSelectionCount = doc->m_Selection->count();
 	QString patternName = "Pattern_"+doc->m_Selection->itemAt(0)->itemName();