svn commit: r1546572 - in /openoffice/trunk/main: editeng/source/editeng/editdbg.cxx jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx jvmfwk/plugins/sunmajor/pluginlib/util.cxx

[hdu]

Author: hdu
Date: Fri Nov 29 14:39:04 2013
New Revision: 1546572

URL: http://svn.apache.org/r1546572
Log:
#i123773# fix ambiguity between string concatenation and C++ user-defined 
literals

C++11 conformant compilers such as clang rejects string concatenations
that are ambigous with the C++11 feature "user-defined literals" (N2378)

Modified:
    openoffice/trunk/main/editeng/source/editeng/editdbg.cxx
    openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
    openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx

Modified: openoffice/trunk/main/editeng/source/editeng/editdbg.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/editeng/editdbg.cxx?rev=1546572&r1=1546571&r2=1546572&view=diff
==============================================================================
--- openoffice/trunk/main/editeng/source/editeng/editdbg.cxx (original)
+++ openoffice/trunk/main/editeng/source/editeng/editdbg.cxx Fri Nov 29 
14:39:04 2013
@@ -454,7 +454,7 @@ void EditDbg::ShowEditEngineData( EditEn
        fprintf( fp, "\n\n
================================================================================"
 );
        fprintf( fp, "\n==================   EditEngine & Views   
======================================" );
        fprintf( fp, 
"\n================================================================================"
 );
-       fprintf( fp, "\nControl: %"SAL_PRIxUINT32, pEE->GetControlWord() );
+       fprintf( fp, "\nControl: %" SAL_PRIxUINT32, pEE->GetControlWord() );
        fprintf( fp, "\nRefMapMode: %i", 
pEE->pImpEditEngine->pRefDev->GetMapMode().GetMapUnit() );
        fprintf( fp, "\nPaperSize: %li x %li", pEE->GetPaperSize().Width(), 
pEE->GetPaperSize().Height() );
        fprintf( fp, "\nMaxAutoPaperSize: %li x %li", 
pEE->GetMaxAutoPaperSize().Width(), pEE->GetMaxAutoPaperSize().Height() );

Modified: openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx?rev=1546572&r1=1546571&r2=1546572&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx 
(original)
+++ openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx Fri Nov 
29 14:39:04 2013
@@ -105,7 +105,7 @@ int SunInfo::compareVersions(const rtl::
     rtl::OUString sFirst = getVersion();
 
     SunVersion version1(sFirst);
-    JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION
+    JFW_ENSURE(version1, OUSTR("[Java framework] sunjavaplugin" 
SAL_DLLEXTENSION
                                " does not know the version: ")
                + sFirst + OUSTR(" as valid for a SUN/Oracle JRE."));
     SunVersion version2(sSecond);

Modified: openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx?rev=1546572&r1=1546571&r2=1546572&view=diff
==============================================================================
--- openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx (original)
+++ openoffice/trunk/main/jvmfwk/plugins/sunmajor/pluginlib/util.cxx Fri Nov 29 
14:39:04 2013
@@ -879,7 +879,7 @@ rtl::Reference<VendorBase> getJREInfoByP
                            SameOrSubDirJREMap(sResolvedDir));
     if (entry2 != mapJREs.end())
     {
-        JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ")
+        JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": 
")
                    + OUSTR("JRE found again (detected before): ") + 
sResolvedDir 
                    + OUSTR(".\n"));
         return entry2->second;
@@ -930,7 +930,7 @@ rtl::Reference<VendorBase> getJREInfoByP
             MapIt entry =  mapJREs.find(sFilePath);
             if (entry != mapJREs.end())
             {
-                JFW_TRACE2(OUSTR("[Java framework] 
sunjavaplugin"SAL_DLLEXTENSION ": ")
+                JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" 
SAL_DLLEXTENSION ": ")
                    + OUSTR("JRE found again (detected before): ") + sFilePath 
                    + OUSTR(".\n"));
 
@@ -1018,7 +1018,7 @@ rtl::Reference<VendorBase> getJREInfoByP
         vecBadPaths.push_back(sFilePath);
     else
     {
-        JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin"SAL_DLLEXTENSION ": ")
+        JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": 
")
                    + OUSTR("Found JRE: ") + sResolvedDir 
                    + OUSTR(" \n at: ") + path + OUSTR(".\n"));