[Libreoffice-commits] core.git: sal/osl
Stephan Bergmann
sbergman at redhat.com
Wed May 17 18:49:31 UTC 2017
sal/osl/w32/file_url.cxx | 14 +++++++-------
sal/osl/w32/file_url.hxx | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit fe45f18fa507dfcd2ea87b8b1969e730a6357d16
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri May 12 16:51:55 2017 +0200
BOOL -> bool
Change-Id: Ie1ee8b93753e03326d2a121dcd18a1b6a7038ce3
Reviewed-on: https://gerrit.libreoffice.org/37722
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index 3eda74d30c30..625dfd274add 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -369,7 +369,7 @@ static DWORD GetCaseCorrectPathNameEx(
LPWSTR lpszPath, // path buffer to convert
DWORD cchBuffer, // size of path buffer
DWORD nSkipLevels,
- BOOL bCheckExistence )
+ bool bCheckExistence )
{
::osl::LongPathBuffer< WCHAR > szFile( MAX_PATH + 1 );
sal_Int32 nRemoved = PathRemoveFileSpec( lpszPath, szFile, MAX_PATH + 1 );
@@ -383,24 +383,24 @@ static DWORD GetCaseCorrectPathNameEx(
if ( nRemoved )
{
- BOOL bSkipThis = FALSE;
+ bool bSkipThis = false;
if ( 0 == _tcscmp( szFile, TEXT("..") ) )
{
- bSkipThis = TRUE;
+ bSkipThis = true;
nSkipLevels += 1;
}
else if ( 0 == _tcscmp( szFile, TEXT(".") ) )
{
- bSkipThis = TRUE;
+ bSkipThis = true;
}
else if ( nSkipLevels )
{
- bSkipThis = TRUE;
+ bSkipThis = true;
nSkipLevels--;
}
else
- bSkipThis = FALSE;
+ bSkipThis = false;
if ( !GetCaseCorrectPathNameEx( lpszPath, cchBuffer, nSkipLevels, bCheckExistence ) )
return 0;
@@ -453,7 +453,7 @@ DWORD GetCaseCorrectPathName(
LPCWSTR lpszShortPath, // file name
LPWSTR lpszLongPath, // path buffer
DWORD cchBuffer, // size of path buffer
- BOOL bCheckExistence
+ bool bCheckExistence
)
{
/* Special handling for "\\.\" as system root */
diff --git a/sal/osl/w32/file_url.hxx b/sal/osl/w32/file_url.hxx
index 7a3dc5c074b6..d90d05840f50 100644
--- a/sal/osl/w32/file_url.hxx
+++ b/sal/osl/w32/file_url.hxx
@@ -62,7 +62,7 @@ DWORD GetCaseCorrectPathName (
LPCWSTR lpszShortPath, // file name
LPWSTR lpszLongPath, // path buffer
DWORD cchBuffer, // size of path buffer
- BOOL bCheckExistence
+ bool bCheckExistence
);
oslFileError osl_getSystemPathFromFileURL_ (
More information about the Libreoffice-commits
mailing list