fix build for compilers supporting user-defined literals

User defined literals (http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2378.pdf)
are already available in gcc 4.7 and clang 3.1 and this results in problems in code
where literal strings are concatenated without any whitespace inbetween.

desktop/source/migration/services/jvmfwk.cxx

@@ -324,7 +324,7 @@ void JavaMigration::migrateJavarc()
         return;
 
     OUString sValue;
-    rtl::Bootstrap javaini(m_sUserDir + OUSTR("/user/config/"SAL_CONFIGFILE("java")));
+    rtl::Bootstrap javaini(m_sUserDir + OUSTR( "/user/config/" SAL_CONFIGFILE("java")));
     sal_Bool bSuccess = javaini.getFrom(OUSTR("Home"), sValue);
     OSL_ENSURE(bSuccess, "[Service implementation " IMPL_NAME
                        "] XJob::execute: Could not get Home entry from java.ini/javarc.");

desktop/source/pkgchk/unopkg/unopkg_app.cxx

@@ -269,7 +269,7 @@ extern "C" int unopkg_main()
             return 0;
         }
         else if (isOption( info_version, &nPos )) {
-            dp_misc::writeConsole("\n"APP_NAME" Version 3.3\n");
+            dp_misc::writeConsole( "\n" APP_NAME " Version 3.3\n");
             return 0;
         }
         //consume all bootstrap variables which may occur before the subcommannd
@@ -649,7 +649,7 @@ extern "C" int unopkg_main()
         }
 
         if (option_verbose)
-            dp_misc::writeConsole(OUSTR("\n"APP_NAME" done.\n"));
+            dp_misc::writeConsole( OUSTR( "\n" APP_NAME " done.\n"));
         //Force to release all bridges which connect us to the child processes
         disposeBridges(xLocalComponentContext);
         return 0;
@@ -661,7 +661,7 @@ extern "C" int unopkg_main()
     }
     catch (ucb::CommandAbortedException &)
     {
-        dp_misc::writeConsoleError("\n"APP_NAME" aborted!\n");
+        dp_misc::writeConsoleError( "\n" APP_NAME " aborted!\n");
     }
     catch (deployment::DeploymentException & exc)
     {
@@ -699,7 +699,7 @@ extern "C" int unopkg_main()
             OUSTR("\n"));
     }
     if (!bNoOtherErrorMsg)
-        dp_misc::writeConsoleError("\n"APP_NAME" failed.\n");
+        dp_misc::writeConsoleError( "\n" APP_NAME " failed.\n");
     disposeBridges(xLocalComponentContext);
     return 1;
 }

filter/source/graphicfilter/ieps/ieps.cxx

@@ -204,7 +204,7 @@ static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &r
     TempFile aTemp;
     aTemp.EnableKillingFile();
     rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pstoedit"EXESUFFIX));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "pstoedit" EXESUFFIX));
     rtl::OUString arg1 =
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-f"));
     rtl::OUString arg2 =
@@ -305,7 +305,7 @@ static bool RenderAsPNGThroughConvert(const sal_uInt8* pBuf, sal_uInt32 nBytesRe
     Graphic &rGraphic)
 {
     rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("convert"EXESUFFIX));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "convert" EXESUFFIX));
     // density in pixel/inch
     rtl::OUString arg1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-density"));
     // since the preview is also used for PDF-Export & printing on non-PS-printers,
@@ -328,10 +328,10 @@ static bool RenderAsPNGThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
 {
 #ifdef WNT
     rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gswin32c"EXESUFFIX));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "gswin32c" EXESUFFIX));
 #else
     rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gs"EXESUFFIX));
+            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "gs" EXESUFFIX));
 #endif
     rtl::OUString arg1 =
             rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-q"));

i18npool/source/indexentry/indexentrysupplier_asian.cxx

