From 87087bab94c477485ebe85b955cb08d8281f0a10 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 1 Feb 2017 16:00:41 +0100 Subject: loplugin:stringconstant Change-Id: I8b7611d6fdc55fc8cd9551e129a2e03e58682229 --- .../source/drivers/ado/ADatabaseMetaDataImpl.cxx | 50 +++++++++++----------- connectivity/source/drivers/ado/ADriver.cxx | 16 +++---- connectivity/source/drivers/ado/Aolevariant.cxx | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) (limited to 'connectivity') diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 381113c431fe..5be23aa03ead 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -117,7 +117,7 @@ OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId) void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() { - m_mColumns[8] = OColumn(OUString(),OUString("IS_GRANTABLE"), + m_mColumns[8] = OColumn(OUString(),"IS_GRANTABLE", ColumnValue::NULLABLE, 3,3,0, DataType::VARCHAR); @@ -125,31 +125,31 @@ void ODatabaseMetaDataResultSetMetaData::setColumnPrivilegesMap() void ODatabaseMetaDataResultSetMetaData::setColumnsMap() { - m_mColumns[6] = OColumn(OUString(),OUString("TYPE_NAME"), + m_mColumns[6] = OColumn(OUString(),"TYPE_NAME", ColumnValue::NO_NULLS, 0,0,0, DataType::VARCHAR); - m_mColumns[11] = OColumn(OUString(),OUString("NULLABLE"), + m_mColumns[11] = OColumn(OUString(),"NULLABLE", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[12] = OColumn(OUString(),OUString("REMARKS"), + m_mColumns[12] = OColumn(OUString(),"REMARKS", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[13] = OColumn(OUString(),OUString("COLUMN_DEF"), + m_mColumns[13] = OColumn(OUString(),"COLUMN_DEF", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[14] = OColumn(OUString(),OUString("SQL_DATA_TYPE"), + m_mColumns[14] = OColumn(OUString(),"SQL_DATA_TYPE", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[15] = OColumn(OUString(),OUString("SQL_DATETIME_SUB"), + m_mColumns[15] = OColumn(OUString(),"SQL_DATETIME_SUB", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[16] = OColumn(OUString(),OUString("CHAR_OCTET_LENGTH"), + m_mColumns[16] = OColumn(OUString(),"CHAR_OCTET_LENGTH", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -157,7 +157,7 @@ void ODatabaseMetaDataResultSetMetaData::setColumnsMap() void ODatabaseMetaDataResultSetMetaData::setTablesMap() { - m_mColumns[5] = OColumn(OUString(),OUString("REMARKS"), + m_mColumns[5] = OColumn(OUString(),"REMARKS", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -165,7 +165,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablesMap() void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() { - m_mColumns[12] = OColumn(OUString(),OUString("NULLABLE"), + m_mColumns[12] = OColumn(OUString(),"NULLABLE", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -173,11 +173,11 @@ void ODatabaseMetaDataResultSetMetaData::setProcedureColumnsMap() void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() { - m_mColumns[5] = OColumn(OUString(),OUString("KEY_SEQ"), + m_mColumns[5] = OColumn(OUString(),"KEY_SEQ", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[6] = OColumn(OUString(),OUString("PK_NAME"), + m_mColumns[6] = OColumn(OUString(),"PK_NAME", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -185,15 +185,15 @@ void ODatabaseMetaDataResultSetMetaData::setPrimaryKeysMap() void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() { - m_mColumns[4] = OColumn(OUString(),OUString("NON_UNIQUE"), + m_mColumns[4] = OColumn(OUString(),"NON_UNIQUE", ColumnValue::NO_NULLS, 1,1,0, DataType::BIT); - m_mColumns[5] = OColumn(OUString(),OUString("INDEX_QUALIFIER"), + m_mColumns[5] = OColumn(OUString(),"INDEX_QUALIFIER", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[10] = OColumn(OUString(),OUString("ASC_OR_DESC"), + m_mColumns[10] = OColumn(OUString(),"ASC_OR_DESC", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -201,11 +201,11 @@ void ODatabaseMetaDataResultSetMetaData::setIndexInfoMap() void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() { - m_mColumns[6] = OColumn(OUString(),OUString("PRIVILEGE"), + m_mColumns[6] = OColumn(OUString(),"PRIVILEGE", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); - m_mColumns[7] = OColumn(OUString(),OUString("IS_GRANTABLE"), + m_mColumns[7] = OColumn(OUString(),"IS_GRANTABLE", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); @@ -213,7 +213,7 @@ void ODatabaseMetaDataResultSetMetaData::setTablePrivilegesMap() void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() { - m_mColumns[9] = OColumn(OUString(),OUString("KEY_SEQ"), + m_mColumns[9] = OColumn(OUString(),"KEY_SEQ", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -221,27 +221,27 @@ void ODatabaseMetaDataResultSetMetaData::setCrossReferenceMap() void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() { - m_mColumns[3] = OColumn(OUString(),OUString("PRECISION"), + m_mColumns[3] = OColumn(OUString(),"PRECISION", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[7] = OColumn(OUString(),OUString("NULLABLE"), + m_mColumns[7] = OColumn(OUString(),"NULLABLE", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[12] = OColumn(OUString(),OUString("AUTO_INCREMENT"), + m_mColumns[12] = OColumn(OUString(),"AUTO_INCREMENT", ColumnValue::NO_NULLS, 1,1,0, DataType::BIT); - m_mColumns[16] = OColumn(OUString(),OUString("SQL_DATA_TYPE"), + m_mColumns[16] = OColumn(OUString(),"SQL_DATA_TYPE", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[17] = OColumn(OUString(),OUString("SQL_DATETIME_SUB"), + m_mColumns[17] = OColumn(OUString(),"SQL_DATETIME_SUB", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); - m_mColumns[18] = OColumn(OUString(),OUString("NUM_PREC_RADIX"), + m_mColumns[18] = OColumn(OUString(),"NUM_PREC_RADIX", ColumnValue::NO_NULLS, 1,1,0, DataType::INTEGER); @@ -249,7 +249,7 @@ void ODatabaseMetaDataResultSetMetaData::setTypeInfoMap() void ODatabaseMetaDataResultSetMetaData::setProceduresMap() { - m_mColumns[7] = OColumn(OUString(),OUString("REMARKS"), + m_mColumns[7] = OColumn(OUString(),"REMARKS", ColumnValue::NULLABLE, 0,0,0, DataType::VARCHAR); diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 0494334904ec..c6a22e761dbd 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -156,22 +156,22 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString aBooleanValues[1] = "true"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("IgnoreDriverPrivileges") - ,OUString("Ignore the privileges from the database driver.") + "IgnoreDriverPrivileges" + ,"Ignore the privileges from the database driver." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("EscapeDateTime") - ,OUString("Escape date time format.") + "EscapeDateTime" + ,"Escape date time format." ,false - ,OUString( "true" ) + ,"true" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("TypeInfoSettings") - ,OUString("Defines how the type info of the database metadata should be manipulated.") + "TypeInfoSettings" + ,"Defines how the type info of the database metadata should be manipulated." ,false ,OUString( ) ,Sequence< OUString > ()) diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index b40f7d82fc39..fa63b5060db5 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -412,7 +412,7 @@ void OLEVariant::ChangeType(VARTYPE vartype, const OLEVariant* pSrc) throw css::sdbc::SQLException( sError, nullptr, - OUString( "S1000" ), + "S1000", 1000, css::uno::Any() ); -- cgit