diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-10-05 10:40:50 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-05 10:41:04 +0100 |
commit | 9a8593e69f2d2d2f6fc25d7239cbcdebbf3711ae (patch) | |
tree | f6a4bc54682692999d575b29d69b81b49eb19b00 /dbaccess | |
parent | Don't package libcmis that we link statically (diff) | |
download | core-9a8593e69f2d2d2f6fc25d7239cbcdebbf3711ae.tar.gz core-9a8593e69f2d2d2f6fc25d7239cbcdebbf3711ae.zip |
ByteString->rtl::OStringBuffer
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/core/recovery/dbdocrecovery.cxx | 2 | ||||
-rw-r--r-- | dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 19 | ||||
-rw-r--r-- | dbaccess/source/ui/browser/exsrcbrw.cxx | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 42040e4b7ae2..2e754436d730 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -398,7 +398,7 @@ namespace dbaccess message.append( "' not found in '" ); message.append( ::rtl::OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) ); message.append( "', but required per map file!" ); - OSL_FAIL( message.makeStringAndClear() ); + OSL_FAIL( message.getStr() ); #endif continue; } diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index c004e7b62534..1e16bfc0f3ab 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -37,6 +37,7 @@ #include <xmloff/nmspmap.hxx> #include "xmlEnums.hxx" #include "xmlstrings.hrc" +#include <rtl/strbuf.hxx> #include <tools/debug.hxx> namespace dbaxml @@ -194,9 +195,9 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx #endif rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a boolean!")); + ::rtl::OStringBuffer("OXMLDataSourceSetting::convertString: could not convert \"") + .append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)) + .append("\" into a boolean!").getStr()); aReturn <<= bValue; } break; @@ -209,9 +210,9 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx #endif rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into an integer!")); + ::rtl::OStringBuffer("OXMLDataSourceSetting::convertString: could not convert \"") + .append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)) + .append("\" into an integer!").getStr()); if (TypeClass_SHORT == _rExpectedType.getTypeClass()) aReturn <<= (sal_Int16)nValue; else @@ -231,9 +232,9 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx #endif rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); OSL_ENSURE(bSuccess, - ::rtl::OString("OXMLDataSourceSetting::convertString: could not convert \"") - += ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) - += ::rtl::OString("\" into a double!")); + ::rtl::OStringBuffer("OXMLDataSourceSetting::convertString: could not convert \"") + .append(rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)) + .append("\" into a double!").getStr()); aReturn <<= (double)nValue; } break; diff --git a/dbaccess/source/ui/browser/exsrcbrw.cxx b/dbaccess/source/ui/browser/exsrcbrw.cxx index a77874dba461..1328027ec22e 100644 --- a/dbaccess/source/ui/browser/exsrcbrw.cxx +++ b/dbaccess/source/ui/browser/exsrcbrw.cxx @@ -186,7 +186,7 @@ void SAL_CALL SbaExternalSourceBrowser::dispatch(const ::com::sun::star::util::U aControlProps = *(Sequence< ::com::sun::star::beans::PropertyValue>*)pArguments->Value.getValue(); } else - OSL_FAIL(((ByteString("SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (") += ByteString((const sal_Unicode*)pArguments->Name, gsl_getSystemTextEncoding()).GetBuffer()) += ") !").GetBuffer()); + OSL_FAIL(rtl::OStringBuffer("SbaExternalSourceBrowser::dispatch(AddGridColumn) : unknown argument (").append(rtl::OUStringToOString(pArguments->Name, gsl_getSystemTextEncoding())).append(") !").getStr()); } if (!sControlType.getLength()) { |