diff options
Diffstat (limited to 'vcl/unx')
31 files changed, 395 insertions, 392 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 ); diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx index 365f1c9cdd2e..502d30ef125c 100644 --- a/vcl/unx/gtk/a11y/atktextattributes.cxx +++ b/vcl/unx/gtk/a11y/atktextattributes.cxx @@ -600,12 +600,12 @@ Bool2String( const uno::Any& rAny ) static bool String2Bool( uno::Any& rAny, const gchar * value ) { - sal_Bool bValue; + bool bValue; if( strncmp( value, STRNCMP_PARAM( "true" ) ) ) - bValue = sal_True; + bValue = true; else if( strncmp( value, STRNCMP_PARAM( "false" ) ) ) - bValue = sal_False; + bValue = false; else return false; diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index bdd24551b768..9df91e511925 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -99,7 +99,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext mnHID_FolderChange( 0 ), mnHID_SelectionChange( 0 ), bVersionWidthUnset( false ), - mbPreviewState( sal_False ), + mbPreviewState( false ), mHID_Preview( 0 ), m_pPreview( NULL ), m_pPseudoFilter( NULL ), @@ -393,7 +393,7 @@ public: OUString getFilter() const { return m_sFilter; } /// determines if the filter has sub filter (i.e., the filter is a filter group in real) - sal_Bool hasSubFilters( ) const; + bool hasSubFilters( ) const; /** retrieves the filters belonging to the entry @return @@ -416,7 +416,7 @@ FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFil } //--------------------------------------------------------------------- -sal_Bool FilterEntry::hasSubFilters() const +bool FilterEntry::hasSubFilters() const { return( 0 < m_aSubFilters.getLength() ); } @@ -518,7 +518,7 @@ namespace { //............................................................................ bool operator () ( const FilterEntry& _rEntry ) { - sal_Bool bMatch; + bool bMatch; if( !_rEntry.hasSubFilters() ) // a real filter bMatch = (_rEntry.getTitle() == rTitle) @@ -544,9 +544,9 @@ namespace { //------------------------------------------------------------------------------------ -sal_Bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) +bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( m_pFilterList ) bRet = @@ -560,9 +560,9 @@ sal_Bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle ) } //------------------------------------------------------------------------------------ -sal_Bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) +bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilters ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( m_pFilterList ) { @@ -867,7 +867,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno OUString aNewFilter; OUString aOldFilter = getCurrentFilter(); - sal_Bool bChangeFilter = sal_True; + bool bChangeFilter = true; for ( FilterList::iterator aListIter = m_pFilterList->begin(); aListIter != m_pFilterList->end(); ++aListIter @@ -879,7 +879,7 @@ uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno aNewFilter = aListIter->getTitle(); if( aOldFilter == aListIter->getTitle() ) - bChangeFilter = sal_False; + bChangeFilter = false; bExtensionTypedIn = true; } @@ -1345,7 +1345,7 @@ void SAL_CALL SalGtkFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nContr OSL_TRACE("enable unknown control %d", nControlId); else if( tType == GTK_TYPE_TOGGLE_BUTTON ) { - sal_Bool bChecked = false; + bool bChecked = false; rValue >>= bChecked; gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( pWidget ), bChecked ); } @@ -1373,7 +1373,7 @@ uno::Any SAL_CALL SalGtkFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nC if( !( pWidget = getWidget( nControlId, &tType ) ) ) OSL_TRACE("enable unknown control %d", nControlId); else if( tType == GTK_TYPE_TOGGLE_BUTTON ) - aRetval <<= (sal_Bool) gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( pWidget ) ); + aRetval <<= bool( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON( pWidget ) ) ); else if( tType == GTK_TYPE_COMBO_BOX ) aRetval = HandleGetListValue(GTK_COMBO_BOX(pWidget), nControlAction); else @@ -1619,7 +1619,7 @@ sal_Bool SAL_CALL SalGtkFilePicker::setShowState( sal_Bool bShowState ) throw( u OSL_ASSERT( m_pDialog != NULL ); // TODO return m_pImpl->setShowState( bShowState ); - if( bShowState != mbPreviewState ) + if( bool(bShowState) != mbPreviewState ) { if( bShowState ) { diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx index 60e886fed937..4e25b0e14df8 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx @@ -206,8 +206,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base SalGtkFilePicker( const SalGtkFilePicker& ); SalGtkFilePicker& operator=( const SalGtkFilePicker& ); - sal_Bool FilterNameExists( const OUString& rTitle ); - sal_Bool FilterNameExists( const UnoFilterList& _rGroupedFilters ); + bool FilterNameExists( const OUString& rTitle ); + bool FilterNameExists( const UnoFilterList& _rGroupedFilters ); void ensureFilterList( const OUString& _rInitialCurrentFilter ); @@ -271,7 +271,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base OUString m_aInitialFilter; bool bVersionWidthUnset; - sal_Bool mbPreviewState; + bool mbPreviewState; gulong mHID_Preview; GtkWidget* m_pPreview; GtkFileFilter* m_pPseudoFilter; diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx index 01915a7c5576..6056a84e0f7a 100644 --- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx @@ -44,8 +44,8 @@ typedef struct _cairo_font_options cairo_font_options_t; const char* const tabPrelitDataName="libreoffice-tab-is-prelit"; // initialize statics -sal_Bool GtkSalGraphics::bThemeChanged = sal_True; -sal_Bool GtkSalGraphics::bNeedPixmapPaint = sal_False; +bool GtkSalGraphics::bThemeChanged = true; +bool GtkSalGraphics::bNeedPixmapPaint = false; GtkSalGraphics::GtkSalGraphics( GtkSalFrame *pFrame, GtkWidget *pWindow ) : X11SalGraphics(), @@ -288,7 +288,7 @@ public: { delete [] pData; m_idx = 0; m_size = n; pData = new NWPixmapCacheData[m_size]; } int GetSize() const { return m_size; } - sal_Bool Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap ); + bool Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap ); void Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap* pPixmap ); void ThemeChanged(); @@ -341,7 +341,7 @@ void NWPixmapCache::ThemeChanged() pData[i].SetPixmap( NULL ); } -sal_Bool NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap ) +bool NWPixmapCache::Find( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap** pPixmap ) { aState &= ~CTRL_CACHING_ALLOWED; // mask clipping flag int i; @@ -354,10 +354,10 @@ sal_Bool NWPixmapCache::Find( ControlType aType, ControlState aState, const Rec pData[i].m_pixmap != NULL ) { *pPixmap = pData[i].m_pixmap; - return sal_True; + return true; } } - return sal_False; + return false; } void NWPixmapCache::Fill( ControlType aType, ControlState aState, const Rectangle& r_pixmapRect, GdkPixmap* pPixmap ) @@ -552,7 +552,7 @@ void GtkSalGraphics::copyBits( const SalTwoRect& rPosAry, * Returns sal_True if the platform supports native * drawing of the control defined by nPart */ -sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) +bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) { switch(nType) { @@ -664,7 +664,7 @@ sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPar * * returns whether bIsInside was really set. */ -sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType nType, +bool GtkSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, @@ -752,17 +752,17 @@ sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType nType, if ( has_forward2 ) rIsInside |= aForward.IsInside( aPos ); } - return ( sal_True ); + return true; } if( IsNativeControlSupported(nType, nPart) ) { rIsInside = rControlRegion.IsInside( aPos ); - return( sal_True ); + return true; } else { - return( sal_False ); + return false; } } @@ -776,7 +776,7 @@ sal_Bool GtkSalGraphics::hitTestNativeControl( ControlType nType, * aValue: An optional value (tristate/numerical/string) * rCaption: A caption or title string (like button text etc) */ -sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, +bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -793,7 +793,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, for( unsigned int i = 0; i < gWidgetData.size(); i++ ) if( gWidgetData[i].gNWPixmapCacheList ) gWidgetData[i].gNWPixmapCacheList->ThemeChanged(); - GtkSalGraphics::bThemeChanged = sal_False; + GtkSalGraphics::bThemeChanged = false; } Rectangle aCtrlRect( rControlRegion ); @@ -820,7 +820,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, Size( aCtrlRect.GetWidth()+2, aCtrlRect.GetHeight()+2) ); pixmap = NWGetPixmapFromScreen( aPixmapRect ); if( ! pixmap ) - return sal_False; + return false; gdkDrawable = GDK_DRAWABLE( pixmap ); aCtrlRect = Rectangle( Point(1,1), aCtrlRect.GetSize() ); aClip.push_back( aCtrlRect ); @@ -843,7 +843,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, if (gdkDrawable == 0) return false; - sal_Bool returnVal = sal_False; + bool returnVal = false; if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL) ) { returnVal = NWPaintGTKButton( gdkDrawable, nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption ); @@ -886,7 +886,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, else if ( (nType==CTRL_TAB_ITEM) || (nType==CTRL_TAB_PANE) || (nType==CTRL_TAB_BODY) ) { if ( nType == CTRL_TAB_BODY ) - returnVal = sal_True; + returnVal = true; else returnVal = NWPaintGTKTabItem( nType, nPart, aCtrlRect, aClip, nState, aValue, rCaption); } @@ -977,7 +977,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, * aValue: An optional value (tristate/numerical/string) * rCaption: A caption or title string (like button text etc) */ -sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, +bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -986,7 +986,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { - sal_Bool returnVal = sal_False; + bool returnVal = false; if ( (nType==CTRL_PUSHBUTTON) && (nPart==PART_ENTIRE_CONTROL) && (rControlRegion.GetWidth() > 16) @@ -996,13 +996,13 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, nState, aValue, rCaption ); rNativeContentRegion = rControlRegion; - returnVal = sal_True; + returnVal = true; } if (nType == CTRL_TAB_ITEM && nPart == PART_ENTIRE_CONTROL) { rNativeBoundingRegion = NWGetTabItemRect(m_nXScreen, rControlRegion); rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if ( (nType==CTRL_COMBOBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) ) { @@ -1010,7 +1010,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, aValue, rCaption ); rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if ( (nType==CTRL_SPINBOX) && ((nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) ) { @@ -1019,7 +1019,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, aValue, rCaption ); rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if ( (nType==CTRL_LISTBOX) && ((nPart==PART_BUTTON_DOWN) || (nPart==PART_SUB_EDIT)) ) { @@ -1027,7 +1027,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, aValue, rCaption ); rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if ( (nType==CTRL_TOOLBAR) && ((nPart==PART_DRAW_BACKGROUND_HORZ) || @@ -1039,7 +1039,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, { rNativeBoundingRegion = NWGetToolbarRect( m_nXScreen, nType, nPart, rControlRegion, nState, aValue, rCaption ); rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if ( (nType==CTRL_SCROLLBAR) && ((nPart==PART_BUTTON_LEFT) || (nPart==PART_BUTTON_RIGHT) || (nPart==PART_BUTTON_UP) || (nPart==PART_BUTTON_DOWN) ) ) @@ -1052,7 +1052,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, rNativeContentRegion.Right() = rNativeContentRegion.Left() + 1; if (!rNativeContentRegion.GetHeight()) rNativeContentRegion.Bottom() = rNativeContentRegion.Top() + 1; - returnVal = sal_True; + returnVal = true; } if( (nType == CTRL_MENUBAR) && (nPart == PART_ENTIRE_CONTROL) ) { @@ -1064,7 +1064,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, Size( aMenuBarRect.GetWidth(), aReq.height+1 ) ); rNativeBoundingRegion = aMenuBarRect; rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if( nType == CTRL_MENU_POPUP ) { @@ -1084,7 +1084,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, (rControlRegion.GetHeight()-indicator_size)/2), Size( indicator_size, indicator_size ) ); rNativeContentRegion = aIndicatorRect; - returnVal = sal_True; + returnVal = true; } else if( nPart == PART_MENU_SUBMENU_ARROW ) { @@ -1128,7 +1128,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, Size( arrow_extent, arrow_extent )); rNativeBoundingRegion = Rectangle( Point( 0, 0 ), Size( arrow_extent + horizontal_padding, arrow_extent )); - returnVal = sal_True; + returnVal = true; } } if( (nType == CTRL_RADIOBUTTON || nType == CTRL_CHECKBOX) ) @@ -1149,7 +1149,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, (rControlRegion.GetHeight()-indicator_size)/2), Size( indicator_size, indicator_size ) ); rNativeContentRegion = aIndicatorRect; - returnVal = sal_True; + returnVal = true; } if( (nType == CTRL_EDITBOX || nType == CTRL_SPINBOX || nType == CTRL_COMBOBOX) && nPart == PART_ENTIRE_CONTROL ) { @@ -1163,7 +1163,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, Size( aEditRect.GetWidth(), nHeight ) ); rNativeBoundingRegion = aEditRect; rNativeContentRegion = rNativeBoundingRegion; - returnVal = sal_True; + returnVal = true; } if( (nType == CTRL_SLIDER) && (nPart == PART_THUMB_HORZ || nPart == PART_THUMB_VERT) ) { @@ -1187,7 +1187,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, aRect.Right() = aRect.Left() + slider_width - 1; } rNativeBoundingRegion = rNativeContentRegion = aRect; - returnVal = sal_True; + returnVal = true; } if( nType == CTRL_FRAME && nPart == PART_BORDER ) { @@ -1217,7 +1217,7 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, /************************************************************************ * Individual control drawing functions ************************************************************************/ -sal_Bool GtkSalGraphics::NWPaintGTKArrow( +bool GtkSalGraphics::NWPaintGTKArrow( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1246,7 +1246,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKArrow( return true; } -sal_Bool GtkSalGraphics::NWPaintGTKListHeader( +bool GtkSalGraphics::NWPaintGTKListHeader( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1287,7 +1287,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKListHeader( return true; } -sal_Bool GtkSalGraphics::NWPaintGTKFixedLine( +bool GtkSalGraphics::NWPaintGTKFixedLine( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -1303,7 +1303,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKFixedLine( return true; } -sal_Bool GtkSalGraphics::NWPaintGTKFrame( +bool GtkSalGraphics::NWPaintGTKFrame( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -1367,10 +1367,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKFrame( rControlRectangle.GetHeight()); } - return sal_True; + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKWindowBackground( +bool GtkSalGraphics::NWPaintGTKWindowBackground( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& /* rControlRectangle */, @@ -1391,10 +1391,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKWindowBackground( gtk_paint_flat_box(m_pWindow->style,gdkDrawable,GTK_STATE_NORMAL,GTK_SHADOW_NONE,&clipRect,m_pWindow,"base",0,0,w,h); } - return sal_True; + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKButtonReal( +bool GtkSalGraphics::NWPaintGTKButtonReal( GtkWidget* button, GdkDrawable* gdkDrawable, ControlType, ControlPart, @@ -1408,7 +1408,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKButtonReal( gboolean interiorFocus; gint focusWidth; gint focusPad; - sal_Bool bDrawFocus = sal_True; + bool bDrawFocus = true; gint x, y, w, h; GtkBorder aDefBorder; GtkBorder* pBorder; @@ -1477,7 +1477,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKButtonReal( // If the button is too small, don't ever draw focus or grab more space if ( (w < 16) || (h < 16) ) - bDrawFocus = sal_False; + bDrawFocus = false; gint xi = x, yi = y, wi = w, hi = h; if ( (nState & CTRL_STATE_DEFAULT) && bDrawFocus ) @@ -1528,10 +1528,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKButtonReal( } } - return( sal_True ); + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKButton( +bool GtkSalGraphics::NWPaintGTKButton( GdkDrawable* gdkDrawable, ControlType type, ControlPart part, const Rectangle& rControlRectangle, @@ -1558,7 +1558,7 @@ static Rectangle NWGetButtonArea( SalX11Screen nScreen, gint focusPad; GtkBorder aDefBorder; GtkBorder * pBorder; - sal_Bool bDrawFocus = sal_True; + bool bDrawFocus = true; Rectangle aRect; gint x, y, w, h; @@ -1585,7 +1585,7 @@ static Rectangle NWGetButtonArea( SalX11Screen nScreen, // If the button is too small, don't ever draw focus or grab more space if ( (w < 16) || (h < 16) ) - bDrawFocus = sal_False; + bDrawFocus = false; if ( (nState & CTRL_STATE_DEFAULT) && bDrawFocus ) { @@ -1624,7 +1624,7 @@ static Rectangle NWGetTabItemRect( SalX11Screen nScreen, Rectangle aAreaRect ) //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, +bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, const clipList& rClipList, @@ -1634,7 +1634,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, { GtkStateType stateType; GtkShadowType shadowType; - sal_Bool isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON); + bool isChecked = (aValue.getTristateVal()==BUTTONVALUE_ON); gint x, y; GdkRectangle clipRect; @@ -1677,12 +1677,12 @@ sal_Bool GtkSalGraphics::NWPaintGTKRadio( GdkDrawable* gdkDrawable, x, y, indicator_size, indicator_size ); } - return( sal_True ); + return true; } //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, +bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, const clipList& rClipList, @@ -1724,7 +1724,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKCheck( GdkDrawable* gdkDrawable, x, y, indicator_size, indicator_size ); } - return( sal_True ); + return true; } //------------------------------------- @@ -1740,7 +1740,7 @@ static void NWCalcArrowRect( const Rectangle& rButton, Rectangle& rArrow ) ) ); } -sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, +bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList&, ControlState nState, @@ -1793,7 +1793,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, scrollbarRect = pixmapRect; if ( (scrollbarRect.GetWidth() <= 1) || (scrollbarRect.GetHeight() <= 1) ) - return( sal_True ); + return true; // Grab some button style attributes gtk_widget_style_get( gWidgetData[m_nXScreen].gScrollHorizWidget, @@ -1906,7 +1906,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, thumbRect.Move( (scrollbarRect.GetWidth() - slider_width) / 2, 0 ); } - sal_Bool has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 ); + bool has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 ); scrollbarValues = gtk_range_get_adjustment( GTK_RANGE(scrollbarWidget) ); if ( scrollbarValues == NULL ) @@ -1931,7 +1931,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, // painting them directly to the window flickers pixmap = NWGetPixmapFromScreen( pixmapRect ); if( ! pixmap ) - return sal_False; + return false; x = y = 0; w = pixmapRect.GetWidth(); @@ -2061,11 +2061,11 @@ sal_Bool GtkSalGraphics::NWPaintGTKScrollbar( ControlType, ControlPart nPart, if( !NWRenderPixmapToScreen(pixmap, pixmapRect) ) { g_object_unref( pixmap ); - return( sal_False ); + return false; } g_object_unref( pixmap ); - return( sal_True ); + return true; } //--- @@ -2153,7 +2153,7 @@ static Rectangle NWGetScrollButtonRect( SalX11Screen nScreen, ControlPart nPa //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, +bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, @@ -2178,7 +2178,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKEditBox( GdkDrawable* gdkDrawable, NWPaintOneEditBox( m_nXScreen, gdkDrawable, &clipRect, nType, nPart, pixmapRect, nState, aValue, rCaption ); } - return( sal_True ); + return true; } @@ -2292,7 +2292,7 @@ static void NWPaintOneEditBox( SalX11Screen nScreen, //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, +bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList&, ControlState nState, @@ -2343,7 +2343,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart pixmap = NWGetPixmapFromScreen( pixmapRect ); if ( !pixmap ) - return( sal_False ); + return false; // First render background gtk_paint_flat_box(m_pWindow->style,pixmap,GTK_STATE_NORMAL,GTK_SHADOW_NONE,NULL,m_pWindow,"base", @@ -2389,11 +2389,11 @@ sal_Bool GtkSalGraphics::NWPaintGTKSpinBox( ControlType nType, ControlPart nPart if( !NWRenderPixmapToScreen(pixmap, pixmapRect) ) { g_object_unref( pixmap ); - return( sal_False ); + return false; } g_object_unref( pixmap ); - return( sal_True ); + return true; } //--- @@ -2490,7 +2490,7 @@ static void NWPaintOneSpinButton( SalX11Screen nScreen, //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, +bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, @@ -2565,7 +2565,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKComboBox( GdkDrawable* gdkDrawable, arrowRect.GetWidth(), arrowRect.GetHeight() ); } - return( sal_True ); + return true; } //---- @@ -2630,7 +2630,7 @@ static Rectangle NWGetComboBoxButtonRect( SalX11Screen nScreen, -sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, +bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, const Rectangle& rControlRectangle, const clipList&, ControlState nState, @@ -2776,14 +2776,14 @@ sal_Bool GtkSalGraphics::NWPaintGTKTabItem( ControlType nType, ControlPart, else aCachePage.Fill( nType, nState, pixmapRect, pixmap ); - sal_Bool bSuccess = NWRenderPixmapToScreen(pixmap, pixmapRect); + bool bSuccess = NWRenderPixmapToScreen(pixmap, pixmapRect); g_object_unref( pixmap ); return bSuccess; } //------------------------------------- -sal_Bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable, +bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable, ControlType nType, ControlPart nPart, const Rectangle& rControlRectangle, const clipList& rClipList, @@ -2856,10 +2856,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKListBox( GdkDrawable* gdkDrawable, } } - return( sal_True ); + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKToolbar( +bool GtkSalGraphics::NWPaintGTKToolbar( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3029,12 +3029,12 @@ sal_Bool GtkSalGraphics::NWPaintGTKToolbar( } } - return( sal_True ); + return true; } //---- -sal_Bool GtkSalGraphics::NWPaintGTKMenubar( +bool GtkSalGraphics::NWPaintGTKMenubar( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3117,10 +3117,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKMenubar( } } - return( sal_True ); + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKPopupMenu( +bool GtkSalGraphics::NWPaintGTKPopupMenu( GdkDrawable* gdkDrawable, ControlType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3132,7 +3132,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKPopupMenu( // even crashes) in very old (Fedora Core 4 vintage) gtk's if (gtk_major_version <= 2 && gtk_minor_version <= 8 && nPart == PART_MENU_ITEM && ! (nState & CTRL_STATE_ENABLED) ) - return sal_True; + return true; GtkStateType stateType; GtkShadowType shadowType; @@ -3282,10 +3282,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKPopupMenu( } } - return( sal_True ); + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKTooltip( +bool GtkSalGraphics::NWPaintGTKTooltip( GdkDrawable* gdkDrawable, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -3320,10 +3320,10 @@ sal_Bool GtkSalGraphics::NWPaintGTKTooltip( x, y, w, h ); } - return( sal_True ); + return true; } -sal_Bool GtkSalGraphics::NWPaintGTKListNode( +bool GtkSalGraphics::NWPaintGTKListNode( GdkDrawable*, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -3359,7 +3359,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKListNode( GdkPixmap* pixmap = NWGetPixmapFromScreen( aRect ); if( ! pixmap ) - return sal_False; + return false; GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap ); gtk_paint_expander( gWidgetData[m_nXScreen].gTreeView->style, @@ -3371,13 +3371,13 @@ sal_Bool GtkSalGraphics::NWPaintGTKListNode( w/2, h/2, eStyle ); - sal_Bool bRet = NWRenderPixmapToScreen( pixmap, aRect ); + bool bRet = NWRenderPixmapToScreen( pixmap, aRect ); g_object_unref( pixmap ); return bRet; } -sal_Bool GtkSalGraphics::NWPaintGTKProgress( +bool GtkSalGraphics::NWPaintGTKProgress( GdkDrawable*, ControlType, ControlPart, const Rectangle& rControlRectangle, @@ -3395,7 +3395,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKProgress( GdkPixmap* pixmap = NWGetPixmapFromScreen( Rectangle( Point( 0, 0 ), Size( w, h ) ) ); if( ! pixmap ) - return sal_False; + return false; GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap ); @@ -3440,13 +3440,13 @@ sal_Bool GtkSalGraphics::NWPaintGTKProgress( } } - sal_Bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); + bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); g_object_unref( pixmap ); return bRet; } -sal_Bool GtkSalGraphics::NWPaintGTKSlider( +bool GtkSalGraphics::NWPaintGTKSlider( GdkDrawable*, ControlType, ControlPart nPart, const Rectangle& rControlRectangle, @@ -3465,7 +3465,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKSlider( GdkPixmap* pixmap = NWGetPixmapFromScreen( rControlRectangle ); if( ! pixmap ) - return sal_False; + return false; GdkDrawable* const &pixDrawable = GDK_DRAWABLE( pixmap ); GtkWidget* pWidget = (nPart == PART_TRACK_HORZ_AREA) @@ -3529,7 +3529,7 @@ sal_Bool GtkSalGraphics::NWPaintGTKSlider( } - sal_Bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); + bool bRet = NWRenderPixmapToScreen( pixmap, rControlRectangle ); g_object_unref( pixmap ); return bRet; @@ -3872,8 +3872,8 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) aStyleSet.SetInactiveTabColor( aSelectedBackColor ); // menu disabled entries handling - aStyleSet.SetSkipDisabledInMenus( sal_True ); - aStyleSet.SetAcceleratorsInContextMenus( sal_False ); + aStyleSet.SetSkipDisabledInMenus( true ); + aStyleSet.SetAcceleratorsInContextMenus( false ); // menu colors GtkStyle* pMenuStyle = gtk_widget_get_style( gWidgetData[m_nXScreen].gMenuWidget ); GtkStyle* pMenuItemStyle = gtk_rc_get_style( gWidgetData[m_nXScreen].gMenuItemMenuWidget ); @@ -4145,18 +4145,18 @@ GdkPixmap* GtkSalGraphics::NWGetPixmapFromScreen( Rectangle srcRect ) * Copy an alpha pixmap to screen using a gc with clipping ************************************************************************/ -sal_Bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ) +bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle dstRect ) { // The GC can't be null, otherwise we'd have no clip region GC aFontGC = GetFontGC(); if( aFontGC == NULL ) { std::fprintf(stderr, "salnativewidgets.cxx: no valid GC\n" ); - return( sal_False ); + return false; } if ( !pPixmap ) - return( sal_False ); + return false; // Copy the background of the screen into a composite pixmap CopyScreenArea( GetXDisplay(), @@ -4167,7 +4167,7 @@ sal_Bool GtkSalGraphics::NWRenderPixmapToScreen( GdkPixmap* pPixmap, Rectangle d aFontGC, 0, 0, dstRect.GetWidth(), dstRect.GetHeight(), dstRect.Left(), dstRect.Top() ); - return( sal_True ); + return true; } diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx index b0a6a9f5cf99..eb6609098960 100644 --- a/vcl/unx/gtk/gdi/salprn-gtk.cxx +++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx @@ -198,7 +198,7 @@ GtkSalPrinter::impl_doJob( for (int nPage(0); nPage != nPages; ++nPage) { if (nPage == nPages - 1) - io_rController.setLastPage(sal_True); + io_rController.setLastPage(true); io_rController.printFilteredPage(nPage); } io_rController.setJobState(view::PrintableState_JOB_COMPLETED); @@ -208,7 +208,7 @@ GtkSalPrinter::impl_doJob( } -sal_Bool +bool GtkSalPrinter::StartJob( const OUString* const i_pFileName, const OUString& i_rJobName, @@ -232,7 +232,7 @@ GtkSalPrinter::StartJob( if (!aDialog.run()) { io_rController.abortJob(); - return sal_False; + return false; } aDialog.updateControllerPrintRange(); m_pImpl->m_pPrinter = aDialog.getPrinter(); @@ -267,10 +267,10 @@ GtkSalPrinter::StartJob( } -sal_Bool +bool GtkSalPrinter::EndJob() { - sal_Bool bRet = PspSalPrinter::EndJob(); + bool bRet = PspSalPrinter::EndJob(); if (!lcl_useSystemPrintDialog()) return bRet; @@ -478,8 +478,8 @@ GtkPrintDialog::impl_initCustomTab() sal_Int32 nCurHelpText = 0; OUString aDependsOnName; sal_Int32 nDependsOnValue = 0; - sal_Bool bUseDependencyRow = sal_False; - sal_Bool bIgnore = sal_False; + bool bUseDependencyRow = false; + bool bIgnore = false; GtkWidget* pGroup = NULL; bool bGtkInternal = false; @@ -607,7 +607,7 @@ GtkPrintDialog::impl_initCustomTab() lcl_setHelpText(pWidget, aHelpTexts, 0); m_aControlToPropertyMap[pWidget] = aPropertyName; - sal_Bool bVal = sal_False; + bool bVal = false; pVal = m_rController.getValue(aPropertyName); if (pVal) pVal->Value >>= bVal; diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx index 3ba5b0631a87..c89848b69ebd 100644 --- a/vcl/unx/gtk/window/gtkobject.cxx +++ b/vcl/unx/gtk/window/gtkobject.cxx @@ -30,7 +30,7 @@ #include <unx/gtk/gtkinst.hxx> #include <unx/gtk/gtkgdi.hxx> -GtkSalObject::GtkSalObject( GtkSalFrame* pParent, sal_Bool bShow ) +GtkSalObject::GtkSalObject( GtkSalFrame* pParent, bool bShow ) : m_pSocket( NULL ), m_pRegion( NULL ) { diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 37d1bfad73da..324a06635f84 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -786,7 +786,7 @@ void on_registrar_available( GDBusConnection * /*connection*/, if ( pSalMenu != NULL ) { GtkSalMenu* pGtkSalMenu = static_cast<GtkSalMenu*>(pSalMenu); - pGtkSalMenu->Display( sal_True ); + pGtkSalMenu->Display( true ); pGtkSalMenu->UpdateFull(); } } @@ -807,7 +807,7 @@ void on_registrar_unavailable( GDBusConnection * /*connection*/, if ( pSalMenu ) { GtkSalMenu* pGtkSalMenu = static_cast< GtkSalMenu* >( pSalMenu ); - pGtkSalMenu->Display( sal_False ); + pGtkSalMenu->Display( false ); } } #endif @@ -1534,10 +1534,10 @@ void GtkSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) } } -sal_Bool GtkSalFrame::PostEvent( void* pData ) +bool GtkSalFrame::PostEvent( void* pData ) { getDisplay()->SendInternalEvent( this, pData ); - return sal_True; + return true; } void GtkSalFrame::SetTitle( const OUString& rTitle ) @@ -1806,7 +1806,7 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) * showing the float (cannot grab it to the float * before show). */ - m_pParent->grabPointer( sal_True, sal_True ); + m_pParent->grabPointer( true, true ); } guint32 nUserTime = 0; @@ -1853,7 +1853,7 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) { m_nFloats++; if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 1 ) - grabPointer( sal_True, sal_True ); + grabPointer( true, true ); // #i44068# reset parent's IM context if( m_pParent ) m_pParent->EndExtTextInput(0); @@ -1867,7 +1867,7 @@ void GtkSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) { m_nFloats--; if( ! getDisplay()->GetCaptureFrame() && m_nFloats == 0) - grabPointer( sal_False ); + grabPointer( false ); } gtk_widget_hide( m_pWindow ); if( m_pIMHandler ) @@ -2191,7 +2191,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState ) } } -sal_Bool GtkSalFrame::GetWindowState( SalFrameState* pState ) +bool GtkSalFrame::GetWindowState( SalFrameState* pState ) { pState->mnState = WINDOWSTATE_STATE_NORMAL; pState->mnMask = WINDOWSTATE_MASK_STATE; @@ -2226,7 +2226,7 @@ sal_Bool GtkSalFrame::GetWindowState( SalFrameState* pState ) WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT; - return sal_True; + return true; } typedef enum { @@ -2681,13 +2681,13 @@ void GtkSalFrame::SetPointer( PointerStyle ePointerStyle ) // #i80791# use grabPointer the same way as CaptureMouse, respective float grab if( getDisplay()->MouseCaptured( this ) ) - grabPointer( sal_True, sal_False ); + grabPointer( true, false ); else if( m_nFloats > 0 ) - grabPointer( sal_True, sal_True ); + grabPointer( true, true ); } } -void GtkSalFrame::grabPointer( sal_Bool bGrab, sal_Bool bOwnerEvents ) +void GtkSalFrame::grabPointer( bool bGrab, bool bOwnerEvents ) { #if !GTK_CHECK_VERSION(3,0,0) static const char* pEnv = getenv( "SAL_NO_MOUSEGRABS" ); @@ -2869,10 +2869,10 @@ void GtkSalFrame::EndExtTextInput( sal_uInt16 nFlags ) m_pIMHandler->endExtTextInput( nFlags ); } -sal_Bool GtkSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +bool GtkSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) { // not supported yet - return sal_False; + return false; } LanguageType GtkSalFrame::GetInputLanguage() @@ -3898,7 +3898,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram { // signalize theme changed for NWF caches // FIXME: should be called only once for a style change - GtkSalGraphics::bThemeChanged = sal_True; + GtkSalGraphics::bThemeChanged = true; } #endif } diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx index 976465e74f91..258e1d97cfac 100644 --- a/vcl/unx/gtk/window/gtksalmenu.cxx +++ b/vcl/unx/gtk/window/gtksalmenu.cxx @@ -28,7 +28,7 @@ const sal_uInt16 START_ITEMID_WINDOWLIST = 4600; const sal_uInt16 END_ITEMID_WINDOWLIST = 4699; -static sal_Bool bMenuVisibility = sal_False; +static bool bMenuVisibility = false; /* * This function generates the proper command name for all actions, including @@ -271,7 +271,7 @@ void GtkSalMenu::ImplUpdate( gboolean bRecurse ) sal_Int32 nItem; for ( nItem = 0; nItem < ( sal_Int32 ) GetItemCount(); nItem++ ) { - if ( IsItemVisible( nItem ) == sal_False ) + if ( !IsItemVisible( nItem ) ) continue; GtkSalMenuItem *pSalMenuItem = GetItemAtPos( nItem ); @@ -384,7 +384,7 @@ void GtkSalMenu::UpdateFull() * GtkSalMenu */ -GtkSalMenu::GtkSalMenu( sal_Bool bMenuBar ) : +GtkSalMenu::GtkSalMenu( bool bMenuBar ) : mbMenuBar( bMenuBar ), mpVCLMenu( NULL ), mpOldSalMenu( NULL ), @@ -399,7 +399,7 @@ GtkSalMenu::~GtkSalMenu() { SolarMutexGuard aGuard; - if ( mbMenuBar == sal_True ) + if ( mbMenuBar ) { if ( mpMenuModel ) { @@ -411,7 +411,7 @@ GtkSalMenu::~GtkSalMenu() maItems.clear(); } -sal_Bool GtkSalMenu::VisibleMenuBar() +bool GtkSalMenu::VisibleMenuBar() { return bMenuVisibility; } @@ -713,7 +713,7 @@ void GtkSalMenu::Activate() void GtkSalMenu::Deactivate( const gchar* aMenuCommand ) { - if ( mbMenuBar == sal_False ) + if ( !mbMenuBar ) return; GtkSalMenu* pSalSubMenu = GetMenuForItemCommand( (gchar*) aMenuCommand, TRUE ); @@ -724,23 +724,23 @@ void GtkSalMenu::Deactivate( const gchar* aMenuCommand ) } } -void GtkSalMenu::Display( sal_Bool bVisible ) +void GtkSalMenu::Display( bool bVisible ) { - if ( mbMenuBar == sal_False || mpVCLMenu == NULL ) + if ( !mbMenuBar || mpVCLMenu == NULL ) return; bMenuVisibility = bVisible; - sal_Bool bVCLMenuVisible = ( bVisible == sal_True ) ? sal_False : sal_True; + bool bVCLMenuVisible = ( bVisible ) ? sal_False : sal_True; MenuBar* pMenuBar = static_cast< MenuBar* >( mpVCLMenu ); pMenuBar->SetDisplayable( bVCLMenuVisible ); } -sal_Bool GtkSalMenu::IsItemVisible( unsigned nPos ) +bool GtkSalMenu::IsItemVisible( unsigned nPos ) { SolarMutexGuard aGuard; - sal_Bool bVisible = sal_False; + bool bVisible = false; if ( nPos < maItems.size() ) bVisible = ( ( GtkSalMenuItem* ) maItems[ nPos ])->mbVisible; @@ -789,7 +789,7 @@ void GtkSalMenu::GetSystemMenuData( SystemMenuData* ) GtkSalMenuItem::GtkSalMenuItem( const SalItemParams* pItemData ) : mnId( pItemData->nId ), mnType( pItemData->eType ), - mbVisible( sal_True ), + mbVisible( true ), mpVCLMenu( pItemData->pMenu ), mpParentMenu( NULL ), mpSubMenu( NULL ) diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx index e91c748196cd..6ba0ec33145b 100644 --- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx @@ -396,7 +396,7 @@ void GtkSalGraphics::PaintScrollbar(GtkStyleContext *context, thumbRect.Move( (scrollbarRect.GetWidth() - slider_width) / 2, 0 ); } - sal_Bool has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 ); + bool has_slider = ( thumbRect.GetWidth() > 0 && thumbRect.GetHeight() > 0 ); // ----------------- TROUGH gtk_style_context_save(context); @@ -785,7 +785,7 @@ void GtkSalGraphics::PaintCheckOrRadio(GtkStyleContext *context, gtk_render_option(context, cr, x, y, indicator_size, indicator_size); } -sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, +bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& ) { @@ -823,7 +823,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart renderType = RENDER_COMBOBOX; break; default: - return sal_False; + return false; } break; case CTRL_MENU_POPUP: @@ -864,7 +864,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart context = mpToolButtonStyle; break; default: - return sal_False; + return false; } break; case CTRL_CHECKBOX: @@ -898,7 +898,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart } break; default: - return sal_False; + return false; } cairo_rectangle_int_t translatedRegion = { (int) rControlRegion.Left() - 1, (int) rControlRegion.Top() - 1, @@ -959,7 +959,7 @@ sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart renderAreaToPix(cr, &translatedRegion); cairo_destroy(cr); // unref - return sal_True; + return true; } // FIXME: This is incredibly lame ... but so is cairo's insistance on -exactly- @@ -1007,7 +1007,7 @@ void GtkSalGraphics::renderAreaToPix( cairo_t *cr, gtk_widget_queue_draw_area( mpFrame->getWindow(), ax, ay, awidth, aheight ); } -sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState, +bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState, const ImplControlValue&, const OUString&, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { @@ -1099,13 +1099,13 @@ sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart } else { - return sal_False; + return false; } rNativeBoundingRegion = aEditRect; rNativeContentRegion = rNativeBoundingRegion; - return sal_True; + return true; } /************************************************************************ * helper for GtkSalFrame @@ -1197,8 +1197,8 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) } // menu disabled entries handling - aStyleSet.SetSkipDisabledInMenus( sal_True ); - aStyleSet.SetAcceleratorsInContextMenus( sal_False ); + aStyleSet.SetSkipDisabledInMenus( true ); + aStyleSet.SetAcceleratorsInContextMenus( false ); // menu colors gtk_style_context_get_background_color( mpMenuStyle, GTK_STATE_FLAG_NORMAL, &background_color ); @@ -1439,7 +1439,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) } -sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) +bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) { if( (nType == CTRL_EDITBOX) || @@ -1463,12 +1463,12 @@ sal_Bool GtkSalGraphics::IsNativeControlSupported( ControlType nType, ControlPar (nType == CTRL_MENU_POPUP && ((nPart == PART_MENU_ITEM_CHECK_MARK) || (nPart == PART_MENU_ITEM_RADIO_MARK) || (nPart == PART_MENU_SEPARATOR) || (nPart == PART_MENU_SUBMENU_ARROW)))) - return sal_True; + return true; printf( "Unhandled is native supported for Type: %d, Part %d\n", (int)nType, (int)nPart ); - return sal_False; + return false; } void GtkData::initNWF() {} diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx index d281949f6e37..4d63289e908d 100644 --- a/vcl/unx/kde/UnxCommandThread.cxx +++ b/vcl/unx/kde/UnxCommandThread.cxx @@ -43,7 +43,7 @@ UnxFilePickerCommandThread::~UnxFilePickerCommandThread() { } -sal_Bool SAL_CALL UnxFilePickerCommandThread::result() +bool SAL_CALL UnxFilePickerCommandThread::result() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -115,10 +115,10 @@ void SAL_CALL UnxFilePickerCommandThread::run() sal_Char *pWhereToRead = pBuffer; sal_Char *pEntryBegin = pBuffer; sal_Int32 nBytesRead = 0; - sal_Bool bShouldExit = sal_False; + bool bShouldExit = false; while ( !bShouldExit && ( nBytesRead = read( m_nReadFD, pWhereToRead, pBufferEnd - pWhereToRead ) ) > 0 ) { - sal_Bool bFoundNL = sal_False; + bool bFoundNL = false; sal_Char *pWhereToReadEnd = pWhereToRead + nBytesRead; sal_Char *pEntryEnd = pWhereToRead; do { @@ -127,11 +127,11 @@ void SAL_CALL UnxFilePickerCommandThread::run() if ( pEntryEnd < pWhereToReadEnd ) { - bFoundNL = sal_True; + bFoundNL = true; *pEntryEnd = 0; if ( strcmp( pEntryBegin, "exited" ) == 0 ) - bShouldExit = sal_True; + bShouldExit = true; else handleCommand( OUString( pEntryBegin, pEntryEnd - pEntryBegin, RTL_TEXTENCODING_UTF8 )/*, bQuit*/ ); @@ -181,12 +181,12 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const OUString &rComman if ( aCommandName == "accept" ) { - m_aResult = sal_True; + m_aResult = true; m_aExecCondition.set(); } else if ( aCommandName == "reject" ) { - m_aResult = sal_False; + m_aResult = false; m_aExecCondition.set(); } else if ( aCommandName == "fileSelectionChanged" ) @@ -210,7 +210,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const OUString &rComman if ( aType == "bool" ) { - sal_Bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCase("true"); + bool bValue = !aList.empty() && aList.front().equalsIgnoreAsciiCase("true"); m_aGetValue <<= bValue; m_aGetValueCondition.set(); @@ -275,7 +275,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const OUString &rComman const sal_Unicode *pUnicode = rCommand.getStr(); const sal_Unicode *pEnd = pUnicode + rCommand.getLength(); - sal_Bool bQuoted = sal_False; + bool bQuoted = false; for ( ; pUnicode != pEnd; ++pUnicode ) { diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx index b893eb3559d7..5a3670564abf 100644 --- a/vcl/unx/kde/UnxCommandThread.hxx +++ b/vcl/unx/kde/UnxCommandThread.hxx @@ -81,7 +81,7 @@ protected: ::osl::Mutex m_aMutex; YieldingCondition m_aExecCondition; - sal_Bool m_aResult; + bool m_aResult; ::osl::Condition m_aGetCurrentFilterCondition; OUString m_aGetCurrentFilter; @@ -100,7 +100,7 @@ public: ~UnxFilePickerCommandThread(); YieldingCondition& SAL_CALL execCondition() { return m_aExecCondition; } - sal_Bool SAL_CALL result(); + bool SAL_CALL result(); ::osl::Condition& SAL_CALL getCurrentFilterCondition() { return m_aGetCurrentFilterCondition; } OUString SAL_CALL getCurrentFilter(); diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx index dbf371d673a3..cfd5e3783b8f 100644 --- a/vcl/unx/kde/UnxFilePicker.cxx +++ b/vcl/unx/kde/UnxFilePicker.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> +#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ControlActions.hpp> @@ -171,7 +172,9 @@ sal_Int16 SAL_CALL UnxFilePicker::execute() m_pCommandThread->execCondition().wait(); - return m_pCommandThread->result(); + return m_pCommandThread->result() + ? css::ui::dialogs::ExecutableDialogResults::OK + : css::ui::dialogs::ExecutableDialogResults::CANCEL; } void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode ) @@ -326,7 +329,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA if ( aType == "checkbox" ) { - sal_Bool bControlValue; + bool bControlValue; if ( ( rValue >>= bControlValue ) && bControlValue ) aBuffer.appendAscii( " true" ); else @@ -808,7 +811,7 @@ void UnxFilePicker::appendEscaped( OUStringBuffer &rBuffer, const OUString &rStr rBuffer.appendAscii( "\"", 1 ); } -sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ) +bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ) { typedef struct { sal_Int16 nId; @@ -856,13 +859,13 @@ sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, OUString &rType, sa rType = *(pPtr->pType); rTitleId = pPtr->nTitle; - return sal_True; + return true; } - return sal_False; + return false; } -sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, OUString &rType ) +bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, OUString &rType ) { typedef struct { sal_Int16 nId; @@ -890,7 +893,7 @@ sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, OUString &r rType = pPtr->pType; - return sal_True; + return true; } void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId ) diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx index 3459e64a7476..58aec56647e4 100644 --- a/vcl/unx/kde/UnxFilePicker.hxx +++ b/vcl/unx/kde/UnxFilePicker.hxx @@ -162,8 +162,8 @@ protected: void appendEscaped( OUStringBuffer &rBuffer, const OUString &rString ); private: - sal_Bool controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ); - sal_Bool controlActionInfo( sal_Int16 nControlId, OUString &rType ); + bool controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId ); + bool controlActionInfo( sal_Int16 nControlId, OUString &rType ); void sendAppendControlCommand( sal_Int16 nControlId ); }; diff --git a/vcl/unx/kde/UnxNotifyThread.cxx b/vcl/unx/kde/UnxNotifyThread.cxx index ad838405639b..60eb14933082 100644 --- a/vcl/unx/kde/UnxNotifyThread.cxx +++ b/vcl/unx/kde/UnxNotifyThread.cxx @@ -28,7 +28,7 @@ using namespace ::com::sun::star; UnxFilePickerNotifyThread::UnxFilePickerNotifyThread( UnxFilePicker *pUnxFilePicker ) : m_pUnxFilePicker( pUnxFilePicker ), - m_bExit( sal_False ), + m_bExit( false ), m_eNotifyType( Nothing ), m_nControlId( 0 ) { @@ -54,7 +54,7 @@ void SAL_CALL UnxFilePickerNotifyThread::exit() { ::osl::MutexGuard aGuard( m_aMutex ); - m_bExit = sal_True; + m_bExit = true; m_aExitCondition.reset(); m_aNotifyCondition.set(); diff --git a/vcl/unx/kde/UnxNotifyThread.hxx b/vcl/unx/kde/UnxNotifyThread.hxx index a4529453f94e..993bcd61c6c6 100644 --- a/vcl/unx/kde/UnxNotifyThread.hxx +++ b/vcl/unx/kde/UnxNotifyThread.hxx @@ -45,7 +45,7 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener; - sal_Bool m_bExit; + bool m_bExit; ::osl::Condition m_aExitCondition; NotifyType m_eNotifyType; diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx index 8d458e56c055..86096366d563 100644 --- a/vcl/unx/kde/salnativewidgets-kde.cxx +++ b/vcl/unx/kde/salnativewidgets-kde.cxx @@ -270,7 +270,7 @@ class WidgetPainter @param gc The graphics context. */ - sal_Bool drawStyledWidget( QWidget *pWidget, + bool drawStyledWidget( QWidget *pWidget, ControlState nState, const ImplControlValue& aValue, Display *dpy, XLIB_Window drawable, SalX11Screen nXScreen, int nDepth, GC gc, @@ -284,7 +284,7 @@ class WidgetPainter @return valid push button. */ - QPushButton *pushButton( const Rectangle& rControlRegion, sal_Bool bDefault ); + QPushButton *pushButton( const Rectangle& rControlRegion, bool bDefault ); /** 'Get' method for radio button. @@ -305,7 +305,7 @@ class WidgetPainter @see pushButton(), m_pEditableComboBox */ - QComboBox *comboBox( const Rectangle& rControlRegion, sal_Bool bEditable ); + QComboBox *comboBox( const Rectangle& rControlRegion, bool bEditable ); /** 'Get' method for line edit box. @@ -342,13 +342,13 @@ class WidgetPainter @see pushButton() */ QScrollBar *scrollBar( const Rectangle& rControlRegion, - sal_Bool bHorizontal, const ImplControlValue& aValue ); + bool bHorizontal, const ImplControlValue& aValue ); /** 'Get' method for tool bar. @see pushButton() */ - QToolBar *toolBar( const Rectangle& rControlRegion, sal_Bool bHorizontal ); + QToolBar *toolBar( const Rectangle& rControlRegion, bool bHorizontal ); /** 'Get' method for tool button. @@ -463,13 +463,13 @@ WidgetPainter::~WidgetPainter( void ) delete m_pProgressBar, m_pProgressBar = NULL; } -sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, +bool WidgetPainter::drawStyledWidget( QWidget *pWidget, ControlState nState, const ImplControlValue& aValue, Display *dpy, XLIB_Window drawable, SalX11Screen nXScreen, int nDepth, GC gc, ControlPart nPart ) { if ( !pWidget ) - return sal_False; + return false; // Normalize the widget QPoint qWidgetPos( pWidget->pos() ); @@ -625,7 +625,7 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, pTab = m_pTabMiddle; } if ( !pTab ) - return sal_False; + return false; pTab->setRect( qRect ); @@ -817,7 +817,7 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, pWidget->colorGroup(), nStyle ); } else - return sal_False; + return false; // Bitblt it to the screen X11SalGraphics::CopyScreenArea( @@ -830,11 +830,11 @@ sal_Bool WidgetPainter::drawStyledWidget( QWidget *pWidget, // Restore widget's position pWidget->move( qWidgetPos ); - return sal_True; + return true; } QPushButton *WidgetPainter::pushButton( const Rectangle& rControlRegion, - sal_Bool bDefault ) + bool bDefault ) { if ( !m_pPushButton ) m_pPushButton = new QPushButton( NULL, "push_button" ); @@ -929,7 +929,7 @@ QCheckBox *WidgetPainter::checkBox( const Rectangle& rControlRegion ) } QComboBox *WidgetPainter::comboBox( const Rectangle& rControlRegion, - sal_Bool bEditable ) + bool bEditable ) { QComboBox *pComboBox = NULL; if ( bEditable ) @@ -1041,7 +1041,7 @@ QListView *WidgetPainter::listView( const Rectangle& rControlRegion ) } QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion, - sal_Bool bHorizontal, const ImplControlValue& aValue ) + bool bHorizontal, const ImplControlValue& aValue ) { if ( !m_pScrollBar ) { @@ -1068,7 +1068,7 @@ QScrollBar *WidgetPainter::scrollBar( const Rectangle& rControlRegion, return m_pScrollBar; } -QToolBar *WidgetPainter::toolBar( const Rectangle& rControlRegion, sal_Bool bHorizontal ) +QToolBar *WidgetPainter::toolBar( const Rectangle& rControlRegion, bool bHorizontal ) { if ( !m_pMainWindow ) m_pMainWindow = new QMainWindow( NULL, "main_window" ); @@ -1209,15 +1209,15 @@ class KDESalGraphics : public X11SalGraphics public: KDESalGraphics() {} virtual ~KDESalGraphics() {} - virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); - virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ) SAL_OVERRIDE; - virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, + virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption ); - virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, + virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& aCaption, @@ -1235,7 +1235,7 @@ class KDESalGraphics : public X11SalGraphics @return sal_True if the platform supports native drawing of the widget nType defined by nPart. */ -sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) +bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) { return ( (nType == CTRL_PUSHBUTTON) && (nPart == PART_ENTIRE_CONTROL) ) || @@ -1270,7 +1270,7 @@ sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType nType, ControlPar aPos was or was not inside the native widget specified by the nType/nPart combination. */ -sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, +bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& rPos, bool& rIsInside ) { @@ -1280,7 +1280,7 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP Point aPos = rPos - rControlRegion.TopLeft(); rIsInside = false; - sal_Bool bHorizontal = ( nPart == PART_BUTTON_LEFT || nPart == PART_BUTTON_RIGHT ); + bool bHorizontal = ( nPart == PART_BUTTON_LEFT || nPart == PART_BUTTON_RIGHT ); QScrollBar *pScrollBar = pWidgetPainter->scrollBar( rControlRegion, bHorizontal, ImplControlValue() ); @@ -1290,10 +1290,10 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddLine ); // There are 2 buttons on the right/bottom side of the scrollbar - sal_Bool bTwoSubButtons = sal_False; + bool bTwoSubButtons = false; // It is a Platinum style scroll bar - sal_Bool bPlatinumStyle = sal_False; + bool bPlatinumStyle = false; // Workaround for Platinum and 3 button style scroll bars. // It makes the right/down button bigger. @@ -1303,9 +1303,9 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddPage ).right() + 1 ); if ( qRectAddLine.width() > qRectSubLine.width() ) - bTwoSubButtons = sal_True; + bTwoSubButtons = true; if ( qRectSubLine.left() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).left() ) - bPlatinumStyle = sal_True; + bPlatinumStyle = true; } else { @@ -1313,9 +1313,9 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarAddPage ).bottom() + 1 ); if ( qRectAddLine.height() > qRectSubLine.height() ) - bTwoSubButtons = sal_True; + bTwoSubButtons = true; if ( qRectSubLine.top() > kapp->style().querySubControlMetrics( QStyle::CC_ScrollBar, pScrollBar, QStyle::SC_ScrollBarSubPage ).top() ) - bPlatinumStyle = sal_True; + bPlatinumStyle = true; } switch ( nPart ) @@ -1356,13 +1356,13 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP // cases PART_TRACK_HORZ_AREA and PART_TRACK_VERT_AREA default: - return sal_False; + return false; } - return sal_True; + return true; } - return sal_False; + return false; } @@ -1377,12 +1377,12 @@ sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nP @param aCaption A caption or title string (like button text etc.) */ -sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, +bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& ) { - sal_Bool bReturn = sal_False; + bool bReturn = false; Display *dpy = GetXDisplay(); XLIB_Window drawable = GetDrawable(); @@ -1412,7 +1412,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart else if ( (nType == CTRL_COMBOBOX) && (nPart == PART_ENTIRE_CONTROL) ) { bReturn = pWidgetPainter->drawStyledWidget( - pWidgetPainter->comboBox( rControlRegion, sal_True ), + pWidgetPainter->comboBox( rControlRegion, true ), nState, aValue, dpy, drawable, GetScreenNumber(), GetVisual().GetDepth(), gc ); } @@ -1426,7 +1426,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart else if ( (nType == CTRL_LISTBOX) && (nPart == PART_ENTIRE_CONTROL) ) { bReturn = pWidgetPainter->drawStyledWidget( - pWidgetPainter->comboBox( rControlRegion, sal_False ), + pWidgetPainter->comboBox( rControlRegion, false ), nState, aValue, dpy, drawable, GetScreenNumber(), GetVisual().GetDepth(), gc ); } @@ -1521,13 +1521,13 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType nType, ControlPart nPart @param aCaption A caption or title string (like button text etc.) */ -sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, +bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue&, const OUString&, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { - sal_Bool bReturn = sal_False; + bool bReturn = false; QRect qBoundingRect = WidgetPainter::region2QRect( rControlRegion ); QRect qRect; @@ -1549,7 +1549,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart QStyle::PM_ButtonDefaultIndicator, pWidget ); qBoundingRect.addCoords( -nIndicatorSize, -nIndicatorSize, nIndicatorSize, nIndicatorSize ); - bReturn = sal_True; + bReturn = true; } break; } @@ -1564,7 +1564,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart qRect.setWidth( kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorWidth, pWidget ) ); qRect.setHeight( kapp->style().pixelMetric( QStyle::PM_ExclusiveIndicatorHeight, pWidget ) ); - bReturn = sal_True; + bReturn = true; } break; @@ -1577,7 +1577,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart qRect.setWidth( kapp->style().pixelMetric( QStyle::PM_IndicatorWidth, pWidget ) ); qRect.setHeight( kapp->style().pixelMetric( QStyle::PM_IndicatorHeight, pWidget ) ); - bReturn = sal_True; + bReturn = true; } break; @@ -1594,14 +1594,14 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart QStyle::CC_ComboBox, pWidget, QStyle::SC_ComboBoxEditField ).right() + 1 ); qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); - bReturn = sal_True; + bReturn = true; break; case PART_SUB_EDIT: qRect = kapp->style().querySubControlMetrics( QStyle::CC_ComboBox, pWidget, QStyle::SC_ComboBoxEditField ); qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); - bReturn = sal_True; + bReturn = true; break; } break; @@ -1614,14 +1614,14 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart case PART_BUTTON_UP: qRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetUp ); - bReturn = sal_True; + bReturn = true; qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); break; case PART_BUTTON_DOWN: qRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetDown ); - bReturn = sal_True; + bReturn = true; qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); break; @@ -1629,7 +1629,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart qRect = kapp->style().querySubControlMetrics( QStyle::CC_SpinWidget, pWidget, QStyle::SC_SpinWidgetEditField ); qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); - bReturn = sal_True; + bReturn = true; break; } break; @@ -1671,7 +1671,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); - bReturn = sal_True; + bReturn = true; break; case PART_BUTTON_RIGHT: @@ -1692,7 +1692,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType nType, ControlPart qRect.moveBy( qBoundingRect.left(), qBoundingRect.top() ); - bReturn = sal_True; + bReturn = true; break; } break; @@ -1962,7 +1962,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) qMainWindow.createGUI( "/dev/null" ); // hack // Menu - aStyleSettings.SetSkipDisabledInMenus( sal_True ); + aStyleSettings.SetSkipDisabledInMenus( true ); KMenuBar *pMenuBar = qMainWindow.menuBar(); if ( pMenuBar ) { diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx index 6dc97df86cc2..7c29af7a1fee 100644 --- a/vcl/unx/kde4/KDE4FilePicker.hxx +++ b/vcl/unx/kde4/KDE4FilePicker.hxx @@ -152,7 +152,7 @@ private Q_SLOTS: sal_Int16 executeSlot() throw( ::com::sun::star::uno::RuntimeException ) { return execute(); } // XFilePicker functions - void setMultiSelectionModeSlot( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException ) { return setMultiSelectionMode( bMode ); } + void setMultiSelectionModeSlot( bool bMode ) throw( ::com::sun::star::uno::RuntimeException ) { return setMultiSelectionMode( bMode ); } void setDefaultNameSlot( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException ) { return setDefaultName( rName ); } void setDisplayDirectorySlot( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException ) { return setDisplayDirectory( rDirectory ); } OUString getDisplayDirectorySlot() throw( ::com::sun::star::uno::RuntimeException ) { return getDisplayDirectory(); } @@ -169,7 +169,7 @@ private Q_SLOTS: // XFilePickerControlAccess functions void setValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException) { return setValue( nControlId, nControlAction, rValue ); } ::com::sun::star::uno::Any getValueSlot( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException) { return getValue( nControlId, nControlAction ); } - void enableControlSlot( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ) { return enableControl( nControlId, bEnable ); } + void enableControlSlot( sal_Int16 nControlId, bool bEnable ) throw( ::com::sun::star::uno::RuntimeException ) { return enableControl( nControlId, bEnable ); } void setLabelSlot( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException) { return setLabel( nControlId, rLabel ); } OUString getLabelSlot( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException) { return getLabel( nControlId ); } @@ -185,7 +185,7 @@ Q_SIGNALS: sal_Int16 executeSignal(); // XFilePicker functions - void setMultiSelectionModeSignal( sal_Bool bMode ); + void setMultiSelectionModeSignal( bool bMode ); void setDefaultNameSignal( const OUString &rName ); void setDisplayDirectorySignal( const OUString &rDirectory ); OUString getDisplayDirectorySignal(); @@ -202,7 +202,7 @@ Q_SIGNALS: // XFilePickerControlAccess functions void setValueSignal( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ); ::com::sun::star::uno::Any getValueSignal( sal_Int16 nControlId, sal_Int16 nControlAction ); - void enableControlSignal( sal_Int16 nControlId, sal_Bool bEnable ); + void enableControlSignal( sal_Int16 nControlId, bool bEnable ); void setLabelSignal( sal_Int16 nControlId, const OUString &rLabel ); OUString getLabelSignal( sal_Int16 nControlId ); diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx index abee781cab1b..a1fa6fd280fc 100644 --- a/vcl/unx/kde4/KDESalGraphics.cxx +++ b/vcl/unx/kde4/KDESalGraphics.cxx @@ -88,7 +88,7 @@ KDESalGraphics::~KDESalGraphics() delete m_image; } -sal_Bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part ) +bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part ) { if (type == CTRL_PUSHBUTTON) return true; @@ -242,7 +242,7 @@ static QRegion XRegionToQRegion( XLIB_Region xr ) } #endif -sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, +bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& value, const OUString& ) @@ -256,7 +256,7 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, return false; } - sal_Bool returnVal = true; + bool returnVal = true; QRect widgetRect = region2QRect(rControlRegion); if( type == CTRL_SPINBOX && part == PART_ALL_BUTTONS ) @@ -672,13 +672,13 @@ sal_Bool KDESalGraphics::drawNativeControl( ControlType type, ControlPart part, return returnVal; } -sal_Bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, +bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, const Rectangle& controlRegion, ControlState controlState, const ImplControlValue& val, const OUString&, Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion ) { - sal_Bool retVal = false; + bool retVal = false; QRect boundingRect = region2QRect( controlRegion ); QRect contentRect = boundingRect; @@ -950,7 +950,7 @@ sal_Bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart p aPos was or was not inside the native widget specified by the nType/nPart combination. */ -sal_Bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, +bool KDESalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& rPos, bool& rIsInside ) { diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx index 0fce28980a74..d865d43204e7 100644 --- a/vcl/unx/kde4/KDESalGraphics.hxx +++ b/vcl/unx/kde4/KDESalGraphics.hxx @@ -43,14 +43,14 @@ class KDESalGraphics : public X11SalGraphics @param part Specification of the widget's part if it consists of more than one. @return true if the platform supports native drawing of the widget type defined by part. */ - virtual sal_Bool IsNativeControlSupported( ControlType type, ControlPart part ); + virtual bool IsNativeControlSupported( ControlType type, ControlPart part ); /** Test whether the position is in the native widget. If the return value is TRUE, bIsInside contains information whether aPos was or was not inside the native widget specified by the type/part combination. */ - virtual sal_Bool hitTestNativeControl( ControlType type, ControlPart part, + virtual bool hitTestNativeControl( ControlType type, ControlPart part, const Rectangle& rControlRegion, const Point& aPos, bool& rIsInside ) SAL_OVERRIDE; /** Draw the requested control described by part/nControlState. @@ -64,7 +64,7 @@ class KDESalGraphics : public X11SalGraphics @param aCaption A caption or title string (like button text etc.) */ - virtual sal_Bool drawNativeControl( ControlType type, ControlPart part, + virtual bool drawNativeControl( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& aValue, const OUString& aCaption ); @@ -86,7 +86,7 @@ class KDESalGraphics : public X11SalGraphics @param aCaption A caption or title string (like button text etc.) */ - virtual sal_Bool getNativeControlRegion( ControlType type, ControlPart part, + virtual bool getNativeControlRegion( ControlType type, ControlPart part, const Rectangle& rControlRegion, ControlState nControlState, const ImplControlValue& aValue, const OUString& aCaption, |