diff options
Diffstat (limited to 'vcl/win/source')
-rw-r--r-- | vcl/win/source/app/salinfo.cxx | 4 | ||||
-rw-r--r-- | vcl/win/source/app/salinst.cxx | 10 | ||||
-rw-r--r-- | vcl/win/source/app/salshl.cxx | 4 | ||||
-rw-r--r-- | vcl/win/source/app/saltimer.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi.cxx | 34 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi2.cxx | 8 | ||||
-rw-r--r-- | vcl/win/source/gdi/salgdi3.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/gdi/salnativewidgets-luna.cxx | 22 | ||||
-rw-r--r-- | vcl/win/source/gdi/salprn.cxx | 18 | ||||
-rw-r--r-- | vcl/win/source/gdi/salvd.cxx | 2 | ||||
-rw-r--r-- | vcl/win/source/window/salframe.cxx | 102 | ||||
-rw-r--r-- | vcl/win/source/window/salmenu.cxx | 8 | ||||
-rw-r--r-- | vcl/win/source/window/salobj.cxx | 14 |
13 files changed, 115 insertions, 115 deletions
diff --git a/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx index 178693f15615..19234fdf387e 100644 --- a/vcl/win/source/app/salinfo.cxx +++ b/vcl/win/source/app/salinfo.cxx @@ -56,7 +56,7 @@ static BOOL CALLBACK ImplEnumMonitorProc( HMONITOR hMonitor, reinterpret_cast<sal_IntPtr>(lpRect) ); } -sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr, sal_IntPtr ) +bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr, sal_IntPtr ) { MONITORINFOEXW aInfo; aInfo.cbSize = sizeof( aInfo ); @@ -77,7 +77,7 @@ sal_Bool WinSalSystem::handleMonitorCallback( sal_IntPtr hMonitor, sal_IntPtr, s m_nPrimary = it->second; } } - return sal_True; + return true; } void WinSalSystem::clearMonitors() diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index d639d894c752..602ee8a9bc69 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -228,7 +228,7 @@ void ImplSalYieldMutexAcquireWithWait() if ( pSalData->mnAppThreadId == nThreadId ) { // wait till we get the Mutex - sal_Bool bAcquire = FALSE; + bool bAcquire = FALSE; do { if ( pInst->mpSalYieldMutex->tryToAcquire() ) @@ -261,7 +261,7 @@ void ImplSalYieldMutexAcquireWithWait() -sal_Bool ImplSalYieldMutexTryToAcquire() +bool ImplSalYieldMutexTryToAcquire() { WinSalInstance* pInst = GetSalData()->mpFirstInstance; if ( pInst ) @@ -647,7 +647,7 @@ static void ImplSalDispatchMessage( MSG* pMsg ) -void ImplSalYield( sal_Bool bWait, sal_Bool bHandleAllCurrentEvents ) +void ImplSalYield( bool bWait, bool bHandleAllCurrentEvents ) { MSG aMsg; bool bWasMsg = false, bOneEvent = false; @@ -741,7 +741,7 @@ LRESULT CALLBACK SalComWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lPar rDef = FALSE; break; case SAL_MSG_THREADYIELD: - ImplSalYield( (sal_Bool)wParam, (sal_Bool)lParam ); + ImplSalYield( (bool)wParam, (bool)lParam ); rDef = FALSE; break; // If we get this message, because another GetMessage() call @@ -1004,7 +1004,7 @@ void WinSalInstance::DestroyFrame( SalFrame* pFrame ) SalObject* WinSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /*pWindowData*/, // SystemWindowData meaningless on Windows - sal_Bool /*bShow*/ ) + bool /*bShow*/ ) { // to switch to Main-Thread return (SalObject*)(sal_IntPtr)ImplSendMessage( mhComWnd, SAL_MSG_CREATEOBJECT, 0, (LPARAM)static_cast<WinSalFrame*>(pParent) ); diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx index 8d72b021fae0..cddc07f16d9a 100644 --- a/vcl/win/source/app/salshl.cxx +++ b/vcl/win/source/app/salshl.cxx @@ -32,7 +32,7 @@ extern "C" { #ifdef __MINGW32__ -sal_Bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) +bool WINAPI DllMain( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ) #else BOOL WINAPI _CRT_INIT( HINSTANCE hInst, DWORD nReason, LPVOID pReserved ); @@ -82,7 +82,7 @@ HBITMAP ImplLoadSalBitmap( int nId ) -sal_Bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ) +bool ImplLoadSalIcon( int nId, HICON& rIcon, HICON& rSmallIcon ) { DBG_ASSERT( aSalShlData.mhInst, "no DLL instance handle" ); diff --git a/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx index ef99cd86db8e..c3d2e4e8ed8f 100644 --- a/vcl/win/source/app/saltimer.cxx +++ b/vcl/win/source/app/saltimer.cxx @@ -34,7 +34,7 @@ -void ImplSalStartTimer( sal_uLong nMS, sal_Bool bMutex ) +void ImplSalStartTimer( sal_uLong nMS, bool bMutex ) { SalData* pSalData = GetSalData(); diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx index 04faaa67151d..464583d4f5b4 100644 --- a/vcl/win/source/gdi/salgdi.cxx +++ b/vcl/win/source/gdi/salgdi.cxx @@ -179,7 +179,7 @@ void ImplInitSalGDI() HBITMAP hBmpOld = (HBITMAP) ::SelectObject( hMemDC, hMemBmp ); HBRUSH hMemBrush = ::CreateSolidBrush( PALETTERGB( 175, 171, 169 ) ); HBRUSH hBrushOld = (HBRUSH) ::SelectObject( hMemDC, hMemBrush ); - sal_Bool bDither16 = TRUE; + bool bDither16 = TRUE; ::PatBlt( hMemDC, 0, 0, 8, 8, PATCOPY ); const COLORREF aCol( ::GetPixel( hMemDC, 0, 0 ) ); @@ -1097,7 +1097,7 @@ void WinSalGraphics::SetLineColor( SalColor nSalColor ) SALCOLOR_GREEN( nSalColor ), SALCOLOR_BLUE( nSalColor ) ); HPEN hNewPen = 0; - sal_Bool bStockPen = FALSE; + bool bStockPen = FALSE; // search for stock pen (only screen, because printer have problems, // when we use stock objects) @@ -1181,7 +1181,7 @@ void WinSalGraphics::SetFillColor( SalColor nSalColor ) BYTE nBlue = SALCOLOR_BLUE( nSalColor ); COLORREF nBrushColor = PALETTERGB( nRed, nGreen, nBlue ); HBRUSH hNewBrush = 0; - sal_Bool bStockBrush = FALSE; + bool bStockBrush = FALSE; // search for stock brush (only screen, because printer have problems, // when we use stock objects) @@ -1552,9 +1552,9 @@ bool WinSalGraphics::drawPolyLineBezier( sal_uInt32 nPoints, const SalPoint* pPt ImplRenderPath( getHDC(), nPoints, pPtAry, pFlgAry ); - return sal_True; + return true; #else - return sal_False; + return false; #endif } @@ -1585,7 +1585,7 @@ bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtA sal_uInt32 nPoints_i32(nPoints); ImplPreparePolyDraw(true, 1, &nPoints_i32, &pPtAry, &pFlgAry, pWinPointAry, pWinFlagAry); - sal_Bool bRet( sal_False ); + bool bRet( false ); if( BeginPath( getHDC() ) ) { @@ -1594,7 +1594,7 @@ bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtA if( EndPath( getHDC() ) ) { if( StrokeAndFillPath( getHDC() ) ) - bRet = sal_True; + bRet = true; } } @@ -1606,7 +1606,7 @@ bool WinSalGraphics::drawPolygonBezier( sal_uInt32 nPoints, const SalPoint* pPtA return bRet; #else - return sal_False; + return false; #endif } @@ -1642,7 +1642,7 @@ bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* ImplPreparePolyDraw(true, nPoly, pPoints, pPtAry, pFlgAry, pWinPointAry, pWinFlagAry); - sal_Bool bRet( sal_False ); + bool bRet( false ); if( BeginPath( getHDC() ) ) { @@ -1651,7 +1651,7 @@ bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* if( EndPath( getHDC() ) ) { if( StrokeAndFillPath( getHDC() ) ) - bRet = sal_True; + bRet = true; } } @@ -1663,7 +1663,7 @@ bool WinSalGraphics::drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* return bRet; #else - return sal_False; + return false; #endif } @@ -1688,9 +1688,9 @@ static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, sal_uLong nComp, sal_u return NULL; } -static sal_Bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSize ) +static bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSize ) { - sal_Bool bRetValue = FALSE; + bool bRetValue = FALSE; BYTE* pDest = ImplSearchEntry( pSource, (BYTE*)"%%BoundingBox:", nSize, 14 ); if ( pDest ) { @@ -1705,9 +1705,9 @@ static sal_Bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSiz for ( i = 0; ( i < 4 ) && nSizeLeft; i++ ) { int nDivision = 1; - sal_Bool bDivision = FALSE; - sal_Bool bNegative = FALSE; - sal_Bool bValid = TRUE; + bool bDivision = FALSE; + bool bNegative = FALSE; + bool bValid = TRUE; while ( ( --nSizeLeft ) && ( ( *pDest == ' ' ) || ( *pDest == 0x9 ) ) ) pDest++; BYTE nByte = *pDest; @@ -1752,7 +1752,7 @@ static sal_Bool ImplGetBoundingBox( double* nNumb, BYTE* pSource, sal_uLong nSiz bool WinSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) { - sal_Bool bRetValue = FALSE; + bool bRetValue = FALSE; if ( mbPrinter ) { diff --git a/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx index a39bf3c3c518..dc7f4c5d749e 100644 --- a/vcl/win/source/gdi/salgdi2.cxx +++ b/vcl/win/source/gdi/salgdi2.cxx @@ -339,14 +339,14 @@ void WinSalGraphics::copyArea( long nDestX, long nDestY, void ImplDrawBitmap( HDC hDC, const SalTwoRect& rPosAry, const WinSalBitmap& rSalBitmap, - sal_Bool bPrinter, int nDrawMode ) + bool bPrinter, int nDrawMode ) { if( hDC ) { HGLOBAL hDrawDIB; HBITMAP hDrawDDB = rSalBitmap.ImplGethDDB(); WinSalBitmap* pTmpSalBmp = NULL; - sal_Bool bPrintDDB = ( bPrinter && hDrawDDB ); + bool bPrintDDB = ( bPrinter && hDrawDDB ); if( bPrintDDB ) { @@ -380,7 +380,7 @@ void ImplDrawBitmap( HDC hDC, HDC hBmpDC = ImplGetCachedDC( CACHED_HDC_DRAW, hDrawDDB ); COLORREF nOldBkColor = RGB(0xFF,0xFF,0xFF); COLORREF nOldTextColor = RGB(0,0,0); - sal_Bool bMono = ( rSalBitmap.GetBitCount() == 1 ); + bool bMono = ( rSalBitmap.GetBitCount() == 1 ); if( bMono ) { @@ -700,7 +700,7 @@ SalBitmap* WinSalGraphics::getBitmap( long nX, long nY, long nDX, long nDY ) HDC hDC = getHDC(); HBITMAP hBmpBitmap = CreateCompatibleBitmap( hDC, nDX, nDY ); HDC hBmpDC = ImplGetCachedDC( CACHED_HDC_1, hBmpBitmap ); - sal_Bool bRet; + bool bRet; bRet = BitBlt( hBmpDC, 0, 0, (int) nDX, (int) nDY, hDC, (int) nX, (int) nY, SRCCOPY ) ? TRUE : FALSE; ImplReleaseCachedDC( CACHED_HDC_1 ); diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index 29448a48d47a..9f184797cf85 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -97,7 +97,7 @@ private: FontAttrMap aFontAttributes; OUString aCacheFileName; OUString aBaseURL; - sal_Bool bModified; + bool bModified; protected: OUString OptimizeURL( const OUString& rURL ) const; diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx index cfba8a449b1e..67326b05afeb 100644 --- a/vcl/win/source/gdi/salnativewidgets-luna.cxx +++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx @@ -84,7 +84,7 @@ private: public: VisualStylesAPI(); ~VisualStylesAPI(); - sal_Bool IsAvailable() { return (mhModule != NULL); } + bool IsAvailable() { return (mhModule != NULL); } HTHEME OpenThemeData( HWND hwnd, LPCWSTR pszClassList ); HRESULT CloseThemeData( HTHEME hTheme ); @@ -360,7 +360,7 @@ bool WinSalGraphics::hitTestNativeControl( ControlType, return FALSE; } -sal_Bool ImplDrawTheme( HTHEME hTheme, HDC hDC, int iPart, int iState, RECT rc, const OUString& aStr) +bool ImplDrawTheme( HTHEME hTheme, HDC hDC, int iPart, int iState, RECT rc, const OUString& aStr) { HRESULT hr = vsAPI.DrawThemeBackground( hTheme, hDC, iPart, iState, &rc, 0); @@ -515,7 +515,7 @@ static void impl_drawAeroToolbar( HDC hDC, RECT rc, bool bHorizontal ) } } -sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, +bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, ControlType nType, ControlPart nPart, ControlState nState, @@ -655,7 +655,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, RECT rect; ImplConvertSpinbuttonValues( pValue->mnUpperPart, pValue->mnUpperState, pValue->maUpperRect, &iPart, &iState, &rect ); - sal_Bool bOk = ImplDrawTheme( hTheme, hDC, iPart, iState, rect, aCaption); + bool bOk = ImplDrawTheme( hTheme, hDC, iPart, iState, rect, aCaption); if( bOk ) { @@ -679,7 +679,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, RECT rect; ImplConvertSpinbuttonValues( pValue->mnUpperPart, pValue->mnUpperState, pValue->maUpperRect, &iPart, &iState, &rect ); - sal_Bool bOk = ImplDrawTheme( hTheme, hDC, iPart, iState, rect, aCaption); + bool bOk = ImplDrawTheme( hTheme, hDC, iPart, iState, rect, aCaption); if( bOk ) { @@ -780,7 +780,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, if( nType == CTRL_RADIOBUTTON ) { iPart = BP_RADIOBUTTON; - sal_Bool bChecked = ( aValue.getTristateVal() == BUTTONVALUE_ON ); + bool bChecked = ( aValue.getTristateVal() == BUTTONVALUE_ON ); if( nState & CTRL_STATE_PRESSED ) iState = bChecked ? RBS_CHECKEDPRESSED : RBS_UNCHECKEDPRESSED; @@ -911,7 +911,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, if( nPart == PART_BUTTON ) { iPart = TP_BUTTON; - sal_Bool bChecked = ( aValue.getTristateVal() == BUTTONVALUE_ON ); + bool bChecked = ( aValue.getTristateVal() == BUTTONVALUE_ON ); if( !(nState & CTRL_STATE_ENABLED) ) //iState = TS_DISABLED; // disabled buttons are typically not painted at all but we need visual @@ -945,7 +945,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, if( ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames ) { impl_drawAeroToolbar( hDC, rc, nPart == PART_DRAW_BACKGROUND_HORZ ); - return sal_True; + return true; } return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption); @@ -965,7 +965,7 @@ sal_Bool ImplDrawNativeControl( HDC hDC, HTHEME hTheme, RECT rc, if( ImplGetSVData()->maNWFData.mbDockingAreaAvoidTBFrames ) { impl_drawAeroToolbar( hDC, rc, true ); - return sal_True; + return true; } } return ImplDrawTheme( hTheme, hDC, iPart, iState, rc, aCaption); @@ -1170,7 +1170,7 @@ bool WinSalGraphics::drawNativeControl( ControlType nType, const ImplControlValue& aValue, const OUString& aCaption ) { - sal_Bool bOk = false; + bool bOk = false; HTHEME hTheme = NULL; switch( nType ) @@ -1305,7 +1305,7 @@ bool WinSalGraphics::getNativeControlRegion( ControlType nType, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { - sal_Bool bRet = FALSE; + bool bRet = FALSE; HDC hDC = GetDC( mhWnd ); if( nType == CTRL_TOOLBAR ) diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx index b1dbab938ee9..7c36d1b6f259 100644 --- a/vcl/win/source/gdi/salprn.cxx +++ b/vcl/win/source/gdi/salprn.cxx @@ -273,8 +273,8 @@ static DWORD ImplDeviceCaps( WinSalInfoPrinter* pPrinter, WORD nCaps, nCaps, (LPWSTR)pOutput, pDevMode ); } -static sal_Bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter, - ImplJobSetup* pSetupData, sal_Bool bDelete ) +static bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter, + ImplJobSetup* pSetupData, bool bDelete ) { if ( pSetupData && pSetupData->mpDriverData ) { @@ -356,8 +356,8 @@ static sal_Bool ImplTestSalJobSetup( WinSalInfoPrinter* pPrinter, return FALSE; } -static sal_Bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, - sal_Bool bIn, WinSalFrame* pVisibleDlgParent ) +static bool ImplUpdateSalJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData, + bool bIn, WinSalFrame* pVisibleDlgParent ) { HANDLE hPrn; LPWSTR pPrinterNameW = reinterpret_cast<LPWSTR>(const_cast<sal_Unicode*>(pPrinter->maDeviceName.getStr())); @@ -1057,7 +1057,7 @@ static WinSalGraphics* ImplCreateSalPrnGraphics( HDC hDC ) return pGraphics; } -static sal_Bool ImplUpdateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData ) +static bool ImplUpdateSalPrnIC( WinSalInfoPrinter* pPrinter, ImplJobSetup* pSetupData ) { HDC hNewDC = ImplCreateSalPrnIC( pPrinter, pSetupData ); if ( !hNewDC ) @@ -1324,7 +1324,7 @@ BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ ) { SalData* pSalData = GetSalData(); WinSalPrinter* pPrinter; - sal_Bool bWhile = TRUE; + bool bWhile = TRUE; int i = 0; do @@ -1360,7 +1360,7 @@ BOOL CALLBACK SalPrintAbortProc( HDC hPrnDC, int /* nError */ ) return TRUE; } -static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uLong nCopies, sal_Bool bCollate ) +static LPDEVMODEW ImplSalSetCopies( LPDEVMODEW pDevMode, sal_uLong nCopies, bool bCollate ) { LPDEVMODEW pNewDevMode = pDevMode; if ( pDevMode && (nCopies > 1) ) @@ -1505,7 +1505,7 @@ bool WinSalPrinter::StartJob( const OUString* pFileName, // As the Telocom Balloon Fax driver tends to send messages repeatedly // we try to process first all, and then insert a dummy message - sal_Bool bWhile = TRUE; + bool bWhile = TRUE; int i = 0; do { @@ -1665,7 +1665,7 @@ void ImplSalPrinterAbortJobAsync( HDC hPrnDC ) } } -SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ) +SalGraphics* WinSalPrinter::StartPage( ImplJobSetup* pSetupData, bool bNewJobData ) { if( ! isValid() || mhDC == 0 ) return NULL; diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx index 89eaba889d26..30a733665c49 100644 --- a/vcl/win/source/gdi/salvd.cxx +++ b/vcl/win/source/gdi/salvd.cxx @@ -78,7 +78,7 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics, HDC hDC = NULL; HBITMAP hBmp = NULL; - sal_Bool bOk = FALSE; + bool bOk = FALSE; if( pData ) { diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index 850faf7f94e5..9154fa05a27d 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -117,7 +117,7 @@ using namespace ::com::sun::star::beans; const unsigned int WM_USER_SYSTEM_WINDOW_ACTIVATED = RegisterWindowMessageA("SYSTEM_WINDOW_ACTIVATED"); -sal_Bool WinSalFrame::mbInReparent = FALSE; +bool WinSalFrame::mbInReparent = FALSE; @@ -136,7 +136,7 @@ static void ImplSaveFrameState( WinSalFrame* pFrame ) // save position, size and state for GetWindowState() if ( !pFrame->mbFullScreen ) { - sal_Bool bVisible = (GetWindowStyle( pFrame->mhWnd ) & WS_VISIBLE) != 0; + bool bVisible = (GetWindowStyle( pFrame->mhWnd ) & WS_VISIBLE) != 0; if ( IsIconic( pFrame->mhWnd ) ) { pFrame->maState.mnState |= WINDOWSTATE_STATE_MINIMIZED; @@ -291,7 +291,7 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, HWND hWnd; DWORD nSysStyle = 0; DWORD nExSysStyle = 0; - sal_Bool bSubFrame = FALSE; + bool bSubFrame = FALSE; static const char* pEnvSynchronize = getenv("SAL_SYNCHRONIZE"); if ( pEnvSynchronize ) // no buffering of drawing commands @@ -507,7 +507,7 @@ SalFrame* ImplSalCreateFrame( WinSalInstance* pInst, // helper that only creates the HWND // to allow for easy reparenting of system windows, (i.e. destroy and create new) -HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, sal_Bool bAsChild ) +HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, bool bAsChild ) { HINSTANCE hInstance = GetSalData()->mhInst; sal_uLong nSysStyle = GetWindowLong( oldhWnd, GWL_STYLE ); @@ -826,7 +826,7 @@ static void ImplSalCalcFullScreenSize( const WinSalFrame* pFrame, -static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, sal_Bool bAlways = FALSE ) +static void ImplSalFrameFullScreenPos( WinSalFrame* pFrame, bool bAlways = FALSE ) { if ( bAlways || !IsIconic( pFrame->mhWnd ) ) { @@ -1099,7 +1099,7 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) bool WinSalFrame::PostEvent( void* pData ) { - return (sal_Bool)ImplPostMessage( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData ); + return (bool)ImplPostMessage( mhWnd, SAL_MSG_USEREVENT, 0, (LPARAM)pData ); } @@ -1170,7 +1170,7 @@ SalFrame* WinSalFrame::GetParent() const -static void ImplSalShow( HWND hWnd, sal_Bool bVisible, sal_Bool bNoActivate ) +static void ImplSalShow( HWND hWnd, bool bVisible, bool bNoActivate ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); if ( !pFrame ) @@ -1255,7 +1255,7 @@ void WinSalFrame::SetExtendedFrameStyle( SalExtStyle ) -void WinSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) +void WinSalFrame::Show( bool bVisible, bool bNoActivate ) { // Post this Message to the window, because this only works // in the thread of the window, which has create this window. @@ -1268,7 +1268,7 @@ void WinSalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) -void WinSalFrame::Enable( sal_Bool bEnable ) +void WinSalFrame::Enable( bool bEnable ) { EnableWindow( mhWnd, bEnable ); } @@ -1292,7 +1292,7 @@ void WinSalFrame::SetMaxClientSize( long nWidth, long nHeight ) void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { - sal_Bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; + bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; if ( !bVisible ) { Window *pClientWin = GetWindow()->ImplGetClientWindow(); @@ -1459,7 +1459,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, // Adjust Window in the screen - sal_Bool bCheckOffScreen = TRUE; + bool bCheckOffScreen = TRUE; // but don't do this for floaters or ownerdraw windows that are currently moved interactively if( (mnStyle & SAL_FRAME_STYLE_FLOAT) && !(mnStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) ) @@ -1502,7 +1502,7 @@ void WinSalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, -static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, sal_Bool bAsChild ) +static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, bool bAsChild ) { // save hwnd, will be overwritten in WM_CREATE during createwindow HWND hWndOld = pThis->mhWnd; @@ -1535,8 +1535,8 @@ static void ImplSetParentFrame( WinSalFrame* pThis, HWND hNewParentWnd, sal_Bool pObject = pObject->mpNextObject; } - sal_Bool bNeedGraphics = pThis->mbGraphics; - sal_Bool bNeedCacheDC = FALSE; + bool bNeedGraphics = pThis->mbGraphics; + bool bNeedCacheDC = FALSE; HFONT hFont = NULL; HPEN hPen = NULL; @@ -1775,8 +1775,8 @@ void WinSalFrame::SetWindowState( const SalFrameState* pState ) GetWindowPlacement( mhWnd, &aPlacement ); // set State - sal_Bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; - sal_Bool bUpdateHiddenFramePos = FALSE; + bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; + bool bUpdateHiddenFramePos = FALSE; if ( !bVisible ) { aPlacement.showCmd = SW_HIDE; @@ -1979,7 +1979,7 @@ void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) { // when the ShowState has to be reset, hide the window first to // reduce flicker - sal_Bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; + bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; if ( bVisible && (mnShowState != mnFullScreenShowState) ) ShowWindow( mhWnd, SW_HIDE ); @@ -2011,7 +2011,7 @@ void WinSalFrame::ShowFullScreen( bool bFullScreen, sal_Int32 nDisplay ) -void WinSalFrame::StartPresentation( sal_Bool bStart ) +void WinSalFrame::StartPresentation( bool bStart ) { if ( mbPresentation == bStart ) return; @@ -2066,7 +2066,7 @@ void WinSalFrame::StartPresentation( sal_Bool bStart ) -void WinSalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) +void WinSalFrame::SetAlwaysOnTop( bool bOnTop ) { HWND hWnd; if ( bOnTop ) @@ -2282,7 +2282,7 @@ void WinSalFrame::SetPointer( PointerStyle ePointerStyle ) -void WinSalFrame::CaptureMouse( sal_Bool bCapture ) +void WinSalFrame::CaptureMouse( bool bCapture ) { // Send this Message to the window, because CaptureMouse() only work // in the thread of the window, which has create this window @@ -2324,7 +2324,7 @@ void WinSalFrame::Sync() static void ImplSalFrameSetInputContext( HWND hWnd, const SalInputContext* pContext ) { WinSalFrame* pFrame = GetWindowPtr( hWnd ); - sal_Bool bIME = (pContext->mnOptions & SAL_INPUTCONTEXT_TEXT) != 0; + bool bIME = (pContext->mnOptions & SAL_INPUTCONTEXT_TEXT) != 0; if ( bIME ) { if ( !pFrame->mbIME ) @@ -3179,7 +3179,7 @@ static long ImplHandleMouseMsg( HWND hWnd, UINT nMsg, SalMouseEvent aMouseEvt; long nRet; sal_uInt16 nEvent = 0; - sal_Bool bCall = TRUE; + bool bCall = TRUE; aMouseEvt.mnX = (short)LOWORD( lParam ); aMouseEvt.mnY = (short)HIWORD( lParam ); @@ -3480,7 +3480,7 @@ LanguageType WinSalFrame::GetInputLanguage() bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) { - sal_Bool bRet = FALSE; + bool bRet = FALSE; sal_IntPtr nLangType = aLangType; // just use the passed language identifier, do not try to load additional keyboard support HKL hkl = (HKL) nLangType; @@ -3519,7 +3519,7 @@ bool WinSalFrame::MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangT static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rResult ) { - static sal_Bool bIgnoreCharMsg = FALSE; + static bool bIgnoreCharMsg = FALSE; static WPARAM nDeadChar = 0; static WPARAM nLastVKChar = 0; static sal_uInt16 nLastChar = 0; @@ -3695,7 +3695,7 @@ static long ImplHandleKeyMsg( HWND hWnd, UINT nMsg, MSG aCharMsg; BOOL bCharPeek = FALSE; UINT nCharMsg = WM_CHAR; - sal_Bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); + bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); nLastModKeyCode = 0; // make sure no modkey messages are sent if they belong to a hotkey (see above) aKeyEvt.mnCharCode = 0; @@ -3824,7 +3824,7 @@ long ImplHandleSalObjKeyMsg( HWND hWnd, UINT nMsg, { SalKeyEvent aKeyEvt; sal_uInt16 nEvent; - sal_Bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); + bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); // convert KeyCode aKeyEvt.mnCode = ImplSalGetKeyCode( wParam ); @@ -3893,7 +3893,7 @@ long ImplHandleSalObjSysCharMsg( HWND hWnd, WPARAM wParam, LPARAM lParam ) static bool ImplHandlePaintMsg( HWND hWnd ) { - sal_Bool bMutex = FALSE; + bool bMutex = FALSE; if ( ImplSalYieldMutexTryToAcquire() ) bMutex = TRUE; @@ -4344,7 +4344,7 @@ static void ImplHandleForcePalette( HWND hWnd ) -static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND hWnd, UINT nMsg, +static LRESULT ImplHandlePalette( bool bFrame, HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, int& rDef ) { SalData* pSalData = GetSalData(); @@ -4362,7 +4362,7 @@ static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND hWnd, UINT nMsg, return 0; } - sal_Bool bReleaseMutex = FALSE; + bool bReleaseMutex = FALSE; if ( (nMsg == WM_QUERYNEWPALETTE) || (nMsg == WM_PALETTECHANGED) ) { // as Windows can send these messages also, we have to use @@ -4381,8 +4381,8 @@ static LRESULT ImplHandlePalette( sal_Bool bFrame, HWND hWnd, UINT nMsg, HDC hDC; HPALETTE hOldPal; UINT nCols; - sal_Bool bStdDC; - sal_Bool bUpdate; + bool bStdDC; + bool bUpdate; pSalData->mbInPalChange = TRUE; @@ -4575,7 +4575,7 @@ static int ImplHandleMinMax( HWND hWnd, LPARAM lParam ) // the pointer is stored in every item, so if no position // is specified we just use the first item (ie, pos=0) // if bByPosition is FALSE then nPos denotes a menu id instead of a position -static WinSalMenuItem* ImplGetSalMenuItem( HMENU hMenu, UINT nPos, sal_Bool bByPosition=TRUE ) +static WinSalMenuItem* ImplGetSalMenuItem( HMENU hMenu, UINT nPos, bool bByPosition=TRUE ) { MENUITEMINFOW mi; memset(&mi, 0, sizeof(mi)); @@ -4723,9 +4723,9 @@ static int ImplDrawItem(HWND, WPARAM wParam, LPARAM lParam ) COLORREF clrPrevText, clrPrevBkgnd; HFONT hfntOld; HBRUSH hbrOld; - sal_Bool fChecked = (pDI->itemState & ODS_CHECKED) ? TRUE : FALSE; - sal_Bool fSelected = (pDI->itemState & ODS_SELECTED) ? TRUE : FALSE; - sal_Bool fDisabled = (pDI->itemState & (ODS_DISABLED | ODS_GRAYED)) ? TRUE : FALSE; + bool fChecked = (pDI->itemState & ODS_CHECKED) ? TRUE : FALSE; + bool fSelected = (pDI->itemState & ODS_SELECTED) ? TRUE : FALSE; + bool fDisabled = (pDI->itemState & (ODS_DISABLED | ODS_GRAYED)) ? TRUE : FALSE; // Set the appropriate foreground and background colors. RECT aRect = pDI->rcItem; @@ -4866,7 +4866,7 @@ static int ImplHandleMenuActivate( HWND hWnd, WPARAM wParam, LPARAM ) HMENU hMenu = (HMENU) wParam; // WORD nPos = LOWORD (lParam); - // sal_Bool bWindowMenu = (sal_Bool) HIWORD(lParam); + // bool bWindowMenu = (bool) HIWORD(lParam); // Send activate and deactivate together, so we have not keep track of opened menus // this will be enough to have the menus updated correctly @@ -4901,7 +4901,7 @@ static int ImplHandleMenuSelect( HWND hWnd, WPARAM wParam, LPARAM lParam ) if( !GetSalData()->IsKnownMenuHandle( hMenu ) ) return 0; - sal_Bool bByPosition = FALSE; + bool bByPosition = FALSE; if( nFlags & MF_POPUP ) bByPosition = TRUE; @@ -5156,9 +5156,9 @@ static void ImplUpdateIMECursorPos( WinSalFrame* pFrame, HIMC hIMC ) -static sal_Bool ImplHandleIMEStartComposition( HWND hWnd ) +static bool ImplHandleIMEStartComposition( HWND hWnd ) { - sal_Bool bDef = TRUE; + bool bDef = TRUE; ImplSalYieldMutexAcquireWithWait(); @@ -5186,10 +5186,10 @@ static sal_Bool ImplHandleIMEStartComposition( HWND hWnd ) -static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, +static bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, HIMC hIMC, LPARAM lParam ) { - sal_Bool bDef = TRUE; + bool bDef = TRUE; // Init Event SalExtTextInputEvent aEvt; @@ -5317,9 +5317,9 @@ static sal_Bool ImplHandleIMECompositionInput( WinSalFrame* pFrame, -static sal_Bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) +static bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) { - sal_Bool bDef = TRUE; + bool bDef = TRUE; ImplSalYieldMutexAcquireWithWait(); WinSalFrame* pFrame = GetWindowPtr( hWnd ); @@ -5364,9 +5364,9 @@ static sal_Bool ImplHandleIMEComposition( HWND hWnd, LPARAM lParam ) -static sal_Bool ImplHandleIMEEndComposition( HWND hWnd ) +static bool ImplHandleIMEEndComposition( HWND hWnd ) { - sal_Bool bDef = TRUE; + bool bDef = TRUE; ImplSalYieldMutexAcquireWithWait(); @@ -5491,7 +5491,7 @@ ImplHandleGetObject(HWND hWnd, LPARAM lParam, WPARAM wParam, LRESULT & nRet) // IA2 should be enabled automatically AllSettings aSettings = Application::GetSettings(); MiscSettings aMisc = aSettings.GetMiscSettings(); - aMisc.SetEnableATToolSupport( sal_True ); + aMisc.SetEnableATToolSupport( true ); aSettings.SetMiscSettings( aMisc ); Application::SetSettings( aSettings ); @@ -6012,7 +6012,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP rDef = FALSE; break; case SAL_MSG_SHOW: - ImplSalShow( hWnd, (sal_Bool)wParam, (sal_Bool)lParam ); + ImplSalShow( hWnd, (bool)wParam, (bool)lParam ); rDef = FALSE; break; case SAL_MSG_SETINPUTCONTEXT: @@ -6171,11 +6171,11 @@ LRESULT CALLBACK SalFrameWndProcW( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM l -sal_Bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult ) +bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam, LRESULT& rlResult ) { // handle all messages concerning all frames so they get processed only once // Must work for Unicode and none Unicode - sal_Bool bResult = FALSE; + bool bResult = FALSE; if ( (nMsg == WM_PALETTECHANGED) || (nMsg == SAL_MSG_POSTPALCHANGED) ) { int bDef = TRUE; @@ -6194,7 +6194,7 @@ sal_Bool ImplHandleGlobalMsg( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lParam -sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) +bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) { static int first=1; // if VCL_LOGFILE_ENABLED is set, Win32 API error messages can be written @@ -6202,7 +6202,7 @@ sal_Bool ImplWriteLastError( DWORD lastError, const char *szApiCall ) static char *logEnabled = getenv("VCL_LOGFILE_ENABLED"); if( logEnabled ) { - sal_Bool bSuccess = FALSE; + bool bSuccess = FALSE; static char *szTmp = getenv("TMP"); if( !szTmp || !*szTmp ) szTmp = getenv("TEMP"); diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx index 7bbfd39fc475..522bf2134827 100644 --- a/vcl/win/source/window/salmenu.cxx +++ b/vcl/win/source/window/salmenu.cxx @@ -41,7 +41,7 @@ static DWORD myerr=0; -sal_Bool SalData::IsKnownMenuHandle( HMENU hMenu ) +bool SalData::IsKnownMenuHandle( HMENU hMenu ) { if( mhMenuSet.find( hMenu ) == mhMenuSet.end() ) return FALSE; @@ -53,7 +53,7 @@ sal_Bool SalData::IsKnownMenuHandle( HMENU hMenu ) // WinSalInst factory methods -SalMenu* WinSalInstance::CreateMenu( sal_Bool bMenuBar, Menu* ) +SalMenu* WinSalInstance::CreateMenu( bool bMenuBar, Menu* ) { WinSalMenu *pSalMenu = new WinSalMenu(); @@ -288,13 +288,13 @@ void WinSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsig } } -void WinSalMenu::CheckItem( unsigned nPos, sal_Bool bCheck ) +void WinSalMenu::CheckItem( unsigned nPos, bool bCheck ) { if( static_cast<unsigned>( -1 ) != ::CheckMenuItem( mhMenu, nPos, MF_BYPOSITION|(bCheck ? MF_CHECKED : MF_UNCHECKED) ) ) ImplDrawMenuBar( this ); } -void WinSalMenu::EnableItem( unsigned nPos, sal_Bool bEnable ) +void WinSalMenu::EnableItem( unsigned nPos, bool bEnable ) { if( -1 != ::EnableMenuItem( mhMenu, nPos, MF_BYPOSITION|(bEnable ? MF_ENABLED : (MF_DISABLED|MF_GRAYED) ) ) ) ImplDrawMenuBar( this ); diff --git a/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx index d4ac6f002ec2..981937638e25 100644 --- a/vcl/win/source/window/salobj.cxx +++ b/vcl/win/source/window/salobj.cxx @@ -33,7 +33,7 @@ -static sal_Bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) +static bool ImplIsSysWindowOrChild( HWND hWndParent, HWND hWndChild ) { if ( hWndParent == hWndChild ) return TRUE; @@ -151,7 +151,7 @@ LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) -sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ) +bool ImplSalPreDispatchMsg( MSG* pMsg ) { // Used for Unicode and none Unicode SalData* pSalData = GetSalData(); @@ -174,7 +174,7 @@ sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ) // process KeyEvents even if the control does not process them itself // SysKeys are processed as WM_SYSCOMMAND // Char-Events are not processed, as they are not accelerator-relevant - sal_Bool bWantedKeyCode = FALSE; + bool bWantedKeyCode = FALSE; // A-Z, 0-9 nur in Verbindung mit Control-Taste if ( ((pMsg->wParam >= 65) && (pMsg->wParam <= 90)) || ((pMsg->wParam >= 48) && (pMsg->wParam <= 57)) ) @@ -208,7 +208,7 @@ sal_Bool ImplSalPreDispatchMsg( MSG* pMsg ) ((nKeyCode >= 65) && (nKeyCode <= 90)) || ((nKeyCode >= 97) && (nKeyCode <= 122)) ) { - sal_Bool bRet = FALSE; + bool bRet = FALSE; ImplSalYieldMutexAcquireWithWait(); pObject = ImplFindSalObject( pMsg->hwnd ); if ( pObject ) @@ -731,7 +731,7 @@ void WinSalObject::EndSetClipRegion() void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) { sal_uLong nStyle = 0; - sal_Bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; + bool bVisible = (GetWindowStyle( mhWnd ) & WS_VISIBLE) != 0; if ( bVisible ) { ShowWindow( mhWnd, SW_HIDE ); @@ -744,7 +744,7 @@ void WinSalObject::SetPosSize( long nX, long nY, long nWidth, long nHeight ) -void WinSalObject::Show( sal_Bool bVisible ) +void WinSalObject::Show( bool bVisible ) { if ( bVisible ) ShowWindow( mhWnd, SW_SHOWNORMAL ); @@ -754,7 +754,7 @@ void WinSalObject::Show( sal_Bool bVisible ) -void WinSalObject::Enable( sal_Bool bEnable ) +void WinSalObject::Enable( bool bEnable ) { EnableWindow( mhWnd, bEnable ); } |