From 68ba6ddef50ec4aa92f55fa610c84c9f0d134e67 Mon Sep 17 00:00:00 2001
From: Jan Holesovsky <kendy@collabora.com>
Date: Mon, 27 Jan 2014 11:36:16 +0100
Subject: [PATCH] codemaker: Allow compiler to share these generated strings.

There is really no need to see tons of

component context fails to supply service <something long> of type <something else long>:

and

component context fails to supply service <something long> of type <something else long>

in the binary ;-) - let's split the strings to parts that the linker can
share easily.

Change-Id: I07f149a587c05985045028c3b6530c6efd081ff5
---
 codemaker/source/cppumaker/cpputype.cxx | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index d3898d993b1b..7af4fb4b32d9 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3484,9 +3484,11 @@ void ServiceType::dumpHxxFile(
                 o << indent()
                   << ("throw ::css::uno::DeploymentException("
                       "::rtl::OUString( "
-                      "\"component context fails to supply service ")
-                  << name_ << " of type " << baseName
-                  << ": \" ) + the_exception.Message, the_context);\n";
+                      "\"component context fails to supply service \" ) + ")
+                  << "\"" << name_ << "\" + "
+                  << "\" of type \" + "
+                  << "\"" << baseName << "\" + "
+                  << "\": \" + the_exception.Message, the_context);\n";
                 dec();
                 o << indent() << "}\n" << indent()
                   << "if (!the_instance.is()) {\n";
@@ -3494,9 +3496,11 @@ void ServiceType::dumpHxxFile(
                 o << indent()
                   << ("throw ::css::uno::DeploymentException("
                       "::rtl::OUString( "
-                      "\"component context fails to supply service ")
-                  << name_ << " of type " << baseName
-                  << "\" ), the_context);\n";
+                      "\"component context fails to supply service \" ) + ")
+                  << "\"" << name_ << "\" + "
+                  << "\" of type \" + "
+                  << "\"" << baseName << "\""
+                  << ", the_context);\n";
                 dec();
                 o << indent() << "}\n" << indent() << "return the_instance;\n";
                 dec();