Merge remote-tracking branch 'origin/libreoffice-3-6-3' into suse-3.6

Conflicts:
desktop/source/app/sofficemain.cxx
instsetoo_native/util/openoffice.lst
solenv/inc/minor.mk

Change-Id: I3e9510067c7173f6c71368e70ba6dfe168c5318e

3 files changed, 7 insertions, 10 deletions

diff --git a/sal/inc/osl/diagnose.hxx b/sal/inc/osl/diagnose.hxx
index 6463d8dcca5d..18dc0fe10bd1 100644
--- a/sal/inc/osl/diagnose.hxx
+++ b/sal/inc/osl/diagnose.hxx
@@ -33,6 +33,9 @@
 #include <functional>
 #include <typeinfo>
 
+#ifndef HAVE_CXX0X
+#define BOOST_NO_0X_HDR_TYPEINDEX
+#endif
 #include "boost/unordered_set.hpp"
 #include "osl/diagnose.h"
 #include "osl/interlck.h"
diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 4e76b7410303..e70f3ac29f25 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -320,12 +320,9 @@ public:
 
       @since LibreOffice 3.4
     */
-    sal_Bool isEmpty() const SAL_THROW(())
+    bool isEmpty() const SAL_THROW(())
     {
-        if ( pData->length )
-            return sal_False;
-        else
-            return sal_True;
+        return pData->length == 0;
     }
 
     /**
diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx
index f3d224ecdb0f..5962752c7af2 100644
--- a/sal/inc/rtl/ustring.hxx
+++ b/sal/inc/rtl/ustring.hxx
@@ -405,12 +405,9 @@ public:
 
       @since LibreOffice 3.4
     */
-    sal_Bool isEmpty() const SAL_THROW(())
+    bool isEmpty() const SAL_THROW(())
     {
-        if ( pData->length )
-            return sal_False;
-        else
-            return sal_True;
+        return pData->length == 0;
     }
 
     /**