[layout] Converter: fix frame fill in shapes

qgis · Jan 9, 2018 · 4302910 · 4302910
1 parent af8a229
commit 4302910
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/core/layout/qgscompositionconverter.cpp b/src/core/layout/qgscompositionconverter.cpp
@@ -403,6 +403,9 @@ bool QgsCompositionConverter::readShapeXml( QgsLayoutItemShape *layoutItem, cons
 
     layoutItem->setSymbol( QgsFillSymbol::createSimple( properties ) );
   }
+  // Diable frame for shapes
+  layoutItem->setFrameEnabled( false );
+  layoutItem->setBackgroundEnabled( false );
 
   return true;
 }

diff --git a/tests/src/core/testqgscompositionconverter.cpp b/tests/src/core/testqgscompositionconverter.cpp
@@ -183,6 +183,7 @@ void TestQgsCompositionConverter::importComposerTemplateShape()
   QCOMPARE( shape->backgroundColor(), QColor( 255, 255, 255, 255 ) );
   QCOMPARE( ( int )shape->rotation(), 0 );
   QCOMPARE( shape->hasFrame(), false );
+  QCOMPARE( shape->hasBackground(), false );
 
   qDeleteAll( items );
 }