diff options
53 files changed, 176 insertions, 176 deletions
diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index 2f7c1209f270..7086f55eccaf 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -267,7 +267,7 @@ void SAL_CALL Window::update( ) sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) { - boolean bRet = false; + bool bRet = false; if( media::ZoomLevel_NOT_AVAILABLE != meZoomLevel && media::ZoomLevel_NOT_AVAILABLE != eZoomLevel ) diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index 9934714eecab..e483d47c27b9 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -635,7 +635,7 @@ RaiseInfo::RaiseInfo(typelib_TypeDescription * pTD)throw () & ~static_cast<sal_uInt64>(ExceptionInfos::allocationGranularity - 1); DWORD old_protect; - BOOL success = + bool success = VirtualProtect(pCode, codeSize, PAGE_EXECUTE_READWRITE, &old_protect); (void) success; assert(success && "VirtualProtect() failed!"); diff --git a/comphelper/source/windows/windows_process.cxx b/comphelper/source/windows/windows_process.cxx index f334cfc4ffbe..7588bae027e5 100644 --- a/comphelper/source/windows/windows_process.cxx +++ b/comphelper/source/windows/windows_process.cxx @@ -22,9 +22,9 @@ static int ArgStrLen(const wchar_t *s) { int i = wcslen(s); - BOOL hasDoubleQuote = wcschr(s, L'"') != nullptr; + bool hasDoubleQuote = wcschr(s, L'"') != nullptr; // Only add doublequotes if the string contains a space or a tab - BOOL addDoubleQuotes = wcspbrk(s, L" \t") != nullptr; + bool addDoubleQuotes = wcspbrk(s, L" \t") != nullptr; if (addDoubleQuotes) { @@ -69,9 +69,9 @@ static int ArgStrLen(const wchar_t *s) */ static wchar_t* ArgToString(wchar_t *d, const wchar_t *s) { - BOOL hasDoubleQuote = wcschr(s, L'"') != nullptr; + bool hasDoubleQuote = wcschr(s, L'"') != nullptr; // Only add doublequotes if the string contains a space or a tab - BOOL addDoubleQuotes = wcspbrk(s, L" \t") != nullptr; + bool addDoubleQuotes = wcspbrk(s, L" \t") != nullptr; if (addDoubleQuotes) { @@ -171,7 +171,7 @@ WinLaunchChild(const wchar_t *exePath, HANDLE *hProcess) { wchar_t *cl; - BOOL ok; + bool ok; cl = MakeCommandLine(argc, argv); if (!cl) diff --git a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx index e9c4091353a5..0cc48725c5e1 100644 --- a/dbaccess/win32/source/odbcconfig/odbcconfig.cxx +++ b/dbaccess/win32/source/odbcconfig/odbcconfig.cxx @@ -51,7 +51,7 @@ static int displayLastError() /** registers the window class for our application's main window */ -static BOOL registerWindowClass( HINSTANCE _hAppInstance ) +static bool registerWindowClass( HINSTANCE _hAppInstance ) { WNDCLASSEXW wcx; diff --git a/desktop/win32/source/QuickStart/QuickStart.cxx b/desktop/win32/source/QuickStart/QuickStart.cxx index 0db45b41a125..3277a6abfe5a 100644 --- a/desktop/win32/source/QuickStart/QuickStart.cxx +++ b/desktop/win32/source/QuickStart/QuickStart.cxx @@ -64,7 +64,7 @@ static bool launchSoffice( ) aStartupInfo.cb = sizeof(aStartupInfo); aStartupInfo.wShowWindow = SW_SHOW; PROCESS_INFORMATION aProcessInfo; - BOOL bSuccess = CreateProcessW(filename, imagename, nullptr, nullptr, TRUE, 0, nullptr, nullptr, &aStartupInfo, &aProcessInfo); + bool bSuccess = CreateProcessW(filename, imagename, nullptr, nullptr, TRUE, 0, nullptr, nullptr, &aStartupInfo, &aProcessInfo); if ( !bSuccess ) return false; diff --git a/desktop/win32/source/applauncher/launcher.cxx b/desktop/win32/source/applauncher/launcher.cxx index 987b3e2985e1..bf80dba2cc5a 100644 --- a/desktop/win32/source/applauncher/launcher.cxx +++ b/desktop/win32/source/applauncher/launcher.cxx @@ -54,7 +54,7 @@ extern "C" int APIENTRY wWinMain( HINSTANCE, HINSTANCE, LPWSTR, int ) PROCESS_INFORMATION aProcessInfo; - BOOL fSuccess = CreateProcessW( + bool fSuccess = CreateProcessW( szApplicationName, lpCommandLine, nullptr, diff --git a/desktop/win32/source/guiloader/genericloader.cxx b/desktop/win32/source/guiloader/genericloader.cxx index 193e74bd11b0..be83ebe8effc 100644 --- a/desktop/win32/source/guiloader/genericloader.cxx +++ b/desktop/win32/source/guiloader/genericloader.cxx @@ -77,7 +77,7 @@ static int GenericMain() } desktop_win32::commandLineAppend(p, MY_STRING(L"\"")); - BOOL fSuccess = CreateProcessW( + bool fSuccess = CreateProcessW( szTargetFileName, cl2, nullptr, diff --git a/desktop/win32/source/guistdio/guistdio.inc b/desktop/win32/source/guistdio/guistdio.inc index 85822a817d63..9dd85d90f44b 100644 --- a/desktop/win32/source/guistdio/guistdio.inc +++ b/desktop/win32/source/guistdio/guistdio.inc @@ -347,7 +347,7 @@ int wmain( int, wchar_t** ) // Create process with same command line, environment and stdio handles which // are directed to the created pipes - BOOL fSuccess = CreateProcessW( + bool fSuccess = CreateProcessW( szTargetFileName, GetCommandLineW(), nullptr, diff --git a/desktop/win32/source/loader.cxx b/desktop/win32/source/loader.cxx index 40cef9e3fd4f..a64af994e268 100644 --- a/desktop/win32/source/loader.cxx +++ b/desktop/win32/source/loader.cxx @@ -153,7 +153,7 @@ int officeloader_impl(bool bAllowConsole) DWORD dwExitCode = DWORD(-1); - BOOL fSuccess = FALSE; + bool fSuccess = FALSE; LPWSTR lpCommandLine = nullptr; bool bFirst = true; WCHAR cwd[MAX_PATH]; @@ -251,7 +251,7 @@ int officeloader_impl(bool bAllowConsole) bFirst = false; WCHAR szParentProcessId[64]; // This is more than large enough for a 128 bit decimal value - BOOL bHeadlessMode(FALSE); + bool bHeadlessMode(FALSE); { // Check command line arguments for "--headless" parameter. We only diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx index a3e28806deed..b58f8ea89d24 100644 --- a/dtrans/source/win32/clipb/MtaOleClipb.cxx +++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx @@ -62,8 +62,8 @@ namespace /* private */ const sal_uInt32 MAX_WAITTIME = 10000; // msec const sal_uInt32 MAX_WAIT_SHUTDOWN = 10000; // msec - const BOOL MANUAL_RESET = TRUE; - const BOOL INIT_NONSIGNALED = FALSE; + const bool MANUAL_RESET = TRUE; + const bool INIT_NONSIGNALED = FALSE; /* Cannot use osl conditions because they are blocking without waking up on messages sent by another thread @@ -516,8 +516,8 @@ LRESULT CMtaOleClipboard::sendMessage( UINT msg, WPARAM wParam, LPARAM lParam ) bool CMtaOleClipboard::postMessage( UINT msg, WPARAM wParam, LPARAM lParam ) { - BOOL const ret = PostMessageW(m_hwndMtaOleReqWnd, msg, wParam, lParam); - SAL_WARN_IF(0 == ret, "dtrans", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(m_hwndMtaOleReqWnd, msg, wParam, lParam); + SAL_WARN_IF(!ret, "dtrans", "ERROR: PostMessage() failed!"); return ret; } diff --git a/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx index e003c2a70629..89f8e483d1b7 100644 --- a/dtrans/source/win32/dtobj/DTransHelper.hxx +++ b/dtrans/source/win32/dtobj/DTransHelper.hxx @@ -161,7 +161,7 @@ public: private: HGLOBAL m_hGlob; - BOOL m_bIsLocked; + bool m_bIsLocked; LPVOID m_pGlobMem; }; diff --git a/embeddedobj/source/msole/olecomponent.cxx b/embeddedobj/source/msole/olecomponent.cxx index 80180e8dfdc1..0a532befb6e2 100644 --- a/embeddedobj/source/msole/olecomponent.cxx +++ b/embeddedobj/source/msole/olecomponent.cxx @@ -146,22 +146,22 @@ public: return m_pInterface; } - BOOL operator==( const ComSmart<T>& rObj ) const + bool operator==( const ComSmart<T>& rObj ) const { return ( m_pInterface == rObj.m_pInterface ); } - BOOL operator!=( const ComSmart<T>& rObj ) const + bool operator!=( const ComSmart<T>& rObj ) const { return ( m_pInterface != rObj.m_pInterface ); } - BOOL operator==( const T* pInterface ) const + bool operator==( const T* pInterface ) const { return ( m_pInterface == pInterface ); } - BOOL operator!=( const T* pInterface ) const + bool operator!=( const T* pInterface ) const { return ( m_pInterface != pInterface ); } @@ -647,7 +647,7 @@ bool OleComponent::InitializeObject_Impl() HRESULT hr = m_pNativeImpl->m_pObj->QueryInterface( IID_IOleLink, reinterpret_cast<void**>(&pOleLink) ); OSL_ENSURE( m_pUnoOleObject, "Unexpected object absence!" ); if ( m_pUnoOleObject ) - m_pUnoOleObject->SetObjectIsLink_Impl( bool( pOleLink != nullptr ) ); + m_pUnoOleObject->SetObjectIsLink_Impl( pOleLink != nullptr ); hr = m_pNativeImpl->m_pObj->QueryInterface( IID_IViewObject2, reinterpret_cast<void**>(&m_pNativeImpl->m_pViewObject2) ); diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index 96659ca754fb..4db6abd25235 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -883,7 +883,7 @@ void DocumentHolder::resizeWin( const SIZEL& rNewSize ) POINT aOldOffset; aOldOffset.x = aOldSize.cx; aOldOffset.y = aOldSize.cy; - BOOL bIsOk = LPtoDP( hdc, &aOldOffset, 1 ); + bool bIsOk = LPtoDP( hdc, &aOldOffset, 1 ); POINT aNewOffset; aNewOffset.x = rNewSize.cx; diff --git a/embedserv/source/embed/tracker.cxx b/embedserv/source/embed/tracker.cxx index 233ff0bb21ab..c17655e45866 100644 --- a/embedserv/source/embed/tracker.cxx +++ b/embedserv/source/embed/tracker.cxx @@ -223,7 +223,7 @@ static int afxHandleSize = 0; void Tracker::Construct() { - static BOOL bInitialized = false; + static bool bInitialized = false; if (!bInitialized) { if (afxHatchBrush == nullptr) @@ -385,7 +385,7 @@ BOOL Tracker::TrackHandle(int nHandle,HWND hWnd,POINT point,HWND hWndClipTo) } RECT rectOld; - BOOL bMoved = FALSE; + bool bMoved = FALSE; // get messages until capture lost or cancelled/accepted for (;;) diff --git a/embedserv/source/inc/docholder.hxx b/embedserv/source/inc/docholder.hxx index 1bd9a8746323..7cb85af0fbf6 100644 --- a/embedserv/source/inc/docholder.hxx +++ b/embedserv/source/inc/docholder.hxx @@ -53,7 +53,7 @@ class DocumentHolder : private: ::osl::Mutex m_aMutex; - BOOL m_bAllowInPlace; + bool m_bAllowInPlace; LPOLEINPLACESITE m_pIOleIPSite; LPOLEINPLACEFRAME m_pIOleIPFrame; LPOLEINPLACEUIWINDOW m_pIOleIPUIWindow; diff --git a/embedserv/source/inprocserv/advisesink.hxx b/embedserv/source/inprocserv/advisesink.hxx index 4d3862c9a460..e1bc55a4c0a6 100644 --- a/embedserv/source/inprocserv/advisesink.hxx +++ b/embedserv/source/inprocserv/advisesink.hxx @@ -70,7 +70,7 @@ public: void SetRegID( DWORD nRegID ) { m_nRegID = nRegID; } DWORD GetRegID() { return m_nRegID; } - BOOL IsOleAdvise() { return m_bObjectAdvise; } + bool IsOleAdvise() { return m_bObjectAdvise; } DWORD GetDataAdviseFlag() { return m_nDataRegFlag; } DWORD GetViewAdviseFlag() { return m_nViewRegFlag; } diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index a79b23b22972..9e0c40601226 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -100,7 +100,7 @@ namespace { int nGuidLen = GetStringFromClassID( *guidList[nInd], &pSubKey[23], 38 ); - BOOL bLocalSuccess = FALSE; + bool bLocalSuccess = FALSE; if ( nGuidLen == 38 ) { if ( ERROR_SUCCESS == RegOpenKeyW( HKEY_LOCAL_MACHINE, pSubKey, &hKey ) ) diff --git a/extensions/source/activex/SOActiveX.cxx b/extensions/source/activex/SOActiveX.cxx index 6133d61f415e..ebecf0968e85 100644 --- a/extensions/source/activex/SOActiveX.cxx +++ b/extensions/source/activex/SOActiveX.cxx @@ -212,7 +212,7 @@ HRESULT CSOActiveX::Cleanup() if( mpDispFrame ) { - BOOL bCloserActivated = FALSE; + bool bCloserActivated = FALSE; CComPtr<IDispatch> pDispDocumentCloser; CComVariant aDocCloser( L"com.sun.star.embed.DocumentCloser" ); @@ -715,8 +715,8 @@ void CSOActiveX::CallbackCreateXInputStream( CBindStatusCallback<CSOActiveX>* /* if ( mbReadyForActivation ) return; - BOOL bSuccess = FALSE; - BOOL bFinishDownload = FALSE; + bool bSuccess = FALSE; + bool bFinishDownload = FALSE; if ( !pBytes ) { // means the download is finished, dwSize contains hresult diff --git a/extensions/source/activex/so_activex.cxx b/extensions/source/activex/so_activex.cxx index d3899a4aa205..b539e2897f2d 100644 --- a/extensions/source/activex/so_activex.cxx +++ b/extensions/source/activex/so_activex.cxx @@ -287,7 +287,7 @@ static LSTATUS createKey(HKEY hkey, } EXTERN_C __declspec(dllexport) HRESULT STDAPICALLTYPE DllUnregisterServerNative( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ); -static HRESULT DllRegisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess, const wchar_t* pProgramPath, const wchar_t* pLibName ) +static HRESULT DllRegisterServerNative_Impl( int nMode, bool bForAllUsers, REGSAM nKeyAccess, const wchar_t* pProgramPath, const wchar_t* pLibName ) { char aSubKey[513]; int ind; @@ -483,7 +483,7 @@ static HRESULT DeleteKeyTree( HKEY hkey, const char* pPath, REGSAM nKeyAccess ) return REG_DELETE_KEY_A( hkey, pPath, nKeyAccess & ( KEY_WOW64_64KEY | KEY_WOW64_32KEY ) ); } -static HRESULT DllUnregisterServerNative_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess ) +static HRESULT DllUnregisterServerNative_Impl( int nMode, bool bForAllUsers, REGSAM nKeyAccess ) { char aSubKey[513]; const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; @@ -586,7 +586,7 @@ const char* const aMSMimeType[] = { "application/msword", const int nForMSModes[] = { 1, 1, 2, 2, 4, 4, 4 }; EXTERN_C __declspec(dllexport) HRESULT STDAPICALLTYPE DllUnregisterServerDoc( int nMode, BOOL bForAllUsers, BOOL bFor64Bit ); -static HRESULT DllRegisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess ) +static HRESULT DllRegisterServerDoc_Impl( int nMode, bool bForAllUsers, REGSAM nKeyAccess ) { char aSubKey[513]; int ind; @@ -669,7 +669,7 @@ EXTERN_C __declspec(dllexport) HRESULT STDAPICALLTYPE DllRegisterServerDoc( int // DllUnregisterServerDoc - Removes entries from the system registry -static HRESULT DllUnregisterServerDoc_Impl( int nMode, BOOL bForAllUsers, REGSAM nKeyAccess ) +static HRESULT DllUnregisterServerDoc_Impl( int nMode, bool bForAllUsers, REGSAM nKeyAccess ) { char aSubKey[513]; const char* aPrefix = aLocalPrefix; // bForAllUsers ? "" : aLocalPrefix; diff --git a/extensions/source/update/check/onlinecheck.cxx b/extensions/source/update/check/onlinecheck.cxx index 759b71f04791..af6ade879f40 100644 --- a/extensions/source/update/check/onlinecheck.cxx +++ b/extensions/source/update/check/onlinecheck.cxx @@ -33,7 +33,7 @@ extern "C" bool WNT_hasInternetConnection() WCHAR szConnectionName[1024]; __try { - BOOL fIsConnected = InternetGetConnectedStateExW( + bool fIsConnected = InternetGetConnectedStateExW( &dwFlags, szConnectionName, SAL_N_ELEMENTS(szConnectionName), diff --git a/odk/source/unowinreg/win/unowinreg.cxx b/odk/source/unowinreg/win/unowinreg.cxx index 98934bd2d052..ba28809bfd78 100644 --- a/odk/source/unowinreg/win/unowinreg.cxx +++ b/odk/source/unowinreg/win/unowinreg.cxx @@ -34,7 +34,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenClassesRoot( JNIEnv *env, jclass, jlongArray hkresult) { - jboolean ret = JNI_FALSE; + bool ret = JNI_FALSE; auto phkey = env->GetLongArrayElements(hkresult, nullptr); if (RegOpenKeyEx(HKEY_CLASSES_ROOT, nullptr, 0, KEY_READ, reinterpret_cast<PHKEY>(phkey)) == ERROR_SUCCESS) @@ -47,7 +47,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenCurrentConfig( JNIEnv *env, jclass, jlongArray hkresult) { - jboolean ret = JNI_FALSE; + bool ret = JNI_FALSE; auto phkey = env->GetLongArrayElements(hkresult, nullptr); if (RegOpenKeyEx(HKEY_CURRENT_CONFIG, nullptr, 0, KEY_READ, reinterpret_cast<PHKEY>(phkey)) == ERROR_SUCCESS) @@ -60,7 +60,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenCurrentUser( JNIEnv *env, jclass, jlongArray hkresult) { - jboolean ret = JNI_FALSE; + bool ret = JNI_FALSE; auto phkey = env->GetLongArrayElements(hkresult, nullptr); if (RegOpenKeyEx(HKEY_CURRENT_USER, nullptr, 0, KEY_READ, reinterpret_cast<PHKEY>(phkey)) == ERROR_SUCCESS) @@ -73,7 +73,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenLocalMachine( JNIEnv *env, jclass, jlongArray hkresult) { - jboolean ret = JNI_FALSE; + bool ret = JNI_FALSE; auto phkey = env->GetLongArrayElements(hkresult, nullptr); if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, nullptr, 0, KEY_READ, reinterpret_cast<PHKEY>(phkey)) == ERROR_SUCCESS) @@ -86,7 +86,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenUsers( JNIEnv *env, jclass, jlongArray hkresult) { - jboolean ret = JNI_FALSE; + bool ret = JNI_FALSE; auto phkey = env->GetLongArrayElements(hkresult, nullptr); if (RegOpenKeyEx(HKEY_USERS, nullptr, 0, KEY_READ, reinterpret_cast<PHKEY>(phkey)) == ERROR_SUCCESS) ret = JNI_TRUE; @@ -98,7 +98,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegOpenKeyEx( JNIEnv *env, jclass, jlong parent, jstring name, jlongArray hkresult) { - jboolean ret = JNI_FALSE; + bool ret = JNI_FALSE; const char *namestr = env->GetStringUTFChars(name, nullptr); auto phkey = env->GetLongArrayElements(hkresult, nullptr); if (RegOpenKeyEx(reinterpret_cast<HKEY>(parent), namestr, 0, KEY_READ, reinterpret_cast<PHKEY>(phkey)) @@ -114,7 +114,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_com_sun_star_lib_loader_WinRegKey_winreg_1RegCloseKey( JNIEnv *, jclass, jlong hkey) { - jboolean ret = JNI_FALSE; + bool ret = JNI_FALSE; if (RegCloseKey(reinterpret_cast<HKEY>(hkey)) == ERROR_SUCCESS) ret = JNI_TRUE; return ret; @@ -125,7 +125,7 @@ extern "C" JNIEXPORT jboolean JNIEnv *env, jclass, jlong hkey, jstring value, jlongArray type, jbyteArray data, jlongArray size) { - jboolean ret = JNI_FALSE; + bool ret = JNI_FALSE; const char* valuestr = env->GetStringUTFChars(value, nullptr); auto ptype = env->GetLongArrayElements(type, nullptr); auto pdata = env->GetByteArrayElements(data, nullptr); @@ -146,7 +146,7 @@ extern "C" JNIEXPORT jboolean JNICALL jlongArray maxSubkeyLen, jlongArray values, jlongArray maxValueNameLen, jlongArray maxValueLen, jlongArray secDescriptor) { - jboolean ret = JNI_FALSE; + bool ret = JNI_FALSE; auto psubkeys = env->GetLongArrayElements(subkeys, nullptr); auto pmaxSubkeyLen = env->GetLongArrayElements(maxSubkeyLen, nullptr); auto pvalues = env->GetLongArrayElements(values, nullptr); diff --git a/sal/osl/w32/dllentry.cxx b/sal/osl/w32/dllentry.cxx index 300d43ac1631..9493e59bc982 100644 --- a/sal/osl/w32/dllentry.cxx +++ b/sal/osl/w32/dllentry.cxx @@ -153,7 +153,7 @@ static DWORD GetParentProcessId() if ( IsValidHandle( hSnapshot ) ) { PROCESSENTRY32 pe; - BOOL fSuccess; + bool fSuccess; ZeroMemory( &pe, sizeof(pe) ); pe.dwSize = sizeof(pe); diff --git a/sal/osl/w32/file_dirvol.cxx b/sal/osl/w32/file_dirvol.cxx index c8ccd4001126..70e9b9ccc444 100644 --- a/sal/osl/w32/file_dirvol.cxx +++ b/sal/osl/w32/file_dirvol.cxx @@ -40,7 +40,7 @@ BOOL TimeValueToFileTime(const TimeValue *cpTimeVal, FILETIME *pFTime) SYSTEMTIME BaseSysTime; FILETIME BaseFileTime; FILETIME FTime; - BOOL fSuccess = FALSE; + bool fSuccess = FALSE; BaseSysTime.wYear = 1970; BaseSysTime.wMonth = 1; @@ -71,7 +71,7 @@ BOOL FileTimeToTimeValue(const FILETIME *cpFTime, TimeValue *pTimeVal) { SYSTEMTIME BaseSysTime; FILETIME BaseFileTime; - BOOL fSuccess = FALSE; /* Assume failure */ + bool fSuccess = FALSE; /* Assume failure */ BaseSysTime.wYear = 1970; BaseSysTime.wMonth = 1; @@ -275,9 +275,9 @@ static HANDLE WINAPI OpenLogicalDrivesEnum() return pEnum ? static_cast<HANDLE>(pEnum) : INVALID_HANDLE_VALUE; } -static BOOL WINAPI EnumLogicalDrives(HANDLE hEnum, LPWSTR lpBuffer) +static bool WINAPI EnumLogicalDrives(HANDLE hEnum, LPWSTR lpBuffer) { - BOOL fSuccess = FALSE; + bool fSuccess = FALSE; LPDRIVEENUM pEnum = static_cast<LPDRIVEENUM>(hEnum); if ( pEnum ) @@ -299,9 +299,9 @@ static BOOL WINAPI EnumLogicalDrives(HANDLE hEnum, LPWSTR lpBuffer) return fSuccess; } -static BOOL WINAPI CloseLogicalDrivesEnum(HANDLE hEnum) +static bool WINAPI CloseLogicalDrivesEnum(HANDLE hEnum) { - BOOL fSuccess = FALSE; + bool fSuccess = FALSE; LPDRIVEENUM pEnum = static_cast<LPDRIVEENUM>(hEnum); if ( pEnum ) @@ -368,14 +368,14 @@ static HANDLE WINAPI OpenDirectory( rtl_uString* pPath) return static_cast<HANDLE>(pDirectory); } -static BOOL WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATAW pFindData) +static bool WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATAW pFindData) { - BOOL fSuccess = FALSE; + bool fSuccess = FALSE; LPDIRECTORY pDirectory = static_cast<LPDIRECTORY>(hDirectory); if ( pDirectory ) { - BOOL fValid; + bool fValid; do { @@ -403,9 +403,9 @@ static BOOL WINAPI EnumDirectory(HANDLE hDirectory, LPWIN32_FIND_DATAW pFindData return fSuccess; } -static BOOL WINAPI CloseDirectory(HANDLE hDirectory) +static bool WINAPI CloseDirectory(HANDLE hDirectory) { - BOOL fSuccess = FALSE; + bool fSuccess = FALSE; LPDIRECTORY pDirectory = static_cast<LPDIRECTORY>(hDirectory); if (pDirectory) @@ -587,7 +587,7 @@ static DWORD create_dir_with_callback( // user specified callback function. On success // the function returns ERROR_SUCCESS else a Win32 error code. - BOOL bCreated = CreateDirectoryW( o3tl::toW(rtl_uString_getStr( dir_path )), nullptr ); + bool bCreated = CreateDirectoryW( o3tl::toW(rtl_uString_getStr( dir_path )), nullptr ); if ( bCreated ) { @@ -687,7 +687,7 @@ oslFileError osl_createDirectoryWithFlags(rtl_uString * strPath, sal_uInt32) if ( osl_File_E_None == error ) { - BOOL bCreated = CreateDirectoryW( o3tl::toW(rtl_uString_getStr( strSysPath )), nullptr ); + bool bCreated = CreateDirectoryW( o3tl::toW(rtl_uString_getStr( strSysPath )), nullptr ); if ( !bCreated ) { @@ -812,7 +812,7 @@ static oslFileError osl_getNextDrive( { Directory_Impl *pDirImpl = static_cast<Directory_Impl *>(Directory); DirectoryItem_Impl *pItemImpl = nullptr; - BOOL fSuccess; + bool fSuccess; if ( !pItem ) return osl_File_E_INVAL; @@ -853,7 +853,7 @@ static oslFileError osl_getNextFileItem( { Directory_Impl *pDirImpl = static_cast<Directory_Impl *>(Directory); DirectoryItem_Impl *pItemImpl = nullptr; - BOOL fFound; + bool fFound; if ( !pItem ) return osl_File_E_INVAL; @@ -1306,7 +1306,7 @@ static bool is_volume_space_info_request(sal_uInt32 field_mask) static void get_volume_space_information( const OUString& path, oslVolumeInfo *pInfo) { - BOOL ret = GetDiskFreeSpaceExW( + bool ret = GetDiskFreeSpaceExW( o3tl::toW(path.getStr()), reinterpret_cast<PULARGE_INTEGER>(&pInfo->uFreeSpace), reinterpret_cast<PULARGE_INTEGER>(&pInfo->uTotalSpace), @@ -1693,7 +1693,7 @@ oslFileError SAL_CALL osl_setFileAttributes( oslFileError error; rtl_uString *ustrSysPath = nullptr; DWORD dwFileAttributes; - BOOL fSuccess; + bool fSuccess; // Converts the normalized path into a systempath error = osl_getSystemPathFromFileURL_( ustrFileURL, &ustrSysPath, false ); @@ -1743,7 +1743,7 @@ oslFileError SAL_CALL osl_setFileTime( FILETIME ftLastAccessTime; FILETIME ftLastWriteTime; HANDLE hFile; - BOOL fSuccess; + bool fSuccess; error=osl_getSystemPathFromFileURL_(filePath, &sysPath, false); diff --git a/sal/osl/w32/pipe.cxx b/sal/osl/w32/pipe.cxx index 7c3471888527..89463b899d72 100644 --- a/sal/osl/w32/pipe.cxx +++ b/sal/osl/w32/pipe.cxx @@ -206,7 +206,7 @@ oslPipe SAL_CALL osl_createPipe(rtl_uString *strPipeName, oslPipeOptions Options } else { - BOOL bPipeAvailable; + bool bPipeAvailable; do { diff --git a/sal/osl/w32/process.cxx b/sal/osl/w32/process.cxx index cc5c1568f2f4..f235fc5a572c 100644 --- a/sal/osl/w32/process.cxx +++ b/sal/osl/w32/process.cxx @@ -69,7 +69,7 @@ oslProcessError SAL_CALL osl_terminateProcess(oslProcess Process) DWORD const dwAccessFlags = (PROCESS_CREATE_THREAD | PROCESS_QUERY_INFORMATION | PROCESS_VM_OPERATION | PROCESS_VM_WRITE | PROCESS_VM_READ); - BOOL bHaveDuplHdl = DuplicateHandle(GetCurrentProcess(), // handle to process that has handle + bool bHaveDuplHdl = DuplicateHandle(GetCurrentProcess(), // handle to process that has handle hProcess, // handle to be duplicated GetCurrentProcess(), // process that will get the dup handle &hDupProcess, // store duplicate process handle here diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index fa490a7c29bf..814359647575 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -198,7 +198,7 @@ namespace /* private */ sa.lpSecurityDescriptor = p_security_descriptor; sa.bInheritHandle = b_read_pipe_inheritable || b_write_pipe_inheritable; - BOOL bRet = FALSE; + bool bRet = FALSE; HANDLE hTemp = nullptr; if (!b_read_pipe_inheritable && b_write_pipe_inheritable) @@ -520,7 +520,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( OUString cmdline = command_line.makeStringAndClear(); PROCESS_INFORMATION process_info; - BOOL bRet = FALSE; + bool bRet = FALSE; if ((Security != nullptr) && (static_cast<oslSecurityImpl*>(Security)->m_hToken != nullptr)) { diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx index 55b7ea0d7c06..0c1da6527fd2 100644 --- a/sal/osl/w32/profile.cxx +++ b/sal/osl/w32/profile.cxx @@ -335,7 +335,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile) static bool writeProfileImpl(osl_TFile* pFile) { DWORD BytesWritten=0; - BOOL bRet; + bool bRet; if ( pFile == nullptr || pFile->m_Handle == INVALID_HANDLE_VALUE || ( pFile->m_pWriteBuf == nullptr ) ) { @@ -344,7 +344,7 @@ static bool writeProfileImpl(osl_TFile* pFile) bRet=WriteFile(pFile->m_Handle, pFile->m_pWriteBuf, pFile->m_nWriteBufLen - pFile->m_nWriteBufFree,&BytesWritten,nullptr); - if ( bRet == 0 || BytesWritten == 0 ) + if ( !bRet || BytesWritten == 0 ) { OSL_ENSURE(bRet,"WriteFile failed!!!"); SAL_WARN("sal.osl", "write failed " << strerror(errno)); @@ -404,7 +404,7 @@ DWORD GetPrivateProfileStringWrapper(const osl_TProfileImpl* pProfile, } // Use Unicode version of WritePrivateProfileString, to work with Multi-language paths -BOOL WritePrivateProfileStringWrapper(const osl_TProfileImpl* pProfile, +bool WritePrivateProfileStringWrapper(const osl_TProfileImpl* pProfile, const sal_Char* pszSection, const sal_Char* pszEntry, const sal_Char* pszString) { @@ -427,7 +427,7 @@ BOOL WritePrivateProfileStringWrapper(const osl_TProfileImpl* pProfile, pWEntry = (pEntry ? o3tl::toW(rtl_uString_getStr(pEntry)) : nullptr), pWString = (pString ? o3tl::toW(rtl_uString_getStr(pString)) : nullptr); - BOOL bResult = WritePrivateProfileStringW(pWSection, pWEntry, pWString, o3tl::toW(rtl_uString_getStr(pProfile->m_strFileName))); + bool bResult = WritePrivateProfileStringW(pWSection, pWEntry, pWString, o3tl::toW(rtl_uString_getStr(pProfile->m_strFileName))); if (pString) rtl_uString_release(pString); diff --git a/sal/osl/w32/security.cxx b/sal/osl/w32/security.cxx index d0872ef2c19c..bd3cf3339dc7 100644 --- a/sal/osl/w32/security.cxx +++ b/sal/osl/w32/security.cxx @@ -41,7 +41,7 @@ static bool GetSpecialFolder(rtl_uString **strPath, REFKNOWNFOLDERID rFolder); // We use LPCTSTR here, because we use it with SE_foo_NAME constants // which are defined in winnt.h as UNICODE-dependent TEXT("PrivilegeName") -static BOOL Privilege(LPCTSTR pszPrivilege, BOOL bEnable); +static bool Privilege(LPCTSTR pszPrivilege, bool bEnable); static bool getUserNameImpl(oslSecurity Security, rtl_uString **strName, bool bIncludeDomain); oslSecurity SAL_CALL osl_getCurrentSecurity(void) @@ -296,7 +296,7 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent) PSID pSid = reinterpret_cast<PTOKEN_USER>(pInfoBuffer)->User.Sid; LPWSTR pSidStr = nullptr; - BOOL bResult = ConvertSidToStringSidW(pSid, &pSidStr); + bool bResult = ConvertSidToStringSidW(pSid, &pSidStr); if (bResult) { rtl_uString_newFromStr(strIdent, o3tl::toU(pSidStr)); @@ -312,7 +312,7 @@ sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **strIdent) free(pInfoBuffer); - return bResult != FALSE; + return bResult; } } else @@ -440,7 +440,7 @@ sal_Bool SAL_CALL osl_loadUserProfile(oslSecurity Security) RegCloseKey(HKEY_CURRENT_USER); - if (Privilege(SE_RESTORE_NAME, TRUE)) + if (Privilege(SE_RESTORE_NAME, true)) { HANDLE hAccessToken = static_cast<oslSecurityImpl*>(Security)->m_hToken; @@ -529,7 +529,7 @@ static bool GetSpecialFolder(rtl_uString **strPath, REFKNOWNFOLDERID rFolder) // We use LPCTSTR here, because we use it with SE_foo_NAME constants // which are defined in winnt.h as UNICODE-dependent TEXT("PrivilegeName") -static BOOL Privilege(LPCTSTR strPrivilege, BOOL bEnable) +static bool Privilege(LPCTSTR strPrivilege, bool bEnable) { HANDLE hToken; TOKEN_PRIVILEGES tp; diff --git a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx index b1ffb6976c87..1a2e82eb7c54 100644 --- a/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx +++ b/setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx @@ -89,9 +89,9 @@ static void OutputDebugStringFormatW( LPCWSTR, ... ) } #endif -static BOOL CheckExtensionInRegistry( LPCWSTR lpSubKey ) +static bool CheckExtensionInRegistry( LPCWSTR lpSubKey ) { - BOOL bRet = false; + bool bRet = false; HKEY hKey = nullptr; LONG lResult = RegOpenKeyExW( HKEY_CLASSES_ROOT, lpSubKey, 0, KEY_QUERY_VALUE, &hKey ); @@ -216,14 +216,14 @@ static void saveOldRegistration( LPCWSTR lpSubKey ) } } -static void registerForExtensions( MSIHANDLE handle, BOOL bRegisterAll ) +static void registerForExtensions( MSIHANDLE handle, bool bRegisterAll ) { // Check all file extensions int nIndex = 0; while ( g_Extensions[nIndex] != nullptr ) { saveOldRegistration( g_Extensions[nIndex] ); - BOOL bRegister = bRegisterAll || CheckExtensionInRegistry( g_Extensions[nIndex] ); + bool bRegister = bRegisterAll || CheckExtensionInRegistry( g_Extensions[nIndex] ); if ( bRegister ) registerForExtension( handle, nIndex, true ); ++nIndex; diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index f7234a4725c8..2815d1d85f03 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -37,7 +37,7 @@ typedef int ( __stdcall * DllNativeRegProc ) ( int, BOOL, BOOL, const wchar_t* ); typedef int ( __stdcall * DllNativeUnregProc ) ( int, BOOL, BOOL ); -static BOOL UnicodeEquals( wchar_t const * pStr1, wchar_t const * pStr2 ) +static bool UnicodeEquals( wchar_t const * pStr1, wchar_t const * pStr2 ) { if ( pStr1 == nullptr && pStr2 == nullptr ) return TRUE; @@ -54,7 +54,7 @@ static BOOL UnicodeEquals( wchar_t const * pStr1, wchar_t const * pStr2 ) } -static void RegisterActiveXNative( const wchar_t* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit ) +static void RegisterActiveXNative( const wchar_t* pActiveXPath, int nMode, bool InstallForAllUser, bool InstallFor64Bit ) { HINSTANCE hModule = LoadLibraryExW( pActiveXPath, nullptr, LOAD_WITH_ALTERED_SEARCH_PATH ); if( hModule ) @@ -82,7 +82,7 @@ static void RegisterActiveXNative( const wchar_t* pActiveXPath, int nMode, BOOL } -static void UnregisterActiveXNative( const wchar_t* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit ) +static void UnregisterActiveXNative( const wchar_t* pActiveXPath, int nMode, bool InstallForAllUser, bool InstallFor64Bit ) { HINSTANCE hModule = LoadLibraryExW( pActiveXPath, nullptr, LOAD_WITH_ALTERED_SEARCH_PATH ); if( hModule ) @@ -96,7 +96,7 @@ static void UnregisterActiveXNative( const wchar_t* pActiveXPath, int nMode, BOO } -static BOOL GetMsiPropW( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue ) +static bool GetMsiPropW( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue ) { DWORD sz = 0; if ( MsiGetPropertyW( hMSI, pPropName, const_cast<wchar_t *>(L""), &sz ) == ERROR_MORE_DATA ) @@ -116,7 +116,7 @@ static BOOL GetMsiPropW( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppV } -static BOOL GetActiveXControlPath( MSIHANDLE hMSI, wchar_t** ppActiveXPath ) +static bool GetActiveXControlPath( MSIHANDLE hMSI, wchar_t** ppActiveXPath ) { wchar_t* pProgPath = nullptr; if ( GetMsiPropW( hMSI, L"INSTALLLOCATION", &pProgPath ) && pProgPath ) @@ -136,7 +136,7 @@ static BOOL GetActiveXControlPath( MSIHANDLE hMSI, wchar_t** ppActiveXPath ) } -static BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDeinstallMode ) +static bool GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDeinstallMode ) { // for now the chart is always installed nOldInstallMode = CHART_COMPONENT; @@ -235,9 +235,9 @@ static BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, i } -static BOOL MakeInstallForAllUsers( MSIHANDLE hMSI ) +static bool MakeInstallForAllUsers( MSIHANDLE hMSI ) { - BOOL bResult = FALSE; + bool bResult = FALSE; wchar_t* pVal = nullptr; if ( GetMsiPropW( hMSI, L"ALLUSERS", &pVal ) && pVal ) { @@ -249,9 +249,9 @@ static BOOL MakeInstallForAllUsers( MSIHANDLE hMSI ) } -static BOOL MakeInstallFor64Bit( MSIHANDLE hMSI ) +static bool MakeInstallFor64Bit( MSIHANDLE hMSI ) { - BOOL bResult = FALSE; + bool bResult = FALSE; wchar_t* pVal = nullptr; if ( GetMsiPropW( hMSI, L"VersionNT64", &pVal ) && pVal ) { @@ -272,8 +272,8 @@ extern "C" __declspec(dllexport) UINT __stdcall InstallActiveXControl( MSIHANDLE int nOldInstallMode = 0; int nInstallMode = 0; int nDeinstallMode = 0; - BOOL bInstallForAllUser = MakeInstallForAllUsers( hMSI ); - BOOL bInstallFor64Bit = MakeInstallFor64Bit( hMSI ); + bool bInstallForAllUser = MakeInstallForAllUsers( hMSI ); + bool bInstallFor64Bit = MakeInstallFor64Bit( hMSI ); wchar_t* pActiveXPath = nullptr; if ( GetActiveXControlPath( hMSI, &pActiveXPath ) && pActiveXPath @@ -319,8 +319,8 @@ extern "C" __declspec(dllexport) UINT __stdcall DeinstallActiveXControl( MSIHAND wchar_t* pActiveXPath = nullptr; if ( current_state == INSTALLSTATE_LOCAL && GetActiveXControlPath( hMSI, &pActiveXPath ) && pActiveXPath ) { - BOOL bInstallForAllUser = MakeInstallForAllUsers( hMSI ); - BOOL bInstallFor64Bit = MakeInstallFor64Bit( hMSI ); + bool bInstallForAllUser = MakeInstallForAllUsers( hMSI ); + bool bInstallFor64Bit = MakeInstallFor64Bit( hMSI ); { UnregisterActiveXNative( pActiveXPath, diff --git a/setup_native/source/win32/customactions/sellang/sellang.cxx b/setup_native/source/win32/customactions/sellang/sellang.cxx index e82560f4239a..2610da36003e 100644 --- a/setup_native/source/win32/customactions/sellang/sellang.cxx +++ b/setup_native/source/win32/customactions/sellang/sellang.cxx @@ -38,7 +38,7 @@ #include <spellchecker_selection.hxx> -static BOOL GetMsiPropA( MSIHANDLE hMSI, const char* pPropName, char** ppValue ) +static bool GetMsiPropA( MSIHANDLE hMSI, const char* pPropName, char** ppValue ) { DWORD sz = 0; if ( MsiGetPropertyA( hMSI, pPropName, const_cast<char *>(""), &sz ) == ERROR_MORE_DATA ) { @@ -183,7 +183,7 @@ enum_ui_lang_proc (LPTSTR language, LONG_PTR /* unused_lParam */) return TRUE; } -static BOOL +static bool present_in_ui_langs(const char *lang) { for (int i = 0; i < num_ui_langs; i++) diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx index ee4f7dc0df87..e61f4a43f38e 100644 --- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx +++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx @@ -24,7 +24,7 @@ #include <systools/win32/uwinapi.h> #include "../tools/seterror.hxx" -static BOOL RemoveCompleteDirectoryW(const std::wstring& rPath) +static bool RemoveCompleteDirectoryW(const std::wstring& rPath) { bool bDirectoryRemoved = true; diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx index daf20963673b..c5355008d13d 100644 --- a/setup_native/source/win32/customactions/tools/checkversion.cxx +++ b/setup_native/source/win32/customactions/tools/checkversion.cxx @@ -30,7 +30,7 @@ #include "seterror.hxx" -static BOOL GetMsiPropW( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue ) +static bool GetMsiPropW( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue ) { DWORD sz = 0; if ( MsiGetPropertyW( hMSI, pPropName, const_cast<wchar_t *>(L""), &sz ) == ERROR_MORE_DATA ) diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx index dec949151d5d..a5c81d5e1b0f 100644 --- a/sfx2/source/appl/shutdowniconw32.cxx +++ b/sfx2/source/appl/shutdowniconw32.cxx @@ -300,8 +300,8 @@ static LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LP { case WM_LBUTTONDOWN: { - BOOL const ret = PostMessageW(aExecuterWindow, WM_COMMAND, IDM_STARTCENTER, reinterpret_cast<LPARAM>(hWnd)); - SAL_WARN_IF(0 == ret, "sfx.appl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(aExecuterWindow, WM_COMMAND, IDM_STARTCENTER, reinterpret_cast<LPARAM>(hWnd)); + SAL_WARN_IF(!ret, "sfx.appl", "ERROR: PostMessage() failed!"); break; } @@ -319,8 +319,8 @@ static LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LP EnableMenuItem( popupMenu, IDM_TEMPLATE, MF_BYCOMMAND | (ShutdownIcon::bModalMode ? MF_GRAYED : MF_ENABLED) ); int m = TrackPopupMenuEx( popupMenu, TPM_RETURNCMD|TPM_LEFTALIGN|TPM_RIGHTBUTTON, pt.x, pt.y, hWnd, nullptr ); - BOOL const ret = PostMessageW( hWnd, 0, 0, 0 ); - SAL_WARN_IF(0 == ret, "sfx.appl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW( hWnd, 0, 0, 0 ); + SAL_WARN_IF(!ret, "sfx.appl", "ERROR: PostMessage() failed!"); switch( m ) { case IDM_OPEN: @@ -345,8 +345,8 @@ static LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LP break; } - BOOL const ret2 = PostMessageW(aExecuterWindow, WM_COMMAND, m, reinterpret_cast<LPARAM>(hWnd)); - SAL_WARN_IF(0 == ret2, "sfx.appl", "ERROR: PostMessage() failed!"); + bool const ret2 = PostMessageW(aExecuterWindow, WM_COMMAND, m, reinterpret_cast<LPARAM>(hWnd)); + SAL_WARN_IF(!ret2, "sfx.appl", "ERROR: PostMessage() failed!"); } break; } @@ -371,8 +371,8 @@ static LRESULT CALLBACK listenerWndProc( HWND hWnd, UINT uMsg, WPARAM wParam, LP nid.uID = ID_QUICKSTART; Shell_NotifyIconW(NIM_DELETE, &nid); - BOOL const ret = PostMessageW(aExecuterWindow, WM_COMMAND, IDM_EXIT, reinterpret_cast<LPARAM>(hWnd)); - SAL_WARN_IF(0 == ret, "sfx.appl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(aExecuterWindow, WM_COMMAND, IDM_EXIT, reinterpret_cast<LPARAM>(hWnd)); + SAL_WARN_IF(!ret, "sfx.appl", "ERROR: PostMessage() failed!"); } else return DefWindowProcW(hWnd, uMsg, wParam, lParam); @@ -578,8 +578,8 @@ void OnDrawItem(HWND /*hwnd*/, LPDRAWITEMSTRUCT lpdis) HFONT hfntOld; HBRUSH hbrOld; int x, y; - BOOL fSelected = lpdis->itemState & ODS_SELECTED; - BOOL fDisabled = lpdis->itemState & (ODS_DISABLED | ODS_GRAYED); + bool fSelected = lpdis->itemState & ODS_SELECTED; + bool fDisabled = lpdis->itemState & (ODS_DISABLED | ODS_GRAYED); // Set the appropriate foreground and background colors. @@ -720,7 +720,7 @@ static HRESULT WINAPI SHCoCreateInstance( LPVOID lpszReserved, REFCLSID clsid, L return hResult; } -static BOOL CreateShortcut( const OUString& rAbsObject, const OUString& rAbsObjectPath, +static bool CreateShortcut( const OUString& rAbsObject, const OUString& rAbsObjectPath, const OUString& rAbsShortcut, const OUString& rDescription, const OUString& rParameter ) { HRESULT hres; diff --git a/shell/inc/propsheets.hxx b/shell/inc/propsheets.hxx index 9a95ed169adb..2c3883555d1e 100644 --- a/shell/inc/propsheets.hxx +++ b/shell/inc/propsheets.hxx @@ -65,7 +65,7 @@ public: private: // Windows callback functions static UINT CALLBACK PropPageSummaryCallback(HWND hwnd, UINT uMsg, LPPROPSHEETPAGE ppsp); - static BOOL CALLBACK PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam); + static bool CALLBACK PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam); static BOOL CALLBACK PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPARAM wParam, LPARAM lParam); diff --git a/shell/qa/zip/ziptest.cxx b/shell/qa/zip/ziptest.cxx index f76acf7c916c..7af18912abd2 100644 --- a/shell/qa/zip/ziptest.cxx +++ b/shell/qa/zip/ziptest.cxx @@ -76,7 +76,7 @@ Test::Test() : documentName(), pStream(nullptr) LPVOID pvData = GlobalLock(hGlobal); DWORD dwBytesRead = 0; - BOOL bRead = ReadFile(hFile, pvData, dwFileSize, &dwBytesRead, nullptr); + bool bRead = ReadFile(hFile, pvData, dwFileSize, &dwBytesRead, nullptr); CPPUNIT_ASSERT_MESSAGE("FileStream: ReadFile error.", bRead); GlobalUnlock(hGlobal); CloseHandle(hFile); diff --git a/shell/source/backends/wininetbe/wininetbackend.cxx b/shell/source/backends/wininetbe/wininetbackend.cxx index 599195dcebf7..7bc211747ec2 100644 --- a/shell/source/backends/wininetbe/wininetbackend.cxx +++ b/shell/source/backends/wininetbe/wininetbackend.cxx @@ -116,7 +116,7 @@ WinInetBackend::WinInetBackend() INTERNET_PROXY_INFO pi; LPINTERNET_PROXY_INFO lpi = π DWORD dwLength = sizeof (pi); - BOOL ok = lpfnInternetQueryOption( + bool ok = lpfnInternetQueryOption( nullptr, INTERNET_OPTION_PROXY, lpi, diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx index d0a927daaacc..1fa9af31c9fa 100644 --- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx +++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx @@ -144,8 +144,8 @@ private: ULONG m_ulPropertyNum; // Number of properties that has been processed ULONG m_ulCurrentPropertyNum; // Current Property that is processing; ULONG m_ulChunkID; // Current chunk id - BOOL m_fContents; // TRUE if contents requested - BOOL m_fEof; // TRUE if end of file reached + bool m_fContents; // TRUE if contents requested + bool m_fEof; // TRUE if end of file reached ::std::wstring m_pwsBuffer; // Buffer to save UNICODE content from ChunkBuffer. ULONG m_ChunkPosition; // Chunk pointer to specify the current Chunk; ULONG m_cAttributes; // Count of attributes diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx index 663762e188fb..08beac81985c 100644 --- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx +++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx @@ -39,7 +39,7 @@ #if !defined ListView_SetItemW #define ListView_SetItemW(hwnd, pitem) \ - static_cast<BOOL>(SNDMSG((hwnd), LVM_SETITEMW, 0, reinterpret_cast<LPARAM>(pitem))) + static_cast<bool>(SNDMSG((hwnd), LVM_SETITEMW, 0, reinterpret_cast<LPARAM>(pitem))) #endif diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx index 5ddd6413fce0..196d9ed49ba2 100644 --- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx +++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx @@ -220,7 +220,7 @@ UINT CALLBACK CPropertySheet::PropPageSummaryCallback( } -BOOL CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) +bool CALLBACK CPropertySheet::PropPageSummaryProc(HWND hwnd, UINT uiMsg, WPARAM /*wParam*/, LPARAM lParam) { switch (uiMsg) { diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index e80fa5b708f6..b56ffbf76d71 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -490,7 +490,7 @@ DWORD WINAPI GetPACProxyThread(_In_ LPVOID lpParameter) // autologon prevents caching, and so causes repetitive network traffic. AutoProxyOptions.fAutoLogonIfChallenged = FALSE; WINHTTP_PROXY_INFO ProxyInfo{}; - BOOL bResult + bool bResult = WinHttpGetProxyForUrl(hInternet, o3tl::toW(url.getStr()), &AutoProxyOptions, &ProxyInfo); nError = GetLastError(); if (!bResult && nError == ERROR_WINHTTP_LOGIN_FAILURE) @@ -540,7 +540,7 @@ InternetProxyServer GetPACProxy(const OUString& rProtocol, const OUString& rHost // if configured to do so { WINHTTP_CURRENT_USER_IE_PROXY_CONFIG aProxyConfig{}; - BOOL bResult = WinHttpGetIEProxyConfigForCurrentUser(&aProxyConfig); + bool bResult = WinHttpGetIEProxyConfigForCurrentUser(&aProxyConfig); if (aProxyConfig.lpszProxy) GlobalFree(aProxyConfig.lpszProxy); if (aProxyConfig.lpszProxyBypass) diff --git a/vcl/source/app/winscheduler.cxx b/vcl/source/app/winscheduler.cxx index d9cfa36451ca..0398faaa49c8 100644 --- a/vcl/source/app/winscheduler.cxx +++ b/vcl/source/app/winscheduler.cxx @@ -32,8 +32,8 @@ namespace { void PostMessageToComWnd(UINT nMsg) { - BOOL const ret = PostMessageW(GetSalData()->mpInstance->mhComWnd, nMsg, 0, 0); - SAL_WARN_IF(0 == ret, "vcl.schedule", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(GetSalData()->mpInstance->mhComWnd, nMsg, 0, 0); + SAL_WARN_IF(!ret, "vcl.schedule", "ERROR: PostMessage() failed!"); } } diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 1994a274f8b4..2cf9a4f57d9c 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -549,7 +549,7 @@ bool WinSalInstance::DoYield(bool bWait, bool bHandleAllCurrentEvents) LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, bool& rDef ) { - const BOOL bIsOtherThreadMessage = InSendMessage(); + const bool bIsOtherThreadMessage = InSendMessage(); LRESULT nRet = 0; WinSalInstance *pInst = GetSalData()->mpInstance; WinSalTimer *const pTimer = static_cast<WinSalTimer*>( ImplGetSVData()->maSchedCtx.mpSalTimer ); diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx index 3aa919ec41b5..5a4760ad5e11 100644 --- a/vcl/win/app/saltimer.cxx +++ b/vcl/win/app/saltimer.cxx @@ -110,9 +110,9 @@ void WinSalTimer::Start( sal_uInt64 nMS ) WinSalInstance *pInst = GetSalData()->mpInstance; if ( pInst && !pInst->IsMainThread() ) { - BOOL const ret = PostMessageW(pInst->mhComWnd, + bool const ret = PostMessageW(pInst->mhComWnd, SAL_MSG_STARTTIMER, 0, static_cast<LPARAM>(tools::Time::GetSystemTicks()) + nMS); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } else ImplStart( nMS ); @@ -123,9 +123,9 @@ void WinSalTimer::Stop() WinSalInstance *pInst = GetSalData()->mpInstance; if ( pInst && !pInst->IsMainThread() ) { - BOOL const ret = PostMessageW(pInst->mhComWnd, + bool const ret = PostMessageW(pInst->mhComWnd, SAL_MSG_STOPTIMER, 0, 0); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } else ImplStop(); @@ -140,11 +140,11 @@ void CALLBACK SalTimerProc(PVOID data, BOOLEAN) __try { WinSalTimer *pTimer = static_cast<WinSalTimer*>( data ); - BOOL const ret = PostMessageW( + bool const ret = PostMessageW( GetSalData()->mpInstance->mhComWnd, SAL_MSG_TIMER_CALLBACK, static_cast<WPARAM>(pTimer->GetNextEventVersion()), 0 ); #if OSL_DEBUG_LEVEL > 0 - if (0 == ret) // SEH prevents using SAL_WARN here? + if (!ret) // SEH prevents using SAL_WARN here? fputs("ERROR: PostMessage() failed!\n", stderr); #endif } diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx index 83d5aa749e14..211f84a8609d 100644 --- a/vcl/win/gdi/salprn.cxx +++ b/vcl/win/gdi/salprn.cxx @@ -1464,8 +1464,8 @@ bool WinSalPrinter::StartJob( const OUString* pFileName, // As the Telecom Balloon Fax driver tends to send messages repeatedly // we try to process first all, and then insert a dummy message for (int i = 0; Application::Reschedule( true ) && i <= 15; ++i); - BOOL const ret = PostMessageW(GetSalData()->mpInstance->mhComWnd, SAL_MSG_DUMMY, 0, 0); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(GetSalData()->mpInstance->mhComWnd, SAL_MSG_DUMMY, 0, 0); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); // bring up a file chooser if printing to file port but no file name given OUString aOutFileName; diff --git a/vcl/win/window/salframe.cxx b/vcl/win/window/salframe.cxx index a57e67ce8896..afecae44beaf 100644 --- a/vcl/win/window/salframe.cxx +++ b/vcl/win/window/salframe.cxx @@ -1053,9 +1053,9 @@ void WinSalFrame::ReleaseGraphics( SalGraphics* pGraphics ) bool WinSalFrame::PostEvent(std::unique_ptr<ImplSVEvent> pData) { - BOOL const ret = PostMessageW(mhWnd, SAL_MSG_USEREVENT, 0, reinterpret_cast<LPARAM>(pData.release())); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); - return static_cast<bool>(ret); + bool const ret = PostMessageW(mhWnd, SAL_MSG_USEREVENT, 0, reinterpret_cast<LPARAM>(pData.release())); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); + return ret; } void WinSalFrame::SetTitle( const OUString& rTitle ) @@ -1202,8 +1202,8 @@ void WinSalFrame::Show( bool bVisible, bool bNoActivate ) // We post this message to avoid deadlocks if ( GetSalData()->mnAppThreadId != GetCurrentThreadId() ) { - BOOL const ret = PostMessageW(mhWnd, SAL_MSG_SHOW, WPARAM(bVisible), LPARAM(bNoActivate)); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(mhWnd, SAL_MSG_SHOW, WPARAM(bVisible), LPARAM(bNoActivate)); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } else ImplSalShow( mhWnd, bVisible, bNoActivate ); @@ -1987,8 +1987,8 @@ void WinSalFrame::ToTop( SalFrameToTop nFlags ) // We post this message to avoid deadlocks if ( GetSalData()->mnAppThreadId != GetCurrentThreadId() ) { - BOOL const ret = PostMessageW( mhWnd, SAL_MSG_TOTOP, static_cast<WPARAM>(nFlags), 0 ); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW( mhWnd, SAL_MSG_TOTOP, static_cast<WPARAM>(nFlags), 0 ); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } else ImplSalToTop( mhWnd, nFlags ); @@ -2959,8 +2959,8 @@ static bool ImplHandleMouseMsg( HWND hWnd, UINT nMsg, vcl::Window *pWin = pFrame->GetWindow(); if( pWin && pWin->ImplGetWindowImpl()->mpFrameData->mnFocusId ) { - BOOL const ret = PostMessageW( hWnd, nMsg, wParam, lParam ); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW( hWnd, nMsg, wParam, lParam ); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); return true; } } @@ -3472,7 +3472,7 @@ static bool ImplHandleKeyMsg( HWND hWnd, UINT nMsg, SalKeyEvent aKeyEvt; SalEvent nEvent; MSG aCharMsg; - BOOL bCharPeek = FALSE; + bool bCharPeek = FALSE; UINT nCharMsg = WM_CHAR; bool bKeyUp = (nMsg == WM_KEYUP) || (nMsg == WM_SYSKEYUP); @@ -3696,8 +3696,8 @@ static WinSalFrame* ProcessOrDeferMessage( HWND hWnd, INT nMsg, WPARAM pWParam = ImplSalYieldMutexRelease(); if ( DeferPolicy::Allowed == eCanDefer ) { - BOOL const ret = PostMessageW(hWnd, nMsg, pWParam, 0); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(hWnd, nMsg, pWParam, 0); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } } @@ -4128,13 +4128,13 @@ static LRESULT ImplHandlePalette( bool bFrame, HWND hWnd, UINT nMsg, bReleaseMutex = true; else if ( nMsg == WM_QUERYNEWPALETTE ) { - BOOL const ret = PostMessageW(hWnd, SAL_MSG_POSTQUERYNEWPAL, wParam, lParam); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(hWnd, SAL_MSG_POSTQUERYNEWPAL, wParam, lParam); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } else /* ( nMsg == WM_PALETTECHANGED ) */ { - BOOL const ret = PostMessageW(hWnd, SAL_MSG_POSTPALCHANGED, wParam, lParam); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(hWnd, SAL_MSG_POSTPALCHANGED, wParam, lParam); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } } @@ -4751,8 +4751,8 @@ static bool ImplHandleSysCommand( HWND hWnd, WPARAM wParam, LPARAM lParam ) if ( pFrame->mbFullScreen ) { - BOOL bMaximize = IsZoomed( pFrame->mhWnd ); - BOOL bMinimize = IsIconic( pFrame->mhWnd ); + bool bMaximize = IsZoomed( pFrame->mhWnd ); + bool bMinimize = IsIconic( pFrame->mhWnd ); if ( (nCommand == SC_SIZE) || (!bMinimize && (nCommand == SC_MOVE)) || (!bMaximize && (nCommand == SC_MAXIMIZE)) || diff --git a/vcl/win/window/salobj.cxx b/vcl/win/window/salobj.cxx index 9840994bc9fa..e01dc072bfa3 100644 --- a/vcl/win/window/salobj.cxx +++ b/vcl/win/window/salobj.cxx @@ -115,8 +115,8 @@ static LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) } else { - BOOL const ret = PostMessageW(pObject->mhWnd, SALOBJ_MSG_POSTFOCUS, 0, 0); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(pObject->mhWnd, SALOBJ_MSG_POSTFOCUS, 0, 0); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } } } @@ -135,8 +135,8 @@ static LRESULT CALLBACK SalSysMsgProc( int nCode, WPARAM wParam, LPARAM lParam ) } else { - BOOL const ret = PostMessageW(pObject->mhWnd, SALOBJ_MSG_POSTFOCUS, 0, 0); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(pObject->mhWnd, SALOBJ_MSG_POSTFOCUS, 0, 0); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } } else @@ -162,8 +162,8 @@ bool ImplSalPreDispatchMsg( const MSG* pMsg ) pObject = ImplFindSalObject( pMsg->hwnd ); if ( pObject && !pObject->IsMouseTransparent() ) { - BOOL const ret = PostMessageW(pObject->mhWnd, SALOBJ_MSG_TOTOP, 0, 0); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(pObject->mhWnd, SALOBJ_MSG_TOTOP, 0, 0); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } ImplSalYieldMutexRelease(); } @@ -300,8 +300,8 @@ static LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, L pSysObj = GetSalObjWindowPtr( hWnd ); if ( pSysObj && !pSysObj->IsMouseTransparent() ) { - BOOL const ret = PostMessageW( hWnd, SALOBJ_MSG_TOTOP, 0, 0 ); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW( hWnd, SALOBJ_MSG_TOTOP, 0, 0 ); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } ImplSalYieldMutexRelease(); } @@ -317,8 +317,8 @@ static LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, L } else { - BOOL const ret = PostMessageW( hWnd, SALOBJ_MSG_TOTOP, 0, 0 ); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW( hWnd, SALOBJ_MSG_TOTOP, 0, 0 ); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } break; @@ -337,8 +337,8 @@ static LRESULT CALLBACK SalSysObjWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, L } else { - BOOL const ret = PostMessageW(hWnd, SALOBJ_MSG_POSTFOCUS, 0, 0); - SAL_WARN_IF(0 == ret, "vcl", "ERROR: PostMessage() failed!"); + bool const ret = PostMessageW(hWnd, SALOBJ_MSG_POSTFOCUS, 0, 0); + SAL_WARN_IF(!ret, "vcl", "ERROR: PostMessage() failed!"); } rDef = FALSE; break; diff --git a/winaccessibility/source/UAccCOM/AccRelation.cxx b/winaccessibility/source/UAccCOM/AccRelation.cxx index dcfb4b69eafc..e2586ec5c183 100644 --- a/winaccessibility/source/UAccCOM/AccRelation.cxx +++ b/winaccessibility/source/UAccCOM/AccRelation.cxx @@ -118,7 +118,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccRelation::get_target(long targetIndex, IUn Reference<XAccessible> xRAcc(xTargets[targetIndex], UNO_QUERY); IAccessible* pRet = nullptr; - BOOL isGet = CMAccessible::get_IAccessibleFromXAccessible(xRAcc.get(), &pRet); + bool isGet = CMAccessible::get_IAccessibleFromXAccessible(xRAcc.get(), &pRet); if(isGet) { *target = /*(IAccessible2 *)*/static_cast<IUnknown*>(pRet); diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx index fc39dc6d350e..35d1f85718ef 100644 --- a/winaccessibility/source/UAccCOM/AccTable.cxx +++ b/winaccessibility/source/UAccCOM/AccTable.cxx @@ -73,7 +73,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CAccTable::get_accessibleAt(long row, long col IAccessible* pRet = nullptr; - BOOL isTRUE = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(), &pRet); + bool isTRUE = CMAccessible::get_IAccessibleFromXAccessible(pRAcc.get(), &pRet); if(isTRUE) { *accessible = static_cast<IAccessible2 *>(pRet); diff --git a/winaccessibility/source/UAccCOM/EnumVariant.cxx b/winaccessibility/source/UAccCOM/EnumVariant.cxx index 1cbb4513d73f..ffda36a25bcc 100644 --- a/winaccessibility/source/UAccCOM/EnumVariant.cxx +++ b/winaccessibility/source/UAccCOM/EnumVariant.cxx @@ -65,7 +65,7 @@ HRESULT STDMETHODCALLTYPE CEnumVariant::Next(ULONG cElements,VARIANT __RPC_FAR * { Reference< XAccessible > pRXAcc = m_pXAccessibleSelection->getSelectedAccessibleChild(l1); IAccessible* pChild = nullptr; - BOOL isGet = CMAccessible::get_IAccessibleFromXAccessible(pRXAcc.get(), + bool isGet = CMAccessible::get_IAccessibleFromXAccessible(pRXAcc.get(), &pChild); if(isGet) { diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx b/winaccessibility/source/UAccCOM/MAccessible.cxx index d681c38a793c..7afe11a5bf32 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.cxx +++ b/winaccessibility/source/UAccCOM/MAccessible.cxx @@ -1381,7 +1381,7 @@ IMAccessible* CMAccessible::GetChildInterface(long dChildID)//for test IAccessible* pChild = nullptr; Reference< XAccessible > pXChild = pRContext->getAccessibleChild(dChildID-1); - BOOL isGet = get_IAccessibleFromXAccessible(pXChild.get(), &pChild); + bool isGet = get_IAccessibleFromXAccessible(pXChild.get(), &pChild); if(!isGet) { @@ -1405,7 +1405,7 @@ IMAccessible* CMAccessible::GetChildInterface(long dChildID)//for test * need to process specifically when navigate * @return BOOL, if it is descendantmanager, return true. */ -BOOL CMAccessible::IsDescendantManage() +bool CMAccessible::IsDescendantManage() { return (m_iRole==ROLE_SYSTEM_LIST)||(m_iRole==ROLE_SYSTEM_OUTLINE)||(m_iRole==ROLE_SYSTEM_TABLE); @@ -2021,7 +2021,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible:: get_groupPosition(long __RPC_FA } int level = 0; - BOOL isFound = FALSE; + bool isFound = FALSE; while( pParentAcc.is() && !isFound) { level++; @@ -2493,7 +2493,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP CMAccessible::Put_ActionDescription( const OLE LEAVE_PROTECTED_BLOCK } -BOOL CMAccessible::GetXInterfaceFromXAccessible(XAccessible* pXAcc, XInterface** ppXI, int index) +bool CMAccessible::GetXInterfaceFromXAccessible(XAccessible* pXAcc, XInterface** ppXI, int index) { Reference< XAccessibleContext > pRContext; @@ -2599,7 +2599,7 @@ HRESULT WINAPI CMAccessible::SmartQI(void* /*pv*/, REFIID iid, void** ppvObject) SolarMutexGuard g; XInterface* pXI = nullptr; - BOOL bFound = GetXInterfaceFromXAccessible(m_xAccessible.get(), + bool bFound = GetXInterfaceFromXAccessible(m_xAccessible.get(), &pXI, pMap->XIFIndex); if(!bFound) { @@ -2650,7 +2650,7 @@ CMAccessible::get_IAccessibleFromXAccessible(XAccessible * pXAcc, IAccessible ** { return FALSE; } - BOOL isGet = FALSE; + bool isGet = FALSE; if(g_pAgent) isGet = g_pAgent->GetIAccessibleFromXAccessible(pXAcc, ppIA); diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h index cdbe0e85905d..7ec9e3212d11 100644 --- a/winaccessibility/source/UAccCOM/MAccessible.h +++ b/winaccessibility/source/UAccCOM/MAccessible.h @@ -188,7 +188,7 @@ private: CEnumVariant* m_pEnumVar; // specify if the XAccessible is invalid - BOOL m_isDestroy; + bool m_isDestroy; css::uno::Reference<css::accessibility::XAccessible> m_xAccessible; // initially m_xAction and m_xContext are the same object @@ -205,7 +205,7 @@ private: HRESULT GetLastChild(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation HRESULT GetNextSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation HRESULT GetPreSibling(VARIANT varStart,VARIANT* pvarEndUpAt);//for accNavigate implementation - BOOL IsDescendantManage();//identify whether the current COM belongs to manage_descendant roles + bool IsDescendantManage();//identify whether the current COM belongs to manage_descendant roles // the following private methods are used to implement accSelect method HRESULT SelectChild(css::accessibility::XAccessible* pItem); @@ -218,7 +218,7 @@ private: css::accessibility::XAccessible* pXAcc); css::uno::Reference<css::accessibility::XAccessibleSelection> GetSelection(); // end accSelect implementation methods - static BOOL GetXInterfaceFromXAccessible(css::accessibility::XAccessible*, + static bool GetXInterfaceFromXAccessible(css::accessibility::XAccessible*, css::uno::XInterface**, int); HRESULT WINAPI SmartQI(void* pv, REFIID iid, void** ppvObject); diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx index d9b657891b96..afa9f99ff0d7 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx @@ -602,7 +602,7 @@ uno::Sequence< uno::Reference < XCertificate > > SecurityEnvironment_MSCryptImpl pChainContext = nullptr ; - BOOL bChain = FALSE; + bool bChain = FALSE; if( pCertContext != nullptr ) { HCERTSTORE hAdditionalStore = nullptr; @@ -786,7 +786,7 @@ sal_Int32 SecurityEnvironment_MSCryptImpl::verifyCertificate( HCERTSTORE hCollectionStore = nullptr; HCERTSTORE hIntermediateCertsStore = nullptr; - BOOL bChain = FALSE; + bool bChain = FALSE; if( pCertContext != nullptr ) { hIntermediateCertsStore = |