INTEGRATION: CWS aw024 (1.20.4); FILE MERGED

2006/11/10 05:10:24 aw 1.20.4.9: RESYNC: (1.32-1.33); FILE MERGED
2006/09/21 23:22:29 aw 1.20.4.8: RESYNC: (1.31-1.32); FILE MERGED
2006/08/03 16:34:43 aw 1.20.4.7: RESYNC: (1.29-1.31); FILE MERGED
2006/05/12 20:36:50 aw 1.20.4.6: RESYNC: (1.27-1.29); FILE MERGED
2006/01/26 20:11:09 aw 1.20.4.5: RESYNC: (1.26-1.27); FILE MERGED
2005/11/18 14:36:20 aw 1.20.4.4: RESYNC: (1.22-1.26); FILE MERGED
2005/09/17 13:10:19 aw 1.20.4.3: RESYNC: (1.21-1.22); FILE MERGED
2005/07/22 09:30:46 aw 1.20.4.2: RESYNC: (1.20-1.21); FILE MERGED
2005/05/19 12:11:31 aw 1.20.4.1: #i39529#
This commit is contained in:
Ivo Hinkelmann 2006-11-14 13:34:54 +00:00
parent b238a07aa3
commit 637e8e2c6e

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: slideshowimpl.cxx,v $ * $RCSfile: slideshowimpl.cxx,v $
* *
* $Revision: 1.33 $ * $Revision: 1.34 $
* *
* last change: $Author: kz $ $Date: 2006-10-06 10:37:52 $ * last change: $Author: ihi $ $Date: 2006-11-14 14:34:54 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -661,7 +661,7 @@ bool SlideshowImpl::startPreview(
if( mpView ) if( mpView )
{ {
mpView->AddWin( mpShowWindow ); mpView->AddWindowToPaintView( mpShowWindow );
mpView->SetAnimationPause( TRUE ); mpView->SetAnimationPause( TRUE );
} }
@ -887,7 +887,7 @@ bool SlideshowImpl::startShow( PresentationSettings* pPresSettings )
if( mpView ) if( mpView )
{ {
mpView->AddWin( mpShowWindow ); mpView->AddWindowToPaintView( mpShowWindow );
mpView->SetAnimationPause( TRUE ); mpView->SetAnimationPause( TRUE );
} }
@ -1079,7 +1079,7 @@ void SlideshowImpl::stopShow()
// der DrawView das Praesentationfenster wegnehmen und ihr dafuer ihre alten Fenster wiedergeben // der DrawView das Praesentationfenster wegnehmen und ihr dafuer ihre alten Fenster wiedergeben
if( mpShowWindow && mpView ) if( mpShowWindow && mpView )
mpView->DelWin( mpShowWindow ); mpView->DeleteWindowFromPaintView( mpShowWindow );
if( mpView ) if( mpView )
mpView->SetAnimationPause( FALSE ); mpView->SetAnimationPause( FALSE );