diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-05 17:34:44 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-05 17:34:44 +0200 |
| commit | e7a1b357901efbb69bed7a11b9a1c03747eb16de (patch) | |
| tree | d2b767ad62835bcc55480403047f697aa1988346 | |
| parent | da4aa2cce2492e3dfae429ffdb93024deff9bfed (diff) | |
| parent | d53f1f6ee9f02d3d77c76910023986f7f346fc30 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-3' into libreoffice-3-4
| -rw-r--r-- | sd/source/ui/slideshow/slideshowviewimpl.cxx | 12 | ||||
| -rw-r--r-- | sd/source/ui/view/DocumentRenderer.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drawview.cxx | 2 |
3 files changed, 13 insertions, 3 deletions
diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index 2000ae0c4..fa293b2a7 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(); } } diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 5c28aa582..758e5ed85 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/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; diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx index c346855fc..151762c53 100644 --- a/sd/source/ui/view/drawview.cxx +++ b/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); } |