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

remove unnecessary use of OUString constructor in CONNECTIVITY module

Browse Source 
Change-Id: Ie32d03920d996db2793ead9940fc90668cde03dd
This commit is contained in:
Noel Grandin 2013-11-04 13:51:21 +02:00
parent 2f2416ff06
commit 1bdb2b6f06
62 changed files with 177 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connectivity/qa/connectivity/ado/DriverTest.cxx
View File

@ -65,7 +65,7 @@ void AdoDriverTest::setUp()
m_xAdoComponent = getMultiServiceFactory()->createInstance("com.sun.star.comp.sdbc.ado.ODriver"); m_xAdoComponent = getMultiServiceFactory()->createInstance("com.sun.star.comp.sdbc.ado.ODriver");
CPPUNIT_ASSERT_MESSAGE("no ado component!", m_xAdoComponent.is()); CPPUNIT_ASSERT_MESSAGE("no ado component!", m_xAdoComponent.is());
OUString url = OUString("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=") + OUString url = "sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=" +
getPathFromWorkdir("/CppunitTest/TS001018407.mdb"); getPathFromWorkdir("/CppunitTest/TS001018407.mdb");
Sequence< PropertyValue > info; Sequence< PropertyValue > info;

2
connectivity/qa/connectivity/mork/DriverTest.cxx
View File

@ -64,7 +64,7 @@ void MorkDriverTest::setUp()
// is this the best way to pass test file through URL? // is this the best way to pass test file through URL?
// may be take a custom Sequence< PropertyValue > route? // may be take a custom Sequence< PropertyValue > route?
OUString url = OUString("sdbc:address:thunderbird:unittest:") + OUString url = "sdbc:address:thunderbird:unittest:" +
getPathFromSrc("/connectivity/qa/connectivity/mork/abook_10_john_does.mab"); getPathFromSrc("/connectivity/qa/connectivity/mork/abook_10_john_does.mab");
Sequence< PropertyValue > info; Sequence< PropertyValue > info;

2
connectivity/source/cpool/ZPoolCollection.cxx
View File

@ -171,7 +171,7 @@ OUString SAL_CALL OPoolCollection::getImplementationName_Static( ) throw(Runtim
Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( ) throw(RuntimeException) Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( ) throw(RuntimeException)
{ {
Sequence< OUString > aSupported(1); Sequence< OUString > aSupported(1);
aSupported[0] = OUString("com.sun.star.sdbc.ConnectionPool"); aSupported[0] = "com.sun.star.sdbc.ConnectionPool";
return aSupported; return aSupported;
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

14
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
View File

@ -907,8 +907,8 @@ void ODatabaseMetaDataResultSet::setColumnsMap()
m_aValueRange[12] = aMap; m_aValueRange[12] = aMap;
::std::map< sal_Int32,OUString> aMap2; ::std::map< sal_Int32,OUString> aMap2;
aMap2[0] = OUString("YES"); aMap2[0] = "YES";
aMap2[1] = OUString("NO"); aMap2[1] = "NO";
m_aIntValueRange[18] = aMap2; m_aIntValueRange[18] = aMap2;
ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this); ODatabaseMetaDataResultSetMetaData* pMetaData = new ODatabaseMetaDataResultSetMetaData(m_pRecordSet,this);
@ -1040,9 +1040,9 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap()
m_aValueRange[8] = aMap2; m_aValueRange[8] = aMap2;
::std::map< sal_Int32,OUString> aMap3; ::std::map< sal_Int32,OUString> aMap3;
aMap3[0] = OUString(); aMap3[0] = "";
aMap3[DB_COLLATION_ASC] = OUString("A"); aMap3[DB_COLLATION_ASC] = "A";
aMap3[DB_COLLATION_DESC] = OUString("D"); aMap3[DB_COLLATION_DESC] = "D";
m_aIntValueRange[21] = aMap3; m_aIntValueRange[21] = aMap3;
@ -1063,8 +1063,8 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
m_aColMapping.push_back(7); m_aColMapping.push_back(7);
::std::map< sal_Int32,OUString> aMap; ::std::map< sal_Int32,OUString> aMap;
aMap[0] = OUString("YES"); aMap[0] = "YES";
aMap[1] = OUString("NO"); aMap[1] = "NO";
m_aIntValueRange[7] = aMap; m_aIntValueRange[7] = aMap;

8
connectivity/source/drivers/ado/ADriver.cxx
View File

@ -90,8 +90,8 @@ OUString ODriver::getImplementationName_Static( ) throw(RuntimeException)
Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException) Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
{ {
Sequence< OUString > aSNS( 2 ); Sequence< OUString > aSNS( 2 );
aSNS[0] = OUString("com.sun.star.sdbc.Driver"); aSNS[0] = "com.sun.star.sdbc.Driver";
aSNS[1] = OUString("com.sun.star.sdbcx.Driver"); aSNS[1] = "com.sun.star.sdbcx.Driver";
return aSNS; return aSNS;
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
@ -155,8 +155,8 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
::std::vector< DriverPropertyInfo > aDriverInfo; ::std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< OUString > aBooleanValues(2); Sequence< OUString > aBooleanValues(2);
aBooleanValues[0] = OUString( "false" ); aBooleanValues[0] = "false";
aBooleanValues[1] = OUString( "true" ); aBooleanValues[1] = "true";
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
OUString("IgnoreDriverPrivileges") OUString("IgnoreDriverPrivileges")

4
connectivity/source/drivers/ado/AResultSet.cxx
View File

@ -61,8 +61,8 @@ OUString SAL_CALL OResultSet::getImplementationName( ) throw (::com::sun::star:
::com::sun::star::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
{ {
::com::sun::star::uno::Sequence< OUString > aSupported(2); ::com::sun::star::uno::Sequence< OUString > aSupported(2);
aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported; return aSupported;
} }

8
connectivity/source/drivers/calc/CConnection.cxx
View File

@ -87,7 +87,7 @@ void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValu
} }
m_aFileName = aURL.GetMainURL(INetURLObject::NO_DECODE); m_aFileName = aURL.GetMainURL(INetURLObject::NO_DECODE);
m_sPassword = OUString(); m_sPassword = "";
const char* pPwd = "password"; const char* pPwd = "password";
const PropertyValue *pIter = info.getConstArray(); const PropertyValue *pIter = info.getConstArray();
@ -114,16 +114,16 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
} }
// open read-only as long as updating isn't implemented // open read-only as long as updating isn't implemented
Sequence<PropertyValue> aArgs(2); Sequence<PropertyValue> aArgs(2);
aArgs[0].Name = OUString("Hidden"); aArgs[0].Name = "Hidden";
aArgs[0].Value <<= (sal_Bool) sal_True; aArgs[0].Value <<= (sal_Bool) sal_True;
aArgs[1].Name = OUString("ReadOnly"); aArgs[1].Name = "ReadOnly";
aArgs[1].Value <<= (sal_Bool) sal_True; aArgs[1].Value <<= (sal_Bool) sal_True;
if ( !m_sPassword.isEmpty() ) if ( !m_sPassword.isEmpty() )
{ {
const sal_Int32 nPos = aArgs.getLength(); const sal_Int32 nPos = aArgs.getLength();
aArgs.realloc(nPos+1); aArgs.realloc(nPos+1);
aArgs[nPos].Name = OUString("Password"); aArgs[nPos].Name = "Password";
aArgs[nPos].Value <<= m_sPassword; aArgs[nPos].Value <<= m_sPassword;
} }

4
connectivity/source/drivers/calc/CResultSet.cxx
View File

