coverity#735812 Dereference after null check

Change-Id: Ie839246f637d079e8e16553c85c682d599d86b58

coverity#735812 Dereference after null check
Change-Id: Ie839246f637d079e8e16553c85c682d599d86b58
e1ac3f38 · Caolán McNamara · 246aba2a · e1ac3f38
Kaydet (Commit) e1ac3f38 authored Haz 06, 2014 tarafından Caolán McNamara
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

macromgr.cxx sc/source/ui/docshell/macromgr.cxx +4 -2

No files found.
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -132,7 +132,9 @@ void ScMacroManager::InitUserFuncData()

    Reference< container::XContainer > xModuleContainer;
    SfxObjectShell* pShell = mpDoc->GetDocumentShell();
-    if (pShell && !pShell->GetBasicManager()->GetName().isEmpty())
+    if (!pShell)
+        return;
+    if (!pShell->GetBasicManager()->GetName().isEmpty())
    {
        sProjectName = pShell->GetBasicManager()->GetName();
    }
@@ -151,7 +153,7 @@ void ScMacroManager::InitUserFuncData()
            xModuleContainer->addContainerListener( mxContainerListener );
        }
    }
-    catch( uno::Exception& )
+    catch (const uno::Exception&)
    {
    }
 }