[Libreoffice-commits] core.git: codemaker/source

[Jan Holesovsky]

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

New commits:
commit 68ba6ddef50ec4aa92f55fa610c84c9f0d134e67
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Mon Jan 27 11:36:16 2014 +0100

    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

diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index d3898d9..7af4fb4 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();