[Libreoffice-commits] .: Branch 'libreoffice-3-6-3' - sc/source

[Libreoffice Gerrit user]

 sc/source/filter/excel/xiescher.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc6c29d408245da325178da2f47e1c1220526de9
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Fri Oct 12 15:25:20 2012 -0400

    Check for null object.  The OLE name may not always be set.
    
    (cherry picked from commit fb1d9cc99e026ba9cf15ab49b2251cecfbbf6d10)
    
    Signed-off-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    (cherry picked from commit ea50fe437b4f61e6c97d81721441da2b7d1e2f66)
    
    Change-Id: Ib3e55af8870b41a5b76179d2215fc5125ceda5af
    Signed-off-by: Michael Meeks <michael.meeks at suse.com>
    Signed-off-by: Eike Rathke <erack at redhat.com>

diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 900d2e6..8940167 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3210,7 +3210,7 @@ String XclImpObjectManager::GetOleNameOverride( SCTAB nTab, sal_uInt16 nObjId )
     rtl::OUString sOleName;
     String sCodeName = GetExtDocOptions().GetCodeName( nTab );
 
-    if (  mxOleCtrlNameOverride->hasByName( sCodeName ) )
+    if (mxOleCtrlNameOverride.is() && mxOleCtrlNameOverride->hasByName(sCodeName))
     {
         Reference< XIndexContainer > xIdToOleName;
         mxOleCtrlNameOverride->getByName( sCodeName ) >>= xIdToOleName;