From c1d37365c42a0627a66310c46d4beb2337633654 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 28 Jan 2014 19:59:13 +0100 Subject: bool improvements Change-Id: Iede12ed1e35581cf48d64b898f22949d0c1aa6de --- vcl/unx/generic/app/i18n_ic.cxx | 2 +- vcl/unx/generic/app/i18n_status.cxx | 6 +++--- vcl/unx/generic/app/saldisp.cxx | 4 ++-- vcl/unx/generic/gdi/salgdi.cxx | 10 +++++----- vcl/unx/generic/gdi/salgdi2.cxx | 10 +++++----- vcl/unx/generic/printer/printerinfomanager.cxx | 4 ++-- vcl/unx/generic/window/salframe.cxx | 6 +++--- vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx | 2 +- vcl/unx/gtk/window/gtksalframe.cxx | 8 ++++---- 9 files changed, 26 insertions(+), 26 deletions(-) (limited to 'vcl/unx') diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx index a649c1523aa8..84d2e441a436 100644 --- a/vcl/unx/generic/app/i18n_ic.cxx +++ b/vcl/unx/generic/app/i18n_ic.cxx @@ -170,7 +170,7 @@ SalI18N_InputContext::SalI18N_InputContext ( SalFrame *pFrame ) : maClientData.aInputEv.mpTextAttr = NULL; maClientData.aInputEv.mnCursorPos = 0; maClientData.aInputEv.mnCursorFlags = 0; - maClientData.aInputEv.mbOnlyCursor = sal_False; + maClientData.aInputEv.mbOnlyCursor = false; SalI18N_InputMethod *pInputMethod; pInputMethod = GetGenericData()->GetSalDisplay()->GetInputMethod(); diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx index bc89b6e47ef8..85bbdeef7771 100644 --- a/vcl/unx/generic/app/i18n_status.cxx +++ b/vcl/unx/generic/app/i18n_status.cxx @@ -154,7 +154,7 @@ void XIMStatusWindow::layout() m_aStatusText.SetPosSizePixel( Point( 1, 1 ), aControlSize ); m_aStatusText.SetFont( aFont ); - m_aStatusText.Show( sal_True ); + m_aStatusText.Show( true ); if (m_bAnchoredAtRight && IsVisible()) { @@ -246,7 +246,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent ) { setText( OUString() ); m_pLastParent = pParent; - Show( sal_False, SHOW_NOACTIVATE ); + Show( false, SHOW_NOACTIVATE ); } if( IsVisible() ) { @@ -348,7 +348,7 @@ IIIMPStatusWindow::IIIMPStatusWindow( SalFrame* pParent, bool bOn ) : m_aStatusBtn.SetSelectHdl( LINK( this, IIIMPStatusWindow, SelectHdl ) ); m_aStatusBtn.SetPopupMenu( &m_aMenu ); - m_aStatusBtn.Show( sal_True ); + m_aStatusBtn.Show( true ); const ::std::vector< I18NStatus::ChoiceData >& rChoices( I18NStatus::get().getChoices() ); int i = 1; diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx index c8a78e4b655e..bfbc5582d7b1 100644 --- a/vcl/unx/generic/app/saldisp.cxx +++ b/vcl/unx/generic/app/saldisp.cxx @@ -1820,7 +1820,7 @@ int SalDisplay::CaptureMouse( SalFrame *pCapture ) if( ret != GrabSuccess ) { - DBG_ASSERT( 1, "SalDisplay::CaptureMouse could not grab pointer\n"); + DBG_ASSERT( true, "SalDisplay::CaptureMouse could not grab pointer\n"); return -1; } } @@ -2736,7 +2736,7 @@ SalColor SalColormap::GetColor( Pixel nPixel ) const if( m_hColormap ) { - DBG_ASSERT( 1, "SalColormap::GetColor() !hColormap_\n" ); + DBG_ASSERT( true, "SalColormap::GetColor() !hColormap_\n" ); return nPixel; } diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index cc443a5948ac..29b5b47a8c1b 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -142,7 +142,7 @@ X11SalGraphics::X11SalGraphics() bInvert50GC_ = sal_False; bStippleGC_ = sal_False; bTrackingGC_ = sal_False; - bXORMode_ = sal_False; + bXORMode_ = false; bDitherBrush_ = sal_False; } @@ -1027,22 +1027,22 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly // nothing to do for empty polypolygons const int nOrigPolyCount = rOrigPolyPoly.count(); if( nOrigPolyCount <= 0 ) - return sal_True; + return true; // nothing to do if everything is transparent if( (nBrushColor_ == SALCOLOR_NONE) && (nPenColor_ == SALCOLOR_NONE) ) - return sal_True; + return true; // cannot handle pencolor!=brushcolor yet if( (nPenColor_ != SALCOLOR_NONE) && (nPenColor_ != nBrushColor_) ) - return sal_False; + return false; // TODO: remove the env-variable when no longer needed static const char* pRenderEnv = getenv( "SAL_DISABLE_RENDER_POLY" ); if( pRenderEnv ) - return sal_False; + return false; // snap to raster if requested basegfx::B2DPolyPolygon aPolyPoly = rOrigPolyPoly; diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx index 5d11f00e73a0..6b1aabe93a91 100644 --- a/vcl/unx/generic/gdi/salgdi2.cxx +++ b/vcl/unx/generic/gdi/salgdi2.cxx @@ -495,11 +495,11 @@ void X11SalGraphics::drawBitmap( const SalTwoRect& rPosAry, DBG_ASSERT( !bPrinter_, "Drawing of transparent bitmaps on printer devices is strictly forbidden" ); // decide if alpha masking or transparency masking is needed - BitmapBuffer* pAlphaBuffer = const_cast(rMaskBitmap).AcquireBuffer( sal_True ); + BitmapBuffer* pAlphaBuffer = const_cast(rMaskBitmap).AcquireBuffer( true ); if( pAlphaBuffer != NULL ) { int nMaskFormat = pAlphaBuffer->mnFormat; - const_cast(rMaskBitmap).ReleaseBuffer( pAlphaBuffer, sal_True ); + const_cast(rMaskBitmap).ReleaseBuffer( pAlphaBuffer, true ); if( nMaskFormat == BMP_FORMAT_8BIT_PAL ) drawAlphaBitmap( rPosAry, rSrcBitmap, rMaskBitmap ); } @@ -578,7 +578,7 @@ void X11SalGraphics::drawMaskedBitmap( const SalTwoRect& rPosAry, // #105055# Disable XOR temporarily sal_Bool bOldXORMode( bXORMode_ ); - bXORMode_ = sal_False; + bXORMode_ = false; // copy pixmap #2 (result) to background XCopyArea( pXDisp, aBG, aDrawable, GetCopyGC(), @@ -662,7 +662,7 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR, // TODO: use SalX11Bitmap functionality and caching for the Alpha Pixmap // problem is that they don't provide an 8bit Pixmap on a non-8bit display - BitmapBuffer* pAlphaBuffer = const_cast(rAlphaBmp).AcquireBuffer( sal_True ); + BitmapBuffer* pAlphaBuffer = const_cast(rAlphaBmp).AcquireBuffer( true ); // an XImage needs its data top_down // TODO: avoid wrongly oriented images in upper layers! @@ -707,7 +707,7 @@ bool X11SalGraphics::drawAlphaBitmap( const SalTwoRect& rTR, if( pAlphaBits != (char*)pAlphaBuffer->mpBits ) delete[] pAlphaBits; - const_cast(rAlphaBmp).ReleaseBuffer( pAlphaBuffer, sal_True ); + const_cast(rAlphaBmp).ReleaseBuffer( pAlphaBuffer, true ); XRenderPictureAttributes aAttr; aAttr.repeat = int(true); diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx index 5fe3dbb3ed94..bd3379ad30b3 100644 --- a/vcl/unx/generic/printer/printerinfomanager.cxx +++ b/vcl/unx/generic/printer/printerinfomanager.cxx @@ -313,7 +313,7 @@ void PrinterInfoManager::initialize() m_aGlobalDefaults.m_aContext. setValue( pKey, aValue.equals("*nil") ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), - sal_True ); + true ); } } } @@ -500,7 +500,7 @@ void PrinterInfoManager::initialize() aPrinter.m_aInfo.m_aContext. setValue( pKey, aValue.equals("*nil") ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)), - sal_True ); + true ); } } } diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index 2a4a8867dbe8..e06003daf599 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -2977,7 +2977,7 @@ void X11SalFrame::beginUnicodeSequence() aEv.mpTextAttr = &nTextAttr; aEv.mnCursorPos = 0; aEv.mnCursorFlags = 0; - aEv.mbOnlyCursor = sal_False; + aEv.mbOnlyCursor = false; CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv); } @@ -3006,7 +3006,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c ) aEv.mpTextAttr = &attribs[0]; aEv.mnCursorPos = 0; aEv.mnCursorFlags = 0; - aEv.mbOnlyCursor = sal_False; + aEv.mbOnlyCursor = false; CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv); bRet = true; @@ -3038,7 +3038,7 @@ bool X11SalFrame::endUnicodeSequence() aEv.mpTextAttr = &nTextAttr; aEv.mnCursorPos = 0; aEv.mnCursorFlags = 0; - aEv.mbOnlyCursor = sal_False; + aEv.mbOnlyCursor = false; CallCallback(SALEVENT_EXTTEXTINPUT, (void*)&aEv); } } diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 3652f66db4b4..cb7462d83154 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -692,7 +692,7 @@ sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType nType, Rectangle aForward; Rectangle aBackward; - rIsInside = sal_False; + rIsInside = false; ControlPart nCounterPart = 0; if ( nPart == PART_BUTTON_UP ) diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 037807dcf82f..38ea02318e32 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -1560,11 +1560,11 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha ) g_return_val_if_fail( pSalBitmap != NULL, NULL ); g_return_val_if_fail( pSalAlpha != NULL, NULL ); - BitmapBuffer *pBitmap = pSalBitmap->AcquireBuffer( sal_True ); + BitmapBuffer *pBitmap = pSalBitmap->AcquireBuffer( true ); g_return_val_if_fail( pBitmap != NULL, NULL ); g_return_val_if_fail( pBitmap->mnBitCount == 24, NULL ); - BitmapBuffer *pAlpha = pSalAlpha->AcquireBuffer( sal_True ); + BitmapBuffer *pAlpha = pSalAlpha->AcquireBuffer( true ); g_return_val_if_fail( pAlpha != NULL, NULL ); g_return_val_if_fail( pAlpha->mnBitCount == 8, NULL ); @@ -1599,8 +1599,8 @@ bitmapToPixbuf( SalBitmap *pSalBitmap, SalBitmap *pSalAlpha ) } } - pSalBitmap->ReleaseBuffer( pBitmap, sal_True ); - pSalAlpha->ReleaseBuffer( pAlpha, sal_True ); + pSalBitmap->ReleaseBuffer( pBitmap, true ); + pSalAlpha->ReleaseBuffer( pAlpha, true ); return gdk_pixbuf_new_from_data( pPixbufData, GDK_COLORSPACE_RGB, sal_True, 8, -- cgit