[Libreoffice-commits] .: sd/source

Caolán McNamara caolan at kemper.freedesktop.org
Wed Feb 16 08:46:04 PST 2011


 sd/source/ui/unoidl/DrawController.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1a9c37ac56b97aaf7535bff7bd2fb84b13ef8e50
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 16 16:45:48 2011 +0000

    Resolves: rhbz#674330 dereference of NULL mpBase

diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 6f3c1e1..f64b649 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -166,7 +166,9 @@ void SAL_CALL DrawController::dispose (void)
         {
             mbDisposing = true;
 
-            boost::shared_ptr<ViewShell> pViewShell = mpBase->GetMainViewShell();
+            boost::shared_ptr<ViewShell> pViewShell;
+            if (mpBase)
+                pViewShell = mpBase->GetMainViewShell();
             if ( pViewShell )
             {
                 pViewShell->DeactivateCurrentFunction();


More information about the Libreoffice-commits mailing list