strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aw024 (1.5.56); FILE MERGED

Browse source 
2006/09/21 23:21:59 aw 1.5.56.5: RESYNC: (1.9-1.10); FILE MERGED
2006/08/03 16:34:16 aw 1.5.56.4: RESYNC: (1.8-1.9); FILE MERGED
2005/11/18 14:35:59 aw 1.5.56.3: RESYNC: (1.6-1.8); FILE MERGED
2005/09/17 13:09:56 aw 1.5.56.2: RESYNC: (1.5-1.6); FILE MERGED
2005/05/19 12:11:31 aw 1.5.56.1: #i39529#
This commit is contained in:
Ivo Hinkelmann 2006-11-14 13:34:40 +00:00
parent 74cd846919
commit b238a07aa3
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sd/source/ui/slideshow/showwin.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: showwin.cxx,v $
*
* $Revision: 1.10 $
* $Revision: 1.11 $
*
* last change: $Author: obo $ $Date: 2006-09-16 19:02:26 $
* last change: $Author: ihi $ $Date: 2006-11-14 14:34:40 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -65,6 +65,9 @@
#include "helpids.h"
#include "strings.hrc"
#ifndef _SV_VIRDEV_HXX
#include <vcl/virdev.hxx>
#endif
namespace sd {
@ -423,7 +426,7 @@ BOOL ShowWindow::SetEndMode()
{
if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() )
{
mpViewShell->GetView()->DelWin( this );
mpViewShell->GetView()->DeleteWindowFromPaintView( this );
meShowWindowMode = SHOWWINDOWMODE_END;
// maShowBackground = GetBackground();
// SetBackground( Wallpaper( Color( COL_BLACK ) ) );
@ -452,7 +455,7 @@ BOOL ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout
}
else if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() )
{
mpViewShell->GetView()->DelWin( this );
mpViewShell->GetView()->DeleteWindowFromPaintView( this );
mnPauseTimeout = nTimeout;
mnRestartPageIndex = nPageIndexToRestart;
meShowWindowMode = SHOWWINDOWMODE_PAUSE;
@ -485,7 +488,7 @@ BOOL ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan
{
if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() )
{
mpViewShell->GetView()->DelWin( this );
mpViewShell->GetView()->DeleteWindowFromPaintView( this );
mnRestartPageIndex = nPageIndexToRestart;
meShowWindowMode = SHOWWINDOWMODE_BLANK;
// maShowBackground = GetBackground();
@ -569,7 +572,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart )
if( pSlideShow )
{
if( mpViewShell->GetView() )
mpViewShell->GetView()->AddWin( this );
mpViewShell->GetView()->AddWindowToPaintView( this );
if( SHOWWINDOWMODE_BLANK == eOldShowWindowMode )
{