r14482 by jghali - #8676, newline badly handled when saving/opening causing text overflow : backport #8225 fix to 1.3.6svn

[scribus-commit]

Revision: 14482
Author: jghali
Date: 2010-01-05T10:46:23.214294Z
Commit message: #8676, newline badly handled when saving/opening causing text overflow : backport #8225 fix to 1.3.6svn

Changeset: 
M  /branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
M  /branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp

Diffs:
Index: scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp	(revision 14481)
+++ scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp	(revision 14482)
@@ -1075,7 +1075,7 @@
 	// paragraphstyle for trailing chars
 	if (item->itemText.length() == 0 || item->itemText.text(item->itemText.length()-1) != SpecialChars::PARSEP)
 	{
-		putPStyle(docu, item->itemText.paragraphStyle(item->itemText.length()), "para");
+		putPStyle(docu, item->itemText.paragraphStyle(item->itemText.length()), "trail");
 	}
 }
 
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14481)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14482)
@@ -1023,6 +1023,13 @@
 							Neu->itemText.setStyle(Neu->itemText.length()-1, newStyle);
 							Neu->itemText.setCharStyle(Neu->itemText.length()-1, 1, last->Style);
 						}
+						else if (it.tagName() == "trail")
+						{
+							ParagraphStyle newStyle;
+							PrefsManager* prefsManager = PrefsManager::instance();
+							readParagraphStyle(newStyle, it, prefsManager->appPrefs.AvailFonts, m_Doc);
+							Neu->itemText.setStyle(Neu->itemText.length(), newStyle);
+						}
 						else if (it.tagName()=="tab")
 						{
 							CharStyle newStyle;
@@ -1255,6 +1262,13 @@
 							Neu->itemText.setStyle(Neu->itemText.length()-1, newStyle);
 							Neu->itemText.setCharStyle(Neu->itemText.length()-1, 1, last->Style);
 						}
+						else if (it.tagName() == "trail")
+						{
+							ParagraphStyle newStyle;
+							PrefsManager* prefsManager = PrefsManager::instance();
+							readParagraphStyle(newStyle, it, prefsManager->appPrefs.AvailFonts, m_Doc);
+							Neu->itemText.setStyle(Neu->itemText.length(), newStyle);
+						}
 						else if (it.tagName()=="tab")
 						{
 							CharStyle newStyle;
@@ -3029,6 +3043,14 @@
 							Neu->itemText.setStyle(Neu->itemText.length()-1, newStyle);
 							Neu->itemText.setCharStyle(Neu->itemText.length()-1, 1, last->Style);
 						}
+						else if (it.tagName() == "trail")
+						{
+							ParagraphStyle newStyle;
+							PrefsManager* prefsManager = PrefsManager::instance();
+							readParagraphStyle(newStyle, it, prefsManager->appPrefs.AvailFonts, m_Doc);
+							Neu->itemText.setStyle(Neu->itemText.length(), newStyle);
+							Neu->itemText.setCharStyle(Neu->itemText.length(), 1, last->Style);
+						}
 						else if (it.tagName()=="tab")
 						{
 							CharStyle newStyle;