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

Noel Grandin noel at peralex.com
Thu Oct 31 09:56:31 CET 2013


 connectivity/source/drivers/evoab2/NStatement.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit dc6e04878da4fdd3df5da8d4457d5c92c09731c1
Author: Noel Grandin <noel at peralex.com>
Date:   Thu Oct 31 10:54:16 2013 +0200

    fix ambiguous OUString constructor call
    
    after commit e2451bd729d0f1d795a5b689deba65bc4e9d92c6
    "Convert indexOf->startsWith and lastIndexOf->endsWith"
    
    Change-Id: I19c0e33e318cbf4be90d60bcbb83bc5de4336190

diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index d341edd..31612ce 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -387,7 +387,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
         }
         else if( (aMatchString.indexOf ( WILDCARD ) == aMatchString.lastIndexOf ( WILDCARD ) ) )
         {   // One occurrence of '%'  matches...
-            if ( aMatchString.startsWith( WILDCARD ) )
+            if ( aMatchString.startsWith( OUString(WILDCARD) ) )
                 pResult = createTest( aColumnName, E_BOOK_QUERY_ENDS_WITH, aMatchString.copy( 1 ) );
             else if ( aMatchString.indexOf ( WILDCARD ) == aMatchString.getLength() - 1 )
                 pResult = createTest( aColumnName, E_BOOK_QUERY_BEGINS_WITH, aMatchString.copy( 0, aMatchString.getLength() - 1 ) );
@@ -398,7 +398,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
                 pResult = e_book_query_not( pResult, TRUE );
         }
         else if( aMatchString.getLength() >= 3 &&
-                 aMatchString.startsWith( WILDCARD ) &&
+                 aMatchString.startsWith( OUString(WILDCARD) ) &&
                  aMatchString.indexOf ( WILDCARD, 1) == aMatchString.getLength() - 1 ) {
             // one '%' at the start and another at the end
             pResult = createTest( aColumnName, E_BOOK_QUERY_CONTAINS, aMatchString.copy (1, aMatchString.getLength() - 2) );


More information about the Libreoffice-commits mailing list