r16514 by craig - #9378: Move AutoName=false into setItemName, resolves copying between documents and losing the setting

scribus-commit scribus-commit at lists.scribus.net
Sat Mar 26 10:40:24 CET 2011


Author: craig
Date: Sat Mar 26 09:40:24 2011
New Revision: 16514

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=16514
Log:
#9378: Move AutoName=false into setItemName, resolves copying between documents and losing the setting

Modified:
    branches/Version135/Scribus/scribus/annot.cpp
    branches/Version135/Scribus/scribus/charselect.cpp
    branches/Version135/Scribus/scribus/outlinepalette.cpp
    branches/Version135/Scribus/scribus/pageitem.cpp
    branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
    branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
    branches/Version135/Scribus/scribus/plugins/import/ai/importai.cpp
    branches/Version135/Scribus/scribus/plugins/import/cvg/importcvg.cpp
    branches/Version135/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
    branches/Version135/Scribus/scribus/plugins/import/pct/importpct.cpp
    branches/Version135/Scribus/scribus/plugins/import/ps/importps.cpp
    branches/Version135/Scribus/scribus/plugins/import/svg/svgplugin.cpp
    branches/Version135/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
    branches/Version135/Scribus/scribus/plugins/import/xfig/importxfig.cpp
    branches/Version135/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
    branches/Version135/Scribus/scribus/propertiespalette.cpp
    branches/Version135/Scribus/scribus/scribusview.cpp

Modified: branches/Version135/Scribus/scribus/annot.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/annot.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/annot.cpp (original)
+++ branches/Version135/Scribus/scribus/annot.cpp Sat Mar 26 09:40:24 2011
@@ -1807,10 +1807,7 @@
 	bool AAct = false;
 	item->annotation().setType(ComboBox1->currentIndex()+2);
 	if (Name->text() != OldName)
-	{
 		item->setItemName(Name->text());
-		item->AutoName = false;
-	}
 	item->annotation().setToolTip(Tip->text());
 	item->annotation().setRollOver(TextO->text());
 	item->annotation().setDown(DownT->text());

Modified: branches/Version135/Scribus/scribus/charselect.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/charselect.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/charselect.cpp (original)
+++ branches/Version135/Scribus/scribus/charselect.cpp Sat Mar 26 09:40:24 2011
@@ -198,8 +198,8 @@
 	disconnect(m_enhanced, SIGNAL(insertSpecialChars(const QString &)),
 	           this, SLOT(slot_insertSpecialChars(const QString &)));
 	m_enhanced->close();
-	delete m_enhanced;
-	m_enhanced = 0;
+	m_enhanced->deleteLater();
+//	m_enhanced = 0;
 }
 
 void CharSelect::hideButton_toggled(bool state)

Modified: branches/Version135/Scribus/scribus/outlinepalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/outlinepalette.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/outlinepalette.cpp (original)
+++ branches/Version135/Scribus/scribus/outlinepalette.cpp Sat Mar 26 09:40:24 2011
@@ -304,7 +304,6 @@
 					else
 					{
 						item->PageItemObject->setItemName(NameNew);
-						item->PageItemObject->AutoName = false;
 						m_MainWindow->propertiesPalette->SetCurItem(item->PageItemObject);
 						currDoc->setModified(true);
 					}

Modified: branches/Version135/Scribus/scribus/pageitem.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/pageitem.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/pageitem.cpp (original)
+++ branches/Version135/Scribus/scribus/pageitem.cpp Sat Mar 26 09:40:24 2011
@@ -2238,6 +2238,7 @@
 		return;
 	QString oldName = AnName;
 	AnName = generateUniqueCopyName(newName);
+	AutoName = false;
 	if (UndoManager::undoEnabled())
 	{
 		SimpleState *ss = new SimpleState(Um::Rename, QString(Um::FromTo).arg(AnName).arg(newName));

Modified: branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp Sat Mar 26 09:40:24 2011
@@ -2417,10 +2417,7 @@
 		if (currItem->itemName() == AnName)
 			currItem->AutoName = true;
 		else
-		{
 			currItem->setItemName(AnName);
-			currItem->AutoName = false;
-		}
 	}
 
 	currItem->annotation().setAction(obj->attribute("ANACTION",""));

