[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - 2 commits - mysqlc/source sc/source

[Noel Grandin]

 mysqlc/source/mysqlc_connection.cxx |    4 ++--
 sc/source/core/tool/interpr1.cxx    |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a198bd4789eaf40e8c042ab16fe93ea2d04dcb97
Author: Noel Grandin <noel at peralex.com>
Date:   Fri May 30 13:02:20 2014 +0200

    deb#749592 mysql-connector doesn't work with remote connections
    
    and also
    fdo#77584 mysql-connector doesn't work over SSH tunnel
    
    Not sure exactly how this got broken, I suspect that the UI code
    has started unconditionally passing down the properties, just filling
    them with empty spaces for the unused ones.
    
    Anyhow, this appears to fix the problem.
    
    Cherry-picked from 6b50e21473e7d2b24b5c609d8a1c31f27644d842
    
    Change-Id: I7ac2a0d6bae610f47d2a28daa9beb3ef0e2dbb52
    Reviewed-on: https://gerrit.libreoffice.org/9565
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/9643

diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx
index 8816cb2..4a178b3 100644
--- a/mysqlc/source/mysqlc_connection.cxx
+++ b/mysqlc/source/mysqlc_connection.cxx
@@ -158,10 +158,10 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue >
             OSL_VERIFY( pIter->Value >>= aPass );
         } else if (pIter->Name.equalsAscii("LocalSocket")) {
             OSL_VERIFY( pIter->Value >>= sUnixSocket );
-            unixSocketPassed = true;
+            unixSocketPassed = !sUnixSocket.isEmpty();
         } else if (pIter->Name.equalsAscii("NamedPipe")) {
             OSL_VERIFY( pIter->Value >>= sNamedPipe );
-            namedPipePassed = true;
+            namedPipePassed = !sNamedPipe.isEmpty();
         } else if ( pIter->Name.equalsAscii("PublicConnectionURL")) {
             OSL_VERIFY( pIter->Value >>= m_settings.connectionURL );
         } else if ( pIter->Name.equalsAscii("NewURL")) {    // legacy name for "PublicConnectionURL"
commit a9adf83582069308f7f98c5049256ea5e81c7c68
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Thu Jun 5 07:28:32 2014 +0200

    Resolves fdo#75971 Crash when invoking "Insert > Names > Create"
    
    Cherry-pick 37d7d115dd346ba7a713a5a18d90fc48a0d35072
    + 4f24e3d480bb88a568de10b4d81116766b136c91
    
    Change-Id: Ieb3af12e120cd8f17ee659406d7d0e46f05fba7d
    Reviewed-on: https://gerrit.libreoffice.org/9645
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index b5510f6..c4e6c56 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7801,7 +7801,7 @@ void ScInterpreter::ScLeft()
         if (nParamCount == 2)
         {
             double nVal = ::rtl::math::approxFloor(GetDouble());
-            if ( nVal < 0.0 || nVal > STRING_MAXLEN )
+            if ( rtl::math::isNan(nVal) || nVal < 0.0 || nVal > STRING_MAXLEN )
             {
                 PushIllegalArgument();
                 return ;
@@ -7909,7 +7909,7 @@ void ScInterpreter::ScRightB()
         if (nParamCount == 2)
         {
             double nVal = ::rtl::math::approxFloor(GetDouble());
-            if ( nVal < 0.0 || nVal > STRING_MAXLEN )
+            if ( rtl::math::isNan(nVal) || nVal < 0.0 || nVal > STRING_MAXLEN )
             {
                 PushIllegalArgument();
                 return ;