[Libreoffice-commits] core.git: 2 commits - connectivity/source sal/osl

Michael Stahl mstahl at redhat.com
Thu Nov 20 04:05:00 PST 2014


 connectivity/source/drivers/mozab/MDriver.hxx |    1 +
 sal/osl/unx/signal.cxx                        |    8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 524addb17c7d8dcb50a5ade05108b0168e61409d
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 20 12:58:58 2014 +0100

    connectivity: fix the mozab build
    
    Change-Id: I299c856814e09a93a71f8acf8745a0590e2ecc72

diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx
index 155971e..8423423 100644
--- a/connectivity/source/drivers/mozab/MDriver.hxx
+++ b/connectivity/source/drivers/mozab/MDriver.hxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/compbase2.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <osl/module.h>
commit fc6be0ba3f74f46ce4eb7829ee91cd98179fb627
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Nov 20 12:58:43 2014 +0100

    sal: fix build with clang and --enable-crashdump
    
    Change-Id: I148005489e4ef31b55886c1dd3076650d3a2ec17

diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
index b5de273..c97162b 100644
--- a/sal/osl/unx/signal.cxx
+++ b/sal/osl/unx/signal.cxx
@@ -480,8 +480,8 @@ static int ReportCrash( int Signal )
 
 #define REPORTENV_PARAM     "-crashreportenv:"
 
-    static sal_Bool bCrashReporterExecuted = sal_False;
-    sal_Bool        bAutoCrashReport = sal_False;
+    static bool bCrashReporterExecuted = false;
+    bool bAutoCrashReport = false;
 
     sal_uInt32  argi;
     sal_uInt32  argc;
@@ -503,7 +503,7 @@ static int ReportCrash( int Signal )
             }
             else if ( 0 == rtl_ustr_ascii_compare( rtl_uString_getStr( ustrCommandArg ), "--autocrashreport" ) )
             {
-                bAutoCrashReport = sal_True;
+                bAutoCrashReport = true;
             }
             else if ( 0 == rtl_ustr_ascii_shortenedCompare_WithLength(
                 rtl_uString_getStr( ustrCommandArg ), rtl_uString_getLength( ustrCommandArg ),
@@ -784,7 +784,7 @@ static int ReportCrash( int Signal )
 
                 if ( -1 != ret )
                 {
-                    bCrashReporterExecuted = sal_True;
+                    bCrashReporterExecuted = true;
                     return 1;
                 }
                 else


More information about the Libreoffice-commits mailing list