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

[Petr Mladek]

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

New commits:
commit e7a1b357901efbb69bed7a11b9a1c03747eb16de
Merge: da4aa2c... d53f1f6...
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Apr 5 17:34:44 2011 +0200

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

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);
     }
commit dbf952b83b4cc8fbb7576a0959142920f824d87d
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Mar 8 15:31:11 2011 +0100

    Version 3.3.2.1, tag libreoffice-3.3.2.1 (3.3.2-rc1)
commit 89fe9346a5292ddb1ac19ba734034b61e4b628b2
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Feb 22 11:23:46 2011 +0000

    fix fdo#34533 - occasional blank first slide in presentation

diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx
index 2000ae0..fa293b2 100644
--- a/sd/source/ui/slideshow/slideshowviewimpl.cxx
+++ b/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();
     }
 }