Modified: branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/fileloader/scribus13format/scribus13format.cpp Sat Mar 26 09:40:24 2011
@@ -2287,10 +2287,7 @@
 		if (currItem->itemName() == AnName)
 			currItem->AutoName = true;
 		else
-		{
 			currItem->setItemName(AnName);
-			currItem->AutoName = false;
-		}
 	}
 
 	currItem->annotation().setAction(obj->attribute("ANACTION",""));

Modified: branches/Version135/Scribus/scribus/plugins/import/ai/importai.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/import/ai/importai.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/import/ai/importai.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/import/ai/importai.cpp Sat Mar 26 09:40:24 2011
@@ -2041,7 +2041,6 @@
 					pat.setDoc(m_Doc);
 					PageItem* currItem = tmpSel->itemAt(0);
 					currItem->setItemName(currentPatternDefName);
-					currItem->AutoName = false;
 					m_Doc->DoDrawing = true;
 					QImage tmpImg = currItem->DrawObj_toImage();
 					QImage retImg = QImage(qRound(patternX2 - patternX1), qRound(patternY2 - patternY1), QImage::Format_ARGB32);

Modified: branches/Version135/Scribus/scribus/plugins/import/cvg/importcvg.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/import/cvg/importcvg.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/import/cvg/importcvg.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/import/cvg/importcvg.cpp Sat Mar 26 09:40:24 2011
@@ -208,7 +208,6 @@
 				m_Doc->Items->insert(lowestItem, neu);
 				neu->Groups.push(m_Doc->GroupCounter);
 				neu->setItemName( tr("Group%1").arg(neu->Groups.top()));
-				neu->AutoName = false;
 				neu->isGroupControl = true;
 				neu->groupsLastItem = high;
 				neu->setTextFlowMode(PageItem::TextFlowDisabled);

Modified: branches/Version135/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/import/oodraw/oodrawimp.cpp Sat Mar 26 09:40:24 2011
@@ -468,7 +468,6 @@
 			m_Doc->Items->insert(lowestItem, neu);
 			neu->Groups.push(m_Doc->GroupCounter);
 			neu->setItemName( tr("Group%1").arg(neu->Groups.top()));
-			neu->AutoName = false;
 			neu->isGroupControl = true;
 			neu->groupsLastItem = high;
 			neu->setTextFlowMode(PageItem::TextFlowDisabled);
@@ -618,7 +617,6 @@
 			neu->setItemName(e.attribute("id"));
 		else
 			neu->setItemName( tr("Group%1").arg(neu->Groups.top()));
-		neu->AutoName = false;
 //		neu->setFillTransparency(1 - gc->Opacity);
 		for (int gr = 0; gr < cElements.count(); ++gr)
 		{
@@ -895,10 +893,7 @@
 		ite->setLineTransparency(oostyle.strokeTrans);
 		ite->setTextFlowMode(PageItem::TextFlowDisabled);
 		if (!drawID.isEmpty())
-		{
 			ite->setItemName(drawID);
-			ite->AutoName = false;
-		}
 		ite = parseTextP(n.toElement(), ite);
 		elements.append(ite);
 	}
@@ -1132,10 +1127,7 @@
 	if (oostyle.dashes.count() != 0)
 		item->DashValues = oostyle.dashes;
 	if (!drawID.isEmpty())
-	{
 		item->setItemName(drawID);
-		item->AutoName = false;
-	}
 	if (elm.hasAttribute("draw:transform"))
 	{
 		parseTransform(&item->PoLine, elm.attribute("draw:transform"));

Modified: branches/Version135/Scribus/scribus/plugins/import/pct/importpct.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/import/pct/importpct.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/import/pct/importpct.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/import/pct/importpct.cpp Sat Mar 26 09:40:24 2011
@@ -209,7 +209,6 @@
 				m_Doc->Items->insert(lowestItem, neu);
 				neu->Groups.push(m_Doc->GroupCounter);
 				neu->setItemName( tr("Group%1").arg(neu->Groups.top()));
-				neu->AutoName = false;
 				neu->isGroupControl = true;
 				neu->groupsLastItem = high;
 				neu->setTextFlowMode(PageItem::TextFlowDisabled);

Modified: branches/Version135/Scribus/scribus/plugins/import/ps/importps.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/import/ps/importps.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/import/ps/importps.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/import/ps/importps.cpp Sat Mar 26 09:40:24 2011
@@ -278,7 +278,6 @@
 				m_Doc->Items->insert(lowestItem, neu);
 				neu->Groups.push(m_Doc->GroupCounter);
 				neu->setItemName( tr("Group%1").arg(neu->Groups.top()));
-				neu->AutoName = false;
 				neu->isGroupControl = true;
 				neu->groupsLastItem = high;
 				neu->setTextFlowMode(PageItem::TextFlowDisabled);
@@ -705,7 +704,6 @@
 						}
 						ite->isGroupControl = true;
 						ite->setItemName( tr("Group%1").arg(m_Doc->GroupCounter));
-						ite->AutoName = false;
 						ite->setTextFlowMode(PageItem::TextFlowDisabled);
 						Elements.append(ite);
 						groupStack.push(ite);
@@ -741,7 +739,6 @@
 							}
 							ite->isGroupControl = true;
 							ite->setItemName( tr("Group%1").arg(m_Doc->GroupCounter));
-							ite->AutoName = false;
 							ite->setTextFlowMode(PageItem::TextFlowDisabled);
 							Elements.append(ite);
 							groupStack.push(ite);

Modified: branches/Version135/Scribus/scribus/plugins/import/svg/svgplugin.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/import/svg/svgplugin.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/import/svg/svgplugin.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/import/svg/svgplugin.cpp Sat Mar 26 09:40:24 2011
@@ -408,7 +408,6 @@
 			m_Doc->Items->insert(lowestItem, neu);
 			neu->Groups.push(m_Doc->GroupCounter);
 			neu->setItemName( tr("Group%1").arg(neu->Groups.top()));
-			neu->AutoName = false;
 			neu->isGroupControl = true;
 			neu->groupsLastItem = high;
 			for (int a = 0; a < m_Doc->Items->count(); ++a)
@@ -594,10 +593,7 @@
 	{
 		QString nodeId = e.toElement().attribute("id");
 		if( !nodeId.isEmpty() )
-		{
 			item->setItemName(" "+nodeId);
-			item->AutoName = false;
-		}
 	}
 	item->setFillTransparency( 1 - gc->FillOpacity * gc->Opacity );
 	item->setLineTransparency( 1 - gc->StrokeOpacity * gc->Opacity );
@@ -1018,7 +1014,6 @@
 			neu->setItemName(e.attribute("id"));
 		else
 			neu->setItemName( tr("Group%1").arg(neu->Groups.top()));
-		neu->AutoName = false;
 		neu->setFillTransparency(1 - gc->Opacity);
 		neu->gXpos = neu->xPos() - gx;
 		neu->gYpos = neu->yPos() - gy;

Modified: branches/Version135/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/import/wmf/wmfimport.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/import/wmf/wmfimport.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/import/wmf/wmfimport.cpp Sat Mar 26 09:40:24 2011
@@ -645,7 +645,6 @@
 			m_Doc->Items->insert(lowestItem, neu);
 			neu->Groups.push(m_Doc->GroupCounter);
 			neu->setItemName( tr("Group%1").arg(neu->Groups.top()));
-			neu->AutoName = false;
 			neu->isGroupControl = true;
 			neu->groupsLastItem = high;
 			for (int a = 0; a < m_Doc->Items->count(); ++a)

Modified: branches/Version135/Scribus/scribus/plugins/import/xfig/importxfig.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/import/xfig/importxfig.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/import/xfig/importxfig.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/import/xfig/importxfig.cpp Sat Mar 26 09:40:24 2011
@@ -283,7 +283,6 @@
 				m_Doc->Items->insert(lowestItem, neu);
 				neu->Groups.push(m_Doc->GroupCounter);
 				neu->setItemName( tr("Group%1").arg(neu->Groups.top()));
-				neu->AutoName = false;
 				neu->isGroupControl = true;
 				neu->groupsLastItem = high;
 				neu->setTextFlowMode(PageItem::TextFlowDisabled);

Modified: branches/Version135/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/scriptplugin/cmdobj.cpp Sat Mar 26 09:40:24 2011
@@ -36,10 +36,7 @@
 	{
 		QString objName = QString::fromUtf8(Name);
 		if (!ItemExists(objName))
-		{
 			ScCore->primaryMainWindow()->doc->Items->at(i)->setItemName(objName);
-			ScCore->primaryMainWindow()->doc->Items->at(i)->AutoName = false;
-		}
 	}
 //	if (Name != EMPTY_STRING)
 //		ScCore->primaryMainWindow()->doc->Items->at(i)->setItemName(QString::fromUtf8(Name));
@@ -76,10 +73,7 @@
 	{
 		QString objName = QString::fromUtf8(Name);
 		if (!ItemExists(objName))
-		{
 			ScCore->primaryMainWindow()->doc->Items->at(i)->setItemName(objName);
-			ScCore->primaryMainWindow()->doc->Items->at(i)->AutoName = false;
-		}
 	}
 	return PyString_FromString(ScCore->primaryMainWindow()->doc->Items->at(i)->itemName().toUtf8());
 }
@@ -112,10 +106,7 @@
 	{
 		QString objName = QString::fromUtf8(Name);
 		if (!ItemExists(objName))
-		{
 			ScCore->primaryMainWindow()->doc->Items->at(i)->setItemName(objName);
-			ScCore->primaryMainWindow()->doc->Items->at(i)->AutoName = false;
-		}
 	}
 	return PyString_FromString(ScCore->primaryMainWindow()->doc->Items->at(i)->itemName().toUtf8());
 }
@@ -146,10 +137,7 @@
 	{
 		QString objName = QString::fromUtf8(Name);
 		if (!ItemExists(objName))
-		{
 			ScCore->primaryMainWindow()->doc->Items->at(i)->setItemName(objName);
-			ScCore->primaryMainWindow()->doc->Items->at(i)->AutoName = false;
-		}
 	}
 	return PyString_FromString(ScCore->primaryMainWindow()->doc->Items->at(i)->itemName().toUtf8());
 }
@@ -211,10 +199,7 @@
 	{
 		QString objName = QString::fromUtf8(Name);
 		if (!ItemExists(objName))
-		{
 			ScCore->primaryMainWindow()->doc->Items->at(i)->setItemName(objName);
-			ScCore->primaryMainWindow()->doc->Items->at(i)->AutoName = false;
-		}
 	}
 	return PyString_FromString(it->itemName().toUtf8());
 }
@@ -295,10 +280,7 @@
 	{
 		QString objName = QString::fromUtf8(Name);
 		if (!ItemExists(objName))
-		{
 			ScCore->primaryMainWindow()->doc->Items->at(ic)->setItemName(objName);
-			ScCore->primaryMainWindow()->doc->Items->at(ic)->AutoName = false;
-		}
 	}
 	return PyString_FromString(it->itemName().toUtf8());
 }
@@ -382,10 +364,7 @@
 	{
 		QString objName = QString::fromUtf8(Name);
 		if (!ItemExists(objName))
-		{
 			ScCore->primaryMainWindow()->doc->Items->at(ic)->setItemName(objName);
-			ScCore->primaryMainWindow()->doc->Items->at(ic)->AutoName = false;
-		}
 	}
 	return PyString_FromString(it->itemName().toUtf8());
 }
@@ -478,10 +457,7 @@
 	{
 		QString objName = QString::fromUtf8(Name);
 		if (!ItemExists(objName))
-		{
 			ScCore->primaryMainWindow()->doc->Items->at(ic)->setItemName(objName);
-			ScCore->primaryMainWindow()->doc->Items->at(ic)->AutoName = false;
-		}
 	}
 	return PyString_FromString(it->itemName().toUtf8());
 }
@@ -525,10 +501,7 @@
 	{
 		QString objName = QString::fromUtf8(Name);
 		if (!ItemExists(objName))
-		{
 			ScCore->primaryMainWindow()->doc->Items->at(i)->setItemName(objName);
-			ScCore->primaryMainWindow()->doc->Items->at(i)->AutoName = false;
-		}
 	}
 	return PyString_FromString(it->itemName().toUtf8());
 }

Modified: branches/Version135/Scribus/scribus/propertiespalette.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/propertiespalette.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/propertiespalette.cpp (original)
+++ branches/Version135/Scribus/scribus/propertiespalette.cpp Sat Mar 26 09:40:24 2011
@@ -5155,7 +5155,6 @@
 		if (CurItem->itemName() != NameEdit->text())
 		{
 			CurItem->setItemName(NameEdit->text());
-			CurItem->AutoName = false;
 			emit DocChanged();
 		}
 	}

