diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-12 15:25:20 -0400 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-10-15 15:05:23 +0200 |
| commit | cc6c29d408245da325178da2f47e1c1220526de9 (patch) | |
| tree | 0339e724939a3b1a5d2726b2d3712df95f18b074 | |
| parent | 4126a8e2244d0c320a53c5720c3d5664563c8acc (diff) | |
Check for null object. The OLE name may not always be set.
(cherry picked from commit fb1d9cc99e026ba9cf15ab49b2251cecfbbf6d10)
Signed-off-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit ea50fe437b4f61e6c97d81721441da2b7d1e2f66)
Change-Id: Ib3e55af8870b41a5b76179d2215fc5125ceda5af
Signed-off-by: Michael Meeks <michael.meeks@suse.com>
Signed-off-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | sc/source/filter/excel/xiescher.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 900d2e6f86d2..894016791a2f 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; |