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

[Lionel Elie Mamane]

 connectivity/source/commontools/FValue.cxx |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b89fb0d03ead22f023f367c9a9d046d3d41ba1cf
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Mon Oct 14 17:59:10 2013 +0200

    fdo#68657 bool->string conversion to 1/0, not "true"/"false
    
    This matches what OO.org / older versions of LibreOffice did, and which was inadvertently changed in 2bd856e6
    
    Reviewed-on: https://gerrit.libreoffice.org/6275
    Reviewed-by: David Ostrovsky <David.Ostrovsky at gmx.de>
    Tested-by: David Ostrovsky <David.Ostrovsky at gmx.de>
    
    Conflicts:
    	connectivity/source/commontools/FValue.cxx
    
    Change-Id: I1d45ea975a096c599a996caafc41e4aa06d35fcd

diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 0a4a880..04c740a 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1024,7 +1024,12 @@ OUString ORowSetValue::getString( ) const
                 aRet = OUString::number(static_cast<bool>(*this));
                 break;
             case DataType::BOOLEAN:
-                aRet = OUString::boolean(static_cast<bool>(*this));
+                // This would be the natural choice,
+                // but historically it was converted to "0" or "1".
+                // For backwards compatibility, continue doing that.
+                // aRet = OUString::boolean(static_cast<bool>(*this));
+                BOOST_STATIC_ASSERT((boost::is_same< sal_Bool, sal_uInt8 >::value));
+                aRet = OUString::number(static_cast<sal_Bool>(*this));
                 break;
             case DataType::TINYINT:
             case DataType::SMALLINT: