From 9ecc97a2e49cf6853c30aabb99e1ce56f47e8b23 Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Thu, 8 Sep 2016 01:55:44 +0000 Subject: [PATCH] Minor : added for Autonum formula, terminal element located alsoin user collection git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4696 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- sources/qetgraphicsitem/customelement.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sources/qetgraphicsitem/customelement.cpp b/sources/qetgraphicsitem/customelement.cpp index cbe8196d5..65c83d7ec 100644 --- a/sources/qetgraphicsitem/customelement.cpp +++ b/sources/qetgraphicsitem/customelement.cpp @@ -337,7 +337,7 @@ void CustomElement::parseLabels() { } if (prefix == "") { if (!(location().project()->elementAutoNumCurrentFormula().isEmpty()) && (location().project()->elementAutoNumCurrentFormula() != "") && - (this->linkType()!=Element::Slave) && (this->linkType()!=Element::Terminale)) { + (this->linkType()!=Element::Slave)) { QString formula = location().project()->elementAutoNumCurrentFormula(); this->setPrefix(prefix); DiagramContext &dc = this->rElementInformations(); @@ -351,8 +351,7 @@ void CustomElement::parseLabels() { //are being loaded at first time or being pasted else if ((this->taggedText("label")!= NULL) && (location().projectId()!=-1) && (!location().project()->elementAutoNumCurrentFormula().isEmpty()) && - (this->linkType()!=Element::Slave) && (this->linkType()!=Element::Terminale) && - !this->diagram()->item_paste) { + (this->linkType()!=Element::Slave) && !this->diagram()->item_paste) { QString formula = location().project()->elementAutoNumCurrentFormula(); DiagramContext &dc = this->rElementInformations(); QString prefix = this->taggedText("label")->toPlainText();