diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
commit | 4f30c816fa0fb66e650d4e85304292b5ec72b22d (patch) | |
tree | 2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /sd/source/ui/slideshow/showwin.cxx | |
parent | 2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff) |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 40849a63d4ca6da479ef28e129b15109a42e8617 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:18 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 2764d5adfcd646794593cda200fca9d4988d0d06
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:37 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
Notes:
split repo tag: impress_libreoffice-3.3.0.4
Diffstat (limited to 'sd/source/ui/slideshow/showwin.cxx')
-rw-r--r-- | sd/source/ui/slideshow/showwin.cxx | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index b6bd6dbabaea..deaa5c4e222e 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -86,7 +86,7 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, :: maMouseTimer.SetTimeout( HIDE_MOUSE_TIMEOUT ); maShowBackground = Wallpaper( Color( COL_BLACK ) ); -// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); +// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); SetBackground(); // avoids that VCL paints any background! GetParent()->Show(); AddEventListener( LINK( this, ShowWindow, EventHdl ) ); @@ -291,7 +291,7 @@ void ShowWindow::Paint(const Rectangle& rRect) { /* Region aOldClipRegion( GetClipRegion() ); - + Region aClipRegion( rRect ); aClipRegion.Exclude( maPresArea ); SetClipRegion( aClipRegion ); @@ -398,8 +398,8 @@ BOOL ShowWindow::SetEndMode() { DeleteWindowFromPaintView(); meShowWindowMode = SHOWWINDOWMODE_END; -// maShowBackground = GetBackground(); -// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); +// maShowBackground = GetBackground(); +// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); maShowBackground = Wallpaper( Color( COL_BLACK ) ); // hide navigator if it is visible @@ -434,8 +434,8 @@ BOOL ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout mnPauseTimeout = nTimeout; mnRestartPageIndex = nPageIndexToRestart; meShowWindowMode = SHOWWINDOWMODE_PAUSE; -// maShowBackground = GetBackground(); -// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); +// maShowBackground = GetBackground(); +// SetBackground( Wallpaper( Color( COL_BLACK ) ) ); maShowBackground = Wallpaper( Color( COL_BLACK ) ); // hide navigator if it is visible @@ -466,8 +466,8 @@ BOOL ShowWindow::SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlan DeleteWindowFromPaintView(); mnRestartPageIndex = nPageIndexToRestart; meShowWindowMode = SHOWWINDOWMODE_BLANK; -// maShowBackground = GetBackground(); -// SetBackground( Wallpaper( rBlankColor ) ); +// maShowBackground = GetBackground(); +// SetBackground( Wallpaper( rBlankColor ) ); maShowBackground = Wallpaper( rBlankColor ); // hide navigator if it is visible @@ -498,7 +498,7 @@ void ShowWindow::TerminateShow() maPauseTimer.Stop(); maMouseTimer.Stop(); Erase(); -// SetBackground( maShowBackground ); +// SetBackground( maShowBackground ); maShowBackground = Wallpaper( Color( COL_BLACK ) ); meShowWindowMode = SHOWWINDOWMODE_NORMAL; mnPauseTimeout = SLIDE_NO_TIMEOUT; @@ -536,7 +536,7 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) maLogo.Clear(); maPauseTimer.Stop(); Erase(); -// SetBackground( maShowBackground ); +// SetBackground( maShowBackground ); maShowBackground = Wallpaper( Color( COL_BLACK ) ); meShowWindowMode = SHOWWINDOWMODE_NORMAL; mnPauseTimeout = SLIDE_NO_TIMEOUT; @@ -544,11 +544,11 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) if( mpViewShell ) { rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( mpViewShell->GetViewShellBase() ) ); - + if( xSlideShow.is() ) { AddWindowToPaintView(); - + if( SHOWWINDOWMODE_BLANK == eOldShowWindowMode ) { xSlideShow->pause(false); @@ -575,16 +575,16 @@ void ShowWindow::RestartShow( sal_Int32 nPageIndexToRestart ) void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) { - const MapMode& rMap = GetMapMode(); - const Point aOutOrg( PixelToLogic( Point() ) ); - const Size aOutSize( GetOutputSize() ); - const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, rMap ) ); - const Size aOffset( LogicToLogic( Size( 1000, 1000 ), MAP_100TH_MM, rMap ) ); - String aText( SdResId( STR_PRES_PAUSE ) ); - BOOL bDrawn = FALSE; + const MapMode& rMap = GetMapMode(); + const Point aOutOrg( PixelToLogic( Point() ) ); + const Size aOutSize( GetOutputSize() ); + const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, rMap ) ); + const Size aOffset( LogicToLogic( Size( 1000, 1000 ), MAP_100TH_MM, rMap ) ); + String aText( SdResId( STR_PRES_PAUSE ) ); + BOOL bDrawn = FALSE; - Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); - const Font aOldFont( GetFont() ); + Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); + const Font aOldFont( GetFont() ); aFont.SetSize( aTextSize ); aFont.SetColor( COL_WHITE ); @@ -600,7 +600,7 @@ void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) else aGrfSize = LogicToLogic( maLogo.GetPrefSize(), maLogo.GetPrefMapMode(), rMap ); - const Point aGrfPos( Max( aOutOrg.X() + aOutSize.Width() - aGrfSize.Width() - aOffset.Width(), aOutOrg.X() ), + const Point aGrfPos( Max( aOutOrg.X() + aOutSize.Width() - aGrfSize.Width() - aOffset.Width(), aOutOrg.X() ), Max( aOutOrg.Y() + aOutSize.Height() - aGrfSize.Height() - aOffset.Height(), aOutOrg.Y() ) ); if( maLogo.IsAnimated() ) @@ -611,24 +611,24 @@ void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) if( SLIDE_NO_TIMEOUT != mnPauseTimeout ) { - MapMode aVMap( rMap ); - VirtualDevice aVDev( *this ); + MapMode aVMap( rMap ); + VirtualDevice aVDev( *this ); aVMap.SetOrigin( Point() ); aVDev.SetMapMode( aVMap ); aVDev.SetBackground( Wallpaper( Color( COL_BLACK ) ) ); - + // set font first, to determine real output height aVDev.SetFont( aFont ); - + const Size aVDevSize( aOutSize.Width(), aVDev.GetTextHeight() ); if( aVDev.SetOutputSize( aVDevSize ) ) { // Note: if performance gets an issue here, we can use NumberFormatter directly - SvtSysLocale aSysLocale; + SvtSysLocale aSysLocale; const LocaleDataWrapper& aLocaleData = aSysLocale.GetLocaleData(); - + aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " ( " )); aText += aLocaleData.getDuration( Time( 0, 0, mnPauseTimeout ) ); aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " )" )); @@ -650,12 +650,12 @@ void ShowWindow::DrawPauseScene( BOOL bTimeoutOnly ) void ShowWindow::DrawEndScene() { - const Font aOldFont( GetFont() ); - Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); + const Font aOldFont( GetFont() ); + Font aFont( GetSettings().GetStyleSettings().GetMenuFont() ); - const Point aOutOrg( PixelToLogic( Point() ) ); - const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, GetMapMode() ) ); - const String aText( SdResId( STR_PRES_SOFTEND ) ); + const Point aOutOrg( PixelToLogic( Point() ) ); + const Size aTextSize( LogicToLogic( Size( 0, 14 ), MAP_POINT, GetMapMode() ) ); + const String aText( SdResId( STR_PRES_SOFTEND ) ); aFont.SetSize( aTextSize ); aFont.SetColor( COL_WHITE ); |