diff options
Diffstat (limited to 'tools/source/string')
-rw-r--r-- | tools/source/string/strascii.cxx | 14 | ||||
-rw-r--r-- | tools/source/string/strcvt.cxx | 12 | ||||
-rw-r--r-- | tools/source/string/strimp.cxx | 32 | ||||
-rw-r--r-- | tools/source/string/tenccvt.cxx | 4 | ||||
-rw-r--r-- | tools/source/string/tstring.cxx | 30 |
5 files changed, 46 insertions, 46 deletions
diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx index 775e1ca7f142..e47517d93412 100644 --- a/tools/source/string/strascii.cxx +++ b/tools/source/string/strascii.cxx @@ -31,17 +31,17 @@ #ifdef DBG_UTIL -static BOOL ImplDbgCheckAsciiStr( const sal_Char* pAsciiStr, sal_Int32 nLen ) +static sal_Bool ImplDbgCheckAsciiStr( const sal_Char* pAsciiStr, sal_Int32 nLen ) { while ( nLen && *pAsciiStr ) { if ( ((unsigned char)*pAsciiStr) > 127 ) - return FALSE; + return sal_False; ++pAsciiStr, --nLen; } - return TRUE; + return sal_True; } #endif @@ -504,7 +504,7 @@ StringCompare UniString::CompareIgnoreCaseToAscii( const sal_Char* pAsciiStr, // ----------------------------------------------------------------------- -BOOL UniString::EqualsAscii( const sal_Char* pAsciiStr ) const +sal_Bool UniString::EqualsAscii( const sal_Char* pAsciiStr ) const { DBG_CHKTHIS( UniString, DbgCheckUniString ); DBG_ASSERT( ImplDbgCheckAsciiStr( pAsciiStr, STRING_LEN ), @@ -515,7 +515,7 @@ BOOL UniString::EqualsAscii( const sal_Char* pAsciiStr ) const // ----------------------------------------------------------------------- -BOOL UniString::EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const +sal_Bool UniString::EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const { DBG_CHKTHIS( UniString, DbgCheckUniString ); DBG_ASSERT( ImplDbgCheckAsciiStr( pAsciiStr, STRING_LEN ), @@ -526,7 +526,7 @@ BOOL UniString::EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr ) const // ----------------------------------------------------------------------- -BOOL UniString::EqualsAscii( const sal_Char* pAsciiStr, +sal_Bool UniString::EqualsAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex, xub_StrLen nLen ) const { DBG_CHKTHIS( UniString, DbgCheckUniString ); @@ -542,7 +542,7 @@ BOOL UniString::EqualsAscii( const sal_Char* pAsciiStr, // ----------------------------------------------------------------------- -BOOL UniString::EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr, +sal_Bool UniString::EqualsIgnoreCaseAscii( const sal_Char* pAsciiStr, xub_StrLen nIndex, xub_StrLen nLen ) const { DBG_CHKTHIS( UniString, DbgCheckUniString ); diff --git a/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx index ef55dee5bfe2..ce5c7ecdcad0 100644 --- a/tools/source/string/strcvt.cxx +++ b/tools/source/string/strcvt.cxx @@ -227,7 +227,7 @@ sal_Unicode* ImplGet1ByteUnicodeTab( rtl_TextEncoding eTextEncoding ) static sal_uChar* ImplGet1ByteConvertTab( rtl_TextEncoding eSrcTextEncoding, rtl_TextEncoding eDestTextEncoding, - BOOL bReplace ) + sal_Bool bReplace ) { #ifndef BOOTSTRAP TOOLSINDATA* pToolsData = ImplGetToolsInData(); @@ -353,7 +353,7 @@ void ImplDeleteCharTabData() // ======================================================================= void ByteString::ImplStringConvert( - rtl_TextEncoding eSource, rtl_TextEncoding eTarget, BOOL bReplace ) + rtl_TextEncoding eSource, rtl_TextEncoding eTarget, sal_Bool bReplace ) { sal_uChar* pConvertTab = ImplGet1ByteConvertTab( eSource, eTarget, bReplace ); if ( pConvertTab ) @@ -409,7 +409,7 @@ void ByteString::ImplStringConvert( // ======================================================================= -ByteString& ByteString::Convert( rtl_TextEncoding eSource, rtl_TextEncoding eTarget, BOOL bReplace ) +ByteString& ByteString::Convert( rtl_TextEncoding eSource, rtl_TextEncoding eTarget, sal_Bool bReplace ) { DBG_CHKTHIS( ByteString, DbgCheckByteString ); @@ -442,7 +442,7 @@ ByteString& ByteString::Convert( rtl_TextEncoding eSource, rtl_TextEncoding eTar char ByteString::Convert( char c, rtl_TextEncoding eSource, rtl_TextEncoding eTarget, - BOOL bReplace ) + sal_Bool bReplace ) { // TextEncoding Dontknow kann nicht konvertiert werden if ( (eSource == RTL_TEXTENCODING_DONTKNOW) || (eTarget == RTL_TEXTENCODING_DONTKNOW) ) @@ -480,7 +480,7 @@ sal_Unicode ByteString::ConvertToUnicode( char c, rtl_TextEncoding eTextEncoding // ----------------------------------------------------------------------- -char ByteString::ConvertFromUnicode( sal_Unicode c, rtl_TextEncoding eTextEncoding, BOOL bReplace ) +char ByteString::ConvertFromUnicode( sal_Unicode c, rtl_TextEncoding eTextEncoding, sal_Bool bReplace ) { sal_Size nLen; char aBuf[30]; @@ -530,7 +530,7 @@ sal_Unicode ByteString::ConvertToUnicode( const char* pChar, sal_Size* pLen, rtl // ----------------------------------------------------------------------- sal_Size ByteString::ConvertFromUnicode( sal_Unicode c, char* pBuf, sal_Size nBufLen, rtl_TextEncoding eTextEncoding, - BOOL bReplace ) + sal_Bool bReplace ) { // TextEncoding Dontknow wird nicht konvertiert if ( eTextEncoding == RTL_TEXTENCODING_DONTKNOW ) diff --git a/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx index 34038c576aa0..8712733c0851 100644 --- a/tools/source/string/strimp.cxx +++ b/tools/source/string/strimp.cxx @@ -1141,7 +1141,7 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd ) DBG_CHKTHIS( STRING, DBGCHECKSTRING ); // Zeilenumbrueche ermitteln und neue Laenge berechnen - BOOL bConvert = FALSE; // Muss konvertiert werden + sal_Bool bConvert = sal_False; // Muss konvertiert werden const STRCODE* pStr = mpData->maStr; // damit es schneller geht xub_StrLen nLineEndLen = (eLineEnd == LINEEND_CRLF) ? 2 : 1; xub_StrLen nLen = 0; // Ziel-Laenge @@ -1164,7 +1164,7 @@ STRING& STRING::ConvertLineEnd( LineEnd eLineEnd ) ((pStr[i] == _CR) || (pStr[i+1] == _CR))) || ((eLineEnd == LINEEND_CR) && ((pStr[i] == _LF) || (pStr[i+1] == _LF))) ) - bConvert = TRUE; + bConvert = sal_True; } // \r\n oder \n\r, dann Zeichen ueberspringen @@ -1327,18 +1327,18 @@ StringCompare STRING::CompareIgnoreCaseToAscii( const STRCODE* pCharStr, // ----------------------------------------------------------------------- -BOOL STRING::Equals( const STRING& rStr ) const +sal_Bool STRING::Equals( const STRING& rStr ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); // Sind die Daten gleich if ( mpData == rStr.mpData ) - return TRUE; + return sal_True; // Gleiche Laenge if ( mpData->mnLen != rStr.mpData->mnLen ) - return FALSE; + return sal_False; // String vergleichen return (ImplStringCompareWithoutZero( mpData->maStr, rStr.mpData->maStr, mpData->mnLen ) == 0); @@ -1346,7 +1346,7 @@ BOOL STRING::Equals( const STRING& rStr ) const // ----------------------------------------------------------------------- -BOOL STRING::Equals( const STRCODE* pCharStr ) const +sal_Bool STRING::Equals( const STRCODE* pCharStr ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); @@ -1355,18 +1355,18 @@ BOOL STRING::Equals( const STRCODE* pCharStr ) const // ----------------------------------------------------------------------- -BOOL STRING::EqualsIgnoreCaseAscii( const STRING& rStr ) const +sal_Bool STRING::EqualsIgnoreCaseAscii( const STRING& rStr ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); // Sind die Daten gleich if ( mpData == rStr.mpData ) - return TRUE; + return sal_True; // Gleiche Laenge if ( mpData->mnLen != rStr.mpData->mnLen ) - return FALSE; + return sal_False; // String vergleichen return (ImplStringICompareWithoutZero( mpData->maStr, rStr.mpData->maStr, mpData->mnLen ) == 0); @@ -1374,7 +1374,7 @@ BOOL STRING::EqualsIgnoreCaseAscii( const STRING& rStr ) const // ----------------------------------------------------------------------- -BOOL STRING::EqualsIgnoreCaseAscii( const STRCODE* pCharStr ) const +sal_Bool STRING::EqualsIgnoreCaseAscii( const STRCODE* pCharStr ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); @@ -1383,7 +1383,7 @@ BOOL STRING::EqualsIgnoreCaseAscii( const STRCODE* pCharStr ) const // ----------------------------------------------------------------------- -BOOL STRING::Equals( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const +sal_Bool STRING::Equals( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); @@ -1395,7 +1395,7 @@ BOOL STRING::Equals( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen ) co if ( nMaxLen < nLen ) { if ( rStr.mpData->mnLen != nMaxLen ) - return FALSE; + return sal_False; nLen = static_cast< xub_StrLen >(nMaxLen); } @@ -1405,7 +1405,7 @@ BOOL STRING::Equals( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen ) co // ----------------------------------------------------------------------- -BOOL STRING::Equals( const STRCODE* pCharStr, xub_StrLen nIndex, xub_StrLen nLen ) const +sal_Bool STRING::Equals( const STRCODE* pCharStr, xub_StrLen nIndex, xub_StrLen nLen ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); @@ -1418,7 +1418,7 @@ BOOL STRING::Equals( const STRCODE* pCharStr, xub_StrLen nIndex, xub_StrLen nLen // ----------------------------------------------------------------------- -BOOL STRING::EqualsIgnoreCaseAscii( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const +sal_Bool STRING::EqualsIgnoreCaseAscii( const STRING& rStr, xub_StrLen nIndex, xub_StrLen nLen ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); DBG_CHKOBJ( &rStr, STRING, DBGCHECKSTRING ); @@ -1430,7 +1430,7 @@ BOOL STRING::EqualsIgnoreCaseAscii( const STRING& rStr, xub_StrLen nIndex, xub_S if ( nMaxLen < nLen ) { if ( rStr.mpData->mnLen != nMaxLen ) - return FALSE; + return sal_False; nLen = static_cast< xub_StrLen >(nMaxLen); } @@ -1440,7 +1440,7 @@ BOOL STRING::EqualsIgnoreCaseAscii( const STRING& rStr, xub_StrLen nIndex, xub_S // ----------------------------------------------------------------------- -BOOL STRING::EqualsIgnoreCaseAscii( const STRCODE* pCharStr, xub_StrLen nIndex, xub_StrLen nLen ) const +sal_Bool STRING::EqualsIgnoreCaseAscii( const STRCODE* pCharStr, xub_StrLen nIndex, xub_StrLen nLen ) const { DBG_CHKTHIS( STRING, DBGCHECKSTRING ); diff --git a/tools/source/string/tenccvt.cxx b/tools/source/string/tenccvt.cxx index 5237b24948a7..f1f023a90502 100644 --- a/tools/source/string/tenccvt.cxx +++ b/tools/source/string/tenccvt.cxx @@ -84,14 +84,14 @@ rtl_TextEncoding GetOneByteTextEncoding( rtl_TextEncoding eEncoding ) // ----------------------------------------------------------------------- -rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding, USHORT /* nVersion = SOFFICE_FILEFORMAT_50 */ ) +rtl_TextEncoding GetSOLoadTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 /* nVersion = SOFFICE_FILEFORMAT_50 */ ) { return GetExtendedCompatibilityTextEncoding( GetOneByteTextEncoding( eEncoding ) ); } // ----------------------------------------------------------------------- -rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding, USHORT /* nVersion = SOFFICE_FILEFORMAT_50 */ ) +rtl_TextEncoding GetSOStoreTextEncoding( rtl_TextEncoding eEncoding, sal_uInt16 /* nVersion = SOFFICE_FILEFORMAT_50 */ ) { return GetExtendedTextEncoding( GetOneByteTextEncoding( eEncoding ) ); } diff --git a/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx index f2525e3bca84..734e729ceccb 100644 --- a/tools/source/string/tstring.cxx +++ b/tools/source/string/tstring.cxx @@ -188,7 +188,7 @@ double ByteString::ToDouble() const // ----------------------------------------------------------------------- -BOOL ByteString::IsLowerAscii() const +sal_Bool ByteString::IsLowerAscii() const { DBG_CHKTHIS( ByteString, DbgCheckByteString ); @@ -198,18 +198,18 @@ BOOL ByteString::IsLowerAscii() const while ( nIndex < nLen ) { if ( (*pStr >= 65) && (*pStr <= 90) ) - return FALSE; + return sal_False; ++pStr, ++nIndex; } - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- -BOOL ByteString::IsUpperAscii() const +sal_Bool ByteString::IsUpperAscii() const { DBG_CHKTHIS( ByteString, DbgCheckByteString ); @@ -219,18 +219,18 @@ BOOL ByteString::IsUpperAscii() const while ( nIndex < nLen ) { if ( (*pStr >= 97) && (*pStr <= 122) ) - return FALSE; + return sal_False; ++pStr, ++nIndex; } - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- -BOOL ByteString::IsAlphaAscii() const +sal_Bool ByteString::IsAlphaAscii() const { DBG_CHKTHIS( ByteString, DbgCheckByteString ); @@ -241,18 +241,18 @@ BOOL ByteString::IsAlphaAscii() const { if ( !(((*pStr >= 97) && (*pStr <= 122)) || ((*pStr >= 65) && (*pStr <= 90))) ) - return FALSE; + return sal_False; ++pStr, ++nIndex; } - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- -BOOL ByteString::IsNumericAscii() const +sal_Bool ByteString::IsNumericAscii() const { DBG_CHKTHIS( ByteString, DbgCheckByteString ); @@ -262,18 +262,18 @@ BOOL ByteString::IsNumericAscii() const while ( nIndex < nLen ) { if ( !((*pStr >= 48) && (*pStr <= 57)) ) - return FALSE; + return sal_False; ++pStr, ++nIndex; } - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- -BOOL ByteString::IsAlphaNumericAscii() const +sal_Bool ByteString::IsAlphaNumericAscii() const { DBG_CHKTHIS( ByteString, DbgCheckByteString ); @@ -285,11 +285,11 @@ BOOL ByteString::IsAlphaNumericAscii() const if ( !(((*pStr >= 97) && (*pStr <= 122)) || ((*pStr >= 65) && (*pStr <= 90)) || ((*pStr >= 48) && (*pStr <= 57))) ) - return FALSE; + return sal_False; ++pStr, ++nIndex; } - return TRUE; + return sal_True; } |