@ -51,8 +51,8 @@ OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeExcep
Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException) Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{ {
Sequence< OUString > aSupported(2); Sequence< OUString > aSupported(2);
aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported; return aSupported;
} }

12
connectivity/source/drivers/calc/CTable.cxx
View File

@ -479,23 +479,23 @@ void OCalcTable::fillColumns()
} }
break; break;
case DataType::DECIMAL: case DataType::DECIMAL:
aTypeName = OUString("DECIMAL"); aTypeName = "DECIMAL";
break; break;
case DataType::BIT: case DataType::BIT:
aTypeName = OUString("BOOL"); aTypeName = "BOOL";
break; break;
case DataType::DATE: case DataType::DATE:
aTypeName = OUString("DATE"); aTypeName = "DATE";
break; break;
case DataType::TIME: case DataType::TIME:
aTypeName = OUString("TIME"); aTypeName = "TIME";
break; break;
case DataType::TIMESTAMP: case DataType::TIMESTAMP:
aTypeName = OUString("TIMESTAMP"); aTypeName = "TIMESTAMP";
break; break;
default: default:
SAL_WARN( "connectivity.drivers","missing type name"); SAL_WARN( "connectivity.drivers","missing type name");
aTypeName = OUString(); aTypeName = "";
} }
// check if the column name already exists // check if the column name already exists

2
connectivity/source/drivers/dbase/DConnection.cxx
View File

@ -45,7 +45,7 @@ DBG_NAME(ODbaseConnection)
ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver) ODbaseConnection::ODbaseConnection(ODriver* _pDriver) : OConnection(_pDriver)
{ {
DBG_CTOR(ODbaseConnection,NULL); DBG_CTOR(ODbaseConnection,NULL);
m_aFilenameExtension = OUString("dbf"); m_aFilenameExtension = "dbf";
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
ODbaseConnection::~ODbaseConnection() ODbaseConnection::~ODbaseConnection()

4
connectivity/source/drivers/dbase/DDriver.cxx
View File

@ -81,8 +81,8 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
::std::vector< DriverPropertyInfo > aDriverInfo; ::std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< OUString > aBoolean(2); Sequence< OUString > aBoolean(2);
aBoolean[0] = OUString("0"); aBoolean[0] = "0";
aBoolean[1] = OUString("1"); aBoolean[1] = "1";
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
OUString("CharSet") OUString("CharSet")

4
connectivity/source/drivers/dbase/DResultSet.cxx
View File

@ -55,8 +55,8 @@ OUString SAL_CALL ODbaseResultSet::getImplementationName( ) throw ( RuntimeExce
Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) throw( RuntimeException) Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{ {
Sequence< OUString > aSupported(2); Sequence< OUString > aSupported(2);
aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported; return aSupported;
} }

2
connectivity/source/drivers/evoab2/NCatalog.cxx
View File

@ -43,7 +43,7 @@ void OEvoabCatalog::refreshTables()
{ {
TStringVector aVector; TStringVector aVector;
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("TABLE"); aTypes[0] = "TABLE";
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
OUString("%"),OUString("%"),aTypes); OUString("%"),OUString("%"),aTypes);

2
connectivity/source/drivers/evoab2/NDriver.cxx
View File

@ -92,7 +92,7 @@ Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (Ru
// which service is supported // which service is supported
// for more information @see com.sun.star.sdbc.Driver // for more information @see com.sun.star.sdbc.Driver
Sequence< OUString > aSNS( 1 ); Sequence< OUString > aSNS( 1 );
aSNS[0] = OUString("com.sun.star.sdbc.Driver"); aSNS[0] = "com.sun.star.sdbc.Driver";
return aSNS; return aSNS;
} }
//------------------------------------------------------------------ //------------------------------------------------------------------

2
connectivity/source/drivers/evoab2/NResultSet.cxx
View File

@ -72,7 +72,7 @@ OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeExce
Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException) Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{ {
Sequence< OUString > aSupported(1); Sequence< OUString > aSupported(1);
aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); aSupported[0] = "com.sun.star.sdbc.ResultSet";
return aSupported; return aSupported;
} }

2
connectivity/source/drivers/evoab2/NTables.cxx
View File

@ -50,7 +50,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName)
OUString aSchema( "%" ); OUString aSchema( "%" );
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("TABLE"); aTypes[0] = "TABLE";
OUString sEmpty; OUString sEmpty;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);

6
connectivity/source/drivers/file/FConnection.cxx
View File

