correct xlsx element order, related tdf#59663

Change-Id: Iffb7a766f15475e3600332a6c76a15a1d192d7c8

sc/source/filter/excel/excdoc.cxx

@@ -673,6 +673,10 @@ void ExcTable::FillAsTableXml()
     // all MSODRAWING and OBJ stuff of this sheet goes here
     aRecList.AppendRecord( GetObjectManager().ProcessDrawing( GetSdrPage( mnScTab ) ) );
 
+    XclExpImgData* pImgData = xPageSett->getGraphicExport();
+    if (pImgData)
+        aRecList.AppendRecord(std::shared_ptr<XclExpRecordBase>(pImgData));
+
     aRecList.AppendRecord( xExtLst );
 }
 

sc/source/filter/excel/xepage.cxx

@@ -405,9 +405,14 @@ void XclExpPageSettings::SaveXml( XclExpXmlStream& rStrm )
                     static_cast< sal_uInt16 >( GetXclMaxPos().Col() ) ).SaveXml( rStrm );
     XclExpPageBreaks( EXC_ID_VERPAGEBREAKS, maData.maVerPageBreaks,
                     static_cast< sal_uInt16 >( GetXclMaxPos().Row() ) ).SaveXml( rStrm );
+}
 
+XclExpImgData* XclExpPageSettings::getGraphicExport()
+{
     if( const Graphic* pGraphic = maData.mxBrushItem->GetGraphic() )
-        XclExpImgData( *pGraphic, EXC_ID8_IMGDATA ).SaveXml( rStrm );
+        return new XclExpImgData( *pGraphic, EXC_ID8_IMGDATA );
+
+    return NULL;
 }
 
 XclExpChartPageSettings::XclExpChartPageSettings( const XclExpRoot& rRoot ) :

sc/source/filter/inc/xepage.hxx

@@ -24,6 +24,8 @@
 #include "xlpage.hxx"
 #include "xeroot.hxx"
 
+class XclExpImgData;
+
 // Page settings records ======================================================
 
 // Header/footer --------------------------------------------------------------
@@ -100,6 +102,8 @@ public:
     virtual void        Save( XclExpStream& rStrm ) SAL_OVERRIDE;
     virtual void        SaveXml( XclExpXmlStream& rStrm ) SAL_OVERRIDE;
 
+    XclExpImgData* getGraphicExport();
+
 private:
     XclPageData         maData;         /// Page settings data.
 };