QgsCoordinateReferenceSystem::readXML() returns false on failure

simplified a check for valid crs
qgis · Dec 11, 2015 · ac1ee1c · ac1ee1c
1 parent 2d0be1c
commit ac1ee1c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp
@@ -400,16 +400,9 @@ bool QgsComposerMapGrid::readXML( const QDomElement& itemElem, const QDomDocumen
     }
   }
 
-
+  if ( !mCRS.readXML( itemElem ) )
-  QDomElement crsElem = itemElem.firstChildElement( "spatialrefsys" );
-  if ( !crsElem.isNull() )
-  {
-    mCRS.readXML( itemElem );
-  }
-  else
-  {
     mCRS = QgsCoordinateReferenceSystem();
-  }
+
   mBlendMode = ( QPainter::CompositionMode )( itemElem.attribute( "blendMode", "0" ).toUInt() );
 
   //annotation

diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp
@@ -1148,6 +1148,7 @@ QString QgsCoordinateReferenceSystem::toWkt() const
 bool QgsCoordinateReferenceSystem::readXML( const QDomNode & theNode )
 {
   QgsDebugMsg( "Reading Spatial Ref Sys from xml ------------------------!" );
+  bool result = true;
   QDomNode srsNode  = theNode.namedItem( "spatialrefsys" );
 
   if ( ! srsNode.isNull() )
@@ -1260,8 +1261,9 @@ bool QgsCoordinateReferenceSystem::readXML( const QDomNode & theNode )
   {
     // Return default CRS if none was found in the XML.
     createFromId( GEOCRS_ID, InternalCrsId );
+    result = false;
   }
-  return true;
+  return result;
 }
 
 bool QgsCoordinateReferenceSystem::writeXML( QDomNode & theNode, QDomDocument & theDoc ) const