Merge remote-tracking branch 'origin/libreoffice-3-4'

sd/source/ui/slideshow/slideshowviewimpl.cxx

@@ -500,7 +500,17 @@ void SlideShowView::updateimpl( ::osl::ClearableMutexGuard& rGuard, SlideshowImp
     if( pSlideShow )
     {
         ::rtl::Reference< SlideshowImpl > aSLGuard( pSlideShow );
-        rGuard.clear();
+
+        if( mbFirstPaint )
+        {
+            mbFirstPaint = false;
+            SlideshowImpl* pSlideShow = mpSlideShow;
+            rGuard.clear();
+            if( pSlideShow )
+                pSlideShow->onFirstPaint();
+        } else
+            rGuard.clear();
+
         pSlideShow->startUpdateTimer();
     }
 }

sd/source/ui/view/DocumentRenderer.cxx

@@ -1362,7 +1362,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;

sd/source/ui/view/drawview.cxx

@@ -555,7 +555,7 @@ sal_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);
     }