mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace "compareToAscii" by !=

Browse Source 
See http://nabble.documentfoundation.org/Strange-part-in-connectivity-source-drivers-jdbc-tools-cxx-td4110680.html

Change-Id: I1ed37671e6c248ada7a972dba00e0fe98b565e75
This commit is contained in:
Julien Nabet
2014-05-30 22:15:26 +02:00
parent d6b9b1e9c3
commit 6cc359f8d7
1 changed files with 32 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
connectivity/source/drivers/jdbc/tools.cxx
View File

@@ -113,39 +113,38 @@ java_util_Properties* connectivity::createStringPropertyArray(const Sequence< Pr
// these are properties used internally by LibreOffice, // these are properties used internally by LibreOffice,
// and should not be passed to the JDBC driver // and should not be passed to the JDBC driver
// (which probably does not know anything about them anyway). // (which probably does not know anything about them anyway).
// FYI, OUString::compareToAscii() returns zero on equality, like strcmp() if ( pBegin->Name != "JavaDriverClass"
if ( pBegin->Name.compareToAscii( "JavaDriverClass" ) && pBegin->Name != "JavaDriverClassPath"
&& pBegin->Name.compareToAscii( "JavaDriverClassPath" ) && pBegin->Name != "SystemProperties"
&& pBegin->Name.compareToAscii( "SystemProperties" ) && pBegin->Name != "CharSet"
&& pBegin->Name.compareToAscii( "CharSet" ) && pBegin->Name != "AppendTableAliasName"
&& pBegin->Name.compareToAscii( "AppendTableAliasName" ) && pBegin->Name != "AddIndexAppendix"
&& pBegin->Name.compareToAscii( "AddIndexAppendix" ) && pBegin->Name != "FormsCheckRequiredFields"
&& pBegin->Name.compareToAscii( "FormsCheckRequiredFields" ) && pBegin->Name != "GenerateASBeforeCorrelationName"
&& pBegin->Name.compareToAscii( "GenerateASBeforeCorrelationName" ) && pBegin->Name != "EscapeDateTime"
&& pBegin->Name.compareToAscii( "EscapeDateTime" ) && pBegin->Name != "ParameterNameSubstitution"
&& pBegin->Name.compareToAscii( "ParameterNameSubstitution" ) && pBegin->Name != "IsPasswordRequired"
&& pBegin->Name.compareToAscii( "IsPasswordRequired" ) && pBegin->Name != "IsAutoRetrievingEnabled"
&& pBegin->Name.compareToAscii( "IsAutoRetrievingEnabled" ) && pBegin->Name != "AutoRetrievingStatement"
&& pBegin->Name.compareToAscii( "AutoRetrievingStatement" ) && pBegin->Name != "UseCatalogInSelect"
&& pBegin->Name.compareToAscii( "UseCatalogInSelect" ) && pBegin->Name != "UseSchemaInSelect"
&& pBegin->Name.compareToAscii( "UseSchemaInSelect" ) && pBegin->Name != "AutoIncrementCreation"
&& pBegin->Name.compareToAscii( "AutoIncrementCreation" ) && pBegin->Name != "Extension"
&& pBegin->Name.compareToAscii( "Extension" ) && pBegin->Name != "NoNameLengthLimit"
&& pBegin->Name.compareToAscii( "NoNameLengthLimit" ) && pBegin->Name != "EnableSQL92Check"
&& pBegin->Name.compareToAscii( "EnableSQL92Check" ) && pBegin->Name != "EnableOuterJoinEscape"
&& pBegin->Name.compareToAscii( "EnableOuterJoinEscape" ) && pBegin->Name != "BooleanComparisonMode"
&& pBegin->Name.compareToAscii( "BooleanComparisonMode" ) && pBegin->Name != "IgnoreCurrency"
&& pBegin->Name.compareToAscii( "IgnoreCurrency" ) && pBegin->Name != "TypeInfoSettings"
&& pBegin->Name.compareToAscii( "TypeInfoSettings" ) && pBegin->Name != "IgnoreDriverPrivileges"
&& pBegin->Name.compareToAscii( "IgnoreDriverPrivileges" ) && pBegin->Name != "ImplicitCatalogRestriction"
&& pBegin->Name.compareToAscii( "ImplicitCatalogRestriction" ) && pBegin->Name != "ImplicitSchemaRestriction"
&& pBegin->Name.compareToAscii( "ImplicitSchemaRestriction" ) && pBegin->Name != "SupportsTableCreation"
&& pBegin->Name.compareToAscii( "SupportsTableCreation" ) && pBegin->Name != "UseJava"
&& pBegin->Name.compareToAscii( "UseJava" ) && pBegin->Name != "Authentication"
&& pBegin->Name.compareToAscii( "Authentication" ) && pBegin->Name != "PreferDosLikeLineEnds"
&& pBegin->Name.compareToAscii( "PreferDosLikeLineEnds" ) && pBegin->Name != "PrimaryKeySupport"
&& pBegin->Name.compareToAscii( "PrimaryKeySupport" ) && pBegin->Name != "RespectDriverResultSetType"
&& pBegin->Name.compareToAscii( "RespectDriverResultSetType" )
) )
{ {
OUString aStr; OUString aStr;