summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers/calc
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity/source/drivers/calc')
-rw-r--r--connectivity/source/drivers/calc/CCatalog.cxx4
-rw-r--r--connectivity/source/drivers/calc/CColumns.cxx2
-rw-r--r--connectivity/source/drivers/calc/CConnection.cxx20
-rw-r--r--connectivity/source/drivers/calc/CDatabaseMetaData.cxx66
-rw-r--r--connectivity/source/drivers/calc/CDriver.cxx14
-rw-r--r--connectivity/source/drivers/calc/CResultSet.cxx20
-rw-r--r--connectivity/source/drivers/calc/CTable.cxx52
-rw-r--r--connectivity/source/drivers/calc/CTables.cxx4
-rw-r--r--connectivity/source/drivers/calc/Cservices.cxx1
9 files changed, 91 insertions, 92 deletions
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index 2d0ed7431800..e7478ab55aad 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -42,10 +42,10 @@ void OCalcCatalog::refreshTables()
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcCatalog::refreshTables" );
TStringVector aVector;
- Sequence< ::rtl::OUString > aTypes;
+ Sequence< OUString > aTypes;
OCalcConnection::ODocHolder aDocHodler(((OCalcConnection*)m_pConnection));
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
- ::rtl::OUString("%"),::rtl::OUString("%"),aTypes);
+ OUString("%"),OUString("%"),aTypes);
if(xResult.is())
{
diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx
index 859fb97d4826..f5542d74c83d 100644
--- a/connectivity/source/drivers/calc/CColumns.cxx
+++ b/connectivity/source/drivers/calc/CColumns.cxx
@@ -30,7 +30,7 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::container;
-sdbcx::ObjectType OCalcColumns::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OCalcColumns::createObject(const OUString& _rName)
{
OCalcTable* pTable = (OCalcTable*)m_pTable;
::rtl::Reference<OSQLColumns> aCols = pTable->getTableColumns();
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 3ba98f43182c..bae573fcaf28 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -63,7 +63,7 @@ OCalcConnection::~OCalcConnection()
{
}
-void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info)
+void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
throw(SQLException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcConnection::construct" );
@@ -71,7 +71,7 @@ void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
sal_Int32 nLen = url.indexOf(':');
nLen = url.indexOf(':',nLen+1);
- ::rtl::OUString aDSN(url.copy(nLen+1));
+ OUString aDSN(url.copy(nLen+1));
m_aFileName = aDSN;
INetURLObject aURL;
@@ -88,7 +88,7 @@ void OCalcConnection::construct(const ::rtl::OUString& url,const Sequence< Prope
}
m_aFileName = aURL.GetMainURL(INetURLObject::NO_DECODE);
- m_sPassword = ::rtl::OUString();
+ m_sPassword = OUString();
const char* pPwd = "password";
const PropertyValue *pIter = info.getConstArray();
@@ -115,16 +115,16 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
}
// open read-only as long as updating isn't implemented
Sequence<PropertyValue> aArgs(2);
- aArgs[0].Name = ::rtl::OUString("Hidden");
+ aArgs[0].Name = OUString("Hidden");
aArgs[0].Value <<= (sal_Bool) sal_True;
- aArgs[1].Name = ::rtl::OUString("ReadOnly");
+ aArgs[1].Name = OUString("ReadOnly");
aArgs[1].Value <<= (sal_Bool) sal_True;
if ( !m_sPassword.isEmpty() )
{
const sal_Int32 nPos = aArgs.getLength();
aArgs.realloc(nPos+1);
- aArgs[nPos].Name = ::rtl::OUString("Password");
+ aArgs[nPos].Name = OUString("Password");
aArgs[nPos].Value <<= m_sPassword;
}
@@ -134,7 +134,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
try
{
xComponent = xDesktop->loadComponentFromURL(
- m_aFileName, ::rtl::OUString("_blank"), 0, aArgs );
+ m_aFileName, OUString("_blank"), 0, aArgs );
}
catch( const Exception& )
{
@@ -162,7 +162,7 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
aErrorDetails <<= aDetailException;
}
- const ::rtl::OUString sError( m_aResources.getResourceStringWithSubstitution(
+ const OUString sError( m_aResources.getResourceStringWithSubstitution(
STR_COULD_NOT_LOAD_FILE,
"$filename$", m_aFileName
) );
@@ -246,7 +246,7 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLE
// --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const ::rtl::OUString& sql )
+Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql )
throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcConnection::prepareStatement" );
@@ -263,7 +263,7 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons
// --------------------------------------------------------------------------------
-Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const ::rtl::OUString& /*sql*/ )
+Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ )
throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcConnection::prepareCall" );
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 9afd1b1843c9..2d18d449a2f7 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -78,7 +78,7 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( )
aRow.reserve(18);
aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue());
- aRow.push_back(new ORowSetValueDecorator(::rtl::OUString("VARCHAR")));
+ aRow.push_back(new ORowSetValueDecorator(OUString("VARCHAR")));
aRow.push_back(new ORowSetValueDecorator(DataType::VARCHAR));
aRow.push_back(new ORowSetValueDecorator((sal_Int32)65535));
aRow.push_back(ODatabaseMetaDataResultSet::getQuoteValue());
@@ -100,35 +100,35 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( )
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DECIMAL"));
+ aRow[1] = new ORowSetValueDecorator(OUString("DECIMAL"));
aRow[2] = new ORowSetValueDecorator(DataType::DECIMAL);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = ODatabaseMetaDataResultSet::get0Value();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString("BOOL"));
+ aRow[1] = new ORowSetValueDecorator(OUString("BOOL"));
aRow[2] = new ORowSetValueDecorator(DataType::BIT);
aRow[3] = new ORowSetValueDecorator((sal_Int32)20);
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = new ORowSetValueDecorator((sal_Int32)15);
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString("DATE"));
+ aRow[1] = new ORowSetValueDecorator(OUString("DATE"));
aRow[2] = new ORowSetValueDecorator(DataType::DATE);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = ODatabaseMetaDataResultSet::get0Value();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIME"));
+ aRow[1] = new ORowSetValueDecorator(OUString("TIME"));
aRow[2] = new ORowSetValueDecorator(DataType::TIME);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
aRow[15] = ODatabaseMetaDataResultSet::get0Value();
aRows.push_back(aRow);
- aRow[1] = new ORowSetValueDecorator(::rtl::OUString("TIMESTAMP"));
+ aRow[1] = new ORowSetValueDecorator(OUString("TIMESTAMP"));
aRow[2] = new ORowSetValueDecorator(DataType::TIMESTAMP);
aRow[3] = ODatabaseMetaDataResultSet::get0Value();
aRow[9] = ODatabaseMetaDataResultSet::getBasicValue();
@@ -143,8 +143,8 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( )
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
- const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/, const ::rtl::OUString& tableNamePattern,
- const ::rtl::OUString& columnNamePattern ) throw(SQLException, RuntimeException)
+ const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
+ const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::getColumns" );
::osl::MutexGuard aGuard( m_aMutex );
@@ -163,9 +163,9 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
aRow[10] = new ORowSetValueDecorator((sal_Int32)10);
- Sequence< ::rtl::OUString> aTabNames(xNames->getElementNames());
- const ::rtl::OUString* pTabIter = aTabNames.getConstArray();
- const ::rtl::OUString* pTabEnd = pTabIter + aTabNames.getLength();
+ Sequence< OUString> aTabNames(xNames->getElementNames());
+ const OUString* pTabIter = aTabNames.getConstArray();
+ const OUString* pTabEnd = pTabIter + aTabNames.getLength();
for(;pTabIter != pTabEnd;++pTabIter)
{
if(match(tableNamePattern,*pTabIter,'\0'))
@@ -178,10 +178,10 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
if(!xColumns.is())
throw SQLException();
- const Sequence< ::rtl::OUString> aColNames(xColumns->getElementNames());
+ const Sequence< OUString> aColNames(xColumns->getElementNames());
- const ::rtl::OUString* pColumnIter = aColNames.getConstArray();
- const ::rtl::OUString* pEnd = pColumnIter + aColNames.getLength();
+ const OUString* pColumnIter = aColNames.getConstArray();
+ const OUString* pEnd = pColumnIter + aColNames.getLength();
Reference< XPropertySet> xColumn;
for(sal_Int32 i=1;pColumnIter != pEnd;++pColumnIter,++i)
{
@@ -217,13 +217,13 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
switch(sal_Int32(aRow[11]->getValue()))
{
case ColumnValue::NO_NULLS:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString("NO"));
+ aRow[18] = new ORowSetValueDecorator(OUString("NO"));
break;
case ColumnValue::NULLABLE:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString("YES"));
+ aRow[18] = new ORowSetValueDecorator(OUString("YES"));
break;
default:
- aRow[18] = new ORowSetValueDecorator(::rtl::OUString());
+ aRow[18] = new ORowSetValueDecorator(OUString());
}
aRows.push_back(aRow);
}
@@ -240,12 +240,12 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
// -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException)
+OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::getURL" );
::osl::MutexGuard aGuard( m_aMutex );
- return ::rtl::OUString("sdbc:calc:") + m_pConnection->getURL();
+ return OUString("sdbc:calc:") + m_pConnection->getURL();
}
// -------------------------------------------------------------------------
@@ -284,7 +284,7 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLExce
// -------------------------------------------------------------------------
-static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const ::rtl::OUString& rName )
+static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, const OUString& rName )
{
Any aAny = xSheets->getByName( rName );
Reference<XSpreadsheet> xSheet;
@@ -296,7 +296,7 @@ static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, co
if (xProp.is())
{
sal_Bool bVisible = sal_Bool();
- Any aVisAny = xProp->getPropertyValue( ::rtl::OUString("IsVisible") );
+ Any aVisAny = xProp->getPropertyValue( OUString("IsVisible") );
if ( aVisAny >>= bVisible )
if (!bVisible)
return sal_True; // hidden
@@ -326,7 +326,7 @@ static sal_Bool lcl_IsEmptyOrHidden( const Reference<XSpreadsheets>& xSheets, co
return sal_False;
}
-static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const ::rtl::OUString& rName )
+static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const OUString& rName )
{
sal_Bool bUnnamed = sal_False;
@@ -339,7 +339,7 @@ static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const
{
try
{
- Any aUserAny = xRangeProp->getPropertyValue( ::rtl::OUString("IsUserDefined") );
+ Any aUserAny = xRangeProp->getPropertyValue( OUString("IsUserDefined") );
sal_Bool bUserDefined = sal_Bool();
if ( aUserAny >>= bUserDefined )
bUnnamed = !bUserDefined;
@@ -357,8 +357,8 @@ static sal_Bool lcl_IsUnnamed( const Reference<XDatabaseRanges>& xRanges, const
// -------------------------------------------------------------------------
Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
- const Any& /*catalog*/, const ::rtl::OUString& /*schemaPattern*/,
- const ::rtl::OUString& tableNamePattern, const Sequence< ::rtl::OUString >& types )
+ const Any& /*catalog*/, const OUString& /*schemaPattern*/,
+ const OUString& tableNamePattern, const Sequence< OUString >& types )
throw(SQLException, RuntimeException)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcDatabaseMetaData::getTables" );
@@ -370,7 +370,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
// check if ORowSetValue type is given
// when no types are given then we have to return all tables e.g. TABLE
- ::rtl::OUString aTable("TABLE");
+ OUString aTable("TABLE");
sal_Bool bTableFound = sal_True;
sal_Int32 nLength = types.getLength();
@@ -378,8 +378,8 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
{
bTableFound = sal_False;
- const ::rtl::OUString* pIter = types.getConstArray();
- const ::rtl::OUString* pEnd = pIter + nLength;
+ const OUString* pIter = types.getConstArray();
+ const OUString* pEnd = pIter + nLength;
for(;pIter != pEnd;++pIter)
{
if(*pIter == aTable)
@@ -401,13 +401,13 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
Reference<XSpreadsheets> xSheets = xDoc->getSheets();
if ( !xSheets.is() )
throw SQLException();
- Sequence< ::rtl::OUString > aSheetNames = xSheets->getElementNames();
+ Sequence< OUString > aSheetNames = xSheets->getElementNames();
ODatabaseMetaDataResultSet::ORows aRows;
sal_Int32 nSheetCount = aSheetNames.getLength();
for (sal_Int32 nSheet=0; nSheet<nSheetCount; nSheet++)
{
- ::rtl::OUString aName = aSheetNames[nSheet];
+ OUString aName = aSheetNames[nSheet];
if ( !lcl_IsEmptyOrHidden( xSheets, aName ) && match(tableNamePattern,aName,'\0') )
{
ODatabaseMetaDataResultSet::ORow aRow(3);
@@ -424,15 +424,15 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
if ( xDocProp.is() )
{
- Any aRangesAny = xDocProp->getPropertyValue( ::rtl::OUString("DatabaseRanges") );
+ Any aRangesAny = xDocProp->getPropertyValue( OUString("DatabaseRanges") );
Reference<XDatabaseRanges> xRanges;
if ( aRangesAny >>= xRanges )
{
- Sequence< ::rtl::OUString > aDBNames = xRanges->getElementNames();
+ Sequence< OUString > aDBNames = xRanges->getElementNames();
sal_Int32 nDBCount = aDBNames.getLength();
for (sal_Int32 nRange=0; nRange<nDBCount; nRange++)
{
- ::rtl::OUString aName = aDBNames[nRange];
+ OUString aName = aDBNames[nRange];
if ( !lcl_IsUnnamed( xRanges, aName ) && match(tableNamePattern,aName,'\0') )
{
ODatabaseMetaDataResultSet::ORow aRow(3);
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 27ea3e1e5467..c66fbe82e9fa 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -36,12 +36,12 @@ using namespace ::com::sun::star::lang;
//------------------------------------------------------------------------------
// static ServiceInfo
-rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException)
+OUString ODriver::getImplementationName_Static( ) throw(RuntimeException)
{
- return rtl::OUString("com.sun.star.comp.sdbc.calc.ODriver");
+ return OUString("com.sun.star.comp.sdbc.calc.ODriver");
}
-::rtl::OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException)
+OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException)
{
return getImplementationName_Static();
}
@@ -57,7 +57,7 @@ rtl::OUString ODriver::getImplementationName_Static( ) throw(RuntimeException)
return *(new ODriver(_rxFactory));
}
-Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
+Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url,
const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
@@ -75,18 +75,18 @@ Reference< XConnection > SAL_CALL ODriver::connect( const ::rtl::OUString& url,
return xCon;
}
-sal_Bool SAL_CALL ODriver::acceptsURL( const ::rtl::OUString& url )
+sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url )
throw(SQLException, RuntimeException)
{
return url.startsWith("sdbc:calc:");
}
-Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const ::rtl::OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
+Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException)
{
if ( !acceptsURL(url) )
{
SharedResources aResources;
- const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
+ const OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR);
::dbtools::throwGenericSQLException(sMessage ,*this);
}
return Sequence< DriverPropertyInfo >();
diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx
index 193be29a4a0d..d110297ff083 100644
--- a/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/connectivity/source/drivers/calc/CResultSet.cxx
@@ -42,24 +42,24 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr
registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, ::getBooleanCppuType());
}
// -------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException)
+OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException)
{
- return ::rtl::OUString("com.sun.star.sdbcx.calc.ResultSet");
+ return OUString("com.sun.star.sdbcx.calc.ResultSet");
}
// -------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException)
+Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(2);
- aSupported[0] = ::rtl::OUString("com.sun.star.sdbc.ResultSet");
- aSupported[1] = ::rtl::OUString("com.sun.star.sdbcx.ResultSet");
+ Sequence< OUString > aSupported(2);
+ aSupported[0] = OUString("com.sun.star.sdbc.ResultSet");
+ aSupported[1] = OUString("com.sun.star.sdbcx.ResultSet");
return aSupported;
}
// -------------------------------------------------------------------------
-sal_Bool SAL_CALL OCalcResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw( RuntimeException)
+sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames());
- const ::rtl::OUString* pSupported = aSupported.getConstArray();
- const ::rtl::OUString* pEnd = pSupported + aSupported.getLength();
+ Sequence< OUString > aSupported(getSupportedServiceNames());
+ const OUString* pSupported = aSupported.getConstArray();
+ const OUString* pEnd = pSupported + aSupported.getLength();
for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported)
;
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index ff3c33319a48..1e37cc38ecc3 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -146,7 +146,7 @@ static CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell
CellContentType eCellType = xCell->getType();
if ( eCellType == CellContentType_FORMULA )
{
- static const ::rtl::OUString s_sFormulaResultType("FormulaResultType");
+ static const OUString s_sFormulaResultType("FormulaResultType");
Reference<XPropertySet> xProp( xCell, UNO_QUERY );
try
{
@@ -228,7 +228,7 @@ static bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int3
static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Reference<XNumberFormats>& xFormats,
sal_Int32 nDocColumn, sal_Int32 nStartRow, sal_Bool bHasHeaders,
- ::rtl::OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency )
+ OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency )
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetColumnInfo" );
//! avoid duplicate field names
@@ -265,7 +265,7 @@ static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Refe
sal_Int16 nNumType = NumberFormat::NUMBER;
try
{
- static ::rtl::OUString s_NumberFormat("NumberFormat");
+ static OUString s_NumberFormat("NumberFormat");
sal_Int32 nKey = 0;
if ( xProp->getPropertyValue( s_NumberFormat ) >>= nKey )
@@ -431,14 +431,14 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x
// -------------------------------------------------------------------------
-static ::rtl::OUString lcl_GetColumnStr( sal_Int32 nColumn )
+static OUString lcl_GetColumnStr( sal_Int32 nColumn )
{
//RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTable::lcl_GetColumnStr" );
if ( nColumn < 26 )
- return ::rtl::OUString::valueOf( (sal_Unicode) ( 'A' + nColumn ) );
+ return OUString::valueOf( (sal_Unicode) ( 'A' + nColumn ) );
else
{
- ::rtl::OUStringBuffer aBuffer(2);
+ OUStringBuffer aBuffer(2);
aBuffer.setLength( 2 );
aBuffer[0] = (sal_Unicode) ( 'A' + ( nColumn / 26 ) - 1 );
aBuffer[1] = (sal_Unicode) ( 'A' + ( nColumn % 26 ) );
@@ -454,13 +454,13 @@ void OCalcTable::fillColumns()
String aStrFieldName;
aStrFieldName.AssignAscii("Column");
- ::rtl::OUString aTypeName;
+ OUString aTypeName;
::comphelper::UStringMixEqual aCase(m_pConnection->getMetaData()->supportsMixedCaseQuotedIdentifiers());
const sal_Bool bStoresMixedCaseQuotedIdentifiers = getConnection()->getMetaData()->supportsMixedCaseQuotedIdentifiers();
for (sal_Int32 i = 0; i < m_nDataCols; i++)
{
- ::rtl::OUString aColumnName;
+ OUString aColumnName;
sal_Int32 eType = DataType::OTHER;
sal_Bool bCurrency = sal_False;
@@ -477,41 +477,41 @@ void OCalcTable::fillColumns()
{
case DataType::VARCHAR:
{
- static const ::rtl::OUString s_sType("VARCHAR");
+ static const OUString s_sType("VARCHAR");
aTypeName = s_sType;
}
break;
case DataType::DECIMAL:
- aTypeName = ::rtl::OUString("DECIMAL");
+ aTypeName = OUString("DECIMAL");
break;
case DataType::BIT:
- aTypeName = ::rtl::OUString("BOOL");
+ aTypeName = OUString("BOOL");
break;
case DataType::DATE:
- aTypeName = ::rtl::OUString("DATE");
+ aTypeName = OUString("DATE");
break;
case DataType::TIME:
- aTypeName = ::rtl::OUString("TIME");
+ aTypeName = OUString("TIME");
break;
case DataType::TIMESTAMP:
- aTypeName = ::rtl::OUString("TIMESTAMP");
+ aTypeName = OUString("TIMESTAMP");
break;
default:
OSL_FAIL("missing type name");
- aTypeName = ::rtl::OUString();
+ aTypeName = OUString();
}
// check if the column name already exists
- ::rtl::OUString aAlias = aColumnName;
+ OUString aAlias = aColumnName;
OSQLColumns::Vector::const_iterator aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
sal_Int32 nExprCnt = 0;
while(aFind != m_aColumns->get().end())
{
- (aAlias = aColumnName) += ::rtl::OUString::valueOf((sal_Int32)++nExprCnt);
+ (aAlias = aColumnName) += OUString::valueOf((sal_Int32)++nExprCnt);
aFind = connectivity::find(m_aColumns->get().begin(),m_aColumns->get().end(),aAlias,aCase);
}
- sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, ::rtl::OUString(),::rtl::OUString(),
+ sdbcx::OColumn* pColumn = new sdbcx::OColumn( aAlias, aTypeName, OUString(),OUString(),
ColumnValue::NULLABLE, nPrecision, nDecimals,
eType, sal_False, sal_False, bCurrency,
bStoresMixedCaseQuotedIdentifiers,
@@ -526,11 +526,11 @@ void OCalcTable::fillColumns()
// -------------------------------------------------------------------------
OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnection,
- const ::rtl::OUString& _Name,
- const ::rtl::OUString& _Type,
- const ::rtl::OUString& _Description ,
- const ::rtl::OUString& _SchemaName,
- const ::rtl::OUString& _CatalogName
+ const OUString& _Name,
+ const OUString& _Type,
+ const OUString& _Description ,
+ const OUString& _SchemaName,
+ const OUString& _CatalogName
) : OCalcTable_BASE(_pTables,_pConnection,_Name,
_Type,
_Description,
@@ -570,7 +570,7 @@ void OCalcTable::construct()
Reference<XPropertySet> xDocProp( xDoc, UNO_QUERY );
if ( xDocProp.is() )
{
- Reference<XDatabaseRanges> xRanges(xDocProp->getPropertyValue( ::rtl::OUString("DatabaseRanges") ),UNO_QUERY);
+ Reference<XDatabaseRanges> xRanges(xDocProp->getPropertyValue( OUString("DatabaseRanges") ),UNO_QUERY);
if ( xRanges.is() && xRanges->hasByName( m_Name ) )
{
@@ -584,7 +584,7 @@ void OCalcTable::construct()
sal_Bool bRangeHeader = sal_True;
Reference<XPropertySet> xFiltProp( xDBRange->getFilterDescriptor(), UNO_QUERY );
if ( xFiltProp.is() )
- xFiltProp->getPropertyValue(::rtl::OUString("ContainsHeader")) >>= bRangeHeader;
+ xFiltProp->getPropertyValue(OUString("ContainsHeader")) >>= bRangeHeader;
Reference<XSheetCellRange> xSheetRange( xRefer->getReferredCells(), UNO_QUERY );
Reference<XCellRangeAddressable> xAddr( xSheetRange, UNO_QUERY );
@@ -618,7 +618,7 @@ void OCalcTable::construct()
if (xProp.is())
{
::com::sun::star::util::Date aDateStruct;
- if ( xProp->getPropertyValue( ::rtl::OUString("NullDate") ) >>= aDateStruct )
+ if ( xProp->getPropertyValue( OUString("NullDate") ) >>= aDateStruct )
m_aNullDate = ::Date( aDateStruct.Day, aDateStruct.Month, aDateStruct.Year );
}
}
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 54eb644dad0d..9ad139186b47 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -36,11 +36,11 @@ using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::container;
-sdbcx::ObjectType OCalcTables::createObject(const ::rtl::OUString& _rName)
+sdbcx::ObjectType OCalcTables::createObject(const OUString& _rName)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen@sun.com", "OCalcTables::createObject" );
OCalcTable* pTable = new OCalcTable(this,(OCalcConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
- _rName,::rtl::OUString("TABLE"));
+ _rName,OUString("TABLE"));
sdbcx::ObjectType xRet = pTable;
pTable->construct();
return xRet;
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 8c1fc82f713c..1bfbc36731d8 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -21,7 +21,6 @@
#include <cppuhelper/factory.hxx>
using namespace connectivity::calc;
-using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::lang::XSingleServiceFactory;
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 10:15:50 +0000