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

[Stephan Bergmann]

 oox/source/ole/vbaexport.cxx |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 6d8b9aab3cea5b88b3cb56d9343500d45be8b124
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Sep 10 11:04:32 2015 +0200

    Attempt at making CppunitTest_sc_macros_test work again
    
    ...after b15b372c7cc64315e14c7600429f0995ed2b2666 "structure for vba export"
    broke it; moggi, please revisit
    
    Change-Id: I9cf1614b05ebad64898d0e62cfeb4cd2e24dc9e0

diff --git a/oox/source/ole/vbaexport.cxx b/oox/source/ole/vbaexport.cxx
index d6e2b4f..10c0d21 100644
--- a/oox/source/ole/vbaexport.cxx
+++ b/oox/source/ole/vbaexport.cxx
@@ -769,6 +769,9 @@ void exportPROJECTwmStream(SvStream& rStrm, const css::uno::Sequence<OUString>&
 void VbaExport::exportVBA(SotStorage* pRootStorage)
 {
     css::uno::Reference<css::container::XNameContainer> xNameContainer = getBasicLibrary();
+    if (!xNameContainer.is()) {
+        return;
+    }
     css::uno::Sequence<OUString> aElementNames = xNameContainer->getElementNames();
     sal_Int32 n = aElementNames.getLength(); // get the number of modules