diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-30 16:38:54 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-31 08:56:20 +0000 |
commit | 1c3e84d8192218befebcddae2ed9842d081dc6c7 (patch) | |
tree | f4fc5cddd181d6d49bf55f74e6d3d107b8ae8d18 /connectivity | |
parent | e1e6cdbb1e9ff37f0bb740a70045c66953bec50c (diff) |
teach lolugin:stringconstant about calling constructors
so we can remove unnecessary calls to the OUString(literal) constructor
when calling constructors like this:
Foo(OUString("xxx"), 1)
Change-Id: I1de60ef561437c86b27dc9cb095a5deb2e103b36
Reviewed-on: https://gerrit.libreoffice.org/33698
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
21 files changed, 190 insertions, 190 deletions
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index 184828958966..ba73d0dddf03 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -927,7 +927,7 @@ sal_Int32 DBTypeConversion::convertUnicodeString( const OUString& _rSource, OStr throw SQLException( sMessage, nullptr, - OUString( "22018" ), + "22018", 22018, Any() ); @@ -953,7 +953,7 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const OUString& _rSour throw SQLException( sMessage, nullptr, - OUString( "22001" ), + "22001", 22001, Any() ); diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index 1f2466ca3774..ae8b81bbda99 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -159,7 +159,7 @@ namespace param sal_Int32 nProperties( aProperties.getLength() ); aProperties.realloc( nProperties + 1 ); aProperties[ nProperties ] = Property( - OUString( "Value" ), + "Value", PROPERTY_ID_VALUE, ::cppu::UnoType< Any >::get(), PropertyAttribute::TRANSIENT | PropertyAttribute::MAYBEVOID diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index e9983a151782..1f30e6ba419c 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -321,7 +321,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu Sequence< Any > args(1); args[0] = makeAny( NamedValue( - OUString("nodepath"), + "nodepath", makeAny(_rPath))); Reference< XInterface > xInterface( _rxConfProvider->createInstanceWithArguments( diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx index 5eb8888be5cd..04d38c1265af 100644 --- a/connectivity/source/drivers/calc/CTables.cxx +++ b/connectivity/source/drivers/calc/CTables.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::container; sdbcx::ObjectType OCalcTables::createObject(const OUString& _rName) { OCalcTable* pTable = new OCalcTable(this, static_cast<OCalcConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()), - _rName,OUString("TABLE")); + _rName,"TABLE"); sdbcx::ObjectType xRet = pTable; pTable->construct(); return xRet; diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index 21ecbe05ac8c..6e920abdf729 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -85,24 +85,24 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString aBoolean[1] = "1"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("CharSet") - ,OUString("CharSet of the database.") + "CharSet" + ,"CharSet of the database." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ShowDeleted") - ,OUString("Display inactive records.") + "ShowDeleted" + ,"Display inactive records." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("EnableSQL92Check") - ,OUString("Use SQL92 naming constraints.") + "EnableSQL92Check" + ,"Use SQL92 naming constraints." ,false - ,OUString("0") + ,"0" ,aBoolean) ); return Sequence< DriverPropertyInfo >(&(aDriverInfo[0]),aDriverInfo.size()); diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index a2a5add764e3..787226e2ed84 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -49,7 +49,7 @@ using namespace ::com::sun::star::container; sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName) { ODbaseTable* pRet = new ODbaseTable(this, static_cast<ODbaseConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()), - _rName,OUString("TABLE")); + _rName,"TABLE"); sdbcx::ObjectType xRet = pRet; pRet->construct(); diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index a0a1427954e9..ad77694e01cd 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -120,43 +120,43 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt aBoolean[1] = "1"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("CharSet") - ,OUString("CharSet of the database.") + "CharSet" + ,"CharSet of the database." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("Extension") - ,OUString("Extension of the file format.") + "Extension" + ,"Extension of the file format." ,false - ,OUString(".*") + ,".*" ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ShowDeleted") - ,OUString("Display inactive records.") + "ShowDeleted" + ,"Display inactive records." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("EnableSQL92Check") - ,OUString("Use SQL92 naming constraints.") + "EnableSQL92Check" + ,"Use SQL92 naming constraints." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("UseRelativePath") - ,OUString("Handle the connection url as relative path.") + "UseRelativePath" + ,"Handle the connection url as relative path." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("URL") - ,OUString("The URL of the database document which is used to create an absolute path.") + "URL" + ,"The URL of the database document which is used to create an absolute path." ,false ,OUString() ,Sequence< OUString >()) diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 1219f46cf7b8..3eea3918164a 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -88,38 +88,38 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString aBoolean[1] = "1"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("FieldDelimiter") - ,OUString("Field separator.") + "FieldDelimiter" + ,"Field separator." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("HeaderLine") - ,OUString("Text contains headers.") + "HeaderLine" + ,"Text contains headers." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("StringDelimiter") - ,OUString("Text separator.") + "StringDelimiter" + ,"Text separator." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("DecimalDelimiter") - ,OUString("Decimal separator.") + "DecimalDelimiter" + ,"Decimal separator." ,false - ,OUString("0") + ,"0" ,aBoolean) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ThousandDelimiter") - ,OUString("Thousands separator.") + "ThousandDelimiter" + ,"Thousands separator." ,false - ,OUString("0") + ,"0" ,aBoolean) ); return ::comphelper::concatSequences(OFileDriver::getPropertyInfo(url,info ), diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx index f0ce8151d0b6..5c9782caf24d 100644 --- a/connectivity/source/drivers/flat/ETables.cxx +++ b/connectivity/source/drivers/flat/ETables.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::container; sdbcx::ObjectType OFlatTables::createObject(const OUString& _rName) { OFlatTable* pRet = new OFlatTable(this, static_cast<OFlatConnection*>(static_cast<OFileCatalog&>(m_rParent).getConnection()), - _rName,OUString("TABLE")); + _rName,"TABLE"); sdbcx::ObjectType xRet = pRet; pRet->construct(); return xRet; diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index ba542ff972d0..abcd6d23f301 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -246,7 +246,7 @@ namespace connectivity // security: permitted Java classes NamedValue aPermittedClasses( - OUString( "hsqldb.method_class_names" ), + "hsqldb.method_class_names", makeAny( lcl_getPermittedJavaMethods_nothrow( m_xContext ) ) ); aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) ); @@ -410,24 +410,24 @@ namespace connectivity return Sequence< DriverPropertyInfo >(); ::std::vector< DriverPropertyInfo > aDriverInfo; aDriverInfo.push_back(DriverPropertyInfo( - OUString("Storage") - ,OUString("Defines the storage where the database will be stored.") + "Storage" + ,"Defines the storage where the database will be stored." ,true ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("URL") - ,OUString("Defines the url of the data source.") + "URL" + ,"Defines the url of the data source." ,true ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("AutoRetrievingStatement") - ,OUString("Defines the statement which will be executed to retrieve auto increment values.") + "AutoRetrievingStatement" + ,"Defines the statement which will be executed to retrieve auto increment values." ,false - ,OUString("CALL IDENTITY()") + ,"CALL IDENTITY()" ,Sequence< OUString >()) ); return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); @@ -832,13 +832,13 @@ namespace connectivity Sequence< Any > aArguments(2); // the path to the node to open aArguments[0] <<= PropertyValue( - OUString("nodepath"), 0, + "nodepath", 0, makeAny( OUString("/org.openoffice.Setup/L10N" ) ), PropertyState_DIRECT_VALUE ); // the depth: -1 means unlimited aArguments[1] <<= PropertyValue( - OUString("depth"), 0, + "depth", 0, makeAny( (sal_Int32)-1 ), PropertyState_DIRECT_VALUE ); diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index bb1d45337318..af83a5c406b1 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -138,92 +138,92 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const aBooleanValues[1] = "true"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("JavaDriverClass") - ,OUString("The JDBC driver class name.") + "JavaDriverClass" + ,"The JDBC driver class name." ,true ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("JavaDriverClassPath") - ,OUString("The class path where to look for the JDBC driver.") + "JavaDriverClassPath" + ,"The class path where to look for the JDBC driver." ,true - ,OUString( "" ) + , "" ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("SystemProperties") - ,OUString("Additional properties to set at java.lang.System before loading the driver.") + "SystemProperties" + ,"Additional properties to set at java.lang.System before loading the driver." ,true - ,OUString( "" ) + , "" ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ParameterNameSubstitution") - ,OUString("Change named parameters with '?'.") + "ParameterNameSubstitution" + ,"Change named parameters with '?'." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); 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("IsAutoRetrievingEnabled") - ,OUString("Retrieve generated values.") + "IsAutoRetrievingEnabled" + ,"Retrieve generated values." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("AutoRetrievingStatement") - ,OUString("Auto-increment statement.") + "AutoRetrievingStatement" + ,"Auto-increment statement." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("GenerateASBeforeCorrelationName") - ,OUString("Generate AS before table correlation names.") + "GenerateASBeforeCorrelationName" + ,"Generate AS before table correlation names." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("IgnoreCurrency") - ,OUString("Ignore the currency field from the ResultsetMetaData.") + "IgnoreCurrency" + ,"Ignore the currency field from the ResultsetMetaData." ,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 > ()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ImplicitCatalogRestriction") - ,OUString("The catalog which should be used in getTables calls, when the caller passed NULL.") + "ImplicitCatalogRestriction" + ,"The catalog which should be used in getTables calls, when the caller passed NULL." ,false ,OUString( ) ,Sequence< OUString > ()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ImplicitSchemaRestriction") - ,OUString("The schema which should be used in getTables calls, when the caller passed NULL.") + "ImplicitSchemaRestriction" + ,"The schema which should be used in getTables calls, when the caller passed NULL." ,false ,OUString( ) ,Sequence< OUString > ()) diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 491dd7a0d72e..128bb6daf9c7 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -170,12 +170,12 @@ namespace connectivity if ( _eType == T_DRIVERTYPE::Odbc ) { aProps.push_back( PropertyValue( - OUString("Silent") + "Silent" ,0 ,makeAny(true) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - OUString("PreventGetVersionColumns") + "PreventGetVersionColumns" ,0 ,makeAny(true) ,PropertyState_DIRECT_VALUE) ); @@ -185,7 +185,7 @@ namespace connectivity if (!jdc) { aProps.push_back( PropertyValue( - OUString("JavaDriverClass") + "JavaDriverClass" ,0 ,makeAny(OUString("com.mysql.jdbc.Driver")) ,PropertyState_DIRECT_VALUE) ); @@ -194,23 +194,23 @@ namespace connectivity else { aProps.push_back( PropertyValue( - OUString("PublicConnectionURL") + "PublicConnectionURL" ,0 ,makeAny(_sUrl) ,PropertyState_DIRECT_VALUE) ); } aProps.push_back( PropertyValue( - OUString("IsAutoRetrievingEnabled") + "IsAutoRetrievingEnabled" ,0 ,makeAny(true) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - OUString("AutoRetrievingStatement") + "AutoRetrievingStatement" ,0 ,makeAny(OUString("SELECT LAST_INSERT_ID()")) ,PropertyState_DIRECT_VALUE) ); aProps.push_back( PropertyValue( - OUString("ParameterNameSubstitution") + "ParameterNameSubstitution" ,0 ,makeAny(true) ,PropertyState_DIRECT_VALUE) ); @@ -335,25 +335,25 @@ namespace connectivity aDriverInfo.push_back(DriverPropertyInfo( - OUString("CharSet") - ,OUString("CharSet of the database.") + "CharSet" + ,"CharSet of the database." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("SuppressVersionColumns") - ,OUString("Display version columns (when available).") + "SuppressVersionColumns" + ,"Display version columns (when available)." ,false - ,OUString("0") + ,"0" ,aBoolean) ); const T_DRIVERTYPE eType = lcl_getDriverType( url ); if ( eType == T_DRIVERTYPE::Jdbc ) { aDriverInfo.push_back(DriverPropertyInfo( - OUString("JavaDriverClass") - ,OUString("The JDBC driver class name.") + "JavaDriverClass" + ,"The JDBC driver class name." ,true ,getJavaDriverClass(info) ,Sequence< OUString >()) @@ -362,15 +362,15 @@ namespace connectivity else if ( eType == T_DRIVERTYPE::Native ) { aDriverInfo.push_back(DriverPropertyInfo( - OUString("LocalSocket") - ,OUString("The file path of a socket to connect to a local MySQL server.") + "LocalSocket" + ,"The file path of a socket to connect to a local MySQL server." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("NamedPipe") - ,OUString("The name of a pipe to connect to a local MySQL server.") + "NamedPipe" + ,"The name of a pipe to connect to a local MySQL server." ,false ,OUString() ,Sequence< OUString >()) diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index c22db08d7226..0a166e6b8424 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -124,66 +124,66 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr aBooleanValues[1] = "true"; aDriverInfo.push_back(DriverPropertyInfo( - OUString("CharSet") - ,OUString("CharSet of the database.") + "CharSet" + ,"CharSet of the database." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("UseCatalog") - ,OUString("Use catalog for file-based databases.") + "UseCatalog" + ,"Use catalog for file-based databases." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("SystemDriverSettings") - ,OUString("Driver settings.") + "SystemDriverSettings" + ,"Driver settings." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("ParameterNameSubstitution") - ,OUString("Change named parameters with '?'.") + "ParameterNameSubstitution" + ,"Change named parameters with '?'." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); 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("IsAutoRetrievingEnabled") - ,OUString("Retrieve generated values.") + "IsAutoRetrievingEnabled" + ,"Retrieve generated values." ,false - ,OUString( "false" ) + ,"false" ,aBooleanValues) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("AutoRetrievingStatement") - ,OUString("Auto-increment statement.") + "AutoRetrievingStatement" + ,"Auto-increment statement." ,false ,OUString() ,Sequence< OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( - OUString("GenerateASBeforeCorrelationName") - ,OUString("Generate AS before table correlation names.") + "GenerateASBeforeCorrelationName" + ,"Generate AS before table correlation names." ,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) ); diff --git a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx index 5336ef24188f..19e03091541c 100644 --- a/connectivity/source/drivers/postgresql/pq_baseresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_baseresultset.cxx @@ -95,25 +95,25 @@ static ::cppu::IPropertyArrayHelper & getResultSetPropertyArrayHelper() // Should really share! // At least use for the handles the #define'd values in .hxx file... Property( - OUString("CursorName"), 0, + "CursorName", 0, ::cppu::UnoType<OUString>::get() , 0 ), Property( - OUString("EscapeProcessing"), 1, + "EscapeProcessing", 1, cppu::UnoType<bool>::get() , 0 ), Property( - OUString("FetchDirection"), 2, + "FetchDirection", 2, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("FetchSize"), 3, + "FetchSize", 3, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("IsBookmarkable"), 4, + "IsBookmarkable", 4, cppu::UnoType<bool>::get() , 0 ), Property( - OUString("ResultSetConcurrency"), 5, + "ResultSetConcurrency", 5, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("ResultSetType"), 6, + "ResultSetType", 6, ::cppu::UnoType<sal_Int32>::get() , 0 ) }; static_assert( SAL_N_ELEMENTS(aTable) == BASERESULTSET_SIZE, "wrong number of elements" ); diff --git a/connectivity/source/drivers/postgresql/pq_connection.cxx b/connectivity/source/drivers/postgresql/pq_connection.cxx index 563345047368..fac27fdde9e3 100644 --- a/connectivity/source/drivers/postgresql/pq_connection.cxx +++ b/connectivity/source/drivers/postgresql/pq_connection.cxx @@ -540,7 +540,7 @@ void Connection::initialize( const Sequence< Any >& aArguments ) buf.append( errorMessage ); // HY092 is "Invalid attribute/option identifier." // Just the most likely error; the error might be HY024 "Invalid attribute value". - throw SQLException( buf.makeStringAndClear(), *this, OUString("HY092"), 5, Any() ); + throw SQLException( buf.makeStringAndClear(), *this, "HY092", 5, Any() ); } for ( PQconninfoOption * opt = oOpts.get(); opt->keyword != nullptr; ++opt) diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index ee75cde78e12..1ec3b8073735 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -98,31 +98,31 @@ static ::cppu::IPropertyArrayHelper & getPreparedStatementPropertyArrayHelper() static Property aTable[] = { Property( - OUString("CursorName"), 0, + "CursorName", 0, ::cppu::UnoType<OUString>::get() , 0 ), Property( - OUString("EscapeProcessing"), 1, + "EscapeProcessing", 1, cppu::UnoType<bool>::get() , 0 ), Property( - OUString("FetchDirection"), 2, + "FetchDirection", 2, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("FetchSize"), 3, + "FetchSize", 3, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("MaxFieldSize"), 4, + "MaxFieldSize", 4, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("MaxRows"), 5, + "MaxRows", 5, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("QueryTimeOut"), 6, + "QueryTimeOut", 6, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("ResultSetConcurrency"), 7, + "ResultSetConcurrency", 7, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("ResultSetType"), 8, + "ResultSetType", 8, ::cppu::UnoType<sal_Int32>::get() , 0 ) }; static_assert( SAL_N_ELEMENTS(aTable) == PREPARED_STATEMENT_SIZE, "wrong number of elements" ); diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx index 0a0b06bb4e88..5fb50e7e63a9 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx @@ -97,7 +97,7 @@ Reference< XResultSetMetaData > SAL_CALL SequenceResultSet::getMetaData( ) // I did not find "IM001" in a specific standard, // but it seems to be used by other systems (such as ODBC) // and some parts of LibreOffice special-case it. - OUString( "IM001" ), 1, Any() ); + "IM001", 1, Any() ); } return m_meta; } diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index 26910e33fc30..51a38056945b 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -116,31 +116,31 @@ static ::cppu::IPropertyArrayHelper & getStatementPropertyArrayHelper() static Property aTable[] = { Property( - OUString("CursorName"), 0, + "CursorName", 0, ::cppu::UnoType<OUString>::get() , 0 ), Property( - OUString("EscapeProcessing"), 1, + "EscapeProcessing", 1, cppu::UnoType<bool>::get() , 0 ), Property( - OUString("FetchDirection"), 2, + "FetchDirection", 2, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("FetchSize"), 3, + "FetchSize", 3, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("MaxFieldSize"), 4, + "MaxFieldSize", 4, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("MaxRows"), 5, + "MaxRows", 5, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("QueryTimeOut"), 6, + "QueryTimeOut", 6, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("ResultSetConcurrency"), 7, + "ResultSetConcurrency", 7, ::cppu::UnoType<sal_Int32>::get() , 0 ), Property( - OUString("ResultSetType"), 8, + "ResultSetType", 8, ::cppu::UnoType<sal_Int32>::get() , 0 ) }; static_assert( SAL_N_ELEMENTS(aTable) == STATEMENT_SIZE, "wrong number of elements" ); diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx index efecdac1fad9..48728f51ca82 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.cxx +++ b/connectivity/source/drivers/postgresql/pq_tools.cxx @@ -120,7 +120,7 @@ void bufferEscapeConstant( OUStringBuffer & buf, const OUString & value, Connect // We have no good XInterface Reference to pass here, so just give NULL throw SQLException(OUString(errstr, strlen(errstr), ConnectionSettings::encoding), nullptr, - OUString("22018"), + "22018", -1, Any()); } @@ -166,7 +166,7 @@ static inline void ibufferQuoteIdentifier( OUStringBuffer & buf, const OUString // Implementation-defined SQLACCESS error throw SQLException(OUString(errstr, strlen(errstr), ConnectionSettings::encoding), nullptr, - OUString("22018"), + "22018", -1, Any()); } diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index 8e880557793c..18e53246187f 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -1597,8 +1597,8 @@ OSQLTable OSQLParseTreeIterator::impl_createTableObject( const OUString& rTableN nullptr, false, rTableName, - OUString("Table"), - OUString("New Created Table"), + "Table", + "New Created Table", rSchemaName, rCatalogName ); @@ -1704,7 +1704,7 @@ void OSQLParseTreeIterator::setSelectColumnName(::rtl::Reference<OSQLColumns>& _ // did not find a column with this name in any of the tables OParseColumn* pColumn = new OParseColumn( aNewColName, - OUString("VARCHAR"), + "VARCHAR", // TODO: does this match with _nType? // Or should be fill this from the getTypeInfo of the connection? OUString(), diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index c588e2d22ed1..1c237ad4fbee 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -1033,10 +1033,10 @@ OSQLParseNode* OSQLParser::buildNode_Date(const double& fValue, sal_Int32 nType) { OUString aEmptyString; OSQLParseNode* pNewNode = new OSQLInternalNode(aEmptyString, SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::set_fct_spec)); - pNewNode->append(new OSQLInternalNode(OUString("{"), SQLNodeType::Punctuation)); + pNewNode->append(new OSQLInternalNode("{", SQLNodeType::Punctuation)); OSQLParseNode* pDateNode = new OSQLInternalNode(aEmptyString, SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::odbc_fct_spec)); pNewNode->append(pDateNode); - pNewNode->append(new OSQLInternalNode(OUString("}"), SQLNodeType::Punctuation)); + pNewNode->append(new OSQLInternalNode("}", SQLNodeType::Punctuation)); switch (nType) { @@ -1493,7 +1493,7 @@ void OSQLParseNode::substituteParameterNames(OSQLParseNode* _pNode) OSQLParseNode* pChildNode = _pNode->getChild(i); if(SQL_ISRULE(pChildNode,parameter) && pChildNode->count() > 1) { - OSQLParseNode* pNewNode = new OSQLParseNode(OUString("?") ,SQLNodeType::Punctuation,0); + OSQLParseNode* pNewNode = new OSQLParseNode("?" ,SQLNodeType::Punctuation,0); delete pChildNode->replace(pChildNode->getChild(0),pNewNode); sal_Int32 nChildCount = pChildNode->count(); for(sal_Int32 j=1;j < nChildCount;++j) @@ -1754,7 +1754,7 @@ void OSQLParseNode::replaceNodeValue(const OUString& rTableAlias, const OUString { OSQLParseNode * pCol = removeAt((sal_uInt32)0); append(new OSQLParseNode(rTableAlias,SQLNodeType::Name)); - append(new OSQLParseNode(OUString("."),SQLNodeType::Punctuation)); + append(new OSQLParseNode(".",SQLNodeType::Punctuation)); append(pCol); } else @@ -1780,7 +1780,7 @@ OSQLParseNode* MakeANDNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf) { OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_term)); pNewNode->append(pLeftLeaf); - pNewNode->append(new OSQLParseNode(OUString("AND"),SQLNodeType::Keyword,SQL_TOKEN_AND)); + pNewNode->append(new OSQLParseNode("AND",SQLNodeType::Keyword,SQL_TOKEN_AND)); pNewNode->append(pRightLeaf); return pNewNode; } @@ -1789,7 +1789,7 @@ OSQLParseNode* MakeORNode(OSQLParseNode *pLeftLeaf,OSQLParseNode *pRightLeaf) { OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::search_condition)); pNewNode->append(pLeftLeaf); - pNewNode->append(new OSQLParseNode(OUString("OR"),SQLNodeType::Keyword,SQL_TOKEN_OR)); + pNewNode->append(new OSQLParseNode("OR",SQLNodeType::Keyword,SQL_TOKEN_OR)); pNewNode->append(pRightLeaf); return pNewNode; } @@ -1889,7 +1889,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool { OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_term)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0)); - pNewNode->append(new OSQLParseNode(OUString("AND"),SQLNodeType::Keyword,SQL_TOKEN_AND)); + pNewNode->append(new OSQLParseNode("AND",SQLNodeType::Keyword,SQL_TOKEN_AND)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1)); replaceAndReset(pSearchCondition,pNewNode); @@ -1909,7 +1909,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool { OSQLParseNode* pNewNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::search_condition)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)0)); - pNewNode->append(new OSQLParseNode(OUString("OR"),SQLNodeType::Keyword,SQL_TOKEN_OR)); + pNewNode->append(new OSQLParseNode("OR",SQLNodeType::Keyword,SQL_TOKEN_OR)); pNewNode->append(pSearchCondition->removeAt((sal_uInt32)1)); replaceAndReset(pSearchCondition,pNewNode); @@ -1947,7 +1947,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pNot = pComparison->getChild(1); OSQLParseNode* pNotNot = nullptr; if(pNot->isRule()) // no NOT token (empty rule) - pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode("NOT",SQLNodeType::Keyword,SQL_TOKEN_NOT); else { assert(SQL_ISTOKEN(pNot,NOT)); @@ -1965,22 +1965,22 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool case SQLNodeType::Equal: assert(pComparison->getNodeType() == SQLNodeType::Equal && "OSQLParseNode::negateSearchCondition: unexpected node type!"); - pNewComparison = new OSQLParseNode(OUString("<>"),SQLNodeType::NotEqual,SQL_NOTEQUAL); + pNewComparison = new OSQLParseNode("<>",SQLNodeType::NotEqual,SQL_NOTEQUAL); break; case SQLNodeType::Less: - pNewComparison = new OSQLParseNode(OUString(">="),SQLNodeType::GreatEq,SQL_GREATEQ); + pNewComparison = new OSQLParseNode(">=",SQLNodeType::GreatEq,SQL_GREATEQ); break; case SQLNodeType::Great: - pNewComparison = new OSQLParseNode(OUString("<="),SQLNodeType::LessEq,SQL_LESSEQ); + pNewComparison = new OSQLParseNode("<=",SQLNodeType::LessEq,SQL_LESSEQ); break; case SQLNodeType::LessEq: - pNewComparison = new OSQLParseNode(OUString(">"),SQLNodeType::Great,SQL_GREAT); + pNewComparison = new OSQLParseNode(">",SQLNodeType::Great,SQL_GREAT); break; case SQLNodeType::GreatEq: - pNewComparison = new OSQLParseNode(OUString("<"),SQLNodeType::Less,SQL_LESS); + pNewComparison = new OSQLParseNode("<",SQLNodeType::Less,SQL_LESS); break; case SQLNodeType::NotEqual: - pNewComparison = new OSQLParseNode(OUString("="),SQLNodeType::Equal,SQL_EQUAL); + pNewComparison = new OSQLParseNode("=",SQLNodeType::Equal,SQL_EQUAL); break; } pSearchCondition->replace(pComparison, pNewComparison); @@ -2000,7 +2000,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pNot = pPart2->getChild(nNotPos); OSQLParseNode* pNotNot = nullptr; if(pNot->isRule()) // no NOT token (empty rule) - pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode("NOT",SQLNodeType::Keyword,SQL_TOKEN_NOT); else { assert(SQL_ISTOKEN(pNot,NOT)); @@ -2014,7 +2014,7 @@ void OSQLParseNode::negateSearchCondition(OSQLParseNode*& pSearchCondition, bool OSQLParseNode* pNot = pSearchCondition->getChild( 1 )->getChild( 0 ); OSQLParseNode* pNotNot = nullptr; if(pNot->isRule()) - pNotNot = new OSQLParseNode(OUString("NOT"),SQLNodeType::Keyword,SQL_TOKEN_NOT); + pNotNot = new OSQLParseNode("NOT",SQLNodeType::Keyword,SQL_TOKEN_NOT); else pNotNot = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::sql_not)); pSearchCondition->getChild( 1 )->replace(pNot, pNotNot); @@ -2104,9 +2104,9 @@ void OSQLParseNode::absorptions(OSQLParseNode*& pSearchCondition) OSQLParseNode* p2ndAnd = MakeANDNode(new OSQLParseNode(*pA),pC); pNewNode = MakeORNode(p1stAnd,p2ndAnd); OSQLParseNode* pNode = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNode->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); + pNode->append(new OSQLParseNode("(",SQLNodeType::Punctuation)); pNode->append(pNewNode); - pNode->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); + pNode->append(new OSQLParseNode(")",SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(p1stAnd); OSQLParseNode::eraseBraces(p2ndAnd); replaceAndReset(pSearchCondition,pNode); @@ -2183,9 +2183,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pNode = MakeORNode(pLeft,pRight); OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2200,9 +2200,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pNode = MakeORNode(pLeft,pRight); OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2217,9 +2217,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pNode = MakeORNode(pLeft,pRight); OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); @@ -2234,9 +2234,9 @@ void OSQLParseNode::compress(OSQLParseNode *&pSearchCondition) OSQLParseNode* pNode = MakeORNode(pLeft,pRight); OSQLParseNode* pNewRule = new OSQLParseNode(OUString(),SQLNodeType::Rule,OSQLParser::RuleID(OSQLParseNode::boolean_primary)); - pNewRule->append(new OSQLParseNode(OUString("("),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode("(",SQLNodeType::Punctuation)); pNewRule->append(pNode); - pNewRule->append(new OSQLParseNode(OUString(")"),SQLNodeType::Punctuation)); + pNewRule->append(new OSQLParseNode(")",SQLNodeType::Punctuation)); OSQLParseNode::eraseBraces(pLeft); OSQLParseNode::eraseBraces(pRight); |