[Libreoffice-commits] .: sd/source

Caolán McNamara caolan at kemper.freedesktop.org
Wed Apr 13 05:17:02 PDT 2011


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

New commits:
commit 4af2ee43a6d0bd81ba3fd61fdef663622662359b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Apr 13 13:13:45 2011 +0100

    make this safe

diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index b30f483..15797bf 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -553,8 +553,10 @@ IMPL_LINK(ViewOverlayManager,UpdateTagsHdl, void *, EMPTYARG)
 bool ViewOverlayManager::CreateTags()
 {
     bool bChanges = false;
+
+    ::boost::shared_ptr<ViewShell> aMainShell = mrBase.GetMainViewShell();
     
-    SdPage* pPage = mrBase.GetMainViewShell()->getCurrentPage();
+    SdPage* pPage = aMainShell.get() ? aMainShell->getCurrentPage() : NULL;
     
     if( pPage && !pPage->IsMasterPage() && (pPage->GetPageKind() == PK_STANDARD) )    
     {


More information about the Libreoffice-commits mailing list