From d84cf2de01f17f2617846135081a819ce74dd87a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 14 Feb 2014 22:45:44 +0100 Subject: sal: sal_Bool -> bool Change-Id: I071a931660dafc1ee5950da527b042fb175255b8 --- sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 40 +++++++++++++++--------------- sal/qa/OStringBuffer/rtl_String_Utils.cxx | 20 +++++++-------- sal/qa/OStringBuffer/rtl_String_Utils.hxx | 10 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) (limited to 'sal/qa/OStringBuffer') diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index 41477e92d56c..d81c463220a1 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -67,7 +67,7 @@ namespace rtl_OStringBuffer sal_Int32 nLenStrBuftmp = aStrBuftmp.getLength(); rtl::OString sStr(aStrBuftmp.getStr()); - sal_Bool res = aStrtmp.equals( sStr ); + bool res = aStrtmp.equals( sStr ); CPPUNIT_ASSERT_MESSAGE ( @@ -195,7 +195,7 @@ namespace rtl_OStringBuffer ::rtl::OStringBuffer aStrBuf1; ::rtl::OString aStr1; - sal_Bool lastRes = (aStrBuf1.makeStringAndClear() == aStr1 ); + bool lastRes = (aStrBuf1.makeStringAndClear() == aStr1 ); CPPUNIT_ASSERT_MESSAGE ( @@ -211,7 +211,7 @@ namespace rtl_OStringBuffer ::rtl::OStringBuffer aStrBuf2(26); ::rtl::OString aStr2; - sal_Bool lastRes = (aStrBuf2.makeStringAndClear() == aStr2 ); + bool lastRes = (aStrBuf2.makeStringAndClear() == aStr2 ); CPPUNIT_ASSERT_MESSAGE ( @@ -227,7 +227,7 @@ namespace rtl_OStringBuffer ::rtl::OStringBuffer aStrBuf3(*arrOUS[0]); ::rtl::OString aStr3(*arrOUS[0]); - sal_Bool lastRes = (aStrBuf3.makeStringAndClear() == aStr3 ); + bool lastRes = (aStrBuf3.makeStringAndClear() == aStr3 ); CPPUNIT_ASSERT_MESSAGE ( @@ -243,7 +243,7 @@ namespace rtl_OStringBuffer ::rtl::OStringBuffer aStrBuf4(*arrOUS[1]); ::rtl::OString aStr4(*arrOUS[1]); - sal_Bool lastRes = (aStrBuf4.makeStringAndClear() == aStr4 ); + bool lastRes = (aStrBuf4.makeStringAndClear() == aStr4 ); CPPUNIT_ASSERT_MESSAGE ( @@ -258,7 +258,7 @@ namespace rtl_OStringBuffer ::rtl::OStringBuffer aStrBuf5(*arrOUS[2]); ::rtl::OString aStr5(*arrOUS[2]); - sal_Bool lastRes = (aStrBuf5.makeStringAndClear() == aStr5 ); + bool lastRes = (aStrBuf5.makeStringAndClear() == aStr5 ); CPPUNIT_ASSERT_MESSAGE ( @@ -273,7 +273,7 @@ namespace rtl_OStringBuffer ::rtl::OStringBuffer aStrBuf6(*arrOUS[3]); ::rtl::OString aStr6(*arrOUS[3]); - sal_Bool lastRes = (aStrBuf6.makeStringAndClear() == aStr6 ); + bool lastRes = (aStrBuf6.makeStringAndClear() == aStr6 ); CPPUNIT_ASSERT_MESSAGE ( @@ -288,7 +288,7 @@ namespace rtl_OStringBuffer ::rtl::OStringBuffer aStrBuf7(*arrOUS[4]); ::rtl::OString aStr7(*arrOUS[4]); - sal_Bool lastRes = (aStrBuf7.makeStringAndClear() == aStr7 ); + bool lastRes = (aStrBuf7.makeStringAndClear() == aStr7 ); CPPUNIT_ASSERT_MESSAGE ( @@ -303,7 +303,7 @@ namespace rtl_OStringBuffer ::rtl::OStringBuffer aStrBuf8(*arrOUS[5]); ::rtl::OString aStr8(*arrOUS[5]); - sal_Bool lastRes = (aStrBuf8.makeStringAndClear() == aStr8 ); + bool lastRes = (aStrBuf8.makeStringAndClear() == aStr8 ); CPPUNIT_ASSERT_MESSAGE ( @@ -2760,7 +2760,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr45 ); ::rtl::OStringBuffer aStrBuf( *arrOUS[0] ); - sal_Bool input = sal_True; + bool input = true; aStrBuf.append( input ); @@ -2776,7 +2776,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr46 ); ::rtl::OStringBuffer aStrBuf( *arrOUS[0] ); - sal_Bool input = sal_False; + bool input = false; aStrBuf.append( input ); @@ -2792,7 +2792,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr47 ); ::rtl::OStringBuffer aStrBuf( *arrOUS[1] ); - sal_Bool input = sal_True; + bool input = true; aStrBuf.append( input ); @@ -2808,7 +2808,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr48 ); ::rtl::OStringBuffer aStrBuf( *arrOUS[1] ); - sal_Bool input = sal_False; + bool input = false; aStrBuf.append( input ); @@ -2824,7 +2824,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr47 ); ::rtl::OStringBuffer aStrBuf( *arrOUS[2] ); - sal_Bool input = sal_True; + bool input = true; aStrBuf.append( input ); @@ -2840,7 +2840,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr48 ); ::rtl::OStringBuffer aStrBuf( *arrOUS[2] ); - sal_Bool input = sal_False; + bool input = false; aStrBuf.append( input ); @@ -2856,7 +2856,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr47 ); ::rtl::OStringBuffer aStrBuf( *arrOUS[3] ); - sal_Bool input = sal_True; + bool input = true; aStrBuf.append( input ); @@ -2872,7 +2872,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr48 ); ::rtl::OStringBuffer aStrBuf( *arrOUS[3] ); - sal_Bool input = sal_False; + bool input = false; aStrBuf.append( input ); @@ -2888,7 +2888,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr49 ); ::rtl::OStringBuffer aStrBuf( *arrOUS[4] ); - sal_Bool input = sal_True; + bool input = true; aStrBuf.append( input ); @@ -2904,7 +2904,7 @@ namespace rtl_OStringBuffer { OString expVal( kTestStr50 ); ::rtl::OStringBuffer aStrBuf( *arrOUS[4] ); - sal_Bool input = sal_False; + bool input = false; aStrBuf.append( input ); @@ -14224,7 +14224,7 @@ namespace rtl_OStringBuffer aStrBuf.append( input ); - sal_Bool bRes = expVal.equals( aStrBuf.getStr() ); + bool bRes = expVal.equals( aStrBuf.getStr() ); CPPUNIT_ASSERT_MESSAGE ( "input Int64 -9223372036854775808 and return OStringBuffer[0]+(-9223372036854775808)", diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx index 53a1f18a575f..1b5cf71c7d0b 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx @@ -78,7 +78,7 @@ sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ) } //------------------------------------------------------------------------ -sal_Bool cmpstr( const sal_Char* str1, const sal_Char* str2, sal_uInt32 len ) +bool cmpstr( const sal_Char* str1, const sal_Char* str2, sal_uInt32 len ) { const sal_Char* pBuf1 = str1; const sal_Char* pBuf2 = str2; @@ -93,11 +93,11 @@ sal_Bool cmpstr( const sal_Char* str1, const sal_Char* str2, sal_uInt32 len ) return( i == len ); } //----------------------------------------------------------------------- -sal_Bool cmpstr( const sal_Char* str1, const sal_Char* str2 ) +bool cmpstr( const sal_Char* str1, const sal_Char* str2 ) { const sal_Char* pBuf1 = str1; const sal_Char* pBuf2 = str2; - sal_Bool res = sal_True; + bool res = true; while ( (*pBuf1 == *pBuf2) && *pBuf1 !='\0' && *pBuf2 != '\0') { @@ -105,13 +105,13 @@ sal_Bool cmpstr( const sal_Char* str1, const sal_Char* str2 ) (pBuf2)++; } if (*pBuf1 == '\0' && *pBuf2 == '\0') - res = sal_True; + res = true; else - res = sal_False; + res = false; return (res); } //------------------------------------------------------------------------ -sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 len ) +bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 len ) { const sal_Unicode* pBuf1 = str1; const sal_Unicode* pBuf2 = str2; @@ -127,11 +127,11 @@ sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 l } //----------------------------------------------------------------------- -sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 ) +bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 ) { const sal_Unicode* pBuf1 = str1; const sal_Unicode* pBuf2 = str2; - sal_Bool res = sal_True; + bool res = true; while ( (*pBuf1 == *pBuf2) && *pBuf1 !='\0' && *pBuf2 != '\0') { @@ -139,9 +139,9 @@ sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 ) (pBuf2)++; } if (*pBuf1 == '\0' && *pBuf2 == '\0') - res = sal_True; + res = true; else - res = sal_False; + res = false; return (res); } diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.hxx b/sal/qa/OStringBuffer/rtl_String_Utils.hxx index a824ef9f5270..75e0bf6a9d4a 100644 --- a/sal/qa/OStringBuffer/rtl_String_Utils.hxx +++ b/sal/qa/OStringBuffer/rtl_String_Utils.hxx @@ -32,10 +32,10 @@ sal_Char* cpystr( sal_Char* dst, const sal_Char* src ); sal_Char* cpynstr( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ); -sal_Bool cmpstr( const sal_Char* str1, const sal_Char* str2, sal_uInt32 len ); -sal_Bool cmpstr( const sal_Char* str1, const sal_Char* str2 ); -sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 len ); -sal_Bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 ); +bool cmpstr( const sal_Char* str1, const sal_Char* str2, sal_uInt32 len ); +bool cmpstr( const sal_Char* str1, const sal_Char* str2 ); +bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2, sal_uInt32 len ); +bool cmpustr( const sal_Unicode* str1, const sal_Unicode* str2 ); sal_Char* createName( sal_Char* dst, const sal_Char* src, sal_uInt32 cnt ); @@ -44,7 +44,7 @@ sal_uInt32 AStringLen( const sal_Char *pAStr ); //------------------------------------------------------------------------ -sal_Bool AStringNIsValid( const sal_Char *pAStr, +bool AStringNIsValid( const sal_Char *pAStr, const sal_uInt32 nStrLen ); -- cgit