[Libreoffice-commits] .: Branch 'integration/dev300_m101' - slideshow/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Mar 12 17:03:34 PST 2011
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 12 ++++----
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx | 14 +++++-----
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx | 14 +++++-----
slideshow/source/engine/shapes/viewmediashape.cxx | 8 ++---
4 files changed, 24 insertions(+), 24 deletions(-)
New commits:
commit a9e6c0bb00fb5a6de631476bdffd23174b58d9b3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 12 18:59:43 2011 -0600
mis-merge clean-up tools types
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 7965a79..9200f4c 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -372,12 +372,12 @@ bool OGLTransitionerImpl::initialize( const Reference< presentation::XSlideShowV
//
if( pWindow )
{
- pWindow->SetMouseTransparent( TRUE );
+ pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
- pWindow->EnableEraseBackground( FALSE );
+ pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground();
pWindow->SetControlBackground();
- pWindow->EnablePaint(FALSE);
+ pWindow->EnablePaint(sal_False);
pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel());
// GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay);
// GLWin.win = pChildSysData->aWindow;
@@ -455,12 +455,12 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
if( pWindow )
{
- pWindow->SetMouseTransparent( TRUE );
+ pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
- pWindow->EnableEraseBackground( FALSE );
+ pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground();
pWindow->SetControlBackground();
- pWindow->EnablePaint(FALSE);
+ pWindow->EnablePaint(sal_False);
pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel());
}
diff --git a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
index a64eb04..7172fc8 100644
--- a/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
@@ -487,13 +487,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_TEXTURE_RGB_EXT,
&value);
- if (value == FALSE)
+ if (value == sal_False)
continue;
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_MIPMAP_TEXTURE_EXT,
&value);
- if (value == FALSE)
+ if (value == sal_False)
continue;
/* TODO: handle non Y inverted cases */
@@ -517,7 +517,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
winData.nSize = sizeof(winData);
OSL_TRACE("using VisualID %08X", vi->visualid);
winData.pVisual = (void*)(vi->visual);
- pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE);
+ pWindow=new SystemChildWindow(pPWindow, 0, &winData, sal_False);
pChildSysData = pWindow->GetSystemData();
if( pChildSysData ) {
break;
@@ -537,18 +537,18 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
const SystemEnvData* pChildSysData = NULL;
SystemWindowData winData;
winData.nSize = sizeof(winData);
- pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE);
+ pWindow=new SystemChildWindow(pPWindow, 0, &winData, sal_False);
pChildSysData = pWindow->GetSystemData();
#endif
if( pWindow )
{
- pWindow->SetMouseTransparent( TRUE );
+ pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
- pWindow->EnableEraseBackground( FALSE );
+ pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground();
pWindow->SetControlBackground();
- pWindow->EnablePaint(FALSE);
+ pWindow->EnablePaint(sal_False);
#if defined( WNT )
GLWin.hWnd = sysData->hWnd;
#elif defined( UNX )
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
index 1583d84..a46e73c 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
@@ -456,13 +456,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_TEXTURE_RGB_EXT,
&value);
- if (value == FALSE)
+ if (value == sal_False)
continue;
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_MIPMAP_TEXTURE_EXT,
&value);
- if (value == FALSE)
+ if (value == sal_False)
continue;
/* TODO: handle non Y inverted cases */
@@ -486,7 +486,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
winData.nSize = sizeof(winData);
OSL_TRACE("using VisualID %08X", vi->visualid);
winData.pVisual = (void*)(vi->visual);
- pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE);
+ pWindow=new SystemChildWindow(pPWindow, 0, &winData, sal_False);
pChildSysData = pWindow->GetSystemData();
if( pChildSysData ) {
break;
@@ -506,18 +506,18 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
const SystemEnvData* pChildSysData = NULL;
SystemWindowData winData;
winData.nSize = sizeof(winData);
- pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE);
+ pWindow=new SystemChildWindow(pPWindow, 0, &winData, sal_False);
pChildSysData = pWindow->GetSystemData();
#endif
if( pWindow )
{
- pWindow->SetMouseTransparent( TRUE );
+ pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
- pWindow->EnableEraseBackground( FALSE );
+ pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground();
pWindow->SetControlBackground();
- pWindow->EnablePaint(FALSE);
+ pWindow->EnablePaint(sal_False);
#if defined( WNT )
GLWin.hWnd = sysData->hWnd;
#elif defined( UNX )
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 8066df9..22eeb44 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -450,10 +450,10 @@ namespace slideshow
mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ),
Size( aAWTRect.Width, aAWTRect.Height ) );
mpMediaWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
- mpMediaWindow->EnableEraseBackground( FALSE );
- mpMediaWindow->EnablePaint( FALSE );
- mpMediaWindow->SetForwardKey( TRUE );
- mpMediaWindow->SetMouseTransparent( TRUE );
+ mpMediaWindow->EnableEraseBackground( sal_False );
+ mpMediaWindow->EnablePaint( sal_False );
+ mpMediaWindow->SetForwardKey( sal_True );
+ mpMediaWindow->SetMouseTransparent( sal_True );
mpMediaWindow->Show();
if( mxPlayer.is() )
More information about the Libreoffice-commits
mailing list