From c21217ee269d07ef9cf6dec6f54f6194c3fb4d9b Mon Sep 17 00:00:00 2001
From: Christian Hitz <christian@klarinett.li>
Date: Fri, 19 Sep 2014 10:35:06 +0200
Subject: [PATCH 03/17] silence warnings about variables assigned to themselves

---
 scribus/plugins/import/odg/importodg.cpp     | 4 ++--
 scribus/plugins/import/oodraw/oodrawimp.cpp  | 4 ++--
 scribus/plugins/import/shape/importshape.cpp | 4 ++--
 scribus/plugins/import/svg/svgplugin.cpp     | 4 ++--
 scribus/plugins/import/viva/importviva.cpp   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scribus/plugins/import/odg/importodg.cpp b/scribus/plugins/import/odg/importodg.cpp
index 6d1af06..11d3d25 100644
--- a/scribus/plugins/import/odg/importodg.cpp
+++ b/scribus/plugins/import/odg/importodg.cpp
@@ -2832,7 +2832,7 @@ double OdgPlug::parseUnit(const QString &unit)
 		unitval.replace( "%", "" );
 	double value = ScCLocale::toDoubleC(unitval);
 	if( unit.right( 2 ) == "pt" )
-		value = value;
+		{}/* value = value; */ //no change
 	else if( unit.right( 2 ) == "cm" )
 		value = ( value / 2.54 ) * 72;
 	else if( unit.right( 2 ) == "mm" )
@@ -2840,7 +2840,7 @@ double OdgPlug::parseUnit(const QString &unit)
 	else if( unit.right( 2 ) == "in" )
 		value = value * 72;
 	else if( unit.right( 2 ) == "px" )
-		value = value;
+		{}/* value = value; */ //no change
 	else if( unit.right( 1 ) == "%" )
 		value = value / 100.0;
 	return value;
diff --git a/scribus/plugins/import/oodraw/oodrawimp.cpp b/scribus/plugins/import/oodraw/oodrawimp.cpp
index 0f1d369..17bcffa 100644
--- a/scribus/plugins/import/oodraw/oodrawimp.cpp
+++ b/scribus/plugins/import/oodraw/oodrawimp.cpp
@@ -1350,7 +1350,7 @@ double OODPlug::parseUnit(const QString &unit)
 		unitval.replace( "px", "" );
 	double value = ScCLocale::toDoubleC(unitval);
 	if( unit.right( 2 ) == "pt" )
-		value = value;
+		{}/* value = value; */ // no change
 	else if( unit.right( 2 ) == "cm" )
 		value = ( value / 2.54 ) * 72;
 	else if( unit.right( 2 ) == "mm" )
@@ -1358,7 +1358,7 @@ double OODPlug::parseUnit(const QString &unit)
 	else if( unit.right( 2 ) == "in" )
 		value = value * 72;
 	else if( unit.right( 2 ) == "px" )
-		value = value;
+		{}/* value = value; */ // no change
 	return value;
 }
 
diff --git a/scribus/plugins/import/shape/importshape.cpp b/scribus/plugins/import/shape/importshape.cpp
index 98b492d..b94b232 100644
--- a/scribus/plugins/import/shape/importshape.cpp
+++ b/scribus/plugins/import/shape/importshape.cpp
@@ -843,7 +843,7 @@ double ShapePlug::parseUnit(const QString &unit)
 		noUnit = true;
 	double value = ScCLocale::toDoubleC(unitval);
 	if( unit.right( 2 ) == sPT )
-		value = value;
+		{}/* value = value; */ //no change
 	else if( unit.right( 2 ) == sCM )
 	{
 		value = cm2pts(value);
@@ -865,7 +865,7 @@ double ShapePlug::parseUnit(const QString &unit)
 		Conversion = 0.8;
 	}
 	else if(noUnit)
-		value = value;
+		{}/* value = value; */ //no change
 	return value;
 }
 
diff --git a/scribus/plugins/import/svg/svgplugin.cpp b/scribus/plugins/import/svg/svgplugin.cpp
index dfb6d78..5f7b761 100644
--- a/scribus/plugins/import/svg/svgplugin.cpp
+++ b/scribus/plugins/import/svg/svgplugin.cpp
@@ -2064,7 +2064,7 @@ double SVGPlug::parseUnit(const QString &unit)
 		noUnit = true;
 	double value = ScCLocale::toDoubleC(unitval);
 	if (unit.right( 2 ) == "pt")
-		value = value;
+		{}/* value = value; */ //no change
 	else if (unit.right( 2 ) == "cm")
 		value = ( value / 2.54 ) * 72;
 	else if (unit.right( 2 ) == "mm")
@@ -2074,7 +2074,7 @@ double SVGPlug::parseUnit(const QString &unit)
 	else if (unit.right( 2 ) == "px")
 		value = value * 0.8;
 	else if (noUnit)
-		value = value;
+		{}/* value = value; */ //no change
 	return value;
 }
 
diff --git a/scribus/plugins/import/viva/importviva.cpp b/scribus/plugins/import/viva/importviva.cpp
index fd06d47..5d8f50d 100644
--- a/scribus/plugins/import/viva/importviva.cpp
+++ b/scribus/plugins/import/viva/importviva.cpp
@@ -94,7 +94,7 @@ double VivaPlug::parseUnit(const QString &unit)
 		noUnit = true;
 	double value = ScCLocale::toDoubleC(unitval);
 	if (unit.right( 2 ) == "pt")
-		value = value;
+		{}/* value = value; */ //no change
 	else if (unit.right( 2 ) == "cm")
 		value = ( value / 2.54 ) * 72;
 	else if (unit.right( 2 ) == "mm")
@@ -104,7 +104,7 @@ double VivaPlug::parseUnit(const QString &unit)
 	else if (unit.right( 2 ) == "px")
 		value = value * 0.8;
 	else if (noUnit)
-		value = value;
+		{}/* value = value; */ //no change
 	return value;
 }
 
-- 
2.1.0

