[Libreoffice-commits] core.git: 2 commits - codemaker/source vcl/headless

[Caolán McNamara]

 codemaker/source/cppumaker/cpputype.cxx |    6 ++----
 vcl/headless/svpgdi.cxx                 |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 5b9062a229611258153bd08296844d92fe3eb0d5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 27 10:49:23 2015 +0000

    crashtesting: we're using OneBitMsbPal as the 1bit format, not OneBitLsbGrey
    
    Change-Id: I25c6fe1bd1df568911838ab161a130f8b0571e16

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index a940e36..8783ab6 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -300,7 +300,7 @@ namespace
             return false;
 
         if (rBuffer->getScanlineFormat() != SVP_CAIRO_FORMAT
-         && rBuffer->getScanlineFormat() != basebmp::Format::OneBitLsbGrey)
+         && rBuffer->getScanlineFormat() != basebmp::Format::OneBitMsbPal)
             return false;
 
 #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0)
commit 759eb79d886b70c7e7ab86b48e63d1b627b7dc44
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Nov 27 10:34:28 2015 +0000

    give useful details in non-debug mode too
    
    Change-Id: I5a3be096ad4417735254abb387b21029e636f5b8

diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index e4f6fa8..bd74149 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3446,11 +3446,9 @@ static OUString failsToSupply(const OUString& name_, const OString& baseName)
 {
     return OUString(
             "\n"
-            "#if OSL_DEBUG_LEVEL > 0\n"
+            "\n"
             "                ::rtl::OUString(\"component context fails to supply service '" + name_ + "' of type '" + OStringToOUString(baseName, RTL_TEXTENCODING_UTF8) + "'\")\n"
-            "#else\n"
-            "                ::rtl::OUString(\"service not supplied\")\n"
-            "#endif\n");
+            "\n");
 }
 
 void ServiceType::dumpHxxFile(