Skip to content

C
core
Kaydet (Commit) d2b23dfd authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

mis-merge clean-up tools types

üst c61cd1a5
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
Dosyayı görüntüle @ d2b23dfd
...@@ -372,12 +372,12 @@ bool OGLTransitionerImpl::initialize( const Reference< presentation::XSlideShowV ...@@ -372,12 +372,12 @@ bool OGLTransitionerImpl::initialize( const Reference< presentation::XSlideShowV
// //
if( pWindow ) if( pWindow )
{ {
pWindow->SetMouseTransparent( TRUE ); pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP ); pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
pWindow->EnableEraseBackground( FALSE ); pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground(); pWindow->SetControlForeground();
pWindow->SetControlBackground(); pWindow->SetControlBackground();
pWindow->EnablePaint(FALSE); pWindow->EnablePaint(sal_False);
pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel()); pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel());
// GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay); // GLWin.dpy = reinterpret_cast<unx::Display*>(pChildSysData->pDisplay);
// GLWin.win = pChildSysData->aWindow; // GLWin.win = pChildSysData->aWindow;
...@@ -455,12 +455,12 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta ...@@ -455,12 +455,12 @@ bool OGLTransitionerImpl::initWindowFromSlideShowView( const Reference< presenta
if( pWindow ) if( pWindow )
{ {
pWindow->SetMouseTransparent( TRUE ); pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP ); pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
pWindow->EnableEraseBackground( FALSE ); pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground(); pWindow->SetControlForeground();
pWindow->SetControlBackground(); pWindow->SetControlBackground();
pWindow->EnablePaint(FALSE); pWindow->EnablePaint(sal_False);
pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel()); pWindow->SetPosSizePixel(pPWindow->GetPosPixel(),pPWindow->GetSizePixel());
} }
......
slideshow/source/engine/OGLTrans/unx/OGLTrans_TransitionerImpl.cxx
Dosyayı görüntüle @ d2b23dfd
...@@ -487,13 +487,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) ...@@ -487,13 +487,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i], glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_TEXTURE_RGB_EXT, GLX_BIND_TO_TEXTURE_RGB_EXT,
&value); &value);
if (value == FALSE) if (value == sal_False)
continue; continue;
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i], glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_MIPMAP_TEXTURE_EXT, GLX_BIND_TO_MIPMAP_TEXTURE_EXT,
&value); &value);
if (value == FALSE) if (value == sal_False)
continue; continue;
/* TODO: handle non Y inverted cases */ /* TODO: handle non Y inverted cases */
...@@ -517,7 +517,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) ...@@ -517,7 +517,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
winData.nSize = sizeof(winData); winData.nSize = sizeof(winData);
OSL_TRACE("using VisualID %08X", vi->visualid); OSL_TRACE("using VisualID %08X", vi->visualid);
winData.pVisual = (void*)(vi->visual); winData.pVisual = (void*)(vi->visual);
pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE); pWindow=new SystemChildWindow(pPWindow, 0, &winData, sal_False);
pChildSysData = pWindow->GetSystemData(); pChildSysData = pWindow->GetSystemData();
if( pChildSysData ) { if( pChildSysData ) {
break; break;
...@@ -537,18 +537,18 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) ...@@ -537,18 +537,18 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
const SystemEnvData* pChildSysData = NULL; const SystemEnvData* pChildSysData = NULL;
SystemWindowData winData; SystemWindowData winData;
winData.nSize = sizeof(winData); winData.nSize = sizeof(winData);
pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE); pWindow=new SystemChildWindow(pPWindow, 0, &winData, sal_False);
pChildSysData = pWindow->GetSystemData(); pChildSysData = pWindow->GetSystemData();
#endif #endif
if( pWindow ) if( pWindow )
{ {
pWindow->SetMouseTransparent( TRUE ); pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP ); pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
pWindow->EnableEraseBackground( FALSE ); pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground(); pWindow->SetControlForeground();
pWindow->SetControlBackground(); pWindow->SetControlBackground();
pWindow->EnablePaint(FALSE); pWindow->EnablePaint(sal_False);
#if defined( WNT ) #if defined( WNT )
GLWin.hWnd = sysData->hWnd; GLWin.hWnd = sysData->hWnd;
#elif defined( UNX ) #elif defined( UNX )
......
slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionerImpl.cxx
Dosyayı görüntüle @ d2b23dfd
...@@ -456,13 +456,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) ...@@ -456,13 +456,13 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i], glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_TEXTURE_RGB_EXT, GLX_BIND_TO_TEXTURE_RGB_EXT,
&value); &value);
if (value == FALSE) if (value == sal_False)
continue; continue;
glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i], glXGetFBConfigAttrib (GLWin.dpy, fbconfigs[i],
GLX_BIND_TO_MIPMAP_TEXTURE_EXT, GLX_BIND_TO_MIPMAP_TEXTURE_EXT,
&value); &value);
if (value == FALSE) if (value == sal_False)
continue; continue;
/* TODO: handle non Y inverted cases */ /* TODO: handle non Y inverted cases */
...@@ -486,7 +486,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) ...@@ -486,7 +486,7 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
winData.nSize = sizeof(winData); winData.nSize = sizeof(winData);
OSL_TRACE("using VisualID %08X", vi->visualid); OSL_TRACE("using VisualID %08X", vi->visualid);
winData.pVisual = (void*)(vi->visual); winData.pVisual = (void*)(vi->visual);
pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE); pWindow=new SystemChildWindow(pPWindow, 0, &winData, sal_False);
pChildSysData = pWindow->GetSystemData(); pChildSysData = pWindow->GetSystemData();
if( pChildSysData ) { if( pChildSysData ) {
break; break;
...@@ -506,18 +506,18 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow ) ...@@ -506,18 +506,18 @@ bool OGLTransitionerImpl::createWindow( Window* pPWindow )
const SystemEnvData* pChildSysData = NULL; const SystemEnvData* pChildSysData = NULL;
SystemWindowData winData; SystemWindowData winData;
winData.nSize = sizeof(winData); winData.nSize = sizeof(winData);
pWindow=new SystemChildWindow(pPWindow, 0, &winData, FALSE); pWindow=new SystemChildWindow(pPWindow, 0, &winData, sal_False);
pChildSysData = pWindow->GetSystemData(); pChildSysData = pWindow->GetSystemData();
#endif #endif
if( pWindow ) if( pWindow )
{ {
pWindow->SetMouseTransparent( TRUE ); pWindow->SetMouseTransparent( sal_True );
pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP ); pWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
pWindow->EnableEraseBackground( FALSE ); pWindow->EnableEraseBackground( sal_False );
pWindow->SetControlForeground(); pWindow->SetControlForeground();
pWindow->SetControlBackground(); pWindow->SetControlBackground();
pWindow->EnablePaint(FALSE); pWindow->EnablePaint(sal_False);
#if defined( WNT ) #if defined( WNT )
GLWin.hWnd = sysData->hWnd; GLWin.hWnd = sysData->hWnd;
#elif defined( UNX ) #elif defined( UNX )
......
slideshow/source/engine/shapes/viewmediashape.cxx
Dosyayı görüntüle @ d2b23dfd
...@@ -450,10 +450,10 @@ namespace slideshow ...@@ -450,10 +450,10 @@ namespace slideshow
mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ),
Size( aAWTRect.Width, aAWTRect.Height ) ); Size( aAWTRect.Width, aAWTRect.Height ) );
mpMediaWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP ); mpMediaWindow->SetParentClipMode( PARENTCLIPMODE_NOCLIP );
mpMediaWindow->EnableEraseBackground( FALSE ); mpMediaWindow->EnableEraseBackground( sal_False );
mpMediaWindow->EnablePaint( FALSE ); mpMediaWindow->EnablePaint( sal_False );
mpMediaWindow->SetForwardKey( TRUE ); mpMediaWindow->SetForwardKey( sal_True );
mpMediaWindow->SetMouseTransparent( TRUE ); mpMediaWindow->SetMouseTransparent( sal_True );
mpMediaWindow->Show(); mpMediaWindow->Show();
if( mxPlayer.is() ) if( mxPlayer.is() )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment