[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - connectivity/source

[Stephan Bergmann]

 connectivity/source/drivers/kab/KDriver.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8cdb63858d76833e67b2cd79244840beeaaedaa8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 27 14:14:55 2015 +0100

    sdbc:address:kab URLs don't have a trailing ":"
    
    broken since 4bf95c4c31dd871065d4042028a4b3ae476dab70 "make use of startsWith()"
    where the tricky
    
      !url.compareTo(::rtl::OUString("sdbc:address:kab:"), 16)
    
    was replaced with
    
      url.startsWith("sdbc:address:kab:")
    
    even though the original exempted the trailing ":" from the comparison
    
    (cherry picked from commit 27e85dd314e02dc97612bf1682fccacaf0244127)
    Conflicts:
    	connectivity/source/drivers/kab/KDriver.cxx
    
    Change-Id: I45175b2669d61eb4cee36d4456ccb69d0f11ef63
    Reviewed-on: https://gerrit.libreoffice.org/14670
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx
index 8fb6642..07483c6 100644
--- a/connectivity/source/drivers/kab/KDriver.cxx
+++ b/connectivity/source/drivers/kab/KDriver.cxx
@@ -404,7 +404,7 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url )
         return sal_False;
 
     // here we have to look whether we support this URL format
-    return url.startsWith("sdbc:address:kab:");
+    return url.startsWith("sdbc:address:kab");
 }
 
 Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException, std::exception)