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

[Norbert Thiebaud]

 oox/source/export/shapes.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a64df1b8fd594dceb561565a77db5cc095085e66
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Feb 21 18:43:20 2013 -0600

    coverity#983372 : Dereference before null check
    
    Change-Id: Icfb2db359f2cf2625e1f7e5ed7ed0f255d40d21c
    Reviewed-on: https://gerrit.libreoffice.org/2319
    Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
    Tested-by: Thomas Arnhold <thomas at arnhold.org>

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 41d505a..d276f74 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -1311,11 +1311,11 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference< XShape > xShape )
                 // this part now supports only embedded spreadsheets, it can be extended to support remaining ooxml documents
                 // only exporter, counter and object filename are specific to spreadsheet
                 Reference< XSpreadsheetDocument > xSheetDoc( mAny, UNO_QUERY );
-                if( xSheetDoc.is() )
+                if( xSheetDoc.is() && mpFB)
                 {
                     Reference< XComponent > xDocument( mAny, UNO_QUERY );
                     Reference< XExporter > xExporter( mpFB->getServiceFactory()->createInstance( "com.sun.star.comp.oox.ExcelFilterExport" ), UNO_QUERY );
-                    if( xDocument.is() && xExporter.is() && mpFB )
+                    if( xDocument.is() && xExporter.is())
                     {
                         Reference< XOutputStream > xOutStream = mpFB->openFragmentStream( OUStringBuffer()
                                                                                           .appendAscii( GetComponentDir() )