r14499 by jghali - #8683, magnifier does not work : avoid magnification step values of 100% as this cause zooming not to work in this case

[scribus-commit]

Revision: 14499
Author: jghali
Date: 2010-01-07T08:28:42.854195Z
Commit message: #8683, magnifier does not work : avoid magnification step values of 100% as this cause zooming not to work in this case

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

Diffs:
Index: scribus/prefsmanager.cpp
===================================================================
--- scribus/prefsmanager.cpp	(revision 14498)
+++ scribus/prefsmanager.cpp	(revision 14499)
@@ -1894,8 +1894,8 @@
 			appPrefs.toolSettings.magMax  = dc.attribute("MAGMAX", "3200").toInt();
 			appPrefs.toolSettings.magStep = dc.attribute("MAGSTEP", "200").toInt();
 			//CB Reset prefs zoom step value to 200% instead of old values.
-			if (appPrefs.toolSettings.magStep<100)
-				appPrefs.toolSettings.magStep=200;
+			if (appPrefs.toolSettings.magStep <= 100)
+				appPrefs.toolSettings.magStep = 200;
 			appPrefs.toolSettings.dBrushPict = dc.attribute("CPICT", CommonStrings::None);
 			appPrefs.toolSettings.shadePict = dc.attribute("PICTSHADE", "100").toInt();
 			appPrefs.toolSettings.scaleX = ScCLocale::toDoubleC(dc.attribute("PICTSCX"), 1.0);
Index: scribus/plugins/fileloader/scribus13format/scribus13format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 14498)
+++ scribus/plugins/fileloader/scribus13format/scribus13format.cpp	(revision 14499)
@@ -410,8 +410,8 @@
 		m_Doc->toolSettings.magMax     = dc.attribute("MAGMAX", "3200").toInt();
 		m_Doc->toolSettings.magStep    = dc.attribute("MAGSTEP", "200").toInt();
 		//CB Reset doc zoom step value to 200% instead of old values.
-		if (m_Doc->toolSettings.magStep<100)
-			m_Doc->toolSettings.magStep=200;
+		if (m_Doc->toolSettings.magStep <= 100)
+			m_Doc->toolSettings.magStep = 200;
 		m_Doc->toolSettings.tabFillChar = dc.attribute("TabFill","");
 		m_Doc->toolSettings.dTabWidth   = ScCLocale::toDoubleC(dc.attribute("TabWidth"), 36.0);
 		if (dc.hasAttribute("CPICT"))
Index: scribus/plugins/fileloader/scribus134format/scribus134format.cpp
===================================================================
--- scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14498)
+++ scribus/plugins/fileloader/scribus134format/scribus134format.cpp	(revision 14499)
@@ -424,8 +424,8 @@
 		m_Doc->toolSettings.dispY = ScCLocale::toDoubleC( dc.attribute("dispY"), 10.0);
 		m_Doc->toolSettings.constrain = ScCLocale::toDoubleC( dc.attribute("constrain"), 15.0);
 		//CB Reset doc zoom step value to 200% instead of old values.
-		if (m_Doc->toolSettings.magStep<100)
-			m_Doc->toolSettings.magStep=200;
+		if (m_Doc->toolSettings.magStep <= 100)
+			m_Doc->toolSettings.magStep = 200;
 		m_Doc->toolSettings.tabFillChar = dc.attribute("TabFill","");
 		m_Doc->toolSettings.dTabWidth= ScCLocale::toDoubleC(dc.attribute("TabWidth"), 36.0);
 		if (dc.hasAttribute("CPICT"))