qgis · Jul 26, 2017
diff --git a/‎python/core/qgsvectorlayerlabeling.sip
Lines changed: 6 additions & 0 deletions b/‎python/core/qgsvectorlayerlabeling.sip
Lines changed: 6 additions & 0 deletions
diff --git a/‎python/core/symbology-ng/qgssymbollayerutils.sip
Lines changed: 8 additions & 0 deletions b/‎python/core/symbology-ng/qgssymbollayerutils.sip
Lines changed: 8 additions & 0 deletions
diff --git a/‎src/core/qgsvectorlayer.cpp
Lines changed: 3 additions & 2 deletions b/‎src/core/qgsvectorlayer.cpp
Lines changed: 3 additions & 2 deletions
@@ -76,6 +76,11 @@ Try to create instance of an implementation based on the XML data
  :rtype: QgsAbstractVectorLayerLabeling
 %End
 
+    virtual void toSld( QDomNode &parent, const QgsStringMap &props ) const;
+%Docstring
+ Writes the SE 1.1 TextSymbolizer element based on the current layer labeling settings
+%End
+
   private:
     QgsAbstractVectorLayerLabeling( const QgsAbstractVectorLayerLabeling &rhs );
 };
@@ -105,6 +110,7 @@ Constructs simple labeling configuration with given initial settings
     virtual QgsPalLayerSettings settings( const QString &providerId = QString() ) const;
     virtual bool requiresAdvancedEffects() const;
 
+    virtual void toSld( QDomNode &parent, const QgsStringMap &props ) const;
 
     static QgsVectorLayerSimpleLabeling *create( const QDomElement &element, const QgsReadWriteContext &context );
 %Docstring
 
@@ -481,6 +481,14 @@ Create ogr feature style string for pen
  :rtype: bool
 %End
 
+    static void createAnchorPointElement( QDomDocument &doc, QDomElement &element, QPointF anchor );
+%Docstring
+ Creates a SE 1.1 anchor point element as a child of the specified element
+ \param doc The document
+ \param element The parent element
+ \param anchor An anchor specification, with values between 0 and 1
+%End
+
     static void createOnlineResourceElement( QDomDocument &doc, QDomElement &element, const QString &path, const QString &format );
     static bool onlineResourceFromSldElement( QDomElement &element, QString &path, QString &format );
 %Docstring
 
@@ -2211,7 +2211,8 @@ bool QgsVectorLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
     QgsSymbolLayerUtils::mergeScaleDependencies( maximumScale(), minimumScale(), localProps );
   }
 
-  if ( isSpatial() ) {
+  if ( isSpatial() )
+  {
     // store the Name element
     QDomElement nameNode = doc.createElement( "se:Name" );
     nameNode.appendChild( doc.createTextNode( name() ) );
@@ -2229,7 +2230,7 @@ bool QgsVectorLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error
     userStyleElem.appendChild( featureTypeStyleElem );
 
     mRenderer->toSld( doc, featureTypeStyleElem, localProps );
-    if ( mLabeling != nullptr )
+    if ( labelsEnabled() )
     {
       mLabeling->toSld( featureTypeStyleElem, localProps );
     }
Original file line number	Diff line number	Diff line change
`@@ -2211,7 +2211,8 @@ bool QgsVectorLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error`
`2211`	`2211`	`QgsSymbolLayerUtils::mergeScaleDependencies( maximumScale(), minimumScale(), localProps );`
`2212`	`2212`	`}`
`2213`	`2213`
`2214`		`- if ( isSpatial() ) {`
	`2214`	`+ if ( isSpatial() )`
	`2215`	`+ {`
`2215`	`2216`	`// store the Name element`
`2216`	`2217`	`QDomElement nameNode = doc.createElement( "se:Name" );`
`2217`	`2218`	`nameNode.appendChild( doc.createTextNode( name() ) );`
`@@ -2229,7 +2230,7 @@ bool QgsVectorLayer::writeSld( QDomNode &node, QDomDocument &doc, QString &error`
`2229`	`2230`	`userStyleElem.appendChild( featureTypeStyleElem );`
`2230`	`2231`
`2231`	`2232`	`mRenderer->toSld( doc, featureTypeStyleElem, localProps );`
`2232`		`- if ( mLabeling != nullptr )`
	`2233`	`+ if ( labelsEnabled() )`
`2233`	`2234`	`{`
`2234`	`2235`	`mLabeling->toSld( featureTypeStyleElem, localProps );`
`2235`	`2236`	`}`