r20283 by craig - #13129: backport 12193 <Firash>

[scribus-commit]

Author: craig
Date: Mon Jul 27 20:35:22 2015
New Revision: 20283

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20283
Log:
#13129: backport 12193 <Firash>

Modified:
    branches/Version14x/Scribus/scribus/scribus.cpp
    branches/Version14x/Scribus/scribus/stylemanager.cpp

Modified: branches/Version14x/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20283&path=/branches/Version14x/Scribus/scribus/scribus.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scribus.cpp (original)
+++ branches/Version14x/Scribus/scribus/scribus.cpp Mon Jul 27 20:35:22 2015
@@ -518,10 +518,10 @@
 
 	// initializing style manager here too even it's not strictly a palette
 	styleManager = new StyleManager(this, "styleManager");
-	styleManager->addStyle(new SMLineStyle());
 	SMCharacterStyle *tmpCS = new SMCharacterStyle();
 	styleManager->addStyle(new SMParagraphStyle(tmpCS->tmpStyles()));
 	styleManager->addStyle(tmpCS);
+	styleManager->addStyle(new SMLineStyle());
 	connect( scrActions["editStyles"], SIGNAL(toggled(bool)), styleManager, SLOT(setPaletteShown(bool)) );
 	connect( styleManager, SIGNAL(paletteShown(bool)), scrActions["editStyles"], SLOT(setChecked(bool)));
 	styleManager->installEventFilter(this);

Modified: branches/Version14x/Scribus/scribus/stylemanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20283&path=/branches/Version14x/Scribus/scribus/stylemanager.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/stylemanager.cpp (original)
+++ branches/Version14x/Scribus/scribus/stylemanager.cpp Mon Jul 27 20:35:22 2015
@@ -147,7 +147,8 @@
 		m_styleClassesPS[m_items.at(i)->typeNamePlural()] = m_items.at(i)->typeNameSingular();
 		m_styleClassesSP[m_items.at(i)->typeNameSingular()] = m_items.at(i)->typeNamePlural();
 	}
-	popupStrings.sort();
+	//13219, 12193 backport
+	//popupStrings.sort();
 	for (int i = 0; i < popupStrings.count(); ++i)
 		m_newPopup->addAction(popupStrings[i]);