Kaydet (Commit) 47d95d75 authored tarafından Michael Stahl's avatar Michael Stahl

OXMLDataSourceSetting::convertString: try to make Clang tb happy

Change-Id: I8b2509f28206fd5b6c20c88d9186a9a18f76f7a5
üst 92376b09
...@@ -178,13 +178,11 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx ...@@ -178,13 +178,11 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx
case TypeClass_BOOLEAN: // sal_Bool case TypeClass_BOOLEAN: // sal_Bool
{ {
bool bValue(false); bool bValue(false);
#if OSL_DEBUG_LEVEL > 0 bool const bSuccess =
sal_Bool bSuccess =
#endif
::sax::Converter::convertBool(bValue, _rReadCharacters); ::sax::Converter::convertBool(bValue, _rReadCharacters);
OSL_ENSURE(bSuccess, OString(OString("OXMLDataSourceSetting::convertString: could not convert \"") + SAL_WARN_IF(!bSuccess, "dbaccess",
OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US) + "OXMLDataSourceSetting::convertString: could not convert \""
OString("\" into a boolean!")).getStr()); << _rReadCharacters << "\" into a boolean!");
aReturn <<= bValue; aReturn <<= bValue;
} }
break; break;
...@@ -192,14 +190,11 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx ...@@ -192,14 +190,11 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx
case TypeClass_LONG: // sal_Int32 case TypeClass_LONG: // sal_Int32
{ // it's a real int32/16 property { // it's a real int32/16 property
sal_Int32 nValue(0); sal_Int32 nValue(0);
#if OSL_DEBUG_LEVEL > 0 bool const bSuccess =
sal_Bool bSuccess =
#endif
::sax::Converter::convertNumber(nValue, _rReadCharacters); ::sax::Converter::convertNumber(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess, SAL_WARN_IF(!bSuccess, "dbaccess",
::rtl::OStringBuffer("OXMLDataSourceSetting::convertString: could not convert \"") "OXMLDataSourceSetting::convertString: could not convert \""
.append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)) << _rReadCharacters << "\" into an integer!");
.append("\" into an integer!").getStr());
if (TypeClass_SHORT == _rExpectedType.getTypeClass()) if (TypeClass_SHORT == _rExpectedType.getTypeClass())
aReturn <<= (sal_Int16)nValue; aReturn <<= (sal_Int16)nValue;
else else
...@@ -214,14 +209,11 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx ...@@ -214,14 +209,11 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx
case TypeClass_DOUBLE: case TypeClass_DOUBLE:
{ {
double nValue = 0.0; double nValue = 0.0;
#if OSL_DEBUG_LEVEL > 0 bool const bSuccess =
sal_Bool bSuccess =
#endif
::sax::Converter::convertDouble(nValue, _rReadCharacters); ::sax::Converter::convertDouble(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess, SAL_WARN_IF(!bSuccess, "dbaccess",
::rtl::OStringBuffer("OXMLDataSourceSetting::convertString: could not convert \"") "OXMLDataSourceSetting::convertString: could not convert \""
.append(rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)) << _rReadCharacters << "\" into a double!");
.append("\" into a double!").getStr());
aReturn <<= (double)nValue; aReturn <<= (double)nValue;
} }
break; break;
...@@ -229,7 +221,8 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx ...@@ -229,7 +221,8 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx
aReturn <<= _rReadCharacters; aReturn <<= _rReadCharacters;
break; break;
default: default:
OSL_FAIL("OXMLDataSourceSetting::convertString: invalid type class!"); SAL_WARN("dbaccess",
"OXMLDataSourceSetting::convertString: invalid type class!");
} }
return aReturn; return aReturn;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment