[mapguide-commits] r6060 - trunk/MgDev/Server/src/Services/Rendering

[svn_mapguide at osgeo.org]

Author: liuar
Date: 2011-08-11 21:32:45 -0700 (Thu, 11 Aug 2011)
New Revision: 6060

Modified:
   trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
Log:
Submit on behalf of Sam Wang
Implements RFC 114 - Extend MapGuide API to Support Save Points
Ticket: http://trac.osgeo.org/mapguide/ticket/1737
+++++++++++++++++++++++++++
1. Fixed a small logic error which causes layer stylization failed
check if vl->GetUrlData() is null before checking if vl->GetUrlData()->GetUrlContent() is empty.
2. Changed the code style to move the if () case to a separate line.

Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp	2011-08-11 12:58:11 UTC (rev 6059)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.cpp	2011-08-12 04:32:45 UTC (rev 6060)
@@ -1576,8 +1576,10 @@
                                              uig);   // uiGraphic
 
                     //extract hyperlink and tooltip info
-                    if (!vl->GetToolTip().empty()) layerinfo.hastooltips() = true;
-                    if (!vl->GetUrlData()->GetUrlContent().empty()) layerinfo.hashyperlinks() = true;
+                    if (!vl->GetToolTip().empty()) 
+                        layerinfo.hastooltips() = true;
+                    if (vl->GetUrlData() && !vl->GetUrlData()->GetUrlContent().empty()) 
+                        layerinfo.hashyperlinks() = true;
 
                     //set up the property name mapping -- it tells us what
                     //string the viewer should be displaying as the name of each