diff options
author | Rüdiger Timm <rt@openoffice.org> | 2007-04-03 14:41:46 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2007-04-03 14:41:46 +0000 |
commit | d6ccc2350862fc9782b6822b74bfc78e6a84a29d (patch) | |
tree | d58e4febe34a63e619c9db3f9d4503b983b59fd8 /sd/source/ui/dlg/docprev.cxx | |
parent | 047765da8a8d06995accc8570adf7966dde35bba (diff) |
INTEGRATION: CWS components1 (1.17.148); FILE MERGED
2007/01/25 14:44:38 af 1.17.148.4: RESYNC: (1.19-1.20); FILE MERGED
2006/11/21 16:14:20 af 1.17.148.3: RESYNC: (1.18-1.19); FILE MERGED
2006/09/25 16:59:35 af 1.17.148.2: RESYNC: (1.17-1.18); FILE MERGED
2006/09/15 08:59:40 af 1.17.148.1: #i68075# Added parent window argument to SlideShow constructor.
Diffstat (limited to 'sd/source/ui/dlg/docprev.cxx')
-rw-r--r-- | sd/source/ui/dlg/docprev.cxx | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx index c30892fe3a0b..2f19f4213b11 100644 --- a/sd/source/ui/dlg/docprev.cxx +++ b/sd/source/ui/dlg/docprev.cxx @@ -4,9 +4,9 @@ * * $RCSfile: docprev.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: obo $ $Date: 2007-03-14 13:11:50 $ + * last change: $Author: rt $ $Date: 2007-04-03 15:41:46 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -87,6 +87,9 @@ #ifndef SD_VIEW_SHELL_HXX #include "ViewShell.hxx" #endif +#ifndef SD_VIEW_SHELL_BASE_HXX +#include "ViewShellBase.hxx" +#endif #ifndef SD_SHOW_VIEW_HXX #include "showview.hxx" #endif @@ -94,6 +97,7 @@ #include "drawview.hxx" #endif #include "sdpage.hxx" +#include "sfx2/viewfrm.hxx" #ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> @@ -240,14 +244,18 @@ void SdDocPreviewWin::startPreview() if( pPage && (pPage->getTransitionType() != 0) ) { - std::auto_ptr<sd::Slideshow> pSlideShow( - new sd::Slideshow( 0, 0, pDoc ) ); - - Reference< XDrawPage > xDrawPage( pPage->getUnoPage(), UNO_QUERY ); - Reference< XAnimationNode > xAnimationNode; - - if (pSlideShow->startPreview( xDrawPage, xAnimationNode, this )) - mpSlideShow = pSlideShow.release(); + SfxViewFrame* pFrame = SfxViewFrame::Current(); + if (pFrame != NULL) + { + std::auto_ptr<sd::Slideshow> pSlideShow( + new sd::Slideshow( 0, 0, pDoc, &pFrame->GetWindow() ) ); + + Reference< XDrawPage > xDrawPage( pPage->getUnoPage(), UNO_QUERY ); + Reference< XAnimationNode > xAnimationNode; + + if (pSlideShow->startPreview( xDrawPage, xAnimationNode, this )) + mpSlideShow = pSlideShow.release(); + } } } } |