Kaydet (Commit) 1bb145fc authored tarafından Caolán McNamara's avatar Caolán McNamara

fix build

üst 63135c90
...@@ -211,9 +211,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe ...@@ -211,9 +211,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
#endif #endif
rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters); rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters);
OSL_ENSURE(bSuccess, OSL_ENSURE(bSuccess,
::rtl::OString("OXMLControlProperty::convertString: could not convert \"") ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \"").
+= ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+= ::rtl::OString("\" into a boolean!")); append("\" into a boolean!").getStr());
aReturn <<= bValue; aReturn <<= bValue;
} }
break; break;
...@@ -226,9 +226,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe ...@@ -226,9 +226,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
#endif #endif
rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters); rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess, OSL_ENSURE(bSuccess,
::rtl::OString("OXMLControlProperty::convertString: could not convert \"") ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \"").
+= ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) append(rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+= ::rtl::OString("\" 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
...@@ -248,9 +248,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe ...@@ -248,9 +248,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
#endif #endif
rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess, OSL_ENSURE(bSuccess,
::rtl::OString("OXMLControlProperty::convertString: could not convert \"") ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \"").
+= ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+= ::rtl::OString("\" into a double!")); append("\" into a double!").getStr());
aReturn <<= (double)nValue; aReturn <<= (double)nValue;
} }
break; break;
...@@ -279,9 +279,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe ...@@ -279,9 +279,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
#endif #endif
rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters); rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters);
OSL_ENSURE(bSuccess, OSL_ENSURE(bSuccess,
::rtl::OString("OPropertyImport::convertString: could not convert \"") ::rtl::OStringBuffer("OPropertyImport::convertString: could not convert \"").
+= ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US) append(rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+= ::rtl::OString("\" into a double!")); append("\" into a double!").getStr());
// then convert it into the target type // then convert it into the target type
switch (nType) switch (nType)
......
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