@@ -41,9 +41,9 @@ IndexEntrySupplier_asian::IndexEntrySupplier_asian(
 {
     implementationName = "com.sun.star.i18n.IndexEntrySupplier_asian";
 #ifdef SAL_DLLPREFIX
-    OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "index_data" SAL_DLLEXTENSION);
 #else
-    OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii("index_data" SAL_DLLEXTENSION);
 #endif
     hModule = osl_loadModuleRelative(
         &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );

i18npool/source/textconversion/textconversion.cxx

@@ -37,9 +37,9 @@ extern "C" { static void SAL_CALL thisModule() {} }
 TextConversion::TextConversion()
 {
 #ifdef SAL_DLLPREFIX
-    OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"textconv_dict"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "textconv_dict" SAL_DLLEXTENSION);
 #else
-    OUString lib=OUString::createFromAscii("textconv_dict"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii( "textconv_dict" SAL_DLLEXTENSION);
 #endif
     hModule = osl_loadModuleRelative(
         &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );

i18npool/source/transliteration/textToPronounce_zh.cxx

@@ -144,9 +144,9 @@ extern "C" { static void SAL_CALL thisModule() {} }
 TextToPronounce_zh::TextToPronounce_zh(const sal_Char* func_name)
 {
 #ifdef SAL_DLLPREFIX
-    OUString lib=OUString::createFromAscii(SAL_DLLPREFIX"index_data"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii( SAL_DLLPREFIX "index_data" SAL_DLLEXTENSION);
 #else
-    OUString lib=OUString::createFromAscii("index_data"SAL_DLLEXTENSION);
+    OUString lib=OUString::createFromAscii( "index_data" SAL_DLLEXTENSION);
 #endif
     hModule = osl_loadModuleRelative(
         &thisModule, lib.pData, SAL_LOADMODULE_DEFAULT );

jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx

@@ -498,7 +498,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
             sRuntimeLib, osl_getThreadTextEncoding());
         rtl::OString sSymbol = rtl::OUStringToOString(
             sSymbolCreateJava, osl_getThreadTextEncoding());
-        fprintf(stderr,"[Java framework]sunjavaplugin"SAL_DLLEXTENSION
+        fprintf(stderr,"[Java framework]sunjavaplugin" SAL_DLLEXTENSION
                 "Java runtime library: %s does not export symbol %s !\n",
                 sLib.getStr(), sSymbol.getStr());
         return JFW_PLUGIN_E_VM_CREATION_FAILED;
@@ -589,13 +589,13 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
         rtl::OUString message;
         if( err < 0)
         {
-            fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION
+            fprintf( stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
                     "Can not create Java Virtual Machine\n");
             errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
         }
         else if( err > 0)
         {
-            fprintf(stderr,"[Java framework] sunjavaplugin"SAL_DLLEXTENSION
+            fprintf( stderr,"[Java framework] sunjavaplugin" SAL_DLLEXTENSION
                     "Can not create JavaVirtualMachine, abort handler was called.\n");
             errcode = JFW_PLUGIN_E_VM_CREATION_FAILED;
         }
@@ -603,7 +603,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     else
     {
         *ppVm = pJavaVM;
-        JFW_TRACE2("[Java framework] sunjavaplugin"SAL_DLLEXTENSION " has created a VM.\n");
+        JFW_TRACE2( "[Java framework] sunjavaplugin" SAL_DLLEXTENSION " has created a VM.\n");
     }
 
 

tools/inc/tools/diagnose_ex.h

@@ -86,14 +86,14 @@
                                      OSL_ENSURE(c, m); \
                                      throw ::com::sun::star::lang::IllegalArgumentException( \
                                      ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                     ::rtl::OUString::createFromAscii(",\n"m), \
+                                     ::rtl::OUString::createFromAscii( ",\n" m), \
                                      ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(), \
                                      0 ); }
 #define ENSURE_ARG_OR_THROW2(c, m, ifc, arg) if( !(c) ) { \
                                                OSL_ENSURE(c, m); \
                                                throw ::com::sun::star::lang::IllegalArgumentException( \
                                                ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                               ::rtl::OUString::createFromAscii(",\n"m), \
+                                               ::rtl::OUString::createFromAscii( ",\n" m), \
                                                ifc, \
                                                arg ); }
 
@@ -104,13 +104,13 @@
                                      OSL_ENSURE(c, m); \
                                      throw ::com::sun::star::uno::RuntimeException( \
                                      ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                     ::rtl::OUString::createFromAscii(",\n"m), \
+                                     ::rtl::OUString::createFromAscii( ",\n" m), \
                                      ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >() ); }
 #define ENSURE_OR_THROW2(c, m, ifc) if( !(c) ) { \
                                           OSL_ENSURE(c, m); \
                                           throw ::com::sun::star::uno::RuntimeException( \
                                           ::rtl::OUString::createFromAscii(BOOST_CURRENT_FUNCTION) + \
-                                          ::rtl::OUString::createFromAscii(",\n"m), \
+                                          ::rtl::OUString::createFromAscii( ",\n" m), \
                                           ifc ); }
 
 /** This macro asserts the given condition (in debug mode), and

unotools/source/config/bootstrap.cxx

@@ -149,7 +149,7 @@ namespace utl
             rtl::OUString uri;
             rtl::Bootstrap::get(
                 rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri);
-            s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM("/program/"BOOTSTRAP_DATA_NAME)));
+            s_pData = new Impl(uri + OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" BOOTSTRAP_DATA_NAME)));
         }
         return *s_pData;
     }
@@ -693,7 +693,7 @@ OUString Bootstrap::getAllUsersValue(OUString const& _sDefault)
 {
     OUString const csAllUsersItem(RTL_CONSTASCII_USTRINGPARAM(SETUP_ITEM_ALLUSERS));
 
-    rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/"SETUP_DATA_NAME ) ) );
+    rtl::Bootstrap aData( getExecutableDirectory() + OUString( RTL_CONSTASCII_USTRINGPARAM( "/" SETUP_DATA_NAME ) ) );
     OUString sResult;
     aData.getFrom( csAllUsersItem, sResult, _sDefault );
     return sResult;
@@ -910,7 +910,7 @@ sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rVa
     rtl::Bootstrap::get(
         rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("BRAND_BASE_DIR")), uri);
     rtl::Bootstrap aData( uri +
-                          OUString(RTL_CONSTASCII_USTRINGPARAM("/program/"SAL_CONFIGFILE("version"))) );
+                          OUString(RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE("version"))) );
     if ( aData.getHandle() == NULL )
         // version.ini (versionrc) doesn't exist
         return sal_False;

xmlsecurity/source/xmlsec/nss/nssinitializer.cxx

@@ -296,9 +296,9 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa
         deleteRootsModule();
 
 #if defined SYSTEM_MOZILLA
-        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION));
+        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "libnssckbi" SAL_DLLEXTENSION));
 #else
-        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${OOO_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION));
+        OUString rootModule(RTL_CONSTASCII_USTRINGPARAM( "${OOO_BASE_DIR}/program/libnssckbi" SAL_DLLEXTENSION));
 #endif
         ::rtl::Bootstrap::expandMacros(rootModule);
 
@@ -328,18 +328,18 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa
                 RootsModule = 0;
                 if (found)
                     xmlsec_trace("Added new root certificate module "
-                              "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());
+                              "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
                 else
                 {
                     xmlsec_trace("FAILED to load the new root certificate module "
-                              "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());
+                              "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
                     return_value = false;
                 }
             }
             else
             {
                 xmlsec_trace("FAILED to add new root certifice module: "
-                          "\""ROOT_CERTS"\" contained in \n%s", ospath.getStr());
+                          "\"" ROOT_CERTS "\" contained in \n%s", ospath.getStr());
                 return_value = false;
 
             }
@@ -368,17 +368,17 @@ extern "C" void nsscrypto_finalize()
 
         if (SECSuccess == SECMOD_UnloadUserModule(RootsModule))
         {
-            xmlsec_trace("Unloaded module \""ROOT_CERTS"\".");
+            xmlsec_trace( "Unloaded module \"" ROOT_CERTS "\".");
         }
         else
         {
-            xmlsec_trace("Failed unloadeding module \""ROOT_CERTS"\".");
+            xmlsec_trace( "Failed unloadeding module \"" ROOT_CERTS "\".");
         }
         SECMOD_DestroyModule(RootsModule);
     }
     else
     {
-        xmlsec_trace("Unloading module \""ROOT_CERTS
+        xmlsec_trace( "Unloading module \"" ROOT_CERTS
                   "\" failed because it was not found.");
     }
     PK11_LogoutAll();