1 files changed, 19 insertions, 24 deletions

diff --git a/binaryurp/source/reader.cxx b/binaryurp/source/reader.cxx
index d938a8e947fd..353c07e29722 100644
--- a/binaryurp/source/reader.cxx
+++ b/binaryurp/source/reader.cxx
@@ -24,6 +24,7 @@
 #include <memory>
 #include <vector>
 
+#include "boost/scoped_ptr.hpp"
 #include "com/sun/star/connection/XConnection.hpp"
 #include "com/sun/star/io/IOException.hpp"
 #include "com/sun/star/uno/Any.hxx"
@@ -54,8 +55,6 @@
 #include "specialfunctionids.hxx"
 #include "unmarshal.hxx"
 
-#include <boost/scoped_ptr.hpp>
-
 namespace binaryurp {
 
 namespace {
@@ -119,8 +118,7 @@ void Reader::execute() {
             header.done();
             if (count == 0) {
                 throw css::io::IOException(
-                    "binaryurp::Reader: block with zero message count"
-                    " received",
+                    "binaryurp::Reader: block with zero message count received",
                     css::uno::Reference< css::uno::XInterface >());
             }
             Unmarshal block(bridge_, state_, read(con, size, false));
@@ -158,8 +156,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
             if (((flags2 & 0x40) != 0) != forceSynchronous) {
                     // bit 6: SYNCHRONOUS
                 throw css::uno::RuntimeException(
-                    "URP: request message with MUSTREPLY != SYNCHRONOUS"
-                    " received",
+                    ("URP: request message with MUSTREPLY != SYNCHRONOUS"
+                     " received"),
                     css::uno::Reference< css::uno::XInterface >());
             }
         } else {
@@ -182,8 +180,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
     } else {
         if (!lastType_.is()) {
             throw css::uno::RuntimeException(
-                "URP: request message with NEWTYPE received when last"
-                " interface type has not yet been set",
+                ("URP: request message with NEWTYPE received when last"
+                 " interface type has not yet been set"),
                 css::uno::Reference< css::uno::XInterface >());
         }
         type = lastType_;
@@ -200,8 +198,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
     } else {
         if (lastOid_.isEmpty()) {
             throw css::uno::RuntimeException(
-                "URP: request message with NEWOID received when last"
-                " OID has not yet been set",
+                ("URP: request message with NEWOID received when last OID has"
+                 " not yet been set"),
                 css::uno::Reference< css::uno::XInterface >());
         }
         oid = lastOid_;
@@ -211,8 +209,7 @@ void Reader::readMessage(Unmarshal & unmarshal) {
     type.makeComplete();
     if (type.get()->eTypeClass != typelib_TypeClass_INTERFACE) {
         throw css::uno::RuntimeException(
-            "URP: request message with non-interface interface type"
-            " received",
+            "URP: request message with non-interface interface type received",
             css::uno::Reference< css::uno::XInterface >());
     }
     typelib_InterfaceTypeDescription * itd =
@@ -248,8 +245,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
     } else {
         if (forceSynchronous) {
             throw css::uno::RuntimeException(
-                "URP: synchronous request message with non-oneway"
-                " function ID received",
+                ("URP: synchronous request message with non-oneway function ID"
+                 " received"),
                 css::uno::Reference< css::uno::XInterface >());
         }
         synchronous = true;
@@ -302,8 +299,8 @@ void Reader::readMessage(Unmarshal & unmarshal) {
             break;
         default:
             throw css::uno::RuntimeException(
-                "URP: request message with UrpProtocolProperties OID"
-                " and unknown function ID received",
+                ("URP: request message with UrpProtocolProperties OID and"
+                 " unknown function ID received"),
                 css::uno::Reference< css::uno::XInterface >());
         }
     } else {
@@ -333,16 +330,15 @@ void Reader::readMessage(Unmarshal & unmarshal) {
                                           css::uno::XInterface > >::get())))))
                 {
                     throw css::uno::RuntimeException(
-                        "URP: queryInterface request message with"
-                        " unknown OID received",
+                        ("URP: queryInterface request message with unknown OID"
+                         " received"),
                         css::uno::Reference< css::uno::XInterface >());
                 }
             }
             break;
         case SPECIAL_FUNCTION_ID_RESERVED:
             throw css::uno::RuntimeException(
-                "URP: request message with unknown function ID 1"
-                " received",
+                "URP: request message with unknown function ID 1 received",
                 css::uno::Reference< css::uno::XInterface >());
         case SPECIAL_FUNCTION_ID_RELEASE:
             break;
@@ -429,8 +425,7 @@ void Reader::readReplyMessage(Unmarshal & unmarshal, sal_uInt8 flags1) {
             }
             if (!ok) {
                 throw css::uno::RuntimeException(
-                    "URP: reply message with bad exception type"
-                    " received",
+                    "URP: reply message with bad exception type received",
                     css::uno::Reference< css::uno::XInterface >());
             }
         }
@@ -502,8 +497,8 @@ rtl::ByteSequence Reader::getTid(Unmarshal & unmarshal, bool newTid) const {
     }
     if (lastTid_.getLength() == 0) {
         throw css::uno::RuntimeException(
-            "URP: message with NEWTID received when last TID has not"
-            " yet been set",
+            ("URP: message with NEWTID received when last TID has not yet been"
+             " set"),
             css::uno::Reference< css::uno::XInterface >());
     }
     return lastTid_;