Modified: branches/Version135/Scribus/scribus/scribusview.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=16514&path=/branches/Version135/Scribus/scribus/scribusview.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/scribusview.cpp (original)
+++ branches/Version135/Scribus/scribus/scribusview.cpp Sat Mar 26 09:40:24 2011
@@ -3672,17 +3672,10 @@
 			if (currItem->itemName() == Buffer->AnName)
 				currItem->AutoName = true;
 			else
-			{
 				currItem->setItemName(Buffer->AnName);
-				currItem->AutoName = false;
-			}
 		}
 		else
-		{
-//			currItem->setItemName(currItem->generateUniqueCopyName(Buffer->AnName));
 			currItem->setItemName(Buffer->AnName);
-			currItem->AutoName = false;
-		}
 	}
 	else
 	{
@@ -4133,7 +4126,6 @@
 						bb->setLocked(currItem->locked());
 						bb->NamedLStyle = currItem->NamedLStyle;
 						bb->setItemName(currItem->itemName()+"+U"+ccounter.setNum(a));
-						bb->AutoName = false;
 						FPoint start, stop;
 						if (charStyle.effects() & ScStyle_Subscript)
 						{
@@ -4175,7 +4167,6 @@
 							bb->setLocked(currItem->locked());
 							bb->NamedLStyle = currItem->NamedLStyle;
 							bb->setItemName(currItem->itemName()+"+Sh"+ccounter.setNum(a));
-							bb->AutoName = false;
 							bb->PoLine = pts.copy();
 							QMatrix shmap;
 							shmap.translate(glxTr, glyTr);
@@ -4211,7 +4202,6 @@
 						bb->setLocked(currItem->locked());
 						bb->NamedLStyle = currItem->NamedLStyle;
 						bb->setItemName(currItem->itemName()+"+"+ccounter.setNum(a));
-						bb->AutoName = false;
 						bb->PoLine = pts.copy();
 						if (!currItem->asPathText())
 							bb->setRotation(currItem->rotation());
@@ -4276,7 +4266,6 @@
 						bb->setLocked(currItem->locked());
 						bb->NamedLStyle = currItem->NamedLStyle;
 						bb->setItemName(currItem->itemName()+"+S"+ccounter.setNum(a));
-						bb->AutoName = false;
 						FPoint start = FPoint(hl->glyph.xoffset-kern, -Upos);
 						FPoint stop = FPoint(hl->glyph.xoffset+Ulen, -Upos);
 						bb->PoLine.resize(0);
@@ -4367,7 +4356,6 @@
 							bb->setLocked(currItem->locked());
 							bb->NamedLStyle = currItem->NamedLStyle;
 							bb->setItemName(currItem->itemName()+"+U"+ccounter.setNum(a));
-							bb->AutoName = false;
 							bb->setRotation(currItem->rotation());
 							bb->PoLine.addQuadPoint(FPoint(0, 0), FPoint(0, 0), FPoint(hl->glyph.xadvance, 0), FPoint(hl->glyph.xadvance, 0));
 							bb->setLineColor(hl->fillColor());
@@ -4427,7 +4415,6 @@
 								bb->setLocked(currItem->locked());
 								bb->NamedLStyle = currItem->NamedLStyle;
 								bb->setItemName(currItem->itemName()+"+Sh"+ccounter.setNum(a));
-								bb->AutoName = false;
 								bb->PoLine = pts.copy();
 								bb->setRotation(currItem->rotation());
 								bb->setFillColor(hl->strokeColor());
@@ -4477,7 +4464,6 @@
 							bb->setLocked(currItem->locked());
 							bb->NamedLStyle = currItem->NamedLStyle;
 							bb->setItemName(currItem->itemName()+"+"+ccounter.setNum(a));
-							bb->AutoName = false;
 							bb->PoLine = pts.copy();
 							bb->setRotation(currItem->rotation());
 							bb->setFillColor(hl->fillColor());
@@ -4554,7 +4540,6 @@
 							bb->setLocked(currItem->locked());
 							bb->NamedLStyle = currItem->NamedLStyle;
 							bb->setItemName(currItem->itemName()+"+S"+ccounter.setNum(a));
-							bb->AutoName = false;
 							bb->setRotation(currItem->rotation());
 							bb->PoLine.addQuadPoint(FPoint(0, 0), FPoint(0, 0), FPoint(hl->glyph.xadvance, 0), FPoint(hl->glyph.xadvance, 0));
 							bb->setLineColor(hl->fillColor());




More information about the scribus-commit mailing list