sc/source/core/data/formulacell.cxx | 2 +- sc/source/core/opencl/openclwrapper.cxx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit ae98892269205632f52d220749e154ca3a87f18c Author: Tor Lillqvist <t...@collabora.com> Date: Thu Oct 30 14:47:51 2014 +0200 Log the state as an integer, not as a byte with value 0, 1 or 2 It is rather hard to see in a terminal window whether a char with value 0, 1 or 2 has been printed;) The elegant thing to do would of course be to make the enum in question into an enum class, and define an operator<< for it, to output it symbolically. But I can not be distracted into that now. Change-Id: Ibfa4f4d5925d1db3cbbf35f84df70640f47a8d56 diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 3ba6bf3..96b4339 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -3687,7 +3687,7 @@ bool ScFormulaCell::InterpretFormulaGroup() mxGroup->meCalcState = sc::GroupCalcRunning; if (!sc::FormulaGroupInterpreter::getStatic()->interpret(*pDocument, mxGroup->mpTopCell->aPos, mxGroup, aCode)) { - SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state " << mxGroup->meCalcState << ") failed, disabling"); + SAL_INFO("sc.opencl", "interpreting group " << mxGroup << " (state " << (int) mxGroup->meCalcState << ") failed, disabling"); mxGroup->meCalcState = sc::GroupCalcDisabled; return false; } commit 288550ee6db7e3b3f81a027145d006f422d67876 Author: Tor Lillqvist <t...@collabora.com> Date: Thu Oct 30 14:28:48 2014 +0200 Use more specific log area for the "binary file" messages So that they can easily be avoided as they are rather uninteresting, in my humble opinion. Did not want to drop these SAL_INFOs altogether as this after all is not "my" code. Change-Id: Icb92f4ca2715c3dfef522319fdb1f81b782ec6cc diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index 464d70b..23db69e 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -158,11 +158,11 @@ std::vector<boost::shared_ptr<osl::File> > OpenCLDevice::binaryGenerated( const if(pNewFile->open(osl_File_OpenFlag_Read) == osl::FileBase::E_None) { aGeneratedFiles.push_back(boost::shared_ptr<osl::File>(pNewFile)); - SAL_INFO("sc.opencl", "Opening binary file '" << fileName << "' for reading: success"); + SAL_INFO("sc.opencl.file", "Opening binary file '" << fileName << "' for reading: success"); } else { - SAL_INFO("sc.opencl", "Opening binary file '" << fileName << "' for reading: FAIL"); + SAL_INFO("sc.opencl.file", "Opening binary file '" << fileName << "' for reading: FAIL"); delete pNewFile; break; } @@ -238,9 +238,9 @@ bool OpenCLDevice::generatBinFromKernelSource( cl_program program, const char * OString fileName = createFileName(mpArryDevsID[i], clFileName); if ( !writeBinaryToFile( fileName, binaries[i], binarySizes[i] ) ) - SAL_INFO("sc.opencl", "Writing binary file '" << fileName << "': FAIL"); + SAL_INFO("sc.opencl.file", "Writing binary file '" << fileName << "': FAIL"); else - SAL_INFO("sc.opencl", "Writing binary file '" << fileName << "': success"); + SAL_INFO("sc.opencl.file", "Writing binary file '" << fileName << "': success"); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits