[Libreoffice-commits] core.git: oox/source

[nd101 (via logerrit)]

 oox/source/drawingml/chart/plotareacontext.cxx |    2 +-
 oox/source/drawingml/chart/plotareamodel.cxx   |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d851a02df57ab378ed0cc6d9362516de09c3279c
Author:     nd101 <Fong at nd.com.cn>
AuthorDate: Tue Jun 23 22:15:40 2020 +0800
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Jul 14 22:06:10 2020 +0200

    tdf#60316 Chart plotarea background issue
    
    The default shall be of nofill instead of white.
    
    Change-Id: Id29feb7d1f8a24e4c3c768aa69f2775cdbf031a0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96955
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/oox/source/drawingml/chart/plotareacontext.cxx b/oox/source/drawingml/chart/plotareacontext.cxx
index 76f7c7ef1956..4f231e0eda35 100644
--- a/oox/source/drawingml/chart/plotareacontext.cxx
+++ b/oox/source/drawingml/chart/plotareacontext.cxx
@@ -191,7 +191,7 @@ ContextHandlerRef PlotAreaContext::onCreateContext( sal_Int32 nElement, const At
                 case C_TOKEN( layout ):
                     return new LayoutContext( *this, mrModel.mxLayout.create() );
                 case C_TOKEN( spPr ):
-                    return new ShapePropertiesContext( *this, mrModel.mxShapeProp.create() );
+                    return new ShapePropertiesContext( *this, mrModel.mxShapeProp.getOrCreate() );
                 case C_TOKEN(dTable):
                     return new DataTableContext( *this, mrModel.mxDataTable.create() );
             }
diff --git a/oox/source/drawingml/chart/plotareamodel.cxx b/oox/source/drawingml/chart/plotareamodel.cxx
index 72abacc20570..c5e403a2453a 100644
--- a/oox/source/drawingml/chart/plotareamodel.cxx
+++ b/oox/source/drawingml/chart/plotareamodel.cxx
@@ -18,6 +18,8 @@
  */
 
 #include <drawingml/chart/plotareamodel.hxx>
+#include <drawingml/fillproperties.hxx>
+#include <oox/token/tokens.hxx>
 
 namespace oox::drawingml::chart {
 
@@ -53,6 +55,7 @@ DataTableModel::~DataTableModel()
 
 PlotAreaModel::PlotAreaModel()
 {
+    mxShapeProp.create().getFillProperties().moFillType = XML_noFill;
 }
 
 PlotAreaModel::~PlotAreaModel()