diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 12:53:51 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-21 12:53:51 +0100 |
commit | e8f8f24c8415898c787bbfb629247ed62e73a2b9 (patch) | |
tree | dae18a3acbf29c192118e7c003f80df8da8e21ae /vcl/unx/generic | |
parent | 1c8402465cfd4df862409dc310f5f099d044c4d8 (diff) |
vcl: sal_Bool -> bool
Change-Id: I2a3e3d3e3266ea0f0fafdd91362076a4aa160f0e
Diffstat (limited to 'vcl/unx/generic')
-rw-r--r-- | vcl/unx/generic/app/i18n_status.cxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/app/i18n_xkb.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/app/saldisp.cxx | 34 | ||||
-rw-r--r-- | vcl/unx/generic/app/salinst.cxx | 10 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.cxx | 8 | ||||
-rw-r--r-- | vcl/unx/generic/dtrans/X11_selection.hxx | 2 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 130 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi2.cxx | 12 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salgdi3.cxx | 6 | ||||
-rw-r--r-- | vcl/unx/generic/gdi/salvd.cxx | 22 | ||||
-rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 56 | ||||
-rw-r--r-- | vcl/unx/generic/window/salobj.cxx | 6 |
12 files changed, 147 insertions, 147 deletions
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index 85bbdeef7771..3446d18472dc 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -373,7 +373,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) : else fprintf( stderr, "Warning: could not reposition status window since no frame\n" ); #endif - EnableAlwaysOnTop( sal_True ); + EnableAlwaysOnTop( true ); } IIIMPStatusWindow::~IIIMPStatusWindow() diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx index 6886c793a7cb..9a12c97c2d3a 100644 --- a/vcl/unx/generic/app/i18n_xkb.cxx +++ b/vcl/unx/generic/app/i18n_xkb.cxx @@ -24,7 +24,7 @@ #include "unx/i18n_xkb.hxx" SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay ) - : mbUseExtension( sal_True ), + : mbUseExtension( true ), mnDefaultGroup( 0 ) { mpDisplay = pDisplay; @@ -53,9 +53,9 @@ SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay ) int nExtMajorVersion = XkbMajorVersion; int nExtMinorVersion = XkbMinorVersion; - mbUseExtension = (sal_Bool)XkbQueryExtension( mpDisplay, + mbUseExtension = XkbQueryExtension( mpDisplay, &nMajorExtOpcode, (int*)&mnEventBase, (int*)&mnErrorBase, - &nExtMajorVersion, &nExtMinorVersion ); + &nExtMajorVersion, &nExtMinorVersion ) != 0; } // query notification for changes of the keyboard group diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index 607f413acfc5..2ea2c4c61141 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -126,7 +126,7 @@ static int sal_significantBits( Pixel nMask ) return nBits; } -static sal_Bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI ) +static bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI ) { int nInfos; XVisualInfo aTemplate; @@ -136,14 +136,14 @@ static sal_Bool sal_GetVisualInfo( Display *pDisplay, XID nVID, XVisualInfo &rVI pInfos = XGetVisualInfo( pDisplay, VisualIDMask, &aTemplate, &nInfos ); if( !pInfos ) - return sal_False; + return false; rVI = *pInfos; XFree( pInfos ); DBG_ASSERT( rVI.visualid == nVID, "sal_GetVisualInfo: could not get correct visual by visualId" ); - return sal_True; + return true; } // --------------------------------------------------------------------------- @@ -175,7 +175,7 @@ sal_GetServerVendor( Display *p_display ) return vendor_unknown; } -sal_Bool SalDisplay::BestVisual( Display *pDisplay, +bool SalDisplay::BestVisual( Display *pDisplay, int nScreen, XVisualInfo &rVI ) { @@ -200,22 +200,22 @@ sal_Bool SalDisplay::BestVisual( Display *pDisplay, int i; for( i = 0; i < nVisuals; i++ ) { - sal_Bool bUsable = sal_False; + bool bUsable = false; int nTrueColor = 1; if ( pVInfos[i].screen != nScreen ) { - bUsable = sal_False; + bUsable = false; } else if( pVInfos[i].c_class == TrueColor ) { nTrueColor = 2048; if( pVInfos[i].depth == 24 ) - bUsable = sal_True; + bUsable = true; } else if( pVInfos[i].c_class == PseudoColor ) { - bUsable = sal_True; + bUsable = true; } pWeight[ i ] = bUsable ? nTrueColor*pVInfos[i].depth : -1024; pWeight[ i ] -= pVInfos[ i ].visualid; @@ -332,12 +332,12 @@ static int DisplayHasEvent( int fd, SalX11Display *pDisplay ) if( ! pDisplay->IsDisplay() ) return 0; - int result; + bool result; GetSalData()->m_pInstance->GetYieldMutex()->acquire(); result = pDisplay->IsEvent(); GetSalData()->m_pInstance->GetYieldMutex()->release(); - return result; + return int(result); } static int DisplayQueue( int fd, SalX11Display *pDisplay ) { @@ -1833,13 +1833,13 @@ int SalDisplay::CaptureMouse( SalFrame *pCapture ) // Events -sal_Bool SalX11Display::IsEvent() +bool SalX11Display::IsEvent() { if( HasUserEvents() || XEventsQueued( pDisp_, QueuedAlready ) ) - return sal_True; + return true; XFlush( pDisp_ ); - return sal_False; + return false; } void SalX11Display::Yield() @@ -2752,7 +2752,7 @@ SalColor SalColormap::GetColor( Pixel nPixel ) const return MAKE_SALCOLOR( aColor.red>>8, aColor.green>>8, aColor.blue>>8 ); } -inline sal_Bool SalColormap::GetXPixel( XColor &rColor, +inline bool SalColormap::GetXPixel( XColor &rColor, int r, int g, int b ) const @@ -2763,15 +2763,15 @@ inline sal_Bool SalColormap::GetXPixel( XColor &rColor, return XAllocColor( GetXDisplay(), m_hColormap, &rColor ); } -sal_Bool SalColormap::GetXPixels( XColor &rColor, +bool SalColormap::GetXPixels( XColor &rColor, int r, int g, int b ) const { if( !GetXPixel( rColor, r, g, b ) ) - return sal_False; + return false; if( rColor.pixel & 1 ) - return sal_True; + return true; return GetXPixel( rColor, r^0xFF, g^0xFF, b^0xFF ); } diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 9966c08e7128..487cd637f45d 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -84,7 +84,7 @@ X11SalInstance::~X11SalInstance() struct PredicateReturn { sal_uInt16 nType; - sal_Bool bRet; + bool bRet; }; extern "C" { @@ -121,7 +121,7 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char *pData ) } if ( (nType & pPre->nType) || ( ! nType && (pPre->nType & VCL_INPUT_OTHER) ) ) - pPre->bRet = sal_True; + pPre->bRet = true; return False; } @@ -131,16 +131,16 @@ bool X11SalInstance::AnyInput(sal_uInt16 nType) { SalGenericData *pData = GetGenericData(); Display *pDisplay = pData->GetSalDisplay()->GetDisplay(); - sal_Bool bRet = sal_False; + bool bRet = false; if( (nType & VCL_INPUT_TIMER) && (mpXLib && mpXLib->CheckTimeout(false)) ) - bRet = sal_True; + bRet = true; else if (XPending(pDisplay) ) { PredicateReturn aInput; XEvent aEvent; - aInput.bRet = sal_False; + aInput.bRet = false; aInput.nType = nType; XCheckIfEvent(pDisplay, &aEvent, ImplPredicateEvent, diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx index ead695ce4d97..9ae8e0ebbd4e 100644 --- a/vcl/unx/generic/dtrans/X11_selection.cxx +++ b/vcl/unx/generic/dtrans/X11_selection.cxx @@ -2162,7 +2162,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) // some listener forgot to call dropComplete in the last operation // let us end it now and accept the new enter event aGuard.clear(); - dropComplete( sal_False, m_aCurrentDropWindow, m_nDropTime ); + dropComplete( false, m_aCurrentDropWindow, m_nDropTime ); aGuard.reset(); } @@ -2294,7 +2294,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) aGuard.clear(); it->second->dragExit( aEvent ); // reset the drop status, notify source - dropComplete( sal_False, m_aCurrentDropWindow, m_nDropTime ); + dropComplete( false, m_aCurrentDropWindow, m_nDropTime ); } } } @@ -2305,7 +2305,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage ) * methods for XDropTargetDropContext */ -void SelectionManager::dropComplete( sal_Bool bSuccess, XLIB_Window aDropWindow, XLIB_Time ) +void SelectionManager::dropComplete( bool bSuccess, XLIB_Window aDropWindow, XLIB_Time ) { osl::ClearableMutexGuard aGuard(m_aMutex); @@ -3880,7 +3880,7 @@ sal_Bool SelectionManager::handleEvent( const Any& event ) throw() m_nSelectionTimestamp = nTimestamp; } - return sal_Bool( handleXEvent( *pEvent ) ); + return handleXEvent( *pEvent ); } else { diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx index 5b5ad959b842..cb968f24f147 100644 --- a/vcl/unx/generic/dtrans/X11_selection.hxx +++ b/vcl/unx/generic/dtrans/X11_selection.hxx @@ -465,7 +465,7 @@ namespace x11 { // for XDropTarget{Drag|Drop}Context void accept( sal_Int8 dragOperation, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); void reject( XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); - void dropComplete( sal_Bool success, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); + void dropComplete( bool success, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp ); // for XDragSourceContext sal_Int32 getCurrentCursor(); diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index 29b5b47a8c1b..2bc1c65a16a0 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -130,20 +130,20 @@ X11SalGraphics::X11SalGraphics() pStippleGC_ = NULL; pTrackingGC_ = NULL; - bWindow_ = sal_False; - bPrinter_ = sal_False; - bVirDev_ = sal_False; - bPenGC_ = sal_False; - bFontGC_ = sal_False; - bBrushGC_ = sal_False; - bMonoGC_ = sal_False; - bCopyGC_ = sal_False; - bInvertGC_ = sal_False; - bInvert50GC_ = sal_False; - bStippleGC_ = sal_False; - bTrackingGC_ = sal_False; + bWindow_ = false; + bPrinter_ = false; + bVirDev_ = false; + bPenGC_ = false; + bFontGC_ = false; + bBrushGC_ = false; + bMonoGC_ = false; + bCopyGC_ = false; + bInvertGC_ = false; + bInvert50GC_ = false; + bStippleGC_ = false; + bTrackingGC_ = false; bXORMode_ = false; - bDitherBrush_ = sal_False; + bDitherBrush_ = false; } X11SalGraphics::~X11SalGraphics() @@ -216,7 +216,7 @@ void X11SalGraphics::Init( SalFrame *pFrame, Drawable aTarget, m_nXScreen = nXScreen; SetDrawable( aTarget, nXScreen ); - bWindow_ = sal_True; + bWindow_ = true; m_pFrame = pFrame; m_pVDev = NULL; } @@ -275,7 +275,7 @@ GC X11SalGraphics::SelectPen() XSetForeground( pDisplay, pPenGC_, nPenPixel_ ); XSetFunction ( pDisplay, pPenGC_, bXORMode_ ? GXxor : GXcopy ); SetClipRegion( pPenGC_ ); - bPenGC_ = sal_True; + bPenGC_ = true; } return pPenGC_; @@ -321,7 +321,7 @@ GC X11SalGraphics::SelectBrush() XSetFunction ( pDisplay, pBrushGC_, bXORMode_ ? GXxor : GXcopy ); SetClipRegion( pBrushGC_ ); - bBrushGC_ = sal_True; + bBrushGC_ = true; } return pBrushGC_; @@ -352,7 +352,7 @@ GC X11SalGraphics::GetTrackingGC() if( !bTrackingGC_ ) { SetClipRegion( pTrackingGC_ ); - bTrackingGC_ = sal_True; + bTrackingGC_ = true; } return pTrackingGC_; @@ -397,7 +397,7 @@ void X11SalGraphics::DrawLines( sal_uLong nPoints, #define P_DELTA 51 #define DMAP( v, m ) ((v % P_DELTA) > m ? (v / P_DELTA) + 1 : (v / P_DELTA)) -BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor ) +bool X11SalGraphics::GetDitherPixmap( SalColor nSalColor ) { static const short nOrdDither8Bit[ 8 ][ 8 ] = { @@ -413,7 +413,7 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor ) // test for correct depth (8bit) if( GetColormap().GetVisual().GetDepth() != 8 ) - return sal_False; + return false; char pBits[64]; char *pBitsPtr = pBits; @@ -469,7 +469,7 @@ BOOL X11SalGraphics::GetDitherPixmap( SalColor nSalColor ) pImage->data = NULL; XDestroyImage( pImage ); - return sal_True; + return true; } void X11SalGraphics::GetResolution( sal_Int32 &rDPIX, sal_Int32 &rDPIY ) // const @@ -537,15 +537,15 @@ void X11SalGraphics::ResetClipRegion() { if( mpClipRegion ) { - bPenGC_ = sal_False; - bFontGC_ = sal_False; - bBrushGC_ = sal_False; - bMonoGC_ = sal_False; - bCopyGC_ = sal_False; - bInvertGC_ = sal_False; - bInvert50GC_ = sal_False; - bStippleGC_ = sal_False; - bTrackingGC_ = sal_False; + bPenGC_ = false; + bFontGC_ = false; + bBrushGC_ = false; + bMonoGC_ = false; + bCopyGC_ = false; + bInvertGC_ = false; + bInvert50GC_ = false; + bStippleGC_ = false; + bTrackingGC_ = false; XDestroyRegion( mpClipRegion ); mpClipRegion = NULL; @@ -601,15 +601,15 @@ bool X11SalGraphics::setClipRegion( const Region& i_rClip ) //} // done, invalidate GCs - bPenGC_ = sal_False; - bFontGC_ = sal_False; - bBrushGC_ = sal_False; - bMonoGC_ = sal_False; - bCopyGC_ = sal_False; - bInvertGC_ = sal_False; - bInvert50GC_ = sal_False; - bStippleGC_ = sal_False; - bTrackingGC_ = sal_False; + bPenGC_ = false; + bFontGC_ = false; + bBrushGC_ = false; + bMonoGC_ = false; + bCopyGC_ = false; + bInvertGC_ = false; + bInvert50GC_ = false; + bStippleGC_ = false; + bTrackingGC_ = false; if( XEmptyRegion( mpClipRegion ) ) { @@ -624,7 +624,7 @@ void X11SalGraphics::SetLineColor() if( nPenColor_ != SALCOLOR_NONE ) { nPenColor_ = SALCOLOR_NONE; - bPenGC_ = sal_False; + bPenGC_ = false; } } @@ -634,7 +634,7 @@ void X11SalGraphics::SetLineColor( SalColor nSalColor ) { nPenColor_ = nSalColor; nPenPixel_ = GetPixel( nSalColor ); - bPenGC_ = sal_False; + bPenGC_ = false; } } @@ -642,9 +642,9 @@ void X11SalGraphics::SetFillColor() { if( nBrushColor_ != SALCOLOR_NONE ) { - bDitherBrush_ = sal_False; + bDitherBrush_ = false; nBrushColor_ = SALCOLOR_NONE; - bBrushGC_ = sal_False; + bBrushGC_ = false; } } @@ -652,7 +652,7 @@ void X11SalGraphics::SetFillColor( SalColor nSalColor ) { if( nBrushColor_ != nSalColor ) { - bDitherBrush_ = sal_False; + bDitherBrush_ = false; nBrushColor_ = nSalColor; nBrushPixel_ = GetPixel( nSalColor ); if( TrueColor != GetColormap().GetVisual().GetClass() @@ -674,7 +674,7 @@ void X11SalGraphics::SetFillColor( SalColor nSalColor ) && nSalColor != MAKE_SALCOLOR( 0xFF, 0xFF, 0x00 ) // light brown && nSalColor != MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF ) ) bDitherBrush_ = GetDitherPixmap(nSalColor); - bBrushGC_ = sal_False; + bBrushGC_ = false; } } @@ -693,7 +693,7 @@ void X11SalGraphics::SetROPLineColor( SalROPColor nROPColor ) break; } nPenColor_ = GetColormap().GetColor( nPenPixel_ ); - bPenGC_ = sal_False; + bPenGC_ = false; } void X11SalGraphics::SetROPFillColor( SalROPColor nROPColor ) @@ -710,9 +710,9 @@ void X11SalGraphics::SetROPFillColor( SalROPColor nROPColor ) nBrushPixel_ = (Pixel)(1 << GetVisual().GetDepth()) - 1; break; } - bDitherBrush_ = sal_False; + bDitherBrush_ = false; nBrushColor_ = GetColormap().GetColor( nBrushPixel_ ); - bBrushGC_ = sal_False; + bBrushGC_ = false; } void X11SalGraphics::SetXORMode( bool bSet, bool ) @@ -720,15 +720,15 @@ void X11SalGraphics::SetXORMode( bool bSet, bool ) if( !bXORMode_ == bSet ) { bXORMode_ = bSet; - bPenGC_ = sal_False; - bFontGC_ = sal_False; - bBrushGC_ = sal_False; - bMonoGC_ = sal_False; - bCopyGC_ = sal_False; - bInvertGC_ = sal_False; - bInvert50GC_ = sal_False; - bStippleGC_ = sal_False; - bTrackingGC_ = sal_False; + bPenGC_ = false; + bFontGC_ = false; + bBrushGC_ = false; + bMonoGC_ = false; + bCopyGC_ = false; + bInvertGC_ = false; + bInvert50GC_ = false; + bStippleGC_ = false; + bTrackingGC_ = false; } } @@ -914,7 +914,7 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, GC pGC = SelectBrush(); SetClipRegion( pGC, pXRegA ); // ??? twice XDestroyRegion( pXRegA ); - bBrushGC_ = sal_False; + bBrushGC_ = false; XFillRectangle( GetXDisplay(), GetDrawable(), @@ -928,20 +928,20 @@ void X11SalGraphics::drawPolyPolygon( sal_uInt32 nPoly, drawPolyLine( pPoints[i], pPtAry[i], true ); } -sal_Bool X11SalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) +bool X11SalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) { - return sal_False; + return false; } -sal_Bool X11SalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) +bool X11SalGraphics::drawPolygonBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) { - return sal_False; + return false; } -sal_Bool X11SalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*, +bool X11SalGraphics::drawPolyPolygonBezier( sal_uInt32, const sal_uInt32*, const SalPoint* const*, const sal_uInt8* const* ) { - return sal_False; + return false; } void X11SalGraphics::invert( sal_uInt32 nPoints, @@ -969,9 +969,9 @@ void X11SalGraphics::invert( sal_uInt32 nPoints, Complex, CoordModeOrigin ); } -BOOL X11SalGraphics::drawEPS( long,long,long,long,void*,sal_uLong ) +bool X11SalGraphics::drawEPS( long,long,long,long,void*,sal_uLong ) { - return sal_False; + return false; } XID X11SalGraphics::GetXRenderPicture() diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 6b1aabe93a91..3daf71bbae57 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -118,7 +118,7 @@ inline GC X11SalGraphics::GetMonoGC( Pixmap hPixmap ) if( !bMonoGC_ ) { SetClipRegion( pMonoGC_ ); - bMonoGC_ = sal_True; + bMonoGC_ = true; } return pMonoGC_; @@ -134,7 +134,7 @@ inline GC X11SalGraphics::GetCopyGC() if( !bCopyGC_ ) { SetClipRegion( pCopyGC_ ); - bCopyGC_ = sal_True; + bCopyGC_ = true; } return pCopyGC_; } @@ -151,7 +151,7 @@ GC X11SalGraphics::GetInvertGC() if( !bInvertGC_ ) { SetClipRegion( pInvertGC_ ); - bInvertGC_ = sal_True; + bInvertGC_ = true; } return pInvertGC_; } @@ -198,7 +198,7 @@ GC X11SalGraphics::GetInvert50GC() if( !bInvert50GC_ ) { SetClipRegion( pInvert50GC_ ); - bInvert50GC_ = sal_True; + bInvert50GC_ = true; } return pInvert50GC_; } @@ -215,7 +215,7 @@ inline GC X11SalGraphics::GetStippleGC() { XSetFunction( GetXDisplay(), pStippleGC_, bXORMode_ ? GXxor : GXcopy ); SetClipRegion( pStippleGC_ ); - bStippleGC_ = sal_True; + bStippleGC_ = true; } return pStippleGC_; @@ -577,7 +577,7 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect& rPosAry, DBG_TESTTRANS( aBG ); // #105055# Disable XOR temporarily - sal_Bool bOldXORMode( bXORMode_ ); + bool bOldXORMode( bXORMode_ ); bXORMode_ = false; // copy pixmap #2 (result) to background diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx index 84ec4f657873..e0e1ff4bcc2a 100644 --- a/vcl/unx/generic/gdi/salgdi3.cxx +++ b/vcl/unx/generic/gdi/salgdi3.cxx @@ -118,7 +118,7 @@ X11SalGraphics::GetFontGC() { XSetForeground( pDisplay, pFontGC_, nTextPixel_ ); SetClipRegion( pFontGC_ ); - bFontGC_ = sal_True; + bFontGC_ = true; } return pFontGC_; @@ -492,7 +492,7 @@ X11SalGraphics::SetTextColor( SalColor nSalColor ) { nTextColor_ = nSalColor; nTextPixel_ = GetPixel( nSalColor ); - bFontGC_ = sal_False; + bFontGC_ = false; } } @@ -718,7 +718,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const //-------------------------------------------------------------------------- -sal_Bool X11SalGraphics::CreateFontSubset( +bool X11SalGraphics::CreateFontSubset( const OUString& rToFile, const PhysicalFontFace* pFont, sal_GlyphId* pGlyphIds, diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx index 96d8ed6db943..fde56609167d 100644 --- a/vcl/unx/generic/gdi/salvd.cxx +++ b/vcl/unx/generic/gdi/salvd.cxx @@ -115,10 +115,10 @@ void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap, m_pFrame = NULL; bWindow_ = pDisplay->IsDisplay(); - bVirDev_ = sal_True; + bVirDev_ = true; } -sal_Bool X11SalVirtualDevice::Init( SalDisplay *pDisplay, +bool X11SalVirtualDevice::Init( SalDisplay *pDisplay, long nDX, long nDY, sal_uInt16 nBitCount, SalX11Screen nXScreen, @@ -157,7 +157,7 @@ sal_Bool X11SalVirtualDevice::Init( SalDisplay *pDisplay, else { hDrawable_ = hDrawable; - bExternPixmap_ = sal_True; + bExternPixmap_ = true; } pGraphics_->Init( this, pColormap, bDeleteColormap ); @@ -174,8 +174,8 @@ X11SalVirtualDevice::X11SalVirtualDevice() : nDX_ = 0; nDY_ = 0; nDepth_ = 0; - bGraphics_ = sal_False; - bExternPixmap_ = sal_False; + bGraphics_ = false; + bExternPixmap_ = false; } X11SalVirtualDevice::~X11SalVirtualDevice() @@ -194,18 +194,18 @@ SalGraphics* X11SalVirtualDevice::GetGraphics() return NULL; if( pGraphics_ ) - bGraphics_ = sal_True; + bGraphics_ = true; return pGraphics_; } void X11SalVirtualDevice::ReleaseGraphics( SalGraphics* ) -{ bGraphics_ = sal_False; } +{ bGraphics_ = false; } -sal_Bool X11SalVirtualDevice::SetSize( long nDX, long nDY ) +bool X11SalVirtualDevice::SetSize( long nDX, long nDY ) { if( bExternPixmap_ ) - return sal_False; + return false; if( !nDX ) nDX = 1; if( !nDY ) nDY = 1; @@ -224,7 +224,7 @@ sal_Bool X11SalVirtualDevice::SetSize( long nDX, long nDY ) nDX_ = 1; nDY_ = 1; } - return sal_False; + return false; } if( GetDrawable() ) @@ -237,7 +237,7 @@ sal_Bool X11SalVirtualDevice::SetSize( long nDX, long nDY ) if( pGraphics_ ) InitGraphics( this ); - return sal_True; + return true; } void X11SalVirtualDevice::GetSize( long& rWidth, long& rHeight ) diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index e06003daf599..481f44f7c612 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -193,12 +193,12 @@ void X11SalFrame::askForXEmbedFocus( sal_Int32 i_nTimeCode ) GetGenericData()->ErrorTrapPop(); } -static sal_Bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXScreen, +static bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXScreen, sal_uInt16 nIcon, sal_uInt16 iconSize, Pixmap& icon_pixmap, Pixmap& icon_mask) { if( ! ImplGetResMgr() ) - return sal_False; + return false; sal_uInt16 nIconSizeOffset; @@ -209,11 +209,11 @@ static sal_Bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXSc else if( iconSize >= 16 ) nIconSizeOffset = SV_ICON_SIZE16_START; else - return sal_False; + return false; BitmapEx aIcon( ResId(nIconSizeOffset + nIcon, *ImplGetResMgr())); - if( sal_True == aIcon.IsEmpty() ) - return sal_False; + if( aIcon.IsEmpty() ) + return false; SalTwoRect aRect; aRect.mnSrcX = 0; aRect.mnSrcY = 0; @@ -264,7 +264,7 @@ static sal_Bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXSc XFreeGC( pDisplay->GetDisplay(), aMonoGC ); } - return sal_True; + return true; } void X11SalFrame::Init( sal_uLong nSalFrameStyle, SalX11Screen nXScreen, SystemParentData* pParentData, bool bUseGeometry ) @@ -531,8 +531,8 @@ void X11SalFrame::Init( sal_uLong nSalFrameStyle, SalX11Screen nXScreen, SystemP } nShowState_ = SHOWSTATE_UNKNOWN; - bViewable_ = sal_True; - bMapped_ = sal_False; + bViewable_ = true; + bMapped_ = false; nVisibility_ = VisibilityFullyObscured; mhWindow = XCreateWindow( GetXDisplay(), aFrameParent, @@ -729,16 +729,16 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, sal_uLong nSalFrameStyle, nHeight_ = 0; nStyle_ = 0; mnExtStyle = 0; - bAlwaysOnTop_ = sal_False; + bAlwaysOnTop_ = false; // set bViewable_ to sal_True: hack GetClientSize to report something // different to 0/0 before first map - bViewable_ = sal_True; - bMapped_ = sal_False; - bDefaultPosition_ = sal_True; + bViewable_ = true; + bMapped_ = false; + bDefaultPosition_ = true; nVisibility_ = VisibilityFullyObscured; m_nWorkArea = 0; - mbInShow = sal_False; + mbInShow = false; m_bXEmbed = false; nScreenSaversTimeout_ = 0; @@ -1009,7 +1009,7 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon ) } pHints = &Hints; - sal_Bool bOk = lcl_SelectAppIconPixmap( GetDisplay(), m_nXScreen, + bool bOk = lcl_SelectAppIconPixmap( GetDisplay(), m_nXScreen, nIcon, iconSize, pHints->icon_pixmap, pHints->icon_mask ); if ( !bOk ) @@ -1098,7 +1098,7 @@ void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) setXEmbedInfo(); if( bVisible ) { - mbInShow = sal_True; + mbInShow = true; if( ! (nStyle_ & SAL_FRAME_STYLE_INTRO) ) { // hide all INTRO frames @@ -1712,7 +1712,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState ) } } -sal_Bool X11SalFrame::GetWindowState( SalFrameState* pState ) +bool X11SalFrame::GetWindowState( SalFrameState* pState ) { if( SHOWSTATE_MINIMIZED == nShowState_ ) pState->mnState = WINDOWSTATE_STATE_MINIMIZED; @@ -1751,7 +1751,7 @@ sal_Bool X11SalFrame::GetWindowState( SalFrameState* pState ) pState->mnMask |= _FRAMESTATE_MASK_MAXIMIZED_GEOMETRY; } - return sal_True; + return true; } // native menu implementation - currently empty @@ -2375,10 +2375,10 @@ X11SalFrame::HandleExtTextEvent (XClientMessageEvent *pEvent) // PostEvent -sal_Bool X11SalFrame::PostEvent( void *pData ) +bool X11SalFrame::PostEvent( void *pData ) { GetDisplay()->SendInternalEvent( this, pData ); - return sal_True; + return true; } // Title @@ -2460,10 +2460,10 @@ OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode ) return GetDisplay()->GetKeyName( nKeyCode ); } -sal_Bool X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +bool X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) { // not supported yet - return sal_False; + return false; } LanguageType X11SalFrame::GetInputLanguage() @@ -3628,9 +3628,9 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) XLIB_Window hWM_Parent; XLIB_Window hRoot, *Children, hDummy; unsigned int nChildren; - sal_Bool bNone = pDisplay_->GetProperties() + bool bNone = pDisplay_->GetProperties() & PROPERTY_SUPPORT_WM_Parent_Pixmap_None; - sal_Bool bAccessParentWindow = ! (pDisplay_->GetProperties() + bool bAccessParentWindow = ! (pDisplay_->GetProperties() & PROPERTY_FEATURE_TrustedSolaris); static const char* pDisableStackingCheck = getenv( "SAL_DISABLE_STACKING_CHECK" ); @@ -4013,8 +4013,8 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) XUnmapWindow( GetXDisplay(), GetShellWindow() ); break; } - bMapped_ = sal_True; - bViewable_ = sal_True; + bMapped_ = true; + bViewable_ = true; nRet = sal_True; if ( mpInputContext != NULL ) mpInputContext->Map( this ); @@ -4065,7 +4065,7 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) RestackChildren(); - mbInShow = sal_False; + mbInShow = false; m_bSetFocusOnMap = false; } break; @@ -4073,8 +4073,8 @@ long X11SalFrame::Dispatch( XEvent *pEvent ) case UnmapNotify: if( pEvent->xunmap.window == GetShellWindow() ) { - bMapped_ = sal_False; - bViewable_ = sal_False; + bMapped_ = false; + bViewable_ = false; nRet = sal_True; if ( mpInputContext != NULL ) mpInputContext->Unmap( this ); diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx index 6f61ced8c416..a694b91bd91b 100644 --- a/vcl/unx/generic/window/salobj.cxx +++ b/vcl/unx/generic/window/salobj.cxx @@ -47,7 +47,7 @@ SalObject* X11SalInstance::CreateObject( SalFrame* pParent, SystemWindowData* pW return X11SalObject::CreateObject( pParent, pWindowData, bShow ); } -X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow ) +X11SalObject* X11SalObject::CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) { int error_base, event_base; X11SalObject* pObject = new X11SalObject(); @@ -500,10 +500,10 @@ bool X11SalObject::Dispatch( XEvent* pEvent ) switch( pEvent->type ) { case UnmapNotify: - pObject->mbVisible = sal_False; + pObject->mbVisible = false; return true; case MapNotify: - pObject->mbVisible = sal_True; + pObject->mbVisible = true; return true; case ButtonPress: pObject->CallCallback( SALOBJ_EVENT_TOTOP, NULL ); |