[Libreoffice-commits] core.git: 3 commits - sc/source sw/source

[Tor Lillqvist]

 sc/source/core/opencl/formulagroupcl.cxx |    6 ++++--
 sw/source/filter/html/css1atr.cxx        |    6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit ab431b632e1e329372b8058bebdb69e1815840c2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 16 08:18:15 2014 +0200

    WaE: replace '+' between string literals with juxtaposition
    
    Change-Id: I64690ce1d6960dea52bae6a5bc1d0f1de742cb63

diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 69f1ac7..72ab5c3 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -255,13 +255,13 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp,
         if (bCfgPrintLayout) {
             sOut.append(
                 "p." + OString(sCSS2_P_CLASS_leaders) + "{max-width:" + OString::number(DOT_LEADERS_MAX_WIDTH) +
-                    "cm;padding:0;overflow-x:hidden;line-height:120%}" +
+                    "cm;padding:0;overflow-x:hidden;line-height:120%}"
                 "p." + OString(sCSS2_P_CLASS_leaders) + ":after{float:left;width:0;white-space:nowrap;content:\"");
                 for (int i = 0; i < 100; i++ )
                     sOut.append(". ");
                 sOut.append(
-                    "\"}p." + OString(sCSS2_P_CLASS_leaders) + " span:first-child{padding-right:0.33em;background:white}" +
-                    "p." + OString(sCSS2_P_CLASS_leaders) + " span+span{float:right;padding-left:0.33em;" +
+                    "\"}p." + OString(sCSS2_P_CLASS_leaders) + " span:first-child{padding-right:0.33em;background:white}"
+                    "p." + OString(sCSS2_P_CLASS_leaders) + " span+span{float:right;padding-left:0.33em;"
                     "background:white;position:relative;z-index:1}");
         }
         Strm().WriteCharPtr( sOut.makeStringAndClear().getStr() );
commit 7f3441467324e413974dcc9ceee4c3cb8dbda0ea
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 16 08:16:46 2014 +0200

    WaE: Unreferenced function definition
    
    Change-Id: I25bc6231f4efd76b33db028f6ffea19799519083

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 10d9bcd..28519b5 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3726,10 +3726,12 @@ public:
         mpKernel = pKernel;
     }
 
+#if ENABLE_THREADED_OPENCL_KERNEL_COMPILATION
     void setUnmanagedKernel( DynamicKernel* pKernel )
     {
         mpKernel = pKernel;
     }
+#endif
 
     CLInterpreterResult launchKernel()
     {
commit 634fdb75b5d087df769158063dde7c96c0d705f2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 16 08:11:46 2014 +0200

    SAL_WARN itself already prints __FILE__ and __LINE__ of its call site
    
    Change-Id: I214ee188793e7ef189417460ea32eeaf0a8b6a29

diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index a2c254c..10d9bcd 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -3687,7 +3687,7 @@ public:
 
         if (err != CL_SUCCESS)
         {
-            SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error: " << err << " at " << __FILE__ << ":" << __LINE__);
+            SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error: " << err);
             return false;
         }
 
@@ -3696,7 +3696,7 @@ public:
         err = clEnqueueUnmapMemObject(kEnv.mpkCmdQueue, res, resbuf, 0, NULL, NULL);
         if (err != CL_SUCCESS)
         {
-            SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error: " << err << " at " << __FILE__ << ":" << __LINE__);
+            SAL_WARN("sc.opencl", "Dynamic formula compiler: OpenCL error: " << err);
             return false;
         }