Fix broken export of DXF labels

nyalldawson · nyalldawson · commit 3405bc159852 · 2017-11-20T08:29:17.000+11:00
diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -1014,9 +1014,10 @@ void QgsDxfExport::writeEntities()
         rblp = nullptr;
       }
     }
-    else
+    else if ( labeling )
     {
-      lp = new QgsDxfLabelProvider( vl, QString(), this, nullptr );
+      QgsPalLayerSettings settings = labeling->settings();
+      lp = new QgsDxfLabelProvider( vl, QString(), this, &settings );
       engine.addProvider( lp );
 
       if ( !lp->prepare( ctx, attributes ) )

Original file line number	Diff line number	Diff line change
`@@ -1014,9 +1014,10 @@ void QgsDxfExport::writeEntities()`
`1014`	`1014`	`rblp = nullptr;`
`1015`	`1015`	`}`
`1016`	`1016`	`}`
`1017`		`- else`
	`1017`	`+ else if ( labeling )`
`1018`	`1018`	`{`
`1019`		`- lp = new QgsDxfLabelProvider( vl, QString(), this, nullptr );`
	`1019`	`+ QgsPalLayerSettings settings = labeling->settings();`
	`1020`	`+ lp = new QgsDxfLabelProvider( vl, QString(), this, &settings );`
`1020`	`1021`	`engine.addProvider( lp );`
`1021`	`1022`
`1022`	`1023`	`if ( !lp->prepare( ctx, attributes ) )`