[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

[Stephan Bergmann]

 sc/source/filter/excel/xestream.cxx |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 0e25ff00645b0103b6420156388933b6862694a7
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Wed Dec 11 21:50:26 2013 +0100

    getStatusIndicator can apparently return null
    
    ...at least in CppunitTests
    
    Change-Id: I75f05581db5423dc54ea7810a8cd2bd0f9c0c3f0
    (cherry picked from commit defc4faef618d4273ee5056359f4b8e5eed24a7c)

diff --git a/sc/source/filter/excel/xestream.cxx 
b/sc/source/filter/excel/xestream.cxx
index af7aa78..795f86ba 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1098,7 +1098,8 @@ bool XclExpXmlStream::exportDocument() throw()
 
     uno::Reference<task::XStatusIndicator> xStatusIndicator = 
getStatusIndicator();
 
-    xStatusIndicator->start(ScGlobal::GetRscString(STR_SAVE_DOC), 100);
+    if (xStatusIndicator.is())
+        xStatusIndicator->start(ScGlobal::GetRscString(STR_SAVE_DOC), 100);
 
     // NOTE: Don't use SotStorage or SvStream any more, and never call
     // SfxMedium::GetOutStream() anywhere in the xlsx export filter code!
@@ -1131,13 +1132,16 @@ bool XclExpXmlStream::exportDocument() throw()
     // destruct at the end of the block
     {
         ExcDocument aDocRoot( aRoot );
-        xStatusIndicator->setValue(10);
+        if (xStatusIndicator.is())
+            xStatusIndicator->setValue(10);
         aDocRoot.ReadDoc();
-        xStatusIndicator->setValue(40);
+        if (xStatusIndicator.is())
+            xStatusIndicator->setValue(40);
         aDocRoot.WriteXml( *this );
     }
 
-    xStatusIndicator->end();
+    if (xStatusIndicator.is())
+        xStatusIndicator->end();
     mpRoot = NULL;
     return true;
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits