#2027 Sketcher Trim Feature: correction of compilation on Linux

[modules/shaper.git] / src / Model / Model_AttributeReference.cpp

diff --git a/src/Model/Model_AttributeReference.cpp b/src/Model/Model_AttributeReference.cpp
index b4d5acbeeead1cdd1684f34133d94ae7c756b29b..55c645b45f31db3a0999531c536a4d14f44a3614 100644 (file)
--- a/src/Model/Model_AttributeReference.cpp
+++ b/src/Model/Model_AttributeReference.cpp
@@ -16,8 +16,6 @@
 #include <TDataStd_AsciiString.hxx>
 #include <TDF_Tool.hxx>
 
-using namespace std;
-
 void Model_AttributeReference::setValue(ObjectPtr theObject)
 {
   // now allow to deselect in this attribute: extrusion from/to
@@ -72,7 +70,8 @@ ObjectPtr Model_AttributeReference::value()
       if (myRef->Label().FindAttribute(TDataStd_AsciiString::GetID(), anEntry)) {
         std::shared_ptr<Model_Document> aDR = std::dynamic_pointer_cast<Model_Document>(aRefDoc);
         TDF_Label aRefLab;
-        TDF_Tool::Label(aDR->objects()->featuresLabel().Data(), anEntry->Get().ToCString(), aRefLab);
+        TDF_Tool::Label(aDR->objects()->featuresLabel().Data(),
+          anEntry->Get().ToCString(), aRefLab);
         if (!aRefLab.IsNull()) {
           return aDR->objects()->object(aRefLab);
         }
@@ -104,9 +103,15 @@ bool Model_AttributeReference::isInitialized()
 
 Model_AttributeReference::Model_AttributeReference(TDF_Label& theLabel)
 {
-  myIsInitialized = theLabel.FindAttribute(TDF_Reference::GetID(), myRef) == Standard_True;
+  myLab = theLabel;
+  reinit();
+}
+
+void Model_AttributeReference::reinit()
+{
+  myIsInitialized = myLab.FindAttribute(TDF_Reference::GetID(), myRef) == Standard_True;
   if (!myIsInitialized) {
-    myRef = TDF_Reference::Set(theLabel, theLabel);  // not initialized references to itself
+    myRef = TDF_Reference::Set(myLab, myLab);  // not initialized references to itself
   } else {
     if (owner()) {
       std::shared_ptr<Model_Document> aDoc =