r17274 by fschmid - IDML Importer: apply character style override correctly

[scribus-commit]

Author: fschmid
Date: Sat Feb  4 19:32:57 2012
New Revision: 17274

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17274
Log:
IDML Importer: apply character style override correctly

Modified:
    trunk/Scribus/scribus/plugins/import/idml/importidml.cpp

Modified: trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17274&path=/trunk/Scribus/scribus/plugins/import/idml/importidml.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/importidml.cpp (original)
+++ trunk/Scribus/scribus/plugins/import/idml/importidml.cpp Sat Feb  4 19:32:57 2012
@@ -2444,15 +2444,6 @@
 								fontStyle = stt.attribute("FontStyle", "");
 								hasChangedFont = true;
 							}
-							if (hasChangedFont)
-							{
-								if ((!fontBase.isEmpty()) && (!fontStyle.isEmpty()))
-								{
-									QString fontName = constructFontName(fontBase, fontStyle);
-									nstyle.setFont((*m_Doc->AllFonts)[fontName]);
-								}
-							}
-							readCharStyleAttributes(nstyle, stt);
 							if (stt.hasAttribute("AppliedCharacterStyle"))
 							{
 								QString cStyle = stt.attribute("AppliedCharacterStyle").remove("$ID/");
@@ -2467,6 +2458,15 @@
 									}
 								}
 							}
+							if (hasChangedFont)
+							{
+								if ((!fontBase.isEmpty()) && (!fontStyle.isEmpty()))
+								{
+									QString fontName = constructFontName(fontBase, fontStyle);
+									nstyle.setFont((*m_Doc->AllFonts)[fontName]);
+								}
+							}
+							readCharStyleAttributes(nstyle, stt);
 							for(QDomNode stch = stt.firstChild(); !stch.isNull(); stch = stch.nextSibling() )
 							{
 								QDomElement s = stch.toElement();