connectivity/source/drivers/macab/MacabAddressBook.cxx | 2 +-
connectivity/source/drivers/macab/MacabPreparedStatement.cxx | 2 +-
connectivity/source/drivers/macab/MacabRecord.cxx | 4 ++--
connectivity/source/drivers/macab/MacabRecords.cxx | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit ecae2b16c1d82de9434208262e09831de6d55391
Author: Tor Lillqvist <t...@iki.fi>
Date: Wed Aug 21 16:48:17 2013 +0300
WaE: 'valueOf' is deprecated
Change-Id: I9e7e0872eeb5011b79648e1fca436d09304c44ef
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx
b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index b337f4c..1ba152e 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -237,7 +237,7 @@ void
MacabAddressBook::manageDuplicateGroups(::std::vector<MacabGroup *> _xGroup
{
OUString sName = (*iter1)->getName();
sName += OUString(" (") +
- OUString::valueOf(count) +
+ OUString::number(count) +
OUString(")");
(*iter1)->setName(sName);
}
diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index 152bd3f..1072dacb 100644
--- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -328,7 +328,7 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32
parameterIndex, const
{
const OUString sError(
m_pConnection->getResources().getResourceStringWithSubstitution(
STR_UNKNOWN_PARA_TYPE,
- "$position$", OUString::valueOf(parameterIndex)
+ "$position$", OUString::number(parameterIndex)
) );
::dbtools::throwGenericSQLException(sError,*this);
}
diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx
b/connectivity/source/drivers/macab/MacabRecord.cxx
index b814b44..2ebd786 100644
--- a/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -316,7 +316,7 @@ OUString MacabRecord::fieldToString(const macabfield
*_aField)
// Should we check for the wrong type here, e.g., a float?
sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef)
_aField->value, numberType, &nVal);
if(m_bSuccess != sal_False)
- fieldString = OUString::valueOf(nVal);
+ fieldString = OUString::number(nVal);
}
break;
case kABRealProperty:
@@ -326,7 +326,7 @@ OUString MacabRecord::fieldToString(const macabfield
*_aField)
// Should we check for the wrong type here, e.g., an int?
sal_Bool m_bSuccess = !CFNumberGetValue((CFNumberRef)
_aField->value, numberType, &nVal);
if(m_bSuccess != sal_False)
- fieldString = OUString::valueOf(nVal);
+ fieldString = OUString::number(nVal);
}
break;
default:
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx
b/connectivity/source/drivers/macab/MacabRecords.cxx
index 1f4769b..2efea4e 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -761,7 +761,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const
ABPropertyType _propert
{
arrValue = (CFTypeRef) CFArrayGetValueAtIndex(
(CFArrayRef) _propertyValue, i);
arrType = (ABPropertyType) getABTypeFromCFType(
CFGetTypeID(arrValue) );
- arrLabelString = propertyNameString + OUString::valueOf(i);
+ arrLabelString = propertyNameString + OUString::number(i);
arrLabel = OUStringToCFString(arrLabelString);
arrHeaders[i] = createHeaderForProperty(arrType, arrValue,
arrLabel);
if (!arrHeaders[i])
@@ -836,7 +836,7 @@ void MacabRecords::manageDuplicateHeaders(macabfield
**_headerNames, const sal_I
// There is probably a better way to do this...
OUString newName = CFStringToOUString((CFStringRef)
_headerNames[i]->value);
CFRelease(_headerNames[i]->value);
- newName += OUString(" (") + OUString::valueOf(count) +
OUString(")");
+ newName += OUString(" (") + OUString::number(count) +
OUString(")");
_headerNames[i]->value = OUStringToCFString(newName);
}
}
@@ -957,7 +957,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const
ABPropertyType _propertyT
{
bPlaced = sal_False;
i++;
- columnName = OUString(_propertyName) + OUString(" (")
+ OUString::valueOf(i) + OUString(")");
+ columnName = OUString(_propertyName) + OUString(" (")
+ OUString::number(i) + OUString(")");
}
// success!
@@ -986,7 +986,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const
ABPropertyType _propertyT
for(i = 0; i < arrLength; i++)
{
arrValue = CFArrayGetValueAtIndex( (CFArrayRef)
_propertyValue, i);
- newPropertyName = _propertyName + OUString::valueOf(i);
+ newPropertyName = _propertyName + OUString::number(i);
insertPropertyIntoMacabRecord(_abrecord, _header,
newPropertyName, arrValue);
CFRelease(arrValue);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
