strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Strings: boolean() as a replacement for valueOf(sal_Bool)

Browse source 
valueOf(?) has been superseded by number(?).
O(U)String::valueOf(sal_Bool) has been deprecated without providing an
alternative method. Use boolean() method as a replacement for it.

Change-Id: I7eb74574fa8f1a3cf007cb0cbc32e681007ffb92
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
David Ostrovsky 2013-02-04 11:40:14 +01:00 committed by Stephan Bergmann
parent 55576105d3
commit 751950edc8
4 changed files with 44 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sal/inc/rtl/string.hxx
View file

@ -1490,9 +1490,25 @@ public:
@param b a sal_Bool.
@return a string with the string representation of the argument.
@deprecated there is no replacement, use 'condition ? OString( "true" ) : OString( "false" )'
@deprecated use boolean()
*/
SAL_DEPRECATED_INTERNAL("write explicit code") static OString valueOf( sal_Bool b ) SAL_THROW(())
SAL_DEPRECATED_INTERNAL("use boolean()") static OString valueOf( sal_Bool b ) SAL_THROW(())
{
return boolean(b);
}
/**
Returns the string representation of the boolean argument.
If the sal_Bool is true, the string "true" is returned.
If the sal_Bool is false, the string "false" is returned.
This function can't be used for language specific conversion.
@param b a sal_Bool.
@return a string with the string representation of the argument.
@since LibreOffice 4.1
*/
static OString boolean( sal_Bool b ) SAL_THROW(())
{
sal_Char aBuf[RTL_STR_MAX_VALUEOFBOOLEAN];
rtl_String* pNewData = 0;

20
sal/inc/rtl/ustring.hxx
View file

@ -2141,9 +2141,25 @@ public:
@param b a sal_Bool.
@return a string with the string representation of the argument.
@deprecated there is no replacement, use 'condition ? OString( "true" ) : OString( "false" )'
@deprecated use boolean()
*/
SAL_DEPRECATED_INTERNAL("write explicit condition") static OUString valueOf( sal_Bool b ) SAL_THROW(())
SAL_DEPRECATED_INTERNAL("use boolean()") static OUString valueOf( sal_Bool b ) SAL_THROW(())
{
return boolean(b);
}
/**
Returns the string representation of the boolean argument.
If the sal_Bool is true, the string "true" is returned.
If the sal_Bool is false, the string "false" is returned.
This function can't be used for language specific conversion.
@param b a sal_Bool.
@return a string with the string representation of the argument.
@since LibreOffice 4.1
*/
static OUString boolean( sal_Bool b ) SAL_THROW(())
{
sal_Unicode aBuf[RTL_USTR_MAX_VALUEOFBOOLEAN];
rtl_uString* pNewData = 0;

8
sal/qa/rtl_strings/rtl_OString.cxx
View file

@ -1785,9 +1785,9 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_trim(
//------------------------------------------------------------------------
// testing the method valueOf( sal_Bool b )
// testing the method boolean( sal_Bool b )
//------------------------------------------------------------------------
sal_Bool SAL_CALL test_rtl_OString_valueOf_sal_Bool(
sal_Bool SAL_CALL test_rtl_OString_boolean(
hTestResult hRtlTestResult )
{
sal_Char methName[MAXBUFLENGTH];
@ -1813,7 +1813,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_sal_Bool(
for(i = 0; i < (sizeof (arrTestCase))/(sizeof (TestCase)); i++)
{
::rtl::OString aStr1;
aStr1 = aStr1.valueOf( arrTestCase[i].input1 );
aStr1 = aStr1.boolean( arrTestCase[i].input1 );
sal_Bool lastRes = (arrTestCase[i].expVal->compareTo(aStr1) == 0);
c_rtl_tres_state
@ -2446,7 +2446,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OString_valueOf(
hTestResult hRtlTestResult )
{
c_rtl_tres_state_start(hRtlTestResult, "valueOf");
sal_Bool bTState = test_rtl_OString_valueOf_sal_Bool( hRtlTestResult );
sal_Bool bTState = test_rtl_OString_boolean( hRtlTestResult );
bTState &= test_rtl_OString_valueOf_sal_Char( hRtlTestResult );

8
sal/qa/rtl_strings/rtl_OUString.cxx
View file

@ -1262,9 +1262,9 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_compareToAscii(
//------------------------------------------------------------------------
// testing the method valueOf( sal_Bool b )
// testing the method boolean( sal_Bool b )
//------------------------------------------------------------------------
extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_valueOf_sal_Bool(
extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_boolean(
hTestResult hRtlTestResult )
{
c_rtl_tres_state_start( hRtlTestResult, "Bool");
@ -1300,7 +1300,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString_valueOf_sal_Bool(
for(i=0;i<(sizeof(arrTestCase))/(sizeof(TestCase));i++)
{
sal_Bool lastRes=(*arrTestCase[i].expVal==
OUString::valueOf(arrTestCase[i].input1)
OUString::boolean(arrTestCase[i].input1)
);
@ -3347,7 +3347,7 @@ extern "C" void /* sal_Bool */ SAL_CALL test_rtl_OUString( hTestResult hRtlTestR
test_rtl_OUString_equalsAscii( hRtlTestResult );
test_rtl_OUString_equalsAsciiL( hRtlTestResult );
test_rtl_OUString_compareToAscii( hRtlTestResult );
test_rtl_OUString_valueOf_sal_Bool( hRtlTestResult );
test_rtl_OUString_boolean( hRtlTestResult );
test_rtl_OUString_valueOf_sal_Unicode( hRtlTestResult );
test_rtl_OUString_valueOf( hRtlTestResult );
test_rtl_OUString_createFromAscii( hRtlTestResult );