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

[Lionel Elie Mamane]

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

New commits:
commit 6940532b814669dcb9e4553c5678a9e4670cc6e7
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Sun Oct 20 17:36:45 2013 +0200

    Revert "fdo#68657 bool->string conversion to 1/0, not "true"/"false"
    
    This reverts commit b89fb0d03ead22f023f367c9a9d046d3d41ba1cf.
    
    It was intended for stble branch only; in master, we let the
    incompatible change go through, but we have introduced a
    work-around to get the old behaviour again.

diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 02ba27f..25fa780 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -1024,12 +1024,7 @@ OUString ORowSetValue::getString( ) const
                 aRet = OUString::number(static_cast<bool>(*this));
                 break;
             case DataType::BOOLEAN:
-                // 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));
+                aRet = OUString::boolean(static_cast<bool>(*this));
                 break;
             case DataType::TINYINT:
             case DataType::SMALLINT: