X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_AttributeRefList.cpp;h=44f7e44ab01fa922d1923a40384c438f3a742e65;hb=3ce3e69a217055142b03d67add35d054979a6340;hp=7ffe0c4d38333c3e13ff49358c54272873fc3588;hpb=31edf016c396284daaf418095e2a8d908c945b6a;p=modules%2Fshaper.git diff --git a/src/Model/Model_AttributeRefList.cpp b/src/Model/Model_AttributeRefList.cpp index 7ffe0c4d3..44f7e44ab 100644 --- a/src/Model/Model_AttributeRefList.cpp +++ b/src/Model/Model_AttributeRefList.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// Copyright (C) 2014-2020 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -12,10 +12,9 @@ // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "Model_AttributeRefList.h" @@ -183,7 +182,9 @@ ObjectPtr Model_AttributeRefList::iteratedObject(TDF_ListIteratorOfLabelList& th } theExtIter.Next(); } else { // internal document object - anObj = theDoc->objects()->object(theLIter.Value()); + TDF_Label aLab = theLIter.Value(); + if (!aLab.IsNull()) + anObj = theDoc->objects()->object(theLIter.Value()); } } return anObj; @@ -331,12 +332,11 @@ void Model_AttributeRefList::createHash() myHashObjects.insert(anObj); } } - if (!myHashObjects.empty()) // on open document with multi-rotation referenced have no results - myHashUsed = true; } + if (!myHashObjects.empty()) // on open document with multi-rotation referenced have no results + myHashUsed = true; } - void Model_AttributeRefList::eraseHash() { myHashObjects.clear();