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

[Thorsten Behrens]

 sd/source/ui/view/DocumentRenderer.cxx |    2 +-
 sd/source/ui/view/drawview.cxx         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d53f1f6ee9f02d3d77c76910023986f7f346fc30
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 18 13:19:59 2011 +0100

    Fix fdo#33947 crash in Impress after printing
    
    Fixes lifetime issue with DrawViewShell - solved by not handing
    one in to the print preview DocumentRenderer
    
    Signed-off-by: Thorsten Behrens <tbehrens at novell.com>

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 15461c0..5b6923c 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1329,7 +1329,7 @@ public:
             ::boost::dynamic_pointer_cast<DrawViewShell>(mrBase.GetMainViewShell()));
 
         if ( ! mpPrintView)
-            mpPrintView.reset(new DrawView(mrBase.GetDocShell(), &rPrinter, pDrawViewShell.get()));
+            mpPrintView.reset(new DrawView(mrBase.GetDocShell(), &rPrinter, NULL));
 
         if (nIndex<0 || sal::static_int_cast<sal_uInt32>(nIndex)>=maPrinterPages.size())
             return;
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index ea01586..40ca3a3 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -550,7 +550,7 @@ BOOL DrawView::IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const
 
 void DrawView::MakeVisible(const Rectangle& rRect, ::Window& rWin)
 {
-    if (!rRect.IsEmpty())
+    if (!rRect.IsEmpty() && mpDrawViewShell)
     {
         mpDrawViewShell->MakeVisible(rRect, rWin);
     }