@@ -1655,18 +1655,6 @@ bool QgsVectorLayer::readXml( const QDomNode& layer_node )
1655
1655
updateFields ();
1656
1656
connect ( QgsMapLayerRegistry::instance (), SIGNAL ( layerWillBeRemoved ( QString ) ), this , SLOT ( checkJoinLayerRemove ( QString ) ) );
1657
1657
1658
- QDomNode prevExpNode = layer_node.namedItem ( " previewExpression" );
1659
-
1660
- if ( prevExpNode.isNull () )
1661
- {
1662
- mDisplayExpression = " " ;
1663
- }
1664
- else
1665
- {
1666
- QDomElement prevExpElem = prevExpNode.toElement ();
1667
- mDisplayExpression = prevExpElem.text ();
1668
- }
1669
-
1670
1658
QString errorMsg;
1671
1659
if ( !readSymbology ( layer_node, errorMsg ) )
1672
1660
{
@@ -1852,12 +1840,6 @@ bool QgsVectorLayer::writeXml( QDomNode & layer_node,
1852
1840
layer_node.appendChild ( provider );
1853
1841
}
1854
1842
1855
- // save preview expression
1856
- QDomElement prevExpElem = document.createElement ( " previewExpression" );
1857
- QDomText prevExpText = document.createTextNode ( mDisplayExpression );
1858
- prevExpElem.appendChild ( prevExpText );
1859
- layer_node.appendChild ( prevExpElem );
1860
-
1861
1843
// save joins
1862
1844
mJoinBuffer ->writeXml ( layer_node, document );
1863
1845
@@ -1976,13 +1958,25 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
1976
1958
1977
1959
mConditionalStyles ->readXml ( node );
1978
1960
1961
+ QDomNode prevExpNode = node.namedItem ( " previewExpression" );
1962
+
1963
+ if ( prevExpNode.isNull () )
1964
+ {
1965
+ mDisplayExpression = " " ;
1966
+ }
1967
+ else
1968
+ {
1969
+ QDomElement prevExpElem = prevExpNode.toElement ();
1970
+ mDisplayExpression = prevExpElem.text ();
1971
+ }
1972
+
1973
+
1979
1974
readCustomProperties ( node, " variable" );
1980
1975
1981
1976
QDomElement mapLayerNode = node.toElement ();
1982
1977
if ( mapLayerNode.attribute ( " readOnly" , " 0" ).toInt () == 1 )
1983
1978
mReadOnly = true ;
1984
1979
1985
-
1986
1980
return true ;
1987
1981
}
1988
1982
@@ -2193,6 +2187,12 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString&
2193
2187
}
2194
2188
node.appendChild ( defaultsElem );
2195
2189
2190
+ // preview expression
2191
+ QDomElement prevExpElem = doc.createElement ( " previewExpression" );
2192
+ QDomText prevExpText = doc.createTextNode ( mDisplayExpression );
2193
+ prevExpElem.appendChild ( prevExpText );
2194
+ node.appendChild ( prevExpElem );
2195
+
2196
2196
return true ;
2197
2197
}
2198
2198
0 commit comments