[Libreoffice-commits] .: reportdesign/source

[Caolán McNamara]

 reportdesign/source/filter/xml/xmlControlProperty.cxx |   24 +++++++++---------
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 1bb145fc8095ca347f2bbea8e381ad9672ee39c4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Oct 5 11:07:27 2011 +0100

    fix build

diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index 8a7776c..848ce3b 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -211,9 +211,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
         #endif
             rImporter.GetMM100UnitConverter().convertBool(bValue, _rReadCharacters);
             OSL_ENSURE(bSuccess,
-                    ::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
-                +=  ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-                +=  ::rtl::OString("\" into a boolean!"));
+                    ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \"").
+                append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+                append("\" into a boolean!").getStr());
             aReturn <<= bValue;
         }
         break;
@@ -226,9 +226,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
         #endif
                 rImporter.GetMM100UnitConverter().convertNumber(nValue, _rReadCharacters);
                 OSL_ENSURE(bSuccess,
-                        ::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
-                    +=  ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-                    +=  ::rtl::OString("\" into an integer!"));
+                        ::rtl::OStringBuffer("OXMLControlProperty::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
@@ -248,9 +248,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
         #endif
             rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters);
             OSL_ENSURE(bSuccess,
-                    ::rtl::OString("OXMLControlProperty::convertString: could not convert \"")
-                +=  ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-                +=  ::rtl::OString("\" into a double!"));
+                    ::rtl::OStringBuffer("OXMLControlProperty::convertString: could not convert \"").
+                append(::rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+                append("\" into a double!").getStr());
             aReturn <<= (double)nValue;
         }
         break;
@@ -279,9 +279,9 @@ Any OXMLControlProperty::convertString(const ::com::sun::star::uno::Type& _rExpe
                 #endif
                     rImporter.GetMM100UnitConverter().convertDouble(nValue, _rReadCharacters);
                     OSL_ENSURE(bSuccess,
-                            ::rtl::OString("OPropertyImport::convertString: could not convert \"")
-                        +=  ::rtl::OString(_rReadCharacters.getStr(), _rReadCharacters.getLength(), RTL_TEXTENCODING_ASCII_US)
-                        +=  ::rtl::OString("\" into a double!"));
+                            ::rtl::OStringBuffer("OPropertyImport::convertString: could not convert \"").
+                        append(rtl::OUStringToOString(_rReadCharacters, RTL_TEXTENCODING_ASCII_US)).
+                        append("\" into a double!").getStr());
 
                     // then convert it into the target type
                     switch (nType)