diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2014-05-30 22:15:26 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2014-05-30 22:17:41 +0200 |
commit | 6cc359f8d739a92c2695a5248dfbb49f43d1ca6e (patch) | |
tree | 6d1c994399628ef9394b83888e778643505fd701 /connectivity | |
parent | d6b9b1e9c315309d4aa994d0c1019226d7da448d (diff) |
Replace "compareToAscii" by !=
See http://nabble.documentfoundation.org/Strange-part-in-connectivity-source-drivers-jdbc-tools-cxx-td4110680.html
Change-Id: I1ed37671e6c248ada7a972dba00e0fe98b565e75
Diffstat (limited to 'connectivity')
-rw-r--r-- | connectivity/source/drivers/jdbc/tools.cxx | 65 |
1 files changed, 32 insertions, 33 deletions
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index 0d9ae1ecbadf..5d993308dbff 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -113,39 +113,38 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr // these are properties used internally by LibreOffice, // and should not be passed to the JDBC driver // (which probably does not know anything about them anyway). - // FYI, OUString::compareToAscii() returns zero on equality, like strcmp() - if ( pBegin->Name.compareToAscii( "JavaDriverClass" ) - && pBegin->Name.compareToAscii( "JavaDriverClassPath" ) - && pBegin->Name.compareToAscii( "SystemProperties" ) - && pBegin->Name.compareToAscii( "CharSet" ) - && pBegin->Name.compareToAscii( "AppendTableAliasName" ) - && pBegin->Name.compareToAscii( "AddIndexAppendix" ) - && pBegin->Name.compareToAscii( "FormsCheckRequiredFields" ) - && pBegin->Name.compareToAscii( "GenerateASBeforeCorrelationName" ) - && pBegin->Name.compareToAscii( "EscapeDateTime" ) - && pBegin->Name.compareToAscii( "ParameterNameSubstitution" ) - && pBegin->Name.compareToAscii( "IsPasswordRequired" ) - && pBegin->Name.compareToAscii( "IsAutoRetrievingEnabled" ) - && pBegin->Name.compareToAscii( "AutoRetrievingStatement" ) - && pBegin->Name.compareToAscii( "UseCatalogInSelect" ) - && pBegin->Name.compareToAscii( "UseSchemaInSelect" ) - && pBegin->Name.compareToAscii( "AutoIncrementCreation" ) - && pBegin->Name.compareToAscii( "Extension" ) - && pBegin->Name.compareToAscii( "NoNameLengthLimit" ) - && pBegin->Name.compareToAscii( "EnableSQL92Check" ) - && pBegin->Name.compareToAscii( "EnableOuterJoinEscape" ) - && pBegin->Name.compareToAscii( "BooleanComparisonMode" ) - && pBegin->Name.compareToAscii( "IgnoreCurrency" ) - && pBegin->Name.compareToAscii( "TypeInfoSettings" ) - && pBegin->Name.compareToAscii( "IgnoreDriverPrivileges" ) - && pBegin->Name.compareToAscii( "ImplicitCatalogRestriction" ) - && pBegin->Name.compareToAscii( "ImplicitSchemaRestriction" ) - && pBegin->Name.compareToAscii( "SupportsTableCreation" ) - && pBegin->Name.compareToAscii( "UseJava" ) - && pBegin->Name.compareToAscii( "Authentication" ) - && pBegin->Name.compareToAscii( "PreferDosLikeLineEnds" ) - && pBegin->Name.compareToAscii( "PrimaryKeySupport" ) - && pBegin->Name.compareToAscii( "RespectDriverResultSetType" ) + if ( pBegin->Name != "JavaDriverClass" + && pBegin->Name != "JavaDriverClassPath" + && pBegin->Name != "SystemProperties" + && pBegin->Name != "CharSet" + && pBegin->Name != "AppendTableAliasName" + && pBegin->Name != "AddIndexAppendix" + && pBegin->Name != "FormsCheckRequiredFields" + && pBegin->Name != "GenerateASBeforeCorrelationName" + && pBegin->Name != "EscapeDateTime" + && pBegin->Name != "ParameterNameSubstitution" + && pBegin->Name != "IsPasswordRequired" + && pBegin->Name != "IsAutoRetrievingEnabled" + && pBegin->Name != "AutoRetrievingStatement" + && pBegin->Name != "UseCatalogInSelect" + && pBegin->Name != "UseSchemaInSelect" + && pBegin->Name != "AutoIncrementCreation" + && pBegin->Name != "Extension" + && pBegin->Name != "NoNameLengthLimit" + && pBegin->Name != "EnableSQL92Check" + && pBegin->Name != "EnableOuterJoinEscape" + && pBegin->Name != "BooleanComparisonMode" + && pBegin->Name != "IgnoreCurrency" + && pBegin->Name != "TypeInfoSettings" + && pBegin->Name != "IgnoreDriverPrivileges" + && pBegin->Name != "ImplicitCatalogRestriction" + && pBegin->Name != "ImplicitSchemaRestriction" + && pBegin->Name != "SupportsTableCreation" + && pBegin->Name != "UseJava" + && pBegin->Name != "Authentication" + && pBegin->Name != "PreferDosLikeLineEnds" + && pBegin->Name != "PrimaryKeySupport" + && pBegin->Name != "RespectDriverResultSetType" ) { OUString aStr; |