no message

diff --git a/src/DDS/DDS_DicGroup.cxx b/src/DDS/DDS_DicGroup.cxx
index a9cba4ebeefc68853edb23a603d9c9147059d9e1..40f42a3176901afa42e20c0b9d40508b7c02265d 100644 (file)
--- a/src/DDS/DDS_DicGroup.cxx
+++ b/src/DDS/DDS_DicGroup.cxx
@@ -68,8 +68,6 @@ void DDS_DicGroup::operator=( const DDS_DicGroup& )
 
 void DDS_DicGroup::FillDataMap( const LDOM_Element& theComponentData, const LDOM_Element& theDocElement )
 {
-  TColStd_SequenceOfAsciiString unitSystems;
-
   TCollection_AsciiString aCompName = theComponentData.getAttribute( DDS_Dictionary::KeyWord( "COMPONENT_NAME" ) );
 
   LDOM_Element systems = theComponentData.GetChildByTagName( DDS_Dictionary::KeyWord( "UNIT_SYSTEMS" ) );
@@ -87,8 +85,6 @@ void DDS_DicGroup::FillDataMap( const LDOM_Element& theComponentData, const LDOM
 
       if ( !myUnitSystem.IsBound( aName ) )
         myUnitSystem.Bind( aName, aLabel );
-
-      unitSystems.Append( aName );
     }
   }
 
@@ -98,6 +94,9 @@ void DDS_DicGroup::FillDataMap( const LDOM_Element& theComponentData, const LDOM
     myUnitSystem.Bind( UNIT_SYSTEM_SI, TCollection_ExtendedString( "System international" ) );
   }
 
+  TColStd_SequenceOfAsciiString unitSystems;
+  GetUnitSystems( unitSystems );
+
   LDOM_NodeList aData = theComponentData.getElementsByTagName( DDS_Dictionary::KeyWord( "DATUM" ) );
   if ( !aData.getLength() )
     return;

diff --git a/src/DDS/DDS_DicItem.cxx b/src/DDS/DDS_DicItem.cxx
index b7a0e1bad57f965ad7a1d7571c9ead252e3b911e..868ce89a6f14d12ccdc3c98ad929373cdf07bfe8 100644 (file)
--- a/src/DDS/DDS_DicItem.cxx
+++ b/src/DDS/DDS_DicItem.cxx
@@ -318,7 +318,7 @@ void DDS_DicItem::FillDataMap( TCollection_AsciiString theID, const LDOM_Element
 
   TCollection_AsciiString aBaseKeyWord = DDS_Dictionary::KeyWord( "DATUM_UNITS" );
 
-  for ( Standard_Integer j = 0; j < theSystems.Length(); j++ )
+  for ( Standard_Integer j = 1; j <= theSystems.Length(); j++ )
   {
     UnitSystem anUnitSystem = theSystems.Value( j );
     if ( !anUnitSystem.Length() )

diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx
index 0d2369e1834dbec020926382ecea73e850b65288..1af7d56d6076480548226a17646c0ba4bc8f995a 100644 (file)
--- a/src/QDS/QDS_Datum.cxx
+++ b/src/QDS/QDS_Datum.cxx
@@ -922,7 +922,6 @@ void QDS_Datum::unitSystemChanged( const QString& unitSystem )
   if ( labelWidget() )
     labelWidget()->setText( labText );
 
-
   if ( unitsWidget() )
     unitsWidget()->setText( unitText );