r19630 by jghali - #12817: fix a few missing breaks and copy/paste issues in pageitem.cpp and pageitem_table.cpp

[scribus-commit]

Author: jghali
Date: Mon Nov 17 23:24:53 2014
New Revision: 19630

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19630
Log:
#12817: fix a few missing breaks and copy/paste issues in pageitem.cpp and pageitem_table.cpp

Modified:
    trunk/Scribus/scribus/pageitem.cpp
    trunk/Scribus/scribus/pageitem_table.cpp

Modified: trunk/Scribus/scribus/pageitem.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19630&path=/trunk/Scribus/scribus/pageitem.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem.cpp (original)
+++ trunk/Scribus/scribus/pageitem.cpp Mon Nov 17 23:24:53 2014
@@ -664,7 +664,7 @@
 			}
 			else
 			{
-				if (m_Doc->itemToolPrefs().shapeLineColor != CommonStrings::None)
+				if (m_Doc->itemToolPrefs().shapeFillColor != CommonStrings::None)
 				{
 					const ScColor& col = m_Doc->PageColors[m_Doc->itemToolPrefs().shapeFillColor];
 					QColor qcol = ScColorEngine::getRGBColor(col, m_Doc);
@@ -3207,6 +3207,7 @@
 				case LatexFrame:
 				case OSGFrame:
 					MColor = m_Doc->itemToolPrefs().imageFillColor;
+					break;
 				case TextFrame:
 				case PathText:
 					MColor = m_Doc->itemToolPrefs().textFillColor;
@@ -3425,6 +3426,7 @@
 				case LatexFrame:
 				case OSGFrame:
 					MColor = m_Doc->itemToolPrefs().imageFillColor;
+					break;
 				case TextFrame:
 				case PathText:
 					MColor = m_Doc->itemToolPrefs().textFillColor;
@@ -3952,6 +3954,7 @@
 				case LatexFrame:
 				case OSGFrame:
 					tmp = m_Doc->itemToolPrefs().imageFillColor;
+					break;
 				case TextFrame:
 				case PathText:
 					tmp = m_Doc->itemToolPrefs().textFillColor;

Modified: trunk/Scribus/scribus/pageitem_table.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19630&path=/trunk/Scribus/scribus/pageitem_table.cpp
==============================================================================
--- trunk/Scribus/scribus/pageitem_table.cpp (original)
+++ trunk/Scribus/scribus/pageitem_table.cpp Mon Nov 17 23:24:53 2014
@@ -1162,7 +1162,7 @@
 		// Check if the area was affected by the change.
 		if (newArea != oldArea)
 		{
-			if (newArea.height() < 1 || newArea.height() < 1)
+			if (newArea.height() < 1 || newArea.width() < 1)
 			{
 				// Adjusted area was annihilated, so remove it.
 				areaIt.remove();