From e50ef195bc95f3f410119f623928382cb88b45d2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 1 Jul 2014 15:45:52 +0200
Subject: New loplugin:stringconcat

Change-Id: Id7c517fb37bc28797c45fc0dde83e866f2aa4aac
---
 codemaker/source/cppumaker/cpputype.cxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'codemaker')

diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 5e166fa33bc5..83d0a41033a7 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -2562,7 +2562,7 @@ void PolyStructType::dumpComprehensiveGetCppuType(FileStream & out) {
     dec();
     out << indent() << "}\n";
     dec();
-    out << indent() << "};\n" << " }" << " }\n\n";
+    out << indent() << "};\n } }\n\n";
     dumpGetCppuTypePreamble(out);
     out << indent() << "return *detail::" << staticTypeClass;
     dumpTemplateParameters(out);
@@ -3785,8 +3785,7 @@ void SingletonType::dumpHxxFile(
     inc();
     o << indent() << "assert(the_context.is());\n" << indent()
       << "::css::uno::Reference< " << scopedBaseName
-      << " > instance;\n"
-      << ("#if defined LO_URE_CURRENT_ENV && defined "
+      << (" > instance;\n#if defined LO_URE_CURRENT_ENV && defined "
           "LO_URE_CTOR_ENV_")
       << name_.replaceAll(".", "_dot_")
       << " && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_"
@@ -3803,7 +3802,7 @@ void SingletonType::dumpHxxFile(
                       " ::css::uno::UNO_QUERY);\n#else\n")
       << indent() << ("the_context->getValueByName("
           "::rtl::OUString( \"/singletons/")
-      << name_ << "\" )) >>= instance;\n" << "#endif\n"
+      << name_ << "\" )) >>= instance;\n#endif\n"
       << indent() << "if (!instance.is()) {\n";
     inc();
     o << indent()
-- 
cgit