diff options
author | Ricardo Montania <ricardo@linuxafundo.com.br> | 2012-08-18 15:05:22 -0300 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-08-22 16:45:38 +0200 |
commit | e47fe5cc409b4df2ee3ae58ecf911c1e155bf2e7 (patch) | |
tree | ca84fedff1af17c7f42cea8c2ca3f4b74c41d0ee /binaryurp/source/unmarshal.cxx | |
parent | 438f5023c3f22b521974c6a1bb4d53b59255b724 (diff) |
Change rtl::OUString to OUString
My first commit. Any problem, question, warnings, please tell me.
Change-Id: Ibb02fe15776f3ffe74ddb9488c63a45c447bb493
Diffstat (limited to 'binaryurp/source/unmarshal.cxx')
-rw-r--r-- | binaryurp/source/unmarshal.cxx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/binaryurp/source/unmarshal.cxx b/binaryurp/source/unmarshal.cxx index 462efad110d1..13cd07ca1d45 100644 --- a/binaryurp/source/unmarshal.cxx +++ b/binaryurp/source/unmarshal.cxx @@ -146,7 +146,7 @@ css::uno::TypeDescription Unmarshal::readType() { case typelib_TypeClass_ANY: if ((flags & 0x80) != 0) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: cache flag of simple type is" " set")), @@ -165,7 +165,7 @@ css::uno::TypeDescription Unmarshal::readType() { if ((flags & 0x80) == 0) { if (idx == cache::ignore || !state_.typeCache[idx].is()) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: unknown type cache" " index")), @@ -173,14 +173,14 @@ css::uno::TypeDescription Unmarshal::readType() { } return state_.typeCache[idx]; } else { - rtl::OUString const str(readString()); + OUString const str(readString()); css::uno::TypeDescription t(str); if (!t.is() || t.get()->eTypeClass != static_cast< typelib_TypeClass >(tc)) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: type with unknown" " name: ")) + str, @@ -195,7 +195,7 @@ css::uno::TypeDescription Unmarshal::readType() { t2.get())->pType); if (!t2.is()) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: sequence type with" " unknown component type")), @@ -205,7 +205,7 @@ css::uno::TypeDescription Unmarshal::readType() { case typelib_TypeClass_VOID: case typelib_TypeClass_EXCEPTION: throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: sequence type with" " bad component type")), @@ -222,19 +222,19 @@ css::uno::TypeDescription Unmarshal::readType() { } default: throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: type of unknown type class")), css::uno::Reference< css::uno::XInterface >()); } } -rtl::OUString Unmarshal::readOid() { - rtl::OUString oid(readString()); +OUString Unmarshal::readOid() { + OUString oid(readString()); for (sal_Int32 i = 0; i != oid.getLength(); ++i) { if (oid[i] > 0x7F) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: OID contains non-ASCII" " character")), @@ -245,7 +245,7 @@ rtl::OUString Unmarshal::readOid() { if (oid.isEmpty() && idx != cache::ignore) { if (state_.oidCache[idx].isEmpty()) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: unknown OID cache index")), css::uno::Reference< css::uno::XInterface >()); @@ -271,7 +271,7 @@ rtl::ByteSequence Unmarshal::readTid() { if (tid.getLength() == 0) { if (idx == cache::ignore || state_.tidCache[idx].getLength() == 0) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: unknown TID cache index")), css::uno::Reference< css::uno::XInterface >()); @@ -297,7 +297,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) { sal_uInt8 v = read8(); if (v > 1) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: boolean of unknown value")), css::uno::Reference< css::uno::XInterface >()); @@ -332,7 +332,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) { } case typelib_TypeClass_STRING: { - rtl::OUString v(readString()); + OUString v(readString()); return BinaryAny(type, &v.pData); } case typelib_TypeClass_TYPE: @@ -346,7 +346,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) { css::uno::TypeDescription t(readType()); if (t.get()->eTypeClass == typelib_TypeClass_ANY) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: any of type ANY")), css::uno::Reference< css::uno::XInterface >()); @@ -371,7 +371,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) { } if (!found) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: unknown enum value")), css::uno::Reference< css::uno::XInterface >()); @@ -404,7 +404,7 @@ BinaryAny Unmarshal::readValue(css::uno::TypeDescription const & type) { void Unmarshal::done() const { if (data_ != end_) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: block contains excess data")), css::uno::Reference< css::uno::XInterface >()); @@ -414,7 +414,7 @@ void Unmarshal::done() const { void Unmarshal::check(sal_Int32 size) const { if (end_ - data_ < size) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: trying to read past end of block")), css::uno::Reference< css::uno::XInterface >()); @@ -430,7 +430,7 @@ sal_uInt16 Unmarshal::readCacheIndex() { sal_uInt16 idx = read16(); if (idx >= cache::size && idx != cache::ignore) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: cache index out of range")), css::uno::Reference< css::uno::XInterface >()); @@ -450,17 +450,17 @@ sal_uInt64 Unmarshal::read64() { return n | *data_++; } -rtl::OUString Unmarshal::readString() { +OUString Unmarshal::readString() { sal_uInt32 n = readCompressed(); if (n > SAL_MAX_INT32) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: string size too large")), css::uno::Reference< css::uno::XInterface >()); } check(static_cast< sal_Int32 >(n)); - rtl::OUString s; + OUString s; if (!rtl_convertStringToUString( &s.pData, reinterpret_cast< char const * >(data_), static_cast< sal_Int32 >(n), RTL_TEXTENCODING_UTF8, @@ -469,7 +469,7 @@ rtl::OUString Unmarshal::readString() { RTL_TEXTTOUNICODE_FLAGS_INVALID_ERROR))) { throw css::io::IOException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: string does not contain UTF-8")), css::uno::Reference< css::uno::XInterface >()); @@ -483,7 +483,7 @@ BinaryAny Unmarshal::readSequence(css::uno::TypeDescription const & type) { sal_uInt32 n = readCompressed(); if (n > SAL_MAX_INT32) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: sequence size too large")), css::uno::Reference< css::uno::XInterface >()); @@ -513,7 +513,7 @@ BinaryAny Unmarshal::readSequence(css::uno::TypeDescription const & type) { // sal_uInt32 * sal_Int32 -> sal_uInt64 cannot overflow if (size > SAL_MAX_SIZE - SAL_SEQUENCE_HEADER_SIZE) { throw css::uno::RuntimeException( - rtl::OUString( + OUString( RTL_CONSTASCII_USTRINGPARAM( "binaryurp::Unmarshal: sequence size too large")), css::uno::Reference< css::uno::XInterface >()); |