r20670 by fschmid -

[scribus-commit]

Author: fschmid
Date: Thu Jan  7 19:07:38 2016
New Revision: 20670

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20670
Log:
Final fix for #12212: ODT import works reliably only with LibreOffice/OpenOffice files

Modified:
    trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp

Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20670&path=/trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp	(original)
+++ trunk/Scribus/scribus/plugins/gettext/odt2im/importodt.cpp	Thu Jan  7 19:07:38 2016
@@ -111,6 +111,11 @@
 						if (uz->contains("content.xml"))
 							parseDocReference("content.xml");
 					}
+				}
+				else
+				{
+					if (uz->contains("content.xml"))
+						parseDocReference("content.xml");
 				}
 			}
 			uz->close();
@@ -672,12 +677,12 @@
 			}
 		}
 	}
-	if (pStyle.breakBefore == "column")
+	if ((pStyle.breakBefore == "column") && (item->itemText.length() > 0))
 	{
 		QString txt = SpecialChars::COLBREAK;
 		insertChars(item, txt, tmpStyle, tmpCStyle, posC);
 	}
-	else if (pStyle.breakBefore == "page")
+	else if ((pStyle.breakBefore == "page") && (item->itemText.length() > 0))
 	{
 		QString txt = SpecialChars::FRAMEBREAK;
 		insertChars(item, txt, tmpStyle, tmpCStyle, posC);