-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
State aRes = Acceptable;
QString aName = theName.simplified();
- if ( aName.isEmpty() )
+ if( !myEditedObject.IsNull() ) // To avoid problems when myEditedObject is not set yet
{
- aRes = Intermediate;
- }
- else if( !myEditedObject.IsNull() && myEditedObject->GetName() != theName )
- {
- // check that there are no other objects with the same name in the document
- Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( myModule, aName );
- if ( !anObject.IsNull() )
+ if ( aName.isEmpty() )
{
aRes = Intermediate;
}
+ else if( myEditedObject->GetName() != theName )
+ {
+ // check that there are no other objects with the same name in the document
+ Handle(HYDROData_Entity) anObject = HYDROGUI_Tool::FindObjectByName( myModule, aName );
+ if ( !anObject.IsNull() )
+ {
+ aRes = Intermediate;
+ }
+ }
}
return aRes;
emit alreadyExists( theName );
}
- theName = myEditedObject->GetName();
+ if( !myEditedObject.IsNull() )
+ {
+ theName = myEditedObject->GetName();
+ }
}
void HYDROGUI_NameValidator::setEditedObject( const Handle(HYDROData_Entity) theObj )