@ -167,7 +167,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >&
// set fields to fetch // set fields to fetch
Sequence< OUString > aProps(1); Sequence< OUString > aProps(1);
OUString* pProps = aProps.getArray(); OUString* pProps = aProps.getArray();
pProps[ 0 ] = OUString("Title"); pProps[ 0 ] = "Title";
try try
{ {
@ -394,7 +394,7 @@ Reference< XDynamicResultSet > OConnection::getDir() const
Reference<XDynamicResultSet> xContent; Reference<XDynamicResultSet> xContent;
Sequence< OUString > aProps(1); Sequence< OUString > aProps(1);
OUString* pProps = aProps.getArray(); OUString* pProps = aProps.getArray();
pProps[ 0 ] = OUString("Title"); pProps[ 0 ] = "Title";
try try
{ {
Reference<XContentIdentifier> xIdent = getContent()->getIdentifier(); Reference<XContentIdentifier> xIdent = getContent()->getIdentifier();
@ -437,7 +437,7 @@ void OConnection::throwUrlNotValid(const OUString & _rsUrl,const OUString & _rsM
"$URL$", _rsUrl "$URL$", _rsUrl
); );
aError.SQLState = OUString("S1000"); aError.SQLState = "S1000";
aError.ErrorCode = 0; aError.ErrorCode = 0;
aError.Context = static_cast< XConnection* >(this); aError.Context = static_cast< XConnection* >(this);
if (!_rsMessage.isEmpty()) if (!_rsMessage.isEmpty())

38
connectivity/source/drivers/file/FDateFunctions.cxx
View File

@ -104,25 +104,25 @@ ORowSetValue OOp_DayName::operate(const ORowSetValue& lhs) const
switch(eDayOfWeek) switch(eDayOfWeek)
{ {
case MONDAY: case MONDAY:
sRet = OUString("Monday"); sRet = "Monday";
break; break;
case TUESDAY: case TUESDAY:
sRet = OUString("Tuesday"); sRet = "Tuesday";
break; break;
case WEDNESDAY: case WEDNESDAY:
sRet = OUString("Wednesday"); sRet = "Wednesday";
break; break;
case THURSDAY: case THURSDAY:
sRet = OUString("Thursday"); sRet = "Thursday";
break; break;
case FRIDAY: case FRIDAY:
sRet = OUString("Friday"); sRet = "Friday";
break; break;
case SATURDAY: case SATURDAY:
sRet = OUString("Saturday"); sRet = "Saturday";
break; break;
case SUNDAY: case SUNDAY:
sRet = OUString("Sunday"); sRet = "Sunday";
break; break;
default: default:
OSL_FAIL("Error in enum values for date"); OSL_FAIL("Error in enum values for date");
@ -140,40 +140,40 @@ ORowSetValue OOp_MonthName::operate(const ORowSetValue& lhs) const
switch(aD.Month) switch(aD.Month)
{ {
case 1: case 1:
sRet = OUString("January"); sRet = "January";
break; break;
case 2: case 2:
sRet = OUString("February"); sRet = "February";
break; break;
case 3: case 3:
sRet = OUString("March"); sRet = "March";
break; break;
case 4: case 4:
sRet = OUString("April"); sRet = "April";
break; break;
case 5: case 5:
sRet = OUString("May"); sRet = "May";
break; break;
case 6: case 6:
sRet = OUString("June"); sRet = "June";
break; break;
case 7: case 7:
sRet = OUString("July"); sRet = "July";
break; break;
case 8: case 8:
sRet = OUString("August"); sRet = "August";
break; break;
case 9: case 9:
sRet = OUString("September"); sRet = "September";
break; break;
case 10: case 10:
sRet = OUString("October"); sRet = "October";
break; break;
case 11: case 11:
sRet = OUString("November"); sRet = "November";
break; break;
case 12: case 12:
sRet = OUString("December"); sRet = "December";
break; break;
} }
return sRet; return sRet;

8
connectivity/source/drivers/file/FDriver.cxx
View File

@ -70,8 +70,8 @@ OUString OFileDriver::getImplementationName_Static( ) throw(RuntimeException)
Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
{ {
Sequence< OUString > aSNS( 2 ); Sequence< OUString > aSNS( 2 );
aSNS[0] = OUString("com.sun.star.sdbc.Driver"); aSNS[0] = "com.sun.star.sdbc.Driver";
aSNS[1] = OUString("com.sun.star.sdbcx.Driver"); aSNS[1] = "com.sun.star.sdbcx.Driver";
return aSNS; return aSNS;
} }
@ -122,8 +122,8 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt
::std::vector< DriverPropertyInfo > aDriverInfo; ::std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< OUString > aBoolean(2); Sequence< OUString > aBoolean(2);
aBoolean[0] = OUString("0"); aBoolean[0] = "0";
aBoolean[1] = OUString("1"); aBoolean[1] = "1";
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
OUString("CharSet") OUString("CharSet")

4
connectivity/source/drivers/firebird/Driver.cxx
View File

@ -105,8 +105,8 @@ rtl::OUString FirebirdDriver::getImplementationName_Static() throw(RuntimeExcept
Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (RuntimeException) Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (RuntimeException)
{ {
Sequence< OUString > aSNS( 2 ); Sequence< OUString > aSNS( 2 );
aSNS[0] = OUString("com.sun.star.sdbc.Driver"); aSNS[0] = "com.sun.star.sdbc.Driver";
aSNS[0] = OUString("com.sun.star.sdbcx.Driver"); aSNS[0] = "com.sun.star.sdbcx.Driver";
return aSNS; return aSNS;
} }

4
connectivity/source/drivers/firebird/ResultSet.cxx
View File

@ -807,8 +807,8 @@ Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames()
throw( RuntimeException) throw( RuntimeException)
{ {
Sequence< OUString > aSupported(2); Sequence< OUString > aSupported(2);
aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported; return aSupported;
} }

4
connectivity/source/drivers/flat/EDriver.cxx
View File

@ -85,8 +85,8 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
::std::vector< DriverPropertyInfo > aDriverInfo; ::std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< OUString > aBoolean(2); Sequence< OUString > aBoolean(2);
aBoolean[0] = OUString("0"); aBoolean[0] = "0";
aBoolean[1] = OUString("1"); aBoolean[1] = "1";
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
OUString("FieldDelimiter") OUString("FieldDelimiter")

4
connectivity/source/drivers/flat/EResultSet.cxx
View File

@ -52,8 +52,8 @@ OUString SAL_CALL OFlatResultSet::getImplementationName( ) throw ( RuntimeExcep
Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw( RuntimeException) Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{ {
Sequence< OUString > aSupported(2); Sequence< OUString > aSupported(2);
aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported; return aSupported;
} }

2
connectivity/source/drivers/hsqldb/HCatalog.cxx
View File

@ -71,7 +71,7 @@ void OHCatalog::refreshTables()
void OHCatalog::refreshViews() void OHCatalog::refreshViews()
{ {
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("VIEW"); aTypes[0] = "VIEW";
sal_Bool bSupportsViews = sal_False; sal_Bool bSupportsViews = sal_False;
try try

4
connectivity/source/drivers/hsqldb/HColumns.cxx
View File

@ -55,7 +55,7 @@ OHSQLColumn::OHSQLColumn( sal_Bool _bCase)
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
void OHSQLColumn::construct() void OHSQLColumn::construct()
{ {
m_sAutoIncrement = OUString("IDENTITY"); m_sAutoIncrement = "IDENTITY";
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -72,7 +72,7 @@ void OHSQLColumn::construct()
Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) throw(RuntimeException) Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) throw(RuntimeException)
{ {
Sequence< OUString > aSupported(1); Sequence< OUString > aSupported(1);
aSupported[0] = OUString("com.sun.star.sdbcx.Column"); aSupported[0] = "com.sun.star.sdbcx.Column";
return aSupported; return aSupported;
} }

6
connectivity/source/drivers/hsqldb/HDriver.cxx
View File

@ -510,8 +510,8 @@ namespace connectivity
Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException)
{ {
Sequence< OUString > aSNS( 2 ); Sequence< OUString > aSNS( 2 );
aSNS[0] = OUString("com.sun.star.sdbc.Driver"); aSNS[0] = "com.sun.star.sdbc.Driver";
aSNS[1] = OUString("com.sun.star.sdbcx.Driver"); aSNS[1] = "com.sun.star.sdbcx.Driver";
return aSNS; return aSNS;
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
@ -829,7 +829,7 @@ namespace connectivity
//.............................................................. //..............................................................
OUString lcl_getSystemLocale( const Reference< XComponentContext >& _rxContext ) OUString lcl_getSystemLocale( const Reference< XComponentContext >& _rxContext )
{ {
OUString sLocaleString = OUString( "en-US" ); OUString sLocaleString = "en-US";
try try
{ {
//......................................................... //.........................................................

6
connectivity/source/drivers/jdbc/JDriver.cxx
View File

@ -63,7 +63,7 @@ OUString java_sql_Driver::getImplementationName_Static( ) throw(RuntimeExceptio
Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) throw (RuntimeException) Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) throw (RuntimeException)
{ {
Sequence< OUString > aSNS( 1 ); Sequence< OUString > aSNS( 1 );
aSNS[0] = OUString("com.sun.star.sdbc.Driver"); aSNS[0] = "com.sun.star.sdbc.Driver";
return aSNS; return aSNS;
} }
//------------------------------------------------------------------ //------------------------------------------------------------------
@ -136,8 +136,8 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const
::std::vector< DriverPropertyInfo > aDriverInfo; ::std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< OUString > aBooleanValues(2); Sequence< OUString > aBooleanValues(2);
aBooleanValues[0] = OUString( "false" ); aBooleanValues[0] = "false";
aBooleanValues[1] = OUString( "true" ); aBooleanValues[1] = "true";
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
OUString("JavaDriverClass") OUString("JavaDriverClass")

2
connectivity/source/drivers/kab/KCatalog.cxx
View File

@ -43,7 +43,7 @@ void KabCatalog::refreshTables()
{ {
TStringVector aVector; TStringVector aVector;
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("%"); aTypes[0] = "%";
Reference< XResultSet > xResult = m_xMetaData->getTables( Reference< XResultSet > xResult = m_xMetaData->getTables(
Any(), Any(),
OUString("%"), OUString("%"),

6
connectivity/source/drivers/kab/KDriver.cxx
View File

@ -233,7 +233,7 @@ void KabImplModule::impl_throwGenericSQLException( const OUString& _rMessage )
{ {
SQLException aError; SQLException aError;
aError.Message = _rMessage; aError.Message = _rMessage;
aError.SQLState = OUString( "S1000" ); aError.SQLState = "S1000";
aError.ErrorCode = 0; aError.ErrorCode = 0;
throw aError; throw aError;
} }
@ -249,7 +249,7 @@ void KabImplModule::impl_throwKdeTooNewException()
"$major$",OUString::number(MIN_KDE_VERSION_MAJOR), "$major$",OUString::number(MIN_KDE_VERSION_MAJOR),
"$minor$",OUString::number(MIN_KDE_VERSION_MINOR) "$minor$",OUString::number(MIN_KDE_VERSION_MINOR)
); );
aError.SQLState = OUString( "S1000" ); aError.SQLState = "S1000";
aError.ErrorCode = 0; aError.ErrorCode = 0;
SQLContext aDetails; SQLContext aDetails;
@ -351,7 +351,7 @@ Sequence< OUString > KabDriver::getSupportedServiceNames_Static( ) throw (Runti
// which service is supported // which service is supported
// for more information @see com.sun.star.sdbc.Driver // for more information @see com.sun.star.sdbc.Driver
Sequence< OUString > aSNS( 1 ); Sequence< OUString > aSNS( 1 );
aSNS[0] = OUString("com.sun.star.sdbc.Driver"); aSNS[0] = "com.sun.star.sdbc.Driver";
return aSNS; return aSNS;
} }

4
connectivity/source/drivers/kab/KTables.cxx
View File

@ -38,11 +38,11 @@ using namespace ::com::sun::star::lang;
sdbcx::ObjectType KabTables::createObject(const OUString& _rName) sdbcx::ObjectType KabTables::createObject(const OUString& _rName)
{ {
OUString aName,aSchema; OUString aName,aSchema;
aSchema = OUString("%"); aSchema = "%";
aName = _rName; aName = _rName;
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("%"); aTypes[0] = "%";
OUString sEmpty; OUString sEmpty;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes);

4
connectivity/source/drivers/macab/MacabCatalog.cxx
View File

@ -43,7 +43,7 @@ void MacabCatalog::refreshTables()
{ {
TStringVector aVector; TStringVector aVector;
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("%"); aTypes[0] = "%";
Reference< XResultSet > xResult = m_xMetaData->getTables( Reference< XResultSet > xResult = m_xMetaData->getTables(
Any(), Any(),
OUString("%"), OUString("%"),
@ -84,7 +84,7 @@ void MacabCatalog::refreshUsers()
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
const OUString& MacabCatalog::getDot() const OUString& MacabCatalog::getDot()
{ {
static const OUString sDot = OUString("."); static const OUString sDot = ".";
return sDot; return sDot;
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

4
connectivity/source/drivers/macab/MacabDriver.cxx
View File

@ -141,7 +141,7 @@ void MacabImplModule::impl_throwGenericSQLException( const OUString& _rMessage )
{ {
SQLException aError; SQLException aError;
aError.Message = _rMessage; aError.Message = _rMessage;
aError.SQLState = OUString( "S1000" ); aError.SQLState = "S1000";
aError.ErrorCode = 0; aError.ErrorCode = 0;
throw aError; throw aError;
} }
@ -219,7 +219,7 @@ Sequence< OUString > MacabDriver::getSupportedServiceNames_Static( ) throw (Run
// which service is supported // which service is supported
// for more information @see com.sun.star.sdbc.Driver // for more information @see com.sun.star.sdbc.Driver
Sequence< OUString > aSNS( 1 ); Sequence< OUString > aSNS( 1 );
aSNS[0] = OUString("com.sun.star.sdbc.Driver"); aSNS[0] = "com.sun.star.sdbc.Driver";
return aSNS; return aSNS;
} }

4
connectivity/source/drivers/macab/MacabTables.cxx
View File

@ -38,11 +38,11 @@ using namespace ::com::sun::star::lang;
sdbcx::ObjectType MacabTables::createObject(const OUString& _rName) sdbcx::ObjectType MacabTables::createObject(const OUString& _rName)
{ {
OUString aName,aSchema; OUString aName,aSchema;
aSchema = OUString("%"); aSchema = "%";
aName = _rName; aName = _rName;
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("%"); aTypes[0] = "%";
OUString sEmpty; OUString sEmpty;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), aSchema, aName, aTypes);

2
connectivity/source/drivers/mork/MCatalog.cxx
View File

@ -51,7 +51,7 @@ void OCatalog::refreshTables()
{ {
TStringVector aVector; TStringVector aVector;
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("%"); aTypes[0] = "%";
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
OUString("%"),OUString("%"),aTypes); OUString("%"),OUString("%"),aTypes);

2
connectivity/source/drivers/mork/MNSINIParser.cxx
View File

@ -75,7 +75,7 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce
sectionName = OStringToOUString( sectionName = OStringToOUString(
line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US ); line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US );
if (sectionName.isEmpty()) if (sectionName.isEmpty())
sectionName = OUString("no name section"); sectionName = "no name section";
ini_Section *aSection = &mAllSection[sectionName]; ini_Section *aSection = &mAllSection[sectionName];
aSection->sName = sectionName; aSection->sName = sectionName;

12
connectivity/source/drivers/mork/MResultSet.cxx
View File

@ -71,8 +71,8 @@ OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException
Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{ {
::com::sun::star::uno::Sequence< OUString > aSupported(2); ::com::sun::star::uno::Sequence< OUString > aSupported(2);
aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported; return aSupported;
} }
@ -734,11 +734,11 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchStr
OSQLParseNode *pMark = pNode->getChild(0); OSQLParseNode *pMark = pNode->getChild(0);
// Initialize to empty string // Initialize to empty string
rMatchString = OUString(""); rMatchString = "";
OUString aParameterName; OUString aParameterName;
if (SQL_ISPUNCTUATION(pMark,"?")) { if (SQL_ISPUNCTUATION(pMark,"?")) {
aParameterName = OUString("?"); aParameterName = "?";
} }
else if (SQL_ISPUNCTUATION(pMark,":")) { else if (SQL_ISPUNCTUATION(pMark,":")) {
aParameterName = pNode->getChild(1)->getTokenValue(); aParameterName = pNode->getChild(1)->getTokenValue();
@ -940,7 +940,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
// String containing only a '%' and nothing else // String containing only a '%' and nothing else
op = MQueryOp::Exists; op = MQueryOp::Exists;
// Will be ignored for Exists case, but clear anyway. // Will be ignored for Exists case, but clear anyway.
matchString = OUString(""); matchString = "";
} }
else if ( matchString.indexOf ( WILDCARD ) == -1 && else if ( matchString.indexOf ( WILDCARD ) == -1 &&
matchString.indexOf ( MATCHCHAR ) == -1 ) matchString.indexOf ( MATCHCHAR ) == -1 )
@ -1369,7 +1369,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
if (xTableColumn.is()) if (xTableColumn.is())
xTableColumn->getPropertyValue(sName) >>= sTableColumnName; xTableColumn->getPropertyValue(sName) >>= sTableColumnName;
else else
sTableColumnName = OUString(); sTableColumnName = "";
// look if we have such a select column // look if we have such a select column
// TODO: would like to have a O(log n) search here ... // TODO: would like to have a O(log n) search here ...

4
connectivity/source/drivers/mork/MTables.cxx
View File

@ -47,11 +47,11 @@ using namespace dbtools;
sdbcx::ObjectType OTables::createObject(const OUString& _rName) sdbcx::ObjectType OTables::createObject(const OUString& _rName)
{ {
OUString aName,aSchema; OUString aName,aSchema;
aSchema = OUString("%"); aSchema = "%";
aName = _rName; aName = _rName;
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("%"); aTypes[0] = "%";
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);

2
connectivity/source/drivers/mozab/MCatalog.cxx
View File

@ -51,7 +51,7 @@ void OCatalog::refreshTables()
{ {
TStringVector aVector; TStringVector aVector;
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("%"); aTypes[0] = "%";
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(), Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
OUString("%"),OUString("%"),aTypes); OUString("%"),OUString("%"),aTypes);

16
connectivity/source/drivers/mozab/MResultSet.cxx
View File

@ -70,8 +70,8 @@ OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException
Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{ {
::com::sun::star::uno::Sequence< OUString > aSupported(2); ::com::sun::star::uno::Sequence< OUString > aSupported(2);
aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported; return aSupported;
} }
@ -716,11 +716,11 @@ void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchStr
OSQLParseNode *pMark = pNode->getChild(0); OSQLParseNode *pMark = pNode->getChild(0);
// Initialize to empty string // Initialize to empty string
rMatchString = OUString(""); rMatchString = "";
OUString aParameterName; OUString aParameterName;
if (SQL_ISPUNCTUATION(pMark,"?")) { if (SQL_ISPUNCTUATION(pMark,"?")) {
aParameterName = OUString("?"); aParameterName = "?";
} }
else if (SQL_ISPUNCTUATION(pMark,":")) { else if (SQL_ISPUNCTUATION(pMark,":")) {
aParameterName = pNode->getChild(1)->getTokenValue(); aParameterName = pNode->getChild(1)->getTokenValue();
@ -922,7 +922,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT
// String containing only a '%' and nothing else // String containing only a '%' and nothing else
op = MQueryOp::Exists; op = MQueryOp::Exists;
// Will be ignored for Exists case, but clear anyway. // Will be ignored for Exists case, but clear anyway.
matchString = OUString(""); matchString = "";
} }
else if ( matchString.indexOf ( WILDCARD ) == -1 && else if ( matchString.indexOf ( WILDCARD ) == -1 &&
matchString.indexOf ( MATCHCHAR ) == -1 ) matchString.indexOf ( MATCHCHAR ) == -1 )
@ -1088,9 +1088,9 @@ void OResultSet::fillRowData()
OSL_ENSURE(m_pStatement, "Cannot determine Parent Statement"); OSL_ENSURE(m_pStatement, "Cannot determine Parent Statement");
OUString aStr; OUString aStr;
if (xConnection->isLDAP()) if (xConnection->isLDAP())
aStr = OUString("PrimaryEmail"); aStr = "PrimaryEmail";
else else
aStr = OUString("card:nsIAbCard"); aStr = "card:nsIAbCard";
eVector.push_back( new MQueryExpressionString(aStr, MQueryOp::Exists) ); eVector.push_back( new MQueryExpressionString(aStr, MQueryOp::Exists) );
queryExpression.setExpressions( eVector ); queryExpression.setExpressions( eVector );
@ -1370,7 +1370,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow,
if (xTableColumn.is()) if (xTableColumn.is())
xTableColumn->getPropertyValue(sName) >>= sTableColumnName; xTableColumn->getPropertyValue(sName) >>= sTableColumnName;
else else
sTableColumnName = OUString(); sTableColumnName = "";
// look if we have such a select column // look if we have such a select column
// TODO: would like to have a O(log n) search here ... // TODO: would like to have a O(log n) search here ...

4
connectivity/source/drivers/mozab/MTables.cxx
View File

@ -47,11 +47,11 @@ using namespace dbtools;
sdbcx::ObjectType OTables::createObject(const OUString& _rName) sdbcx::ObjectType OTables::createObject(const OUString& _rName)
{ {
OUString aName,aSchema; OUString aName,aSchema;
aSchema = OUString("%"); aSchema = "%";
aName = _rName; aName = _rName;
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("%"); aTypes[0] = "%";
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes);

2
connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx
View File

@ -82,7 +82,7 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce
sectionName = OStringToOUString( sectionName = OStringToOUString(
line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US ); line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US );
if (sectionName.isEmpty()) if (sectionName.isEmpty())
sectionName = OUString("no name section"); sectionName = "no name section";
ini_Section *aSection = &mAllSection[sectionName]; ini_Section *aSection = &mAllSection[sectionName];
aSection->sName = sectionName; aSection->sName = sectionName;

6
connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx
View File

@ -440,7 +440,7 @@ nsresult getTableStringsProxied(const sal_Char* sAbURI, sal_Int32 *nDirectoryTyp
// Insert table into map // Insert table into map
if ( aTableName.isEmpty() ) if ( aTableName.isEmpty() )
aTableName = OUString("AddressBook"); aTableName = "AddressBook";
OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) ); OSL_TRACE("TableName = >%s<", OUtoCStr( aTableName ) );
@ -624,7 +624,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
::std::vector< OUString > tables; ::std::vector< OUString > tables;
::std::vector< OUString > tabletypes; ::std::vector< OUString > tabletypes;
OUString matchAny = OUString("%"); OUString matchAny = "%";
if ( !getTableStrings( _pCon, tables,tabletypes ) ) if ( !getTableStrings( _pCon, tables,tabletypes ) )
return sal_False; return sal_False;
@ -643,7 +643,7 @@ sal_Bool MDatabaseMetaDataHelper::getTables( OConnection* _pCon,
0 != ::comphelper::findValue( types, aTableType, sal_True ).getLength() || 0 != ::comphelper::findValue( types, aTableType, sal_True ).getLength() ||
0 != ::comphelper::findValue( types, matchAny, sal_True ).getLength())) { 0 != ::comphelper::findValue( types, matchAny, sal_True ).getLength())) {
if ( aTableName.isEmpty() ) { if ( aTableName.isEmpty() ) {
aTableName = OUString("AddressBook"); aTableName = "AddressBook";
} }
OSL_TRACE( "TableName = %s ; TableType = %s", OUtoCStr(aTableName), OUtoCStr(aTableType) ); OSL_TRACE( "TableName = %s ; TableType = %s", OUtoCStr(aTableName), OUtoCStr(aTableType) );

2
connectivity/source/drivers/mysql/YCatalog.cxx
View File

@ -74,7 +74,7 @@ void OMySQLCatalog::refreshTables()
void OMySQLCatalog::refreshViews() void OMySQLCatalog::refreshViews()
{ {
Sequence< OUString > aTypes(1); Sequence< OUString > aTypes(1);
aTypes[0] = OUString("VIEW"); aTypes[0] = "VIEW";
// let's simply assume the server is new enough to support views. Current drivers // let's simply assume the server is new enough to support views. Current drivers
// as of this writing might not return the proper information in getTableTypes, so // as of this writing might not return the proper information in getTableTypes, so

4
connectivity/source/drivers/mysql/YColumns.cxx
View File

@ -55,7 +55,7 @@ OMySQLColumn::OMySQLColumn( sal_Bool _bCase)
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
void OMySQLColumn::construct() void OMySQLColumn::construct()
{ {
m_sAutoIncrement = OUString("auto_increment"); m_sAutoIncrement = "auto_increment";
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -72,7 +72,7 @@ void OMySQLColumn::construct()
Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException) Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException)
{ {
Sequence< OUString > aSupported(1); Sequence< OUString > aSupported(1);
aSupported[0] = OUString("com.sun.star.sdbcx.Column"); aSupported[0] = "com.sun.star.sdbcx.Column";
return aSupported; return aSupported;
} }

19
connectivity/source/drivers/mysql/YDriver.cxx
View File

@ -137,17 +137,12 @@ namespace connectivity
{ {
OUString sNewUrl = _sUrl.copy(11); OUString sNewUrl = _sUrl.copy(11);
if ( isOdbcUrl( _sUrl ) ) if ( isOdbcUrl( _sUrl ) )
sNewUrl = OUString("sdbc:") + sNewUrl; sNewUrl = "sdbc:" + sNewUrl;
else if ( isNativeUrl( _sUrl ) ) else if ( isNativeUrl( _sUrl ) )
sNewUrl = OUString("sdbc:") + sNewUrl; sNewUrl = "sdbc:" + sNewUrl;
else else
{ {
sNewUrl = sNewUrl.copy(5); sNewUrl = "jdbc:mysql://" + sNewUrl.copy(5);
OUString sTempUrl = OUString("jdbc:mysql://");
sTempUrl += sNewUrl;
sNewUrl = sTempUrl;
} }
return sNewUrl; return sNewUrl;
} }
@ -340,8 +335,8 @@ namespace connectivity
return Sequence< DriverPropertyInfo >(); return Sequence< DriverPropertyInfo >();
Sequence< OUString > aBoolean(2); Sequence< OUString > aBoolean(2);
aBoolean[0] = OUString("0"); aBoolean[0] = "0";
aBoolean[1] = OUString("1"); aBoolean[1] = "1";
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
@ -478,8 +473,8 @@ namespace connectivity
Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException)
{ {
Sequence< OUString > aSNS( 2 ); Sequence< OUString > aSNS( 2 );
aSNS[0] = OUString("com.sun.star.sdbc.Driver"); aSNS[0] = "com.sun.star.sdbc.Driver";
aSNS[1] = OUString("com.sun.star.sdbcx.Driver"); aSNS[1] = "com.sun.star.sdbcx.Driver";
return aSNS; return aSNS;
} }
//------------------------------------------------------------------ //------------------------------------------------------------------

8
connectivity/source/drivers/odbc/OFunctions.cxx
View File

@ -91,16 +91,16 @@ sal_Bool LoadLibrary_ODBC3(OUString &_rPath)
if (bLoaded) if (bLoaded)
return sal_True; return sal_True;
#ifdef WNT #ifdef WNT
_rPath = OUString("ODBC32.DLL"); _rPath = "ODBC32.DLL";
#endif #endif
#ifdef UNX #ifdef UNX
#ifdef MACOSX #ifdef MACOSX
_rPath = OUString("libiodbc.dylib"); _rPath = "libiodbc.dylib";
#else #else
_rPath = OUString("libodbc.so.1"); _rPath = "libodbc.so.1";
pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW ); pODBCso = osl_loadModule( _rPath.pData,SAL_LOADMODULE_NOW );
if ( !pODBCso ) if ( !pODBCso )
_rPath = OUString("libodbc.so"); _rPath = "libodbc.so";
#endif /* MACOSX */ #endif /* MACOSX */
#endif #endif

5
connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
View File

@ -51,7 +51,7 @@ ODatabaseMetaData::ODatabaseMetaData(const SQLHANDLE _pHandle,OConnection* _pCon
{ {
m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable());
OUString sVersion = getDriverVersion(); OUString sVersion = getDriverVersion();
m_bOdbc3 = sVersion != OUString("02.50") && sVersion != OUString("02.00"); m_bOdbc3 = sVersion != "02.50" && sVersion != "02.00";
} }
catch(SQLException& ) catch(SQLException& )
{ // doesn't matter here { // doesn't matter here
@ -1188,8 +1188,7 @@ OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeExcep
OUString aValue = m_pConnection->getURL(); OUString aValue = m_pConnection->getURL();
if ( aValue.isEmpty() ) if ( aValue.isEmpty() )
{ {
aValue = OUString("sdbc:odbc:"); aValue = "sdbc:odbc:" + getURLImpl();
aValue += getURLImpl();
} }
return aValue; return aValue;
} }

6
connectivity/source/drivers/odbcbase/ODriver.cxx
View File

@ -68,7 +68,7 @@ OUString ODBCDriver::getImplementationName_Static( ) throw(RuntimeException)
Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException)
{ {
Sequence< OUString > aSNS( 1 ); Sequence< OUString > aSNS( 1 );
aSNS[0] = OUString("com.sun.star.sdbc.Driver"); aSNS[0] = "com.sun.star.sdbc.Driver";
return aSNS; return aSNS;
} }
@ -122,8 +122,8 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr
::std::vector< DriverPropertyInfo > aDriverInfo; ::std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< OUString > aBooleanValues(2); Sequence< OUString > aBooleanValues(2);
aBooleanValues[0] = OUString( "false" ); aBooleanValues[0] = "false";
aBooleanValues[1] = OUString( "true" ); aBooleanValues[1] = "true";
aDriverInfo.push_back(DriverPropertyInfo( aDriverInfo.push_back(DriverPropertyInfo(
OUString("CharSet") OUString("CharSet")

4
connectivity/source/drivers/odbcbase/OResultSet.cxx
View File

@ -75,8 +75,8 @@ OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException
Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{ {
Sequence< OUString > aSupported(2); Sequence< OUString > aSupported(2);
aSupported[0] = OUString("com.sun.star.sdbc.ResultSet"); aSupported[0] = "com.sun.star.sdbc.ResultSet";
aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet"); aSupported[1] = "com.sun.star.sdbcx.ResultSet";
return aSupported; return aSupported;
} }

4
connectivity/source/drivers/postgresql/pq_connection.cxx
View File

@ -148,7 +148,7 @@ static sal_Int32 readLogLevelFromConfiguration()
OUString fileName; OUString fileName;
osl_getModuleURLFromAddress( osl_getModuleURLFromAddress(
(void*) readLogLevelFromConfiguration, (rtl_uString **) &fileName ); (void*) readLogLevelFromConfiguration, (rtl_uString **) &fileName );
fileName = OUString( fileName.getStr(), fileName.lastIndexOf( '/' )+1 ); fileName = fileName.copy( fileName.lastIndexOf( '/' )+1 );
fileName += "postgresql-sdbc.ini"; fileName += "postgresql-sdbc.ini";
rtl::Bootstrap bootstrapHandle( fileName ); rtl::Bootstrap bootstrapHandle( fileName );
@ -558,7 +558,7 @@ void Connection::initialize( const Sequence< Any >& aArguments )
free(err); free(err);
} }
else else
errorMessage = OUString("#no error message#"); errorMessage = "#no error message#";
OUStringBuffer buf( 128 ); OUStringBuffer buf( 128 );
buf.appendAscii( "Error in database URL '" ); buf.appendAscii( "Error in database URL '" );
buf.append( url ); buf.append( url );

2
connectivity/source/parse/PColumn.cxx
View File

@ -266,7 +266,7 @@ void OOrderColumn::construct()
::com::sun::star::uno::Sequence< OUString > SAL_CALL OOrderColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::Sequence< OUString > SAL_CALL OOrderColumn::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException)
{ {
::com::sun::star::uno::Sequence< OUString > aSupported(1); ::com::sun::star::uno::Sequence< OUString > aSupported(1);
aSupported[0] = OUString("com.sun.star.sdb.OrderColumn"); aSupported[0] = "com.sun.star.sdb.OrderColumn";
return aSupported; return aSupported;
} }

16
connectivity/source/parse/sqliterator.cxx
View File

@ -258,7 +258,7 @@ namespace
{ {
_out_rString = _rxRow->getString( _nColumnIndex ); _out_rString = _rxRow->getString( _nColumnIndex );
if ( _rxRow->wasNull() ) if ( _rxRow->wasNull() )
_out_rString= OUString(); _out_rString = "";
} }
//......................................................................... //.........................................................................
@ -280,7 +280,7 @@ namespace
if ( _rxDBMeta.is() ) if ( _rxDBMeta.is() )
{ {
sComposedName = OUString(); sComposedName = "";
Reference< XResultSet> xRes = _rxDBMeta->getTables( Reference< XResultSet> xRes = _rxDBMeta->getTables(
!_rCatalog.isEmpty() ? makeAny( _rCatalog ) : Any(), !_rSchema.isEmpty() ? _rSchema : s_sWildcard, _rTableName, sTableTypes ); !_rCatalog.isEmpty() ? makeAny( _rCatalog ) : Any(), !_rSchema.isEmpty() ? _rSchema : s_sWildcard, _rTableName, sTableTypes );
@ -512,7 +512,7 @@ void OSQLParseTreeIterator::getQualified_join( OSQLTables& _rTables, const OSQLP
OSL_PRECOND( SQL_ISRULE( pTableRef, cross_union ) || SQL_ISRULE( pTableRef, qualified_join ) , OSL_PRECOND( SQL_ISRULE( pTableRef, cross_union ) || SQL_ISRULE( pTableRef, qualified_join ) ,
"OSQLParseTreeIterator::getQualified_join: illegal node!" ); "OSQLParseTreeIterator::getQualified_join: illegal node!" );
aTableRange = OUString(); aTableRange = "";
const OSQLParseNode* pNode = getTableNode(_rTables,pTableRef->getChild(0),aTableRange); const OSQLParseNode* pNode = getTableNode(_rTables,pTableRef->getChild(0),aTableRange);
if ( isTableNode( pNode ) ) if ( isTableNode( pNode ) )
@ -632,7 +632,7 @@ void OSQLParseTreeIterator::getSelect_statement(OSQLTables& _rTables,const OSQLP
OUString aTableRange; OUString aTableRange;
for (sal_uInt32 i = 0; i < pTableRefCommalist->count(); i++) for (sal_uInt32 i = 0; i < pTableRefCommalist->count(); i++)
{ // Process FROM clause { // Process FROM clause
aTableRange = OUString(); aTableRange = "";
const OSQLParseNode* pTableListElement = pTableRefCommalist->getChild(i); const OSQLParseNode* pTableListElement = pTableRefCommalist->getChild(i);
if ( isTableNode( pTableListElement ) ) if ( isTableNode( pTableListElement ) )
@ -725,7 +725,7 @@ namespace
OUString& _out_rColumnName, OUString& _out_rTableRange, OUString& _out_rColumnName, OUString& _out_rTableRange,
const OSQLColumns* _pSelectColumns, OUString& _out_rColumnAliasIfPresent ) const OSQLColumns* _pSelectColumns, OUString& _out_rColumnAliasIfPresent )
{ {
_out_rColumnName = _out_rTableRange = _out_rColumnAliasIfPresent = OUString(); _out_rColumnName = _out_rTableRange = _out_rColumnAliasIfPresent = "";
if ( SQL_ISRULE( _pColumnRef, column_ref ) ) if ( SQL_ISRULE( _pColumnRef, column_ref ) )
{ {
if( _pColumnRef->count() > 1 ) if( _pColumnRef->count() > 1 )
@ -911,7 +911,7 @@ void OSQLParseTreeIterator::traverseCreateColumns(const OSQLParseNode* pSelectNo
} }
else if(pDatatype && pDatatype->getNodeType() == SQL_NODE_KEYWORD) else if(pDatatype && pDatatype->getNodeType() == SQL_NODE_KEYWORD)
{ {
aTypeName = OUString("VARCHAR"); aTypeName = "VARCHAR";
} }
if (!aTypeName.isEmpty()) if (!aTypeName.isEmpty())
@ -1102,8 +1102,8 @@ void OSQLParseTreeIterator::traverseByColumnNames(const OSQLParseNode* pSelectNo
pColumnRef = pColumnRef->getChild(0); pColumnRef = pColumnRef->getChild(0);
} }
OSL_ENSURE(pColumnRef != NULL,"OSQLParseTreeIterator: error in parse tree!"); OSL_ENSURE(pColumnRef != NULL,"OSQLParseTreeIterator: error in parse tree!");
aTableRange = OUString(); aTableRange = "";
sColumnName = OUString(); sColumnName = "";
if ( SQL_ISRULE(pColumnRef,column_ref) ) if ( SQL_ISRULE(pColumnRef,column_ref) )
{ {
// Column name (and TableRange): // Column name (and TableRange):

18
connectivity/source/parse/sqlnode.cxx
View File

@ -373,7 +373,7 @@ bool OSQLParseNode::parseNodeToExecutableStatement( OUString& _out_rString, cons
aParseParam.pParser = &_rParser; aParseParam.pParser = &_rParser;
_out_rString = OUString(); _out_rString = "";
OUStringBuffer sBuffer; OUStringBuffer sBuffer;
bool bSuccess = false; bool bSuccess = false;
try try
@ -794,7 +794,7 @@ sal_Bool OSQLParseNode::getTableComponents(const OSQLParseNode* _pTableNode,
const OSQLParseNode* pTableNode = _pTableNode; const OSQLParseNode* pTableNode = _pTableNode;
// clear the parameter given // clear the parameter given
_rCatalog = Any(); _rCatalog = Any();
_rSchema = _rTable = OUString(); _rSchema = _rTable = "";
// see rule catalog_name: in sqlbison.y // see rule catalog_name: in sqlbison.y
if (SQL_ISRULE(pTableNode,catalog_name)) if (SQL_ISRULE(pTableNode,catalog_name))
{ {
@ -1242,8 +1242,8 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
if ( xFormats.is() ) if ( xFormats.is() )
{ {
::com::sun::star::lang::Locale aLocale; ::com::sun::star::lang::Locale aLocale;
aLocale.Language = OUString("en"); aLocale.Language = "en";
aLocale.Country = OUString("US"); aLocale.Country = "US";
OUString sFormat("YYYY-MM-DD"); OUString sFormat("YYYY-MM-DD");
m_nDateFormatKey = xFormats->queryKey(sFormat,aLocale,sal_False); m_nDateFormatKey = xFormats->queryKey(sFormat,aLocale,sal_False);
if ( m_nDateFormatKey == sal_Int32(-1) ) if ( m_nDateFormatKey == sal_Int32(-1) )
@ -1286,12 +1286,12 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
SQLyylval.pParseNode = NULL; SQLyylval.pParseNode = NULL;
// SQLyypvt = NULL; // SQLyypvt = NULL;
m_pParseTree = NULL; m_pParseTree = NULL;
m_sErrorMessage= OUString(); m_sErrorMessage = "";
// Start the parser // Start the parser
if (SQLyyparse() != 0) if (SQLyyparse() != 0)
{ {
m_sFieldName= OUString(); m_sFieldName = "";
m_xField.clear(); m_xField.clear();
m_xFormatter.clear(); m_xFormatter.clear();
m_nFormatKey = 0; m_nFormatKey = 0;
@ -1312,7 +1312,7 @@ OSQLParseNode* OSQLParser::predicateTree(OUString& rErrorMessage, const OUString
{ {
(*s_pGarbageCollector)->clear(); (*s_pGarbageCollector)->clear();
m_sFieldName= OUString(); m_sFieldName = "";
m_xField.clear(); m_xField.clear();
m_xFormatter.clear(); m_xFormatter.clear();
m_nFormatKey = 0; m_nFormatKey = 0;
@ -1754,14 +1754,14 @@ sal_Bool OSQLParseNode::addDateValue(OUStringBuffer& rString, const SQLParseNode
{ {
if (rParam.aMetaData.shouldEscapeDateTime()) if (rParam.aMetaData.shouldEscapeDateTime())
{ {
suQuote = OUString("#"); suQuote = "#";
} }
} }
else else
{ {
if (rParam.aMetaData.shouldEscapeDateTime()) if (rParam.aMetaData.shouldEscapeDateTime())
{ {
// suQuote = OUString("'"); // suQuote = "'";
return sal_False; return sal_False;
} }
} }

4
connectivity/source/sdbcx/VColumn.cxx
View File

@ -44,9 +44,9 @@ OUString SAL_CALL OColumn::getImplementationName( ) throw (::com::sun::star::un
{ {
::com::sun::star::uno::Sequence< OUString > aSupported(1); ::com::sun::star::uno::Sequence< OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = OUString("com.sun.star.sdbcx.ColumnDescription"); aSupported[0] = "com.sun.star.sdbcx.ColumnDescription";
else else
aSupported[0] = OUString("com.sun.star.sdbcx.Column"); aSupported[0] = "com.sun.star.sdbcx.Column";
return aSupported; return aSupported;
} }

4
connectivity/source/sdbcx/VIndex.cxx
View File

@ -49,9 +49,9 @@ OUString SAL_CALL OIndex::getImplementationName( ) throw (::com::sun::star::uno
{ {
::com::sun::star::uno::Sequence< OUString > aSupported(1); ::com::sun::star::uno::Sequence< OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = OUString("com.sun.star.sdbcx.IndexDescriptor"); aSupported[0] = "com.sun.star.sdbcx.IndexDescriptor";
else else
aSupported[0] = OUString("com.sun.star.sdbcx.Index"); aSupported[0] = "com.sun.star.sdbcx.Index";
return aSupported; return aSupported;
} }

4
connectivity/source/sdbcx/VIndexColumn.cxx
View File

@ -37,9 +37,9 @@ OUString SAL_CALL OIndexColumn::getImplementationName( ) throw (::com::sun::sta
{ {
::com::sun::star::uno::Sequence< OUString > aSupported(1); ::com::sun::star::uno::Sequence< OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = OUString("com.sun.star.sdbcx.IndexDescription"); aSupported[0] = "com.sun.star.sdbcx.IndexDescription";
else else
aSupported[0] = OUString("com.sun.star.sdbcx.Index"); aSupported[0] = "com.sun.star.sdbcx.Index";
return aSupported; return aSupported;
} }

4
connectivity/source/sdbcx/VKey.cxx
View File

@ -47,9 +47,9 @@ OUString SAL_CALL OKey::getImplementationName( ) throw (::com::sun::star::uno::
{ {
::com::sun::star::uno::Sequence< OUString > aSupported(1); ::com::sun::star::uno::Sequence< OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = OUString("com.sun.star.sdbcx.KeyDescription"); aSupported[0] = "com.sun.star.sdbcx.KeyDescription";
else else
aSupported[0] = OUString("com.sun.star.sdbcx.Key"); aSupported[0] = "com.sun.star.sdbcx.Key";
return aSupported; return aSupported;
} }

4
connectivity/source/sdbcx/VKeyColumn.cxx
View File

@ -38,9 +38,9 @@ OUString SAL_CALL OKeyColumn::getImplementationName( ) throw (::com::sun::star:
{ {
::com::sun::star::uno::Sequence< OUString > aSupported(1); ::com::sun::star::uno::Sequence< OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = OUString("com.sun.star.sdbcx.KeyColumnDescription"); aSupported[0] = "com.sun.star.sdbcx.KeyColumnDescription";
else else
aSupported[0] = OUString("com.sun.star.sdbcx.KeyColumn"); aSupported[0] = "com.sun.star.sdbcx.KeyColumn";
return aSupported; return aSupported;
} }

4
connectivity/source/sdbcx/VTable.cxx
View File

@ -52,9 +52,9 @@ OUString SAL_CALL OTable::getImplementationName( ) throw (::com::sun::star::uno
{ {
::com::sun::star::uno::Sequence< OUString > aSupported(1); ::com::sun::star::uno::Sequence< OUString > aSupported(1);
if(isNew()) if(isNew())
aSupported[0] = OUString("com.sun.star.sdbcx.TableDescriptor"); aSupported[0] = "com.sun.star.sdbcx.TableDescriptor";
else else
aSupported[0] = OUString("com.sun.star.sdbcx.Table"); aSupported[0] = "com.sun.star.sdbcx.Table";
return aSupported; return aSupported;
} }

2
connectivity/workben/iniParser/main.cxx
View File

@ -117,7 +117,7 @@ public:
sectionName = OStringToOUString( sectionName = OStringToOUString(
line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US ); line.copy(nIndexStart + 1,nIndexEnd - nIndexStart -1).trim(), RTL_TEXTENCODING_ASCII_US );
if (!sectionName.getLength()) if (!sectionName.getLength())
sectionName = OUString("no name section"); sectionName = "no name section";
ini_Section *aSection = &mAllSection[sectionName]; ini_Section *aSection = &mAllSection[sectionName];
aSection->sName = sectionName; aSection->sName = sectionName;

8
connectivity/workben/testmoz/main.cxx
View File

@ -387,9 +387,9 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
char hostname[40],basedn[40]; char hostname[40],basedn[40];
scanf("%s %s",hostname,basedn); scanf("%s %s",hostname,basedn);
aValue.realloc(2); aValue.realloc(2);
aValue[0].Name = OUString("HostName"); aValue[0].Name = "HostName";
aValue[0].Value <<= OUString::createFromAscii(hostname); aValue[0].Value <<= OUString::createFromAscii(hostname);
aValue[1].Name = OUString("BaseDN"); aValue[1].Name = "BaseDN";
aValue[1].Value <<= OUString::createFromAscii(basedn); aValue[1].Value <<= OUString::createFromAscii(basedn);
break; break;
case 3: case 3:
@ -399,9 +399,9 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
//Default LDAP AB //Default LDAP AB
url=OUString("sdbc:address:ldap://"); url=OUString("sdbc:address:ldap://");
aValue.realloc(2); aValue.realloc(2);
aValue[0].Name = OUString("HostName"); aValue[0].Name = "HostName";
aValue[0].Value <<= OUString("sun-ds"); aValue[0].Value <<= OUString("sun-ds");
aValue[1].Name = OUString("BaseDN"); aValue[1].Name = "BaseDN";
aValue[1].Value <<= OUString("dc=sun,dc=com"); aValue[1].Value <<= OUString("dc=sun,dc=com");
break; break;
default: default:

4
connectivity/workben/testmoz/mozthread.cxx
View File

@ -284,9 +284,9 @@ Reference< ::com::sun::star::sdbc::XConnection> TestConnected
case testLDAP: case testLDAP:
url=OUString("sdbc:address:ldap://"); url=OUString("sdbc:address:ldap://");
aValue.realloc(2); aValue.realloc(2);
aValue[0].Name = OUString("HostName"); aValue[0].Name = "HostName";
aValue[0].Value <<= OUString("sun-ds"); aValue[0].Value <<= OUString("sun-ds");
aValue[1].Name = OUString("BaseDN"); aValue[1].Name = "BaseDN";
aValue[1].Value <<= OUString("dc=sun,dc=com"); aValue[1].Value <<= OUString("dc=sun,dc=com");
break; break;
case testMozilla: case testMozilla: