SLD parsing: handling ogc:Literal within CssParameter

jgrocha · rldhont · commit 8d99a120d01f · 2017-01-23T10:05:30.000+01:00
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp
@@ -2663,21 +2663,21 @@ QgsStringMap QgsSymbolLayerV2Utils::getSvgParameterList( QDomElement &element )
     if ( paramElem.localName() == "SvgParameter" || paramElem.localName() == "CssParameter" )
     {
       QString name = paramElem.attribute( "name" );
-      if (paramElem.firstChild().nodeType() == QDomNode::TextNode)
+      if ( paramElem.firstChild().nodeType() == QDomNode::TextNode )
       {
         value = paramElem.firstChild().nodeValue();
       }
       else
       {
-        if (paramElem.firstChild().nodeType() == QDomNode::ElementNode &&
-            paramElem.firstChild().localName() == "Literal")
+        if ( paramElem.firstChild().nodeType() == QDomNode::ElementNode &&
+             paramElem.firstChild().localName() == "Literal" )
         {
-          QgsDebugMsg(paramElem.firstChild().localName());
+          QgsDebugMsg( paramElem.firstChild().localName() );
           value = paramElem.firstChild().firstChild().nodeValue();
         }
         else
         {
-          QgsDebugMsg(QString("unexpected child of %1").arg(paramElem.localName()));
+          QgsDebugMsg( QString( "unexpected child of %1" ).arg( paramElem.localName() ) );
         }
       }
 

Original file line number	Diff line number	Diff line change
`@@ -2663,21 +2663,21 @@ QgsStringMap QgsSymbolLayerV2Utils::getSvgParameterList( QDomElement &element )`
`2663`	`2663`	`if ( paramElem.localName() == "SvgParameter" \|\| paramElem.localName() == "CssParameter" )`
`2664`	`2664`	`{`
`2665`	`2665`	`QString name = paramElem.attribute( "name" );`
`2666`		`- if (paramElem.firstChild().nodeType() == QDomNode::TextNode)`
	`2666`	`+ if ( paramElem.firstChild().nodeType() == QDomNode::TextNode )`
`2667`	`2667`	`{`
`2668`	`2668`	`value = paramElem.firstChild().nodeValue();`
`2669`	`2669`	`}`
`2670`	`2670`	`else`
`2671`	`2671`	`{`
`2672`		`- if (paramElem.firstChild().nodeType() == QDomNode::ElementNode &&`
`2673`		`- paramElem.firstChild().localName() == "Literal")`
	`2672`	`+ if ( paramElem.firstChild().nodeType() == QDomNode::ElementNode &&`
	`2673`	`+ paramElem.firstChild().localName() == "Literal" )`
`2674`	`2674`	`{`
`2675`		`- QgsDebugMsg(paramElem.firstChild().localName());`
	`2675`	`+ QgsDebugMsg( paramElem.firstChild().localName() );`
`2676`	`2676`	`value = paramElem.firstChild().firstChild().nodeValue();`
`2677`	`2677`	`}`
`2678`	`2678`	`else`
`2679`	`2679`	`{`
`2680`		`- QgsDebugMsg(QString("unexpected child of %1").arg(paramElem.localName()));`
	`2680`	`+ QgsDebugMsg( QString( "unexpected child of %1" ).arg( paramElem.localName() ) );`
`2681`	`2681`	`}`
`2682`	`2682`	`}`
`2683`	`2683`