r19204 by craig - #12367: Disable sample text on last doc close

scribus-commit scribus-commit at lists.scribus.net
Wed Jun 11 18:46:25 UTC 2014


Author: craig
Date: Wed Jun 11 18:46:25 2014
New Revision: 19204

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19204
Log:
#12367: Disable sample text on last doc close

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=19204&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Wed Jun 11 18:46:25 2014
@@ -459,6 +459,7 @@
 	(*scrActions)["editEditRenderSource"]->setEnabled(false);
 	(*scrActions)["extrasHyphenateText"]->setEnabled(false);
 	(*scrActions)["extrasDeHyphenateText"]->setEnabled(false);
+	(*scrActions)["insertSampleText"]->setEnabled(false);
 	(*scrActions)["viewFitInWindow"]->setEnabled(false);
 	(*scrActions)["viewFitWidth"]->setEnabled(false);
 	(*scrActions)["viewFit50"]->setEnabled(false);

Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19204&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Jun 11 18:46:25 2014
@@ -9309,6 +9309,8 @@
 
 void ScribusMainWindow::insertSampleText()
 {
+	if (!HaveDoc)
+		return;
 	LoremManager m(doc, this);
 	if (prefsManager->appPrefs.miscPrefs.useStandardLI)
 	{




More information about the scribus-commit mailing list