r18755 by jghali - #11978: "Use Parent Value" entry is repeated many times in Styles Numeration based on other Styles

[scribus-commit]

Author: jghali
Date: Sun Jan 19 21:33:48 2014
New Revision: 18755

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18755
Log:
#11978: "Use Parent Value" entry is repeated many times in Styles Numeration based on other Styles

Modified:
    trunk/Scribus/scribus/ui/smsccombobox.cpp

Modified: trunk/Scribus/scribus/ui/smsccombobox.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18755&path=/trunk/Scribus/scribus/ui/smsccombobox.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/smsccombobox.cpp (original)
+++ trunk/Scribus/scribus/ui/smsccombobox.cpp Sun Jan 19 21:33:48 2014
@@ -32,7 +32,7 @@
 	hasParent_ = true;
 	pItem_ = i;
 	setFont(!isParentValue);
-	if (!isParentValue)
+	if (!isParentValue && !useParentValue_)
 	{
 		useParentValue_ = true;
 		addItem( tr("Use Parent Value"));
@@ -61,7 +61,7 @@
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 	hasParent_ = true;
 	setFont(!isParentValue);
-	if (!isParentValue)
+	if (!isParentValue && !useParentValue_)
 	{
 		useParentValue_ = true;
 		addItem( tr("Use Parent Value"));
@@ -97,7 +97,7 @@
 	disconnect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
 	hasParent_ = true;
 	setFont(!isParentValue);
-	if (!isParentValue)
+	if (!isParentValue && !useParentValue_)
 	{
 		useParentValue_ = true;
 		addItem( tr("Use Parent Value"));
@@ -181,6 +181,3 @@
 		useParentValue_ = true;
 	}
 }
-
-
-