diff options
Diffstat (limited to 'dbaccess/source/core/api')
49 files changed, 491 insertions, 491 deletions
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx index f7f79e28e93d..dce28eba521a 100644 --- a/dbaccess/source/core/api/BookmarkSet.cxx +++ b/dbaccess/source/core/api/BookmarkSet.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::osl; -void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::construct" ); OCacheSet::construct(_xDriverSet,i_sRowSetFilter); diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx index c61f40b4644c..2fae48bf178b 100644 --- a/dbaccess/source/core/api/BookmarkSet.hxx +++ b/dbaccess/source/core/api/BookmarkSet.hxx @@ -39,7 +39,7 @@ namespace dbaccess m_xRowLocate = NULL; } - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition); // ::com::sun::star::sdbcx::XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/CIndexes.cxx b/dbaccess/source/core/api/CIndexes.cxx index 0994d91539dc..dc83d81dd42e 100644 --- a/dbaccess/source/core/api/CIndexes.cxx +++ b/dbaccess/source/core/api/CIndexes.cxx @@ -38,7 +38,7 @@ using namespace dbaccess; using namespace cppu; -ObjectType OIndexes::createObject(const ::rtl::OUString& _rName) +ObjectType OIndexes::createObject(const OUString& _rName) { ObjectType xRet; if ( m_xIndexes.is() && m_xIndexes->hasByName(_rName) ) @@ -59,7 +59,7 @@ Reference< XPropertySet > OIndexes::createDescriptor() } // XAppend -ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +ObjectType OIndexes::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { Reference<XAppend> xData( m_xIndexes,UNO_QUERY); if ( !xData.is() ) @@ -70,7 +70,7 @@ ObjectType OIndexes::appendObject( const ::rtl::OUString& _rForName, const Refer } // XDrop -void OIndexes::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OIndexes::dropObject(sal_Int32 _nPos,const OUString _sElementName) { if ( m_xIndexes.is() ) { diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx index 33986f1804e8..25c58152f511 100644 --- a/dbaccess/source/core/api/CIndexes.hxx +++ b/dbaccess/source/core/api/CIndexes.hxx @@ -28,14 +28,14 @@ namespace dbaccess { ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xIndexes; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); - virtual connectivity::sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); - virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); + virtual connectivity::sdbcx::ObjectType appendObject( const OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); + virtual void dropObject(sal_Int32 _nPos,const OUString _sElementName); public: OIndexes(connectivity::OTableHelper* _pTable, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxIndexes ) : connectivity::OIndexesHelper(_pTable,_rMutex,_rVector) ,m_xIndexes(_rxIndexes) diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 2f4ce681ce08..a1fa8c941fd8 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -37,7 +37,7 @@ namespace dbaccess { ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos, - const Reference< XDatabaseMetaData >& _rxDBMeta, const ::rtl::OUString& _rDescription, const ::rtl::OUString& i_sLabel,ORowSetCacheIterator& _rColumnValue ) + const Reference< XDatabaseMetaData >& _rxDBMeta, const OUString& _rDescription, const OUString& i_sLabel,ORowSetCacheIterator& _rColumnValue ) :ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, _rDescription, i_sLabel,_rColumnValue ) { } @@ -46,7 +46,7 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaDa { BEGIN_PROPERTY_SEQUENCE(21) - DECL_PROP1( CATALOGNAME, ::rtl::OUString, READONLY ); + DECL_PROP1( CATALOGNAME, OUString, READONLY ); DECL_PROP1( DISPLAYSIZE, sal_Int32, READONLY ); DECL_PROP1_BOOL( ISAUTOINCREMENT, READONLY ); DECL_PROP1_BOOL( ISCASESENSITIVE, READONLY ); @@ -58,14 +58,14 @@ ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& _xMetaDa DECL_PROP1_BOOL( ISSEARCHABLE, READONLY ); DECL_PROP1_BOOL( ISSIGNED, READONLY ); DECL_PROP1_BOOL( ISWRITABLE, READONLY ); - DECL_PROP1( LABEL, ::rtl::OUString, READONLY ); + DECL_PROP1( LABEL, OUString, READONLY ); DECL_PROP1( PRECISION, sal_Int32, READONLY ); DECL_PROP1( SCALE, sal_Int32, READONLY ); - DECL_PROP1( SCHEMANAME, ::rtl::OUString, READONLY ); - DECL_PROP1( SERVICENAME, ::rtl::OUString, READONLY ); - DECL_PROP1( TABLENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( SCHEMANAME, OUString, READONLY ); + DECL_PROP1( SERVICENAME, OUString, READONLY ); + DECL_PROP1( TABLENAME, OUString, READONLY ); DECL_PROP1( TYPE, sal_Int32, READONLY ); - DECL_PROP1( TYPENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( TYPENAME, OUString, READONLY ); DECL_PROP2( VALUE, Any, READONLY, BOUND ); END_PROPERTY_SEQUENCE() diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx index ddb134b5c684..c51579c86099 100644 --- a/dbaccess/source/core/api/CRowSetColumn.hxx +++ b/dbaccess/source/core/api/CRowSetColumn.hxx @@ -36,8 +36,8 @@ namespace dbaccess const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRow >& _xRow, sal_Int32 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta, - const ::rtl::OUString& _rDescription, - const ::rtl::OUString& i_sLabel, + const OUString& _rDescription, + const OUString& i_sLabel, ORowSetCacheIterator& _rColumnValue); virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx b/dbaccess/source/core/api/CRowSetDataColumn.cxx index d16c211e13b8..f9b00667a98a 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.cxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx @@ -45,8 +45,8 @@ ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& const Reference < XRowUpdate >& _xRowUpdate, sal_Int32 _nPos, const Reference< XDatabaseMetaData >& _rxDBMeta, - const ::rtl::OUString& _rDescription, - const ::rtl::OUString& i_sLabel, + const OUString& _rDescription, + const OUString& i_sLabel, const ORowSetCacheIterator& _rColumnValue) :ODataColumn(_xMetaData,_xRow,_xRowUpdate,_nPos,_rxDBMeta) ,m_aColumnValue(_rColumnValue) @@ -68,7 +68,7 @@ ORowSetDataColumn::~ORowSetDataColumn() { BEGIN_PROPERTY_SEQUENCE(21) - DECL_PROP1( CATALOGNAME, ::rtl::OUString, READONLY ); + DECL_PROP1( CATALOGNAME, OUString, READONLY ); DECL_PROP1( DISPLAYSIZE, sal_Int32, READONLY ); DECL_PROP1_BOOL( ISAUTOINCREMENT, READONLY ); DECL_PROP1_BOOL( ISCASESENSITIVE, READONLY ); @@ -80,14 +80,14 @@ ORowSetDataColumn::~ORowSetDataColumn() DECL_PROP1_BOOL( ISSEARCHABLE, READONLY ); DECL_PROP1_BOOL( ISSIGNED, READONLY ); DECL_PROP1_BOOL( ISWRITABLE, READONLY ); - DECL_PROP1( LABEL, ::rtl::OUString, READONLY ); + DECL_PROP1( LABEL, OUString, READONLY ); DECL_PROP1( PRECISION, sal_Int32, READONLY ); DECL_PROP1( SCALE, sal_Int32, READONLY ); - DECL_PROP1( SCHEMANAME, ::rtl::OUString, READONLY ); - DECL_PROP1( SERVICENAME, ::rtl::OUString, READONLY ); - DECL_PROP1( TABLENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( SCHEMANAME, OUString, READONLY ); + DECL_PROP1( SERVICENAME, OUString, READONLY ); + DECL_PROP1( TABLENAME, OUString, READONLY ); DECL_PROP1( TYPE, sal_Int32, READONLY ); - DECL_PROP1( TYPENAME, ::rtl::OUString, READONLY ); + DECL_PROP1( TYPENAME, OUString, READONLY ); DECL_PROP1( VALUE, Any, BOUND ); END_PROPERTY_SEQUENCE() @@ -216,7 +216,7 @@ ORowSetDataColumns::ORowSetDataColumns( const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ) : connectivity::sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aColumns(_rColumns) { @@ -228,7 +228,7 @@ ORowSetDataColumns::~ORowSetDataColumns() DBG_DTOR(ORowSetDataColumns ,NULL); } -sdbcx::ObjectType ORowSetDataColumns::createObject(const ::rtl::OUString& _rName) +sdbcx::ObjectType ORowSetDataColumns::createObject(const OUString& _rName) { connectivity::sdbcx::ObjectType xNamed; @@ -246,7 +246,7 @@ void SAL_CALL ORowSetDataColumns::disposing(void) m_aColumns = NULL; } -void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector) +void ORowSetDataColumns::assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector) { m_aColumns = _rColumns; reFill(_rVector); diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx index bc75088bd081..bd87766d707e 100644 --- a/dbaccess/source/core/api/CRowSetDataColumn.hxx +++ b/dbaccess/source/core/api/CRowSetDataColumn.hxx @@ -40,8 +40,8 @@ namespace dbaccess ORowSetCacheIterator m_aColumnValue; ::com::sun::star::uno::Any m_aOldValue; - ::rtl::OUString m_sLabel; - ::rtl::OUString m_aDescription; // description + OUString m_sLabel; + OUString m_aDescription; // description ORowSetBase* m_pRowSet; virtual ~ORowSetDataColumn(); @@ -51,8 +51,8 @@ namespace dbaccess const ::com::sun::star::uno::Reference < ::com::sun::star::sdbc::XRowUpdate >& _xRowUpdate, sal_Int32 _nPos, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta, - const ::rtl::OUString& _rDescription, - const ::rtl::OUString& i_sLabel, + const OUString& _rDescription, + const OUString& i_sLabel, const ORowSetCacheIterator& _rColumnValue); @@ -81,7 +81,7 @@ namespace dbaccess { ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: ORowSetDataColumns( @@ -89,12 +89,12 @@ namespace dbaccess const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ); virtual ~ORowSetDataColumns(); // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); - void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< ::rtl::OUString> &_rVector); + void assign(const ::rtl::Reference< ::connectivity::OSQLColumns>& _rColumns,const ::std::vector< OUString> &_rVector); }; } diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 1efe897dce16..268854781269 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -69,17 +69,17 @@ OCacheSet::OCacheSet(sal_Int32 i_nMaxRows) } -::rtl::OUString OCacheSet::getIdentifierQuoteString() const +OUString OCacheSet::getIdentifierQuoteString() const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getIdentifierQuoteString" ); - ::rtl::OUString sQuote; + OUString sQuote; Reference<XDatabaseMetaData> xMeta; if ( m_xConnection.is() && (xMeta = m_xConnection->getMetaData()).is() ) sQuote = xMeta->getIdentifierQuoteString(); return sQuote; } -void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& /*i_sRowSetFilter*/) +void OCacheSet::construct( const Reference< XResultSet>& _xDriverSet,const OUString& /*i_sRowSetFilter*/) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::construct" ); OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet"); @@ -162,10 +162,10 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti OUStringBuffer aSql("INSERT INTO " + m_aComposedTableName + " ( "); // set values and column names - ::rtl::OUStringBuffer aValues(" VALUES ( "); - static ::rtl::OUString aPara("?,"); - ::rtl::OUString aQuote = getIdentifierQuoteString(); - static ::rtl::OUString aComma(","); + OUStringBuffer aValues(" VALUES ( "); + static OUString aPara("?,"); + OUString aQuote = getIdentifierQuoteString(); + static OUString aComma(","); sal_Int32 i = 1; ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rInsertRow->get().begin()+1; connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end(); @@ -200,8 +200,8 @@ void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connecti void OCacheSet::fillParameters( const ORowSetRow& _rRow ,const connectivity::OSQLTable& _xTable - ,::rtl::OUStringBuffer& _sCondition - ,::rtl::OUStringBuffer& _sParameter + ,OUStringBuffer& _sCondition + ,OUStringBuffer& _sParameter ,::std::list< sal_Int32>& _rOrgValues) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::fillParameters" ); @@ -232,18 +232,18 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow } } - ::rtl::OUString aColumnName; + OUString aColumnName; - static ::rtl::OUString aPara("?,"); - static ::rtl::OUString aAnd(" AND "); + static OUString aPara("?,"); + static OUString aAnd(" AND "); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + OUString aQuote = getIdentifierQuoteString(); sal_Int32 nCheckCount = 1; // index for the orginal values sal_Int32 i = 1; - ::rtl::OUString sIsNull(" IS NULL"); - ::rtl::OUString sParam(" = ?"); + OUString sIsNull(" IS NULL"); + OUString sParam(" = ?"); ORowVector< ORowSetValue >::Vector::const_iterator aIter = _rRow->get().begin()+1; ORowVector< ORowSetValue >::Vector::const_iterator aEnd = _rRow->get().end()+1; for(; aIter != aEnd;++aIter,++nCheckCount,++i) @@ -292,7 +292,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR OUStringBuffer aSql("UPDATE " + m_aComposedTableName + " SET "); // list all cloumns that should be set - ::rtl::OUStringBuffer aCondition; + OUStringBuffer aCondition; ::std::list< sal_Int32> aOrgValues; fillParameters(_rInsertRow,_xTable,aCondition,aSql,aOrgValues); aSql[aSql.getLength() - 1] = ' '; @@ -362,7 +362,7 @@ void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connecti } } - ::rtl::OUStringBuffer aColumnName; + OUStringBuffer aColumnName; ::std::list< sal_Int32> aOrgValues; fillParameters(_rDeleteRow,_xTable,aSql,aColumnName,aOrgValues); @@ -416,7 +416,7 @@ sal_Bool SAL_CALL OCacheSet::wasNull( ) throw(SQLException, RuntimeException) return m_xDriverRow->wasNull(); } -::rtl::OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getString" ); return m_xDriverRow->getString(columnIndex); diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index 15040e3c1f00..7b3abf6dfec4 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -52,7 +52,7 @@ namespace dbaccess ::com::sun::star::uno::Sequence<sal_Bool> m_aSignedFlags; ::com::sun::star::uno::Sequence<sal_Int32> m_aColumnTypes; ORowSetRow m_aInsertRow; - ::rtl::OUString m_aComposedTableName; + OUString m_aComposedTableName; sal_Int32 m_nMaxRows; sal_Bool m_bInserted; sal_Bool m_bUpdated; @@ -69,21 +69,21 @@ namespace dbaccess ) const; void fillParameters( const ORowSetRow& _rRow ,const connectivity::OSQLTable& _xTable - ,::rtl::OUStringBuffer& _sCondition - ,::rtl::OUStringBuffer& _sParameter + ,OUStringBuffer& _sCondition + ,OUStringBuffer& _sParameter ,::std::list< sal_Int32>& _rOrgValues); void fillTableName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - ::rtl::OUString getIdentifierQuoteString() const; + OUString getIdentifierQuoteString() const; public: // late constructor - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 32691e19be7f..629bb8576652 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -46,13 +46,13 @@ namespace dbaccess /** creates a vector of WildCards and reduce the _rTableFilter of the length of WildsCards */ -sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut) +sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OFilteredContainer::createWildCardVector" ); // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard // for them - ::rtl::OUString* pTableFilters = _rTableFilter.getArray(); - ::rtl::OUString* pEnd = pTableFilters + _rTableFilter.getLength(); + OUString* pTableFilters = _rTableFilter.getArray(); + OUString* pEnd = pTableFilters + _rTableFilter.getLength(); sal_Int32 nShiftPos = 0; for (sal_Int32 i=0; pEnd != pTableFilters; ++pTableFilters,++i) { @@ -74,14 +74,14 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std return nShiftPos; } - bool lcl_isElementAllowed( const ::rtl::OUString& _rName, - const Sequence< ::rtl::OUString >& _rTableFilter, + bool lcl_isElementAllowed( const OUString& _rName, + const Sequence< OUString >& _rTableFilter, const ::std::vector< WildCard >& _rWCSearch ) { sal_Int32 nTableFilterLen = _rTableFilter.getLength(); - const ::rtl::OUString* tableFilter = _rTableFilter.getConstArray(); - const ::rtl::OUString* tableFilterEnd = _rTableFilter.getConstArray() + nTableFilterLen; + const OUString* tableFilter = _rTableFilter.getConstArray(); + const OUString* tableFilterEnd = _rTableFilter.getConstArray() + nTableFilterLen; bool bFilterMatch = ::std::find( tableFilter, tableFilterEnd, _rName ) != tableFilterEnd; // the table is allowed to "pass" if we had no filters at all or any of the non-wildcard filters matches if (!bFilterMatch && !_rWCSearch.empty()) @@ -96,7 +96,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std return bFilterMatch; } - typedef ::boost::optional< ::rtl::OUString > OptionalString; + typedef ::boost::optional< OUString > OptionalString; struct TableInfo { OptionalString sComposedName; @@ -105,13 +105,13 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std OptionalString sSchema; OptionalString sName; - TableInfo( const ::rtl::OUString& _composedName ) + TableInfo( const OUString& _composedName ) :sComposedName( _composedName ) { } - TableInfo( const ::rtl::OUString& _catalog, const ::rtl::OUString& _schema, const ::rtl::OUString& _name, - const ::rtl::OUString& _type ) + TableInfo( const OUString& _catalog, const OUString& _schema, const OUString& _name, + const OUString& _type ) :sComposedName() ,sType( _type ) ,sCatalog( _catalog ) @@ -148,7 +148,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std if ( !_masterContainer.is() ) throw RuntimeException(); - ::rtl::OUString sTypeName; + OUString sTypeName; try { Reference< XPropertySet > xTable( _masterContainer->getByName( *_io_tableInfo.sComposedName ), UNO_QUERY_THROW ); @@ -162,7 +162,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } connectivity::TStringVector lcl_filter( const TableInfos& _unfilteredTables, - const Sequence< ::rtl::OUString >& _tableFilter, const Sequence< ::rtl::OUString >& _tableTypeFilter, + const Sequence< OUString >& _tableFilter, const Sequence< OUString >& _tableTypeFilter, const Reference< XDatabaseMetaData >& _metaData, const Reference< XNameAccess >& _masterContainer ) { TableInfos aFilteredTables; @@ -179,7 +179,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard // for them ::std::vector< WildCard > aWildCardTableFilter; - Sequence< ::rtl::OUString > aNonWildCardTableFilter = _tableFilter; + Sequence< OUString > aNonWildCardTableFilter = _tableFilter; nTableFilterCount = createWildCardVector( aNonWildCardTableFilter, aWildCardTableFilter ); TableInfos aUnfilteredTables( _unfilteredTables ); @@ -207,8 +207,8 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std TableInfos aUnfilteredTables; aUnfilteredTables.swap( aFilteredTables ); - const ::rtl::OUString* pTableTypeFilterBegin = _tableTypeFilter.getConstArray(); - const ::rtl::OUString* pTableTypeFilterEnd = pTableTypeFilterBegin + _tableTypeFilter.getLength(); + const OUString* pTableTypeFilterBegin = _tableTypeFilter.getConstArray(); + const OUString* pTableTypeFilterEnd = pTableTypeFilterBegin + _tableTypeFilter.getLength(); for ( TableInfos::iterator table = aUnfilteredTables.begin(); table != aUnfilteredTables.end(); @@ -245,7 +245,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std IRefreshListener* _pRefreshListener, ::dbtools::IWarningsContainer* _pWarningsContainer ,oslInterlockedCount& _nInAppend) - :OCollection(_rParent,_bCase,_rMutex,::std::vector< ::rtl::OUString>()) + :OCollection(_rParent,_bCase,_rMutex,::std::vector< OUString>()) ,m_bConstructed(sal_False) ,m_pWarningsContainer(_pWarningsContainer) ,m_pRefreshListener(_pRefreshListener) @@ -255,8 +255,8 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } void OFilteredContainer::construct(const Reference< XNameAccess >& _rxMasterContainer, - const Sequence< ::rtl::OUString >& _rTableFilter, - const Sequence< ::rtl::OUString >& _rTableTypeFilter) + const Sequence< OUString >& _rTableFilter, + const Sequence< OUString >& _rTableTypeFilter) { try { @@ -277,9 +277,9 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std TableInfos aUnfilteredTables; - Sequence< ::rtl::OUString > aNames = m_xMasterContainer->getElementNames(); - const ::rtl::OUString* name = aNames.getConstArray(); - const ::rtl::OUString* nameEnd = name + aNames.getLength(); + Sequence< OUString > aNames = m_xMasterContainer->getElementNames(); + const OUString* name = aNames.getConstArray(); + const OUString* nameEnd = name + aNames.getLength(); for ( ; name != nameEnd; ++name ) aUnfilteredTables.push_back( TableInfo( *name ) ); @@ -294,10 +294,10 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } } - void OFilteredContainer::construct(const Sequence< ::rtl::OUString >& _rTableFilter, const Sequence< ::rtl::OUString >& _rTableTypeFilter) + void OFilteredContainer::construct(const Sequence< OUString >& _rTableFilter, const Sequence< OUString >& _rTableTypeFilter) { // build sorted versions of the filter sequences, so the visibility decision is faster - Sequence< ::rtl::OUString > aTableFilter(_rTableFilter); + Sequence< OUString > aTableFilter(_rTableFilter); // for wildcard search : remove all table filters which are a wildcard expression and build a WildCard // for them @@ -312,14 +312,14 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // create a table table filter suitable for the XDatabaseMetaData::getTables call, // taking into account both the externally-provided table type filter, and any // table type restriction which is inherent to the container - Sequence< ::rtl::OUString > aTableTypeFilter; - ::rtl::OUString sInherentTableTypeRestriction( getTableTypeRestriction() ); + Sequence< OUString > aTableTypeFilter; + OUString sInherentTableTypeRestriction( getTableTypeRestriction() ); if ( !sInherentTableTypeRestriction.isEmpty() ) { if ( _rTableTypeFilter.getLength() != 0 ) { - const ::rtl::OUString* tableType = _rTableTypeFilter.getConstArray(); - const ::rtl::OUString* tableTypeEnd = tableType + _rTableTypeFilter.getLength(); + const OUString* tableType = _rTableTypeFilter.getConstArray(); + const OUString* tableTypeEnd = tableType + _rTableTypeFilter.getLength(); for ( ; tableType != tableTypeEnd; ++tableType ) { if ( *tableType == sInherentTableTypeRestriction ) @@ -348,13 +348,13 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } } - static const ::rtl::OUString sAll("%"); + static const OUString sAll("%"); Reference< XResultSet > xTables = m_xMetaData->getTables( Any(), sAll, sAll, aTableTypeFilter ); Reference< XRow > xCurrentRow( xTables, UNO_QUERY_THROW ); TableInfos aUnfilteredTables; - ::rtl::OUString sCatalog, sSchema, sName, sType; + OUString sCatalog, sSchema, sName, sType; while ( xTables->next() ) { sCatalog = xCurrentRow->getString(1); @@ -407,7 +407,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std } } - ::rtl::OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject) + OUString OFilteredContainer::getNameForObject(const ObjectType& _xObject) { OSL_ENSURE( _xObject.is(), "OFilteredContainer::getNameForObject: Object is NULL!" ); return ::dbtools::composeTableName( m_xMetaData, _xObject, ::dbtools::eInDataManipulation, false, false, false ); @@ -426,7 +426,7 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std // drivers, even the ones which do not understand the standard #define FILTER_MODE_MIX_ALL 3 - void OFilteredContainer::getAllTableTypeFilter( Sequence< ::rtl::OUString >& /* [out] */ _rFilter ) const + void OFilteredContainer::getAllTableTypeFilter( Sequence< OUString >& /* [out] */ _rFilter ) const { sal_Int32 nFilterMode = FILTER_MODE_MIX_ALL; // for compatibility reasons, this is the default: we used this way before we @@ -439,9 +439,9 @@ sal_Int32 createWildCardVector(Sequence< ::rtl::OUString >& _rTableFilter, ::std OSL_VERIFY( aFilterModeSetting >>= nFilterMode ); } - const ::rtl::OUString sAll( "%" ); - const ::rtl::OUString sView( "VIEW" ); - const ::rtl::OUString sTable( "TABLE" ); + const OUString sAll( "%" ); + const OUString sView( "VIEW" ); + const OUString sTable( "TABLE" ); switch ( nFilterMode ) { diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index e16d6dcd4af4..54366b41314a 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -41,7 +41,7 @@ namespace dbaccess sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, sal_Bool _bUseAsIndex ) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector,_bUseAsIndex) ,m_aColumns(_rColumns) @@ -51,9 +51,9 @@ namespace dbaccess OPrivateColumns* OPrivateColumns::createWithIntrinsicNames( const ::rtl::Reference< ::connectivity::OSQLColumns >& _rColumns, sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex ) { - ::std::vector< ::rtl::OUString > aNames; aNames.reserve( _rColumns->get().size() ); + ::std::vector< OUString > aNames; aNames.reserve( _rColumns->get().size() ); - ::rtl::OUString sColumName; + OUString sColumName; for ( ::connectivity::OSQLColumns::Vector::const_iterator column = _rColumns->get().begin(); column != _rColumns->get().end(); ++column @@ -75,7 +75,7 @@ namespace dbaccess OPrivateColumns_Base::disposing(); } - connectivity::sdbcx::ObjectType OPrivateColumns::createObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType OPrivateColumns::createObject(const OUString& _rName) { if ( m_aColumns.is() ) { @@ -91,7 +91,7 @@ namespace dbaccess return NULL; } - connectivity::sdbcx::ObjectType OPrivateTables::createObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType OPrivateTables::createObject(const OUString& _rName) { if ( !m_aTables.empty() ) { diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index c48a8b13ec8e..992b6c23c4ce 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -46,7 +46,7 @@ namespace dbaccess { ::rtl::Reference< ::connectivity::OSQLColumns> m_aColumns; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} virtual Reference< XPropertySet > createDescriptor() { @@ -57,7 +57,7 @@ namespace dbaccess sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, sal_Bool _bUseAsIndex = sal_False ); @@ -81,7 +81,7 @@ namespace dbaccess { OSQLTables m_aTables; protected: - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); virtual void impl_refresh() throw(RuntimeException) {} virtual Reference< XPropertySet > createDescriptor() { @@ -92,7 +92,7 @@ namespace dbaccess sal_Bool _bCase, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - const ::std::vector< ::rtl::OUString> &_rVector + const ::std::vector< OUString> &_rVector ) : sdbcx::OCollection(_rParent,_bCase,_rMutex,_rVector) ,m_aTables(_rTables) { diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index 118579014c67..571add7c163d 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -36,9 +36,9 @@ namespace dbaccess { struct SelectColumnDescription { - ::rtl::OUString sRealName; // may be empty - ::rtl::OUString sTableName; // may be empty - ::rtl::OUString sDefaultValue; + OUString sRealName; // may be empty + OUString sTableName; // may be empty + OUString sDefaultValue; sal_Int32 nPosition; sal_Int32 nType; sal_Int32 nScale; @@ -52,7 +52,7 @@ namespace dbaccess { } - SelectColumnDescription( sal_Int32 _nPosition, sal_Int32 _nType, sal_Int32 _nScale,sal_Bool _bNullable, const ::rtl::OUString& _rDefaultValue ) + SelectColumnDescription( sal_Int32 _nPosition, sal_Int32 _nType, sal_Int32 _nScale,sal_Bool _bNullable, const OUString& _rDefaultValue ) :sDefaultValue( _rDefaultValue ) ,nPosition( _nPosition ) ,nType( _nType ) @@ -61,12 +61,12 @@ namespace dbaccess { } }; - typedef ::std::map< ::rtl::OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData; + typedef ::std::map< OUString, SelectColumnDescription, ::comphelper::UStringMixLess > SelectColumnsMetaData; // the elements of _rxQueryColumns must have the properties PROPERTY_REALNAME and PROPERTY_TABLENAME void getColumnPositions(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxQueryColumns, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rColumnNames, - const ::rtl::OUString& _rsUpdateTableName, + const ::com::sun::star::uno::Sequence< OUString >& _rColumnNames, + const OUString& _rsUpdateTableName, SelectColumnsMetaData& o_rColumnNames /* out */, bool i_bAppendTableName = false); @@ -80,7 +80,7 @@ namespace dbaccess OKeySetMatrix m_aKeyMap; OKeySetMatrix::iterator m_aKeyIter; - ::std::vector< ::rtl::OUString > m_aAutoColumns; // contains all columns which are autoincrement ones + ::std::vector< OUString > m_aAutoColumns; // contains all columns which are autoincrement ones OUpdatedParameter m_aUpdatedParameter; // contains all parameter which have been updated and are needed for refetching ORowSetValueVector m_aParameterValueForCache; @@ -105,9 +105,9 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xSet; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow> m_xRow; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer > m_xComposer; - const ::rtl::OUString m_sUpdateTableName; - ::rtl::OUString m_sRowSetFilter; - ::std::vector< ::rtl::OUString > m_aFilterColumns; + const OUString m_sUpdateTableName; + OUString m_sRowSetFilter; + ::std::vector< OUString > m_aFilterColumns; sal_Int32& m_rRowCount; sal_Bool m_bRowCountFinal; @@ -130,7 +130,7 @@ namespace dbaccess void initColumns(); SAL_WNODEPRECATED_DECLARATIONS_PUSH void findTableColumnsMatching_throw( const ::com::sun::star::uno::Any& i_aTable, - const ::rtl::OUString& i_rUpdateTableName, + const OUString& i_rUpdateTableName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData>& i_xMeta, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& i_xQueryColumns, ::std::auto_ptr<SelectColumnsMetaData>& o_pKeyColumnNames); @@ -142,29 +142,29 @@ namespace dbaccess const connectivity::ORowSetValue &_rValue, sal_Int32 _nType, sal_Int32 _nScale ) const; - ::rtl::OUStringBuffer createKeyFilter( ); + OUStringBuffer createKeyFilter( ); bool doTryRefetch_throw() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);; void tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch); - void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>()); - void executeInsert( const ORowSetRow& _rInsertRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName = ::rtl::OUString(),bool bRefetch = false); - void executeStatement(::rtl::OUStringBuffer& io_aFilter, ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& io_xAnalyzer); + void executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const OUString& i_sSQL,const OUString& i_sTableName,const ::std::vector<sal_Int32>& _aIndexColumnPositions = ::std::vector<sal_Int32>()); + void executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQL,const OUString& i_sTableName = OUString(),bool bRefetch = false); + void executeStatement(OUStringBuffer& io_aFilter, ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer>& io_xAnalyzer); virtual ~OKeySet(); public: OKeySet(const connectivity::OSQLTable& _xTable, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xTableKeys, - const ::rtl::OUString& _rUpdateTableName, + const OUString& _rUpdateTableName, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer, const ORowSetValueVector& _aParameterValueForCache, sal_Int32 i_nMaxRows, sal_Int32& o_nRowCount); // late ctor which can throw exceptions - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx index 8ff2da819b01..be34382fad9e 100644 --- a/dbaccess/source/core/api/OptimisticSet.cxx +++ b/dbaccess/source/core/api/OptimisticSet.cxx @@ -66,12 +66,12 @@ using namespace ::com::sun::star; using namespace ::cppu; using namespace ::osl; -DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUStringBuffer,TSQLStatements); +DECLARE_STL_USTRINGACCESS_MAP(OUStringBuffer,TSQLStatements); namespace { - void lcl_fillKeyCondition(const ::rtl::OUString& i_sTableName,const ::rtl::OUString& i_sQuotedColumnName,const ORowSetValue& i_aValue,TSQLStatements& io_aKeyConditions) + void lcl_fillKeyCondition(const OUString& i_sTableName,const OUString& i_sQuotedColumnName,const ORowSetValue& i_aValue,TSQLStatements& io_aKeyConditions) { - ::rtl::OUStringBuffer& rKeyCondition = io_aKeyConditions[i_sTableName]; + OUStringBuffer& rKeyCondition = io_aKeyConditions[i_sTableName]; if ( !rKeyCondition.isEmpty() ) rKeyCondition.append(" AND "); rKeyCondition.append(i_sQuotedColumnName); @@ -90,7 +90,7 @@ OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext, const ORowSetValueVector& _aParameterValueForCache, sal_Int32 i_nMaxRows, sal_Int32& o_nRowCount) - :OKeySet(NULL,NULL,::rtl::OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount) + :OKeySet(NULL,NULL,OUString(),_xComposer,_aParameterValueForCache,i_nMaxRows,o_nRowCount) ,m_aSqlParser( _rContext ) ,m_aSqlIterator( i_xConnection, Reference<XTablesSupplier>(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser, NULL ) ,m_bResultSetChanged(false) @@ -104,7 +104,7 @@ OptimisticSet::~OptimisticSet() DBG_DTOR(OptimisticSet,NULL); } -void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::construct" ); @@ -119,9 +119,9 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: const Reference<XNameAccess> xQueryColumns = xQueryColSup->getColumns(); const Reference<XTablesSupplier> xTabSup(m_xComposer,UNO_QUERY); const Reference<XNameAccess> xTables = xTabSup->getTables(); - const Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames(); - const ::rtl::OUString* pTableNameIter = aTableNames.getConstArray(); - const ::rtl::OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength(); + const Sequence< OUString> aTableNames = xTables->getElementNames(); + const OUString* pTableNameIter = aTableNames.getConstArray(); + const OUString* pTableNameEnd = pTableNameIter + aTableNames.getLength(); for( ; pTableNameIter != pTableNameEnd ; ++pTableNameIter) { SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -140,15 +140,15 @@ void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const :: void OptimisticSet::makeNewStatement( ) { - ::rtl::OUStringBuffer aFilter = createKeyFilter(); + OUStringBuffer aFilter = createKeyFilter(); Reference< XSingleSelectQueryComposer> xSourceComposer(m_xComposer,UNO_QUERY); Reference< XMultiServiceFactory > xFactory(m_xConnection, UNO_QUERY_THROW); Reference<XSingleSelectQueryComposer> xAnalyzer(xFactory->createInstance(SERVICE_NAME_SINGLESELECTQUERYCOMPOSER),UNO_QUERY); - ::rtl::OUString sQuery = xSourceComposer->getQuery(); + OUString sQuery = xSourceComposer->getQuery(); xAnalyzer->setElementaryQuery(xSourceComposer->getElementaryQuery()); // check for joins - ::rtl::OUString aErrorMsg; + OUString aErrorMsg; SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr<OSQLParseNode> pStatementNode( m_aSqlParser.parseTree( aErrorMsg, sQuery ) ); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -156,7 +156,7 @@ void OptimisticSet::makeNewStatement( ) m_aSqlIterator.traverseAll(); fillJoinedColumns_throw(m_aSqlIterator.getJoinConditions()); - const ::rtl::OUString sComposerFilter = m_xComposer->getFilter(); + const OUString sComposerFilter = m_xComposer->getFilter(); if ( !m_sRowSetFilter.isEmpty() || !sComposerFilter.isEmpty() ) { FilterCreator aFilterCreator; @@ -184,10 +184,10 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if ( m_aJoinedKeyColumns.empty() ) throw SQLException(); // list all cloumns that should be set - static ::rtl::OUString s_sPara(" = ?"); - ::rtl::OUString aQuote = getIdentifierQuoteString(); + static OUString s_sPara(" = ?"); + OUString aQuote = getIdentifierQuoteString(); - ::std::map< ::rtl::OUString,bool > aResultSetChanged; + ::std::map< OUString,bool > aResultSetChanged; TSQLStatements aKeyConditions; TSQLStatements aIndexConditions; TSQLStatements aSql; @@ -199,7 +199,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow { if ( aResultSetChanged.find( aIter->second.sTableName ) == aResultSetChanged.end() ) aResultSetChanged[aIter->second.sTableName] = false; - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); if ( m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() ) { aResultSetChanged[aIter->second.sTableName] = m_aJoinedKeyColumns.find(aIter->second.nPosition) != m_aJoinedKeyColumns.end(); @@ -215,7 +215,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow { (_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[aIter->second.nPosition]; } - ::rtl::OUStringBuffer& rPart = aSql[aIter->second.sTableName]; + OUStringBuffer& rPart = aSql[aIter->second.sTableName]; if ( !rPart.isEmpty() ) rPart.append(", "); rPart.append(sQuotedColumnName + s_sPara); @@ -228,8 +228,8 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if( aKeyConditions.empty() ) ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_CONDITION_FOR_PK ), SQL_GENERAL_ERROR, m_xConnection ); - static const ::rtl::OUString s_sUPDATE("UPDATE "); - static const ::rtl::OUString s_sSET(" SET "); + static const OUString s_sUPDATE("UPDATE "); + static const OUString s_sSET(" SET "); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); @@ -240,11 +240,11 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow if ( aSqlIter->second.getLength() ) { m_bResultSetChanged = m_bResultSetChanged || aResultSetChanged[aSqlIter->first]; - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUStringBuffer sSql(s_sUPDATE + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + + OUStringBuffer sSql(s_sUPDATE + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + s_sSET + aSqlIter->second.toString()); - ::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; + OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; if ( !rCondition.isEmpty() ) sSql.append(" WHERE " + rCondition.toString() ); @@ -259,8 +259,8 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn TSQLStatements aSql; TSQLStatements aParameter; TSQLStatements aKeyConditions; - ::std::map< ::rtl::OUString,bool > aResultSetChanged; - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::std::map< OUString,bool > aResultSetChanged; + OUString aQuote = getIdentifierQuoteString(); // here we build the condition part for the update statement SelectColumnsMetaData::const_iterator aIter = m_pColumnNames->begin(); @@ -270,7 +270,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn if ( aResultSetChanged.find( aIter->second.sTableName ) == aResultSetChanged.end() ) aResultSetChanged[aIter->second.sTableName] = false; - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); if ( (_rInsertRow->get())[aIter->second.nPosition].isModified() ) { if ( m_aJoinedKeyColumns.find(aIter->second.nPosition) != m_aJoinedKeyColumns.end() ) @@ -283,11 +283,11 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn { (_rInsertRow->get())[aJoinIter->second] = (_rInsertRow->get())[aIter->second.nPosition]; } - ::rtl::OUStringBuffer& rPart = aSql[aIter->second.sTableName]; + OUStringBuffer& rPart = aSql[aIter->second.sTableName]; if ( !rPart.isEmpty() ) rPart.append(", "); rPart.append(sQuotedColumnName); - ::rtl::OUStringBuffer& rParam = aParameter[aIter->second.sTableName]; + OUStringBuffer& rParam = aParameter[aIter->second.sTableName]; if ( !rParam.isEmpty() ) rParam.append(", "); rParam.append("?"); @@ -297,8 +297,8 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_VALUE_CHANGED ), SQL_GENERAL_ERROR, m_xConnection ); Reference<XDatabaseMetaData> xMetaData = m_xConnection->getMetaData(); - static const ::rtl::OUString s_sINSERT("INSERT INTO "); - static const ::rtl::OUString s_sVALUES(") VALUES ( "); + static const OUString s_sINSERT("INSERT INTO "); + static const OUString s_sVALUES(") VALUES ( "); TSQLStatements::iterator aSqlIter = aSql.begin(); TSQLStatements::iterator aSqlEnd = aSql.end(); for(;aSqlIter != aSqlEnd ; ++aSqlIter) @@ -306,16 +306,16 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn if ( aSqlIter->second.getLength() ) { m_bResultSetChanged = m_bResultSetChanged || aResultSetChanged[aSqlIter->first]; - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); - ::rtl::OUString sSql(s_sINSERT + sComposedTableName + " ( " + aSqlIter->second.toString() + + OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); + OUString sSql(s_sINSERT + sComposedTableName + " ( " + aSqlIter->second.toString() + s_sVALUES + aParameter[aSqlIter->first].toString() + " )"); - ::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; + OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; if ( !rCondition.isEmpty() ) { - ::rtl::OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + + OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + " WHERE " + rCondition.toString()); try @@ -353,7 +353,7 @@ void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const conn void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException) { - ::rtl::OUString aQuote = getIdentifierQuoteString(); + OUString aQuote = getIdentifierQuoteString(); TSQLStatements aKeyConditions; TSQLStatements aIndexConditions; TSQLStatements aSql; @@ -366,7 +366,7 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne if ( m_aJoinedKeyColumns.find(aIter->second.nPosition) == m_aJoinedKeyColumns.end() && m_pKeyColumnNames->find(aIter->first) != m_pKeyColumnNames->end() ) { // only delete rows which aren't the key in the join - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aIter->second.sRealName); lcl_fillKeyCondition(aIter->second.sTableName,sQuotedColumnName,(_rDeleteRow->get())[aIter->second.nPosition],aKeyConditions); } } @@ -375,19 +375,19 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne TSQLStatements::iterator aSqlEnd = aKeyConditions.end(); for(;aSqlIter != aSqlEnd ; ++aSqlIter) { - ::rtl::OUStringBuffer& rCondition = aSqlIter->second; + OUStringBuffer& rCondition = aSqlIter->second; if ( !rCondition.isEmpty() ) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sSql("DELETE FROM " + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + + OUString sSql("DELETE FROM " + ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ) + " WHERE " + rCondition.toString() ); executeDelete(_rDeleteRow, sSql, aSqlIter->first); } } } -void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName) +void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::executeDelete" ); @@ -420,16 +420,16 @@ void OptimisticSet::fillJoinedColumns_throw(const ::std::vector< TNodePair >& i_ ::std::vector< TNodePair >::const_iterator aIter = i_aJoinColumns.begin(); for(;aIter != i_aJoinColumns.end();++aIter) { - ::rtl::OUString sColumnName,sTableName; + OUString sColumnName,sTableName; m_aSqlIterator.getColumnRange(aIter->first,sColumnName,sTableName); - ::rtl::OUString sLeft(sTableName + "." + sColumnName); + OUString sLeft(sTableName + "." + sColumnName); m_aSqlIterator.getColumnRange(aIter->second,sColumnName,sTableName); - ::rtl::OUString sRight(sTableName + "." + sColumnName); + OUString sRight(sTableName + "." + sColumnName); fillJoinedColumns_throw(sLeft, sRight); } } -void OptimisticSet::fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn,const ::rtl::OUString& i_sRightColumn) +void OptimisticSet::fillJoinedColumns_throw(const OUString& i_sLeftColumn,const OUString& i_sRightColumn) { sal_Int32 nLeft = 0,nRight = 0; SelectColumnsMetaData::const_iterator aLeftIter = m_pKeyColumnNames->find(i_sLeftColumn); @@ -478,7 +478,7 @@ bool OptimisticSet::isResultSetChanged() const void OptimisticSet::reset(const Reference< XResultSet>& _xDriverSet) { - OCacheSet::construct(_xDriverSet,::rtl::OUString()); + OCacheSet::construct(_xDriverSet,OUString()); m_bRowCountFinal = sal_False; m_aKeyMap.clear(); OKeySetValue keySetValue((ORowSetValueVector *)NULL,::std::pair<sal_Int32,Reference<XRow> >(0,(Reference<XRow>)NULL)); @@ -515,8 +515,8 @@ namespace }; struct TableNameFunctor : ::std::unary_function<SelectColumnsMetaData::value_type,bool> { - ::rtl::OUString m_sTableName; - TableNameFunctor(const ::rtl::OUString& i_sTableName) + OUString m_sTableName; + TableNameFunctor(const OUString& i_sTableName) : m_sTableName(i_sTableName) { } @@ -537,7 +537,7 @@ bool OptimisticSet::updateColumnValues(const ORowSetValueVector::Vector& io_aCac SelectColumnsMetaData::const_iterator aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),PositionFunctor(*aColIdxIter)); if ( aFind != m_pKeyColumnNames->end() ) { - const ::rtl::OUString sTableName = aFind->second.sTableName; + const OUString sTableName = aFind->second.sTableName; aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),TableNameFunctor(sTableName)); while( aFind != m_pKeyColumnNames->end() ) { @@ -575,7 +575,7 @@ bool OptimisticSet::columnValuesUpdated(ORowSetValueVector::Vector& o_aCachedRow SelectColumnsMetaData::const_iterator aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),PositionFunctor(aIter->second.nPosition)); if ( aFind != m_pKeyColumnNames->end() ) { - const ::rtl::OUString sTableName = aFind->second.sTableName; + const OUString sTableName = aFind->second.sTableName; aFind = ::std::find_if(m_pKeyColumnNames->begin(),m_pKeyColumnNames->end(),TableNameFunctor(sTableName)); while( aFind != m_pKeyColumnNames->end() ) { @@ -608,19 +608,19 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const { TSQLStatements aSql; TSQLStatements aKeyConditions; - ::std::map< ::rtl::OUString,bool > aResultSetChanged; - ::rtl::OUString aQuote = getIdentifierQuoteString(); + ::std::map< OUString,bool > aResultSetChanged; + OUString aQuote = getIdentifierQuoteString(); // here we build the condition part for the update statement SelectColumnsMetaData::const_iterator aColIter = m_pColumnNames->begin(); SelectColumnsMetaData::const_iterator aColEnd = m_pColumnNames->end(); for(;aColIter != aColEnd;++aColIter) { - const ::rtl::OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aColIter->second.sRealName); + const OUString sQuotedColumnName = ::dbtools::quoteName( aQuote,aColIter->second.sRealName); if ( m_aJoinedKeyColumns.find(aColIter->second.nPosition) != m_aJoinedKeyColumns.end() ) { lcl_fillKeyCondition(aColIter->second.sTableName,sQuotedColumnName,io_aRow[aColIter->second.nPosition],aKeyConditions); } - ::rtl::OUStringBuffer& rPart = aSql[aColIter->second.sTableName]; + OUStringBuffer& rPart = aSql[aColIter->second.sTableName]; if ( !rPart.isEmpty() ) rPart.append(", "); rPart.append(sQuotedColumnName); @@ -632,13 +632,13 @@ void OptimisticSet::fillMissingValues(ORowSetValueVector::Vector& io_aRow) const { if ( aSqlIter->second.getLength() ) { - ::rtl::OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; + OUStringBuffer& rCondition = aKeyConditions[aSqlIter->first]; if ( !rCondition.isEmpty() ) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(xMetaData,aSqlIter->first,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation); - ::rtl::OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); - ::rtl::OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + " WHERE " + + OUString sComposedTableName = ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable ); + OUString sQuery("SELECT " + aSqlIter->second.toString() + " FROM " + sComposedTableName + " WHERE " + rCondition.makeStringAndClear()); try diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index da6c034fdeca..83608360d418 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -45,9 +45,9 @@ namespace dbaccess void impl_convertValue_throw(const ORowSetRow& _rInsertRow,const SelectColumnDescription& i_aMetaData); - void executeDelete(const ORowSetRow& _rDeleteRow,const ::rtl::OUString& i_sSQL,const ::rtl::OUString& i_sTableName); + void executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName); void fillJoinedColumns_throw(const ::std::vector< ::connectivity::TNodePair>& i_aJoinColumns); - void fillJoinedColumns_throw(const ::rtl::OUString& i_sLeftColumn,const ::rtl::OUString& i_sRightColumn); + void fillJoinedColumns_throw(const OUString& i_sLeftColumn,const OUString& i_sRightColumn); protected: virtual void makeNewStatement( ); virtual ~OptimisticSet(); @@ -60,7 +60,7 @@ namespace dbaccess sal_Int32& o_nRowCount); // late ctor which can throw exceptions - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); // ::com::sun::star::sdbcx::XDeleteRows virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ,const connectivity::OSQLTable& _xTable) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/PrivateRow.cxx b/dbaccess/source/core/api/PrivateRow.cxx index dd2533c5c21f..465fc3e47f7b 100644 --- a/dbaccess/source/core/api/PrivateRow.cxx +++ b/dbaccess/source/core/api/PrivateRow.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; { return m_aRow[m_nPos].isNull(); } - ::rtl::OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) + OUString SAL_CALL OPrivateRow::getString( ::sal_Int32 columnIndex ) throw (SQLException, RuntimeException) { m_nPos = columnIndex; return m_aRow[m_nPos]; diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx index 80249d5acf2e..2068dfff8af8 100644 --- a/dbaccess/source/core/api/PrivateRow.hxx +++ b/dbaccess/source/core/api/PrivateRow.hxx @@ -34,7 +34,7 @@ namespace dbaccess { } virtual ::sal_Bool SAL_CALL wasNull( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getBoolean( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int8 SAL_CALL getByte( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Int16 SAL_CALL getShort( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 17437c9d885c..abf7bae375b5 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -475,9 +475,9 @@ Any SAL_CALL ORowSet::queryAggregation( const Type& rType ) throw(RuntimeExcepti return aRet; } -rtl::OUString ORowSet::getImplementationName_static( ) throw(RuntimeException) +OUString ORowSet::getImplementationName_static( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.comp.dba.ORowSet"); + return OUString("com.sun.star.comp.dba.ORowSet"); } // ::com::sun::star::XServiceInfo @@ -493,7 +493,7 @@ sal_Bool SAL_CALL ORowSet::supportsService( const OUString& _rServiceName ) thro Sequence< OUString > ORowSet::getSupportedServiceNames_static( ) throw (RuntimeException) { - Sequence< rtl::OUString > aSNS( 5 ); + Sequence< OUString > aSNS( 5 ); aSNS[0] = SERVICE_SDBC_RESULTSET; aSNS[1] = SERVICE_SDBC_ROWSET; aSNS[2] = SERVICE_SDBCX_RESULTSET; @@ -2330,7 +2330,7 @@ sal_Bool ORowSet::impl_buildActiveCommand_throw() } else { - sCommand = rtl::OUString("SELECT * FROM "); + sCommand = OUString("SELECT * FROM "); OUString sCatalog, sSchema, sTable; ::dbtools::qualifiedNameComponents( m_xActiveConnection->getMetaData(), m_aCommand, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation ); sCommand += ::dbtools::composeTableNameForSelect( m_xActiveConnection, sCatalog, sSchema, sTable ); @@ -2559,11 +2559,11 @@ void SAL_CALL ORowSet::setCharacterStream( sal_Int32 parameterIndex, const Refer try { Sequence <sal_Int8> aData; - rtl::OUString aDataStr; + OUString aDataStr; // the data is given as character data and the length defines the character length sal_Int32 nSize = x->readBytes(aData, length * sizeof(sal_Unicode)); if (nSize / sizeof(sal_Unicode)) - aDataStr = rtl::OUString((sal_Unicode*)aData.getConstArray(), nSize / sizeof(sal_Unicode)); + aDataStr = OUString((sal_Unicode*)aData.getConstArray(), nSize / sizeof(sal_Unicode)); rParamValue = aDataStr; rParamValue.setTypeKind( DataType::LONGVARCHAR ); x->closeInput(); @@ -2837,9 +2837,9 @@ void ORowSetClone::release() throw() } // XServiceInfo -rtl::OUString ORowSetClone::getImplementationName( ) throw(RuntimeException) +OUString ORowSetClone::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.ORowSetClone"); + return OUString("com.sun.star.sdb.ORowSetClone"); } sal_Bool ORowSetClone::supportsService( const OUString& _rServiceName ) throw (RuntimeException) diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index 0e3558ad6f43..1ae22058b42b 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -99,20 +99,20 @@ namespace dbaccess OTableContainer* m_pTables; - rtl::OUString m_aCommand; - rtl::OUString m_aDataSourceName; - rtl::OUString m_aURL; - rtl::OUString m_aUser; - rtl::OUString m_aPassword; - rtl::OUString m_aFilter; - rtl::OUString m_aHavingClause; - rtl::OUString m_aGroupBy; - rtl::OUString m_aOrder; - rtl::OUString m_aActiveCommand; - rtl::OUString m_aCursorName; - rtl::OUString m_aUpdateCatalogName; // is set by a query - rtl::OUString m_aUpdateSchemaName; // is set by a query - rtl::OUString m_aUpdateTableName; // is set by a query + OUString m_aCommand; + OUString m_aDataSourceName; + OUString m_aURL; + OUString m_aUser; + OUString m_aPassword; + OUString m_aFilter; + OUString m_aHavingClause; + OUString m_aGroupBy; + OUString m_aOrder; + OUString m_aActiveCommand; + OUString m_aCursorName; + OUString m_aUpdateCatalogName; // is set by a query + OUString m_aUpdateSchemaName; // is set by a query + OUString m_aUpdateTableName; // is set by a query sal_Int32 m_nFetchDirection; sal_Int32 m_nFetchSize; @@ -172,7 +172,7 @@ namespace dbaccess @throws com::sun::star::uno::RuntimeException if any of the components involved throws a com::sun::star::uno::RuntimeException */ - sal_Bool impl_initComposer_throw( ::rtl::OUString& _out_rCommandToExecute ); + sal_Bool impl_initComposer_throw( OUString& _out_rCommandToExecute ); /** returns the table container of our active connection @@ -261,13 +261,13 @@ namespace dbaccess virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XServiceInfo - static methods - static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_static(void) throw( ::com::sun::star::uno::RuntimeException ); + static OUString getImplementationName_static(void) throw( ::com::sun::star::uno::RuntimeException ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&); @@ -298,7 +298,7 @@ namespace dbaccess // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -327,7 +327,7 @@ namespace dbaccess virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -369,7 +369,7 @@ namespace dbaccess // XParameters virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -377,7 +377,7 @@ namespace dbaccess virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -491,9 +491,9 @@ namespace dbaccess virtual void SAL_CALL release() throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 80f2c4660c76..bfeca61b4e68 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -64,16 +64,16 @@ class OEmptyCollection : public sdbcx::OCollection { protected: virtual void impl_refresh() throw(RuntimeException); - virtual connectivity::sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); + virtual connectivity::sdbcx::ObjectType createObject(const OUString& _rName); public: - OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent,sal_True,_rMutex,::std::vector< ::rtl::OUString>()){} + OEmptyCollection(::cppu::OWeakObject& _rParent,::osl::Mutex& _rMutex) : OCollection(_rParent,sal_True,_rMutex,::std::vector< OUString>()){} }; void OEmptyCollection::impl_refresh() throw(RuntimeException) { } -connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const ::rtl::OUString& /*_rName*/) +connectivity::sdbcx::ObjectType OEmptyCollection::createObject(const OUString& /*_rName*/) { return connectivity::sdbcx::ObjectType(); } @@ -279,7 +279,7 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex) return m_aEmptyValue; } -::rtl::OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getString" ); ::osl::MutexGuard aGuard( *m_pMutex ); @@ -592,7 +592,7 @@ Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData( ) throw(SQLE } // XColumnLocate -sal_Int32 SAL_CALL ORowSetBase::findColumn( const ::rtl::OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::findColumn" ); ::connectivity::checkDisposed(m_rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx index 31660e9411ab..185808602f88 100644 --- a/dbaccess/source/core/api/RowSetBase.hxx +++ b/dbaccess/source/core/api/RowSetBase.hxx @@ -262,14 +262,14 @@ namespace dbaccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index f6506fae69f6..3d79f2f8f6c5 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -83,11 +83,11 @@ DBG_NAME(ORowSetCache) ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, const Reference<XComponentContext>& _rContext, - const ::rtl::OUString& _rUpdateTableName, + const OUString& _rUpdateTableName, sal_Bool& _bModified, sal_Bool& _bNew, const ORowSetValueVector& _aParameterValueForCache, - const ::rtl::OUString& i_sRowSetFilter, + const OUString& i_sRowSetFilter, sal_Int32 i_nMaxRows) :m_xSet(_xRs) ,m_xMetaData(Reference< XResultSetMetaDataSupplier >(_xRs,UNO_QUERY)->getMetaData()) @@ -155,7 +155,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, ::comphelper::getINT32(xProp->getPropertyValue(PROPERTY_RESULTSETCONCURRENCY)) == ResultSetConcurrency::READ_ONLY); Reference< XIndexAccess> xUpdateTableKeys; - ::rtl::OUString aUpdateTableName = _rUpdateTableName; + OUString aUpdateTableName = _rUpdateTableName; Reference< XConnection> xConnection; // first we need a connection Reference< XStatement> xStmt(_xRs->getStatement(),UNO_QUERY); @@ -174,7 +174,7 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, Reference<XTablesSupplier> xTabSup(_xAnalyzer,UNO_QUERY); OSL_ENSURE(xTabSup.is(),"ORowSet::execute composer isn't a tablesupplier!"); Reference<XNameAccess> xTables = xTabSup->getTables(); - Sequence< ::rtl::OUString> aTableNames = xTables->getElementNames(); + Sequence< OUString> aTableNames = xTables->getElementNames(); if ( aTableNames.getLength() > 1 && _rUpdateTableName.isEmpty() && bNeedKeySet ) {// here we have a join or union and nobody told us which table to update, so we update them all m_nPrivileges = Privilege::SELECT|Privilege::DELETE|Privilege::INSERT|Privilege::UPDATE; @@ -298,9 +298,9 @@ ORowSetCache::ORowSetCache(const Reference< XResultSet >& _xRs, m_nPrivileges = Privilege::SELECT; sal_Bool bNoInsert = sal_False; - Sequence< ::rtl::OUString> aNames(xColumns->getElementNames()); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames(xColumns->getElementNames()); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) { Reference<XPropertySet> xColumn(xColumns->getByName(*pIter),UNO_QUERY); @@ -1534,7 +1534,7 @@ void ORowSetCache::checkUpdateConditions(sal_Int32 columnIndex) throwFunctionSequenceException(m_xSet.get()); } -sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const ::rtl::OUString& _sUpdateTableName) +sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode,const Reference< XConnection>& _xConnection,const OUString& _sUpdateTableName) { sal_Bool bOk = sal_False; if (pNode->count() == 3 && // Ausdruck is geklammert @@ -1561,7 +1561,7 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode { bOk = sal_False; } - ::rtl::OUString sColumnName,sTableRange; + OUString sColumnName,sTableRange; OSQLParseTreeIterator::getColumnRange( pNode->getChild(0), _xConnection, sColumnName, sTableRange ); bOk = sTableRange == _sUpdateTableName; if ( !bOk ) @@ -1575,11 +1575,11 @@ sal_Bool ORowSetCache::checkInnerJoin(const ::connectivity::OSQLParseNode *pNode sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, const Reference< XSingleSelectQueryAnalyzer >& _xAnalyzer, - const ::rtl::OUString& _sUpdateTableName ) + const OUString& _sUpdateTableName ) { sal_Bool bOk = sal_False; - ::rtl::OUString sSql = _xAnalyzer->getQuery(); - ::rtl::OUString sErrorMsg; + OUString sSql = _xAnalyzer->getQuery(); + OUString sErrorMsg; ::connectivity::OSQLParser aSqlParser( m_aContext ); SAL_WNODEPRECATED_DECLARATIONS_PUSH ::std::auto_ptr< ::connectivity::OSQLParseNode> pSqlParseNode( aSqlParser.parseTree(sErrorMsg,sSql)); @@ -1618,7 +1618,7 @@ sal_Bool ORowSetCache::checkJoin(const Reference< XConnection>& _xConnection, pTableRef = pJoin->getChild(3); OSL_ENSURE(SQL_ISRULE(pTableRef,table_ref),"Must be a tableref here!"); - ::rtl::OUString sTableRange = OSQLParseNode::getTableRange(pTableRef); + OUString sTableRange = OSQLParseNode::getTableRange(pTableRef); if(sTableRange.isEmpty()) pTableRef->getChild(0)->parseNodeToStr( sTableRange, _xConnection, NULL, sal_False, sal_False ); bOk = sTableRange == _sUpdateTableName; diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 6eabf0df1e09..67e8757d89d1 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -120,10 +120,10 @@ namespace dbaccess void checkUpdateConditions(sal_Int32 columnIndex); sal_Bool checkJoin( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xComposer, - const ::rtl::OUString& _sUpdateTableName); + const OUString& _sUpdateTableName); sal_Bool checkInnerJoin(const ::connectivity::OSQLParseNode *pNode ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection - ,const ::rtl::OUString& _sUpdateTableName); + ,const OUString& _sUpdateTableName); // clears the insert row void clearInsertRow(); @@ -137,11 +137,11 @@ namespace dbaccess ORowSetCache(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xRs, const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryAnalyzer >& _xAnalyzer, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, - const ::rtl::OUString& _rUpdateTableName, + const OUString& _rUpdateTableName, sal_Bool& _bModified, sal_Bool& _bNew, const ORowSetValueVector& _aParameterValueForCache, - const ::rtl::OUString& i_sRowSetFilter, + const OUString& i_sRowSetFilter, sal_Int32 i_nMaxRows); ~ORowSetCache(); diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index 30eee81a9976..a10188244c86 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -163,7 +163,7 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue( { Any aValue; getFastPropertyValue(aValue,nHandle); - bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(static_cast< ::rtl::OUString*>(0))); + bRet = ::comphelper::tryPropertyValue(rConvertedValue,rOldValue,rValue,aValue,::getCppuType(static_cast< OUString*>(0))); } break; // we assume that it works } @@ -409,7 +409,7 @@ Sequence< Type > SAL_CALL ODBTableDecorator::getTypes( ) throw(RuntimeException } // XRename, -void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::rename" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -424,7 +424,7 @@ void SAL_CALL ODBTableDecorator::rename( const ::rtl::OUString& _rNewName ) thro } // XAlterTable, -void SAL_CALL ODBTableDecorator::alterColumnByName( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::alterColumnByName" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -484,7 +484,7 @@ Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException) return m_pColumns; } -::rtl::OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException) +OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getName" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -539,7 +539,7 @@ void ODBTableDecorator::fillPrivileges() const } if ( m_nPrivileges == 0 ) // second chance { - ::rtl::OUString sCatalog,sSchema,sName; + OUString sCatalog,sSchema,sName; xProp->getPropertyValue(PROPERTY_CATALOGNAME) >>= sCatalog; xProp->getPropertyValue(PROPERTY_SCHEMANAME) >>= sSchema; xProp->getPropertyValue(PROPERTY_NAME) >>= sName; @@ -586,7 +586,7 @@ void ODBTableDecorator::refreshColumns() ::osl::MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); - ::std::vector< ::rtl::OUString> aVector; + ::std::vector< OUString> aVector; Reference<XNameAccess> xNames; if(m_xTable.is()) @@ -594,9 +594,9 @@ void ODBTableDecorator::refreshColumns() xNames = m_xTable->getColumns(); if(xNames.is()) { - Sequence< ::rtl::OUString> aNames = xNames->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xNames->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for(;pIter != pEnd;++pIter) aVector.push_back(*pIter); } @@ -618,7 +618,7 @@ void ODBTableDecorator::refreshColumns() m_pColumns->reFill(aVector); } -OColumn* ODBTableDecorator::createColumn(const ::rtl::OUString& _rName) const +OColumn* ODBTableDecorator::createColumn(const OUString& _rName) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createColumn" ); OColumn* pReturn = NULL; @@ -648,7 +648,7 @@ void ODBTableDecorator::columnAppended( const Reference< XPropertySet >& /*_rxSo // not interested in } -void ODBTableDecorator::columnDropped(const ::rtl::OUString& _sName) +void ODBTableDecorator::columnDropped(const OUString& _sName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::columnDropped" ); Reference<XDrop> xDrop(m_xColumnDefinitions,UNO_QUERY); @@ -678,7 +678,7 @@ void SAL_CALL ODBTableDecorator::release() throw() OTableDescriptor_BASE::release(); } -void SAL_CALL ODBTableDecorator::setName( const ::rtl::OUString& /*aName*/ ) throw (::com::sun::star::uno::RuntimeException) +void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ ) throw (::com::sun::star::uno::RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::setName" ); throwFunctionNotSupportedException( "XNamed::setName", *this ); diff --git a/dbaccess/source/core/api/View.cxx b/dbaccess/source/core/api/View.cxx index 8523a7020564..82c9d5561a94 100644 --- a/dbaccess/source/core/api/View.cxx +++ b/dbaccess/source/core/api/View.cxx @@ -46,9 +46,9 @@ namespace dbaccess using ::com::sun::star::lang::DisposedException; using ::com::sun::star::sdbc::XRow; - ::rtl::OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const ::rtl::OUString& i_sSetting) + OUString lcl_getServiceNameForSetting(const Reference< ::com::sun::star::sdbc::XConnection >& _xConnection,const OUString& i_sSetting) { - ::rtl::OUString sSupportService; + OUString sSupportService; Any aValue; if ( dbtools::getDataSourceSetting(_xConnection,i_sSetting,aValue) ) { @@ -60,14 +60,14 @@ namespace dbaccess //= View //==================================================================== View::View( const Reference< XConnection >& _rxConnection, sal_Bool _bCaseSensitive, - const ::rtl::OUString& _rCatalogName,const ::rtl::OUString& _rSchemaName, const ::rtl::OUString& _rName ) - :View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, ::rtl::OUString(), _rSchemaName, _rCatalogName ) + const OUString& _rCatalogName,const OUString& _rSchemaName, const OUString& _rName ) + :View_Base( _bCaseSensitive, _rName, _rxConnection->getMetaData(), 0, OUString(), _rSchemaName, _rCatalogName ) { m_nCommandHandle = getProperty(PROPERTY_COMMAND).Handle; try { Reference<XMultiServiceFactory> xFac(_rxConnection,UNO_QUERY_THROW); - static const ::rtl::OUString s_sViewAccess("ViewAccessServiceName"); + static const OUString s_sViewAccess("ViewAccessServiceName"); m_xViewAccess.set(xFac->createInstance(lcl_getServiceNameForSetting(_rxConnection,s_sViewAccess)),UNO_QUERY); } catch(const Exception& ) @@ -113,7 +113,7 @@ namespace dbaccess return Sequence< Type >(pTypes, aOwnTypes.size()); } - void SAL_CALL View::alterCommand( const ::rtl::OUString& _rNewCommand ) throw (SQLException, RuntimeException) + void SAL_CALL View::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException) { OSL_ENSURE(m_xViewAccess.is(),"Illegal call to AlterView!"); m_xViewAccess->alterCommand(this,_rNewCommand); diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx index d4d600559cf7..6fa18a837ad5 100644 --- a/dbaccess/source/core/api/WrappedResultSet.cxx +++ b/dbaccess/source/core/api/WrappedResultSet.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::osl; -void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter) +void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::construct" ); OCacheSet::construct(_xDriverSet,i_sRowSetFilter); diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx index 8359b33eb29d..815158b393eb 100644 --- a/dbaccess/source/core/api/WrappedResultSet.hxx +++ b/dbaccess/source/core/api/WrappedResultSet.hxx @@ -42,7 +42,7 @@ namespace dbaccess m_xRowLocate = NULL; } - virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const ::rtl::OUString& i_sRowSetFilter); + virtual void construct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter); virtual void fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition); // ::com::sun::star::sdbcx::XRowLocate virtual ::com::sun::star::uno::Any SAL_CALL getBookmark() throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index ac28dfcb7f76..355bb0bb066a 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -84,23 +84,23 @@ void OCallableStatement::release() throw () } // XServiceInfo -rtl::OUString OCallableStatement::getImplementationName( ) throw(RuntimeException) +OUString OCallableStatement::getImplementationName( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getImplementationName" ); - return rtl::OUString("com.sun.star.sdb.OCallableStatement"); + return OUString("com.sun.star.sdb.OCallableStatement"); } -Sequence< ::rtl::OUString > OCallableStatement::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OCallableStatement::getSupportedServiceNames( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getSupportedServiceNames" ); - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = SERVICE_SDBC_CALLABLESTATEMENT; aSNS.getArray()[1] = SERVICE_SDB_CALLABLESTATEMENT; return aSNS; } // XOutParameters -void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException) +void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::registerOutParameter" ); MutexGuard aGuard(m_aMutex); @@ -129,7 +129,7 @@ sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeExc return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->wasNull(); } -::rtl::OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getString" ); MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index 731026a77b94..2b5fabb4225c 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -94,19 +94,19 @@ Sequence< Type > OColumn::getTypes() throw (RuntimeException) IMPLEMENT_FORWARD_XINTERFACE2( OColumn, OColumnBase, ::comphelper::OPropertyContainer ) // ::com::sun::star::lang::XServiceInfo -rtl::OUString OColumn::getImplementationName( ) throw(RuntimeException) +OUString OColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OColumn"); + return OUString("com.sun.star.sdb.OColumn"); } -sal_Bool OColumn::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OColumn::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OColumn::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OColumn::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS[0] = SERVICE_SDBCX_COLUMN; return aSNS; } @@ -123,12 +123,12 @@ Reference< XPropertySetInfo > OColumn::getPropertySetInfo() throw (RuntimeExcept return createPropertySetInfo( getInfoHelper() ) ; } -::rtl::OUString SAL_CALL OColumn::getName( ) throw(::com::sun::star::uno::RuntimeException) +OUString SAL_CALL OColumn::getName( ) throw(::com::sun::star::uno::RuntimeException) { return m_sName; } -void SAL_CALL OColumn::setName( const ::rtl::OUString& _rName ) throw(::com::sun::star::uno::RuntimeException) +void SAL_CALL OColumn::setName( const OUString& _rName ) throw(::com::sun::star::uno::RuntimeException) { m_sName = _rName; } @@ -138,17 +138,17 @@ void OColumn::fireValueChange(const ::connectivity::ORowSetValue& /*_rOldValue*/ OSL_FAIL( "OColumn::fireValueChange: not implemented!" ); } -void OColumn::registerProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType ) +void OColumn::registerProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const Type& _rMemberType ) { ::comphelper::OPropertyContainer::registerProperty( _rName, _nHandle, _nAttributes, _pPointerToMember, _rMemberType ); } -void OColumn::registerMayBeVoidProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, Any* _pPointerToMember, const Type& _rExpectedType ) +void OColumn::registerMayBeVoidProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, Any* _pPointerToMember, const Type& _rExpectedType ) { ::comphelper::OPropertyContainer::registerMayBeVoidProperty( _rName, _nHandle, _nAttributes, _pPointerToMember, _rExpectedType ); } -void OColumn::registerPropertyNoMember( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Type& _rType, const void* _pInitialValue ) +void OColumn::registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const Type& _rType, const void* _pInitialValue ) { ::comphelper::OPropertyContainer::registerPropertyNoMember( _rName, _nHandle, _nAttributes, _rType, _pInitialValue ); } @@ -160,7 +160,7 @@ DBG_NAME(OColumns); OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, - sal_Bool _bCaseSensitive,const ::std::vector< ::rtl::OUString> &_rVector, + sal_Bool _bCaseSensitive,const ::std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn, @@ -180,7 +180,7 @@ OColumns::OColumns(::cppu::OWeakObject& _rParent, OColumns::OColumns(::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxDrvColumns, - sal_Bool _bCaseSensitive,const ::std::vector< ::rtl::OUString> &_rVector, + sal_Bool _bCaseSensitive,const ::std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn, @@ -204,25 +204,25 @@ OColumns::~OColumns() } // XServiceInfo -rtl::OUString OColumns::getImplementationName( ) throw(RuntimeException) +OUString OColumns::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OColumns"); + return OUString("com.sun.star.sdb.OColumns"); } -sal_Bool OColumns::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OColumns::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OColumns::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OColumns::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS[0] = SERVICE_SDBCX_CONTAINER; return aSNS; } //------------------------------------------------------------------ -void OColumns::append( const ::rtl::OUString& _rName, OColumn* _pColumn ) +void OColumns::append( const OUString& _rName, OColumn* _pColumn ) { MutexGuard aGuard(m_rMutex); @@ -257,7 +257,7 @@ void OColumns::impl_refresh() throw(::com::sun::star::uno::RuntimeException) m_pRefreshColumns->refreshColumns(); } -connectivity::sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) +connectivity::sdbcx::ObjectType OColumns::createObject(const OUString& _rName) { OSL_ENSURE(m_pColFactoryImpl, "OColumns::createObject: no column factory!"); @@ -369,7 +369,7 @@ Sequence< Type > SAL_CALL OColumns::getTypes( ) throw(RuntimeException) } // XAppend -sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +sdbcx::ObjectType OColumns::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { sdbcx::ObjectType xReturn; @@ -407,7 +407,7 @@ sdbcx::ObjectType OColumns::appendObject( const ::rtl::OUString& _rForName, cons } // XDrop -void OColumns::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OColumns::dropObject(sal_Int32 _nPos,const OUString _sElementName) { Reference< XDrop > xDrop( m_xDrvColumns, UNO_QUERY ); if ( xDrop.is() ) diff --git a/dbaccess/source/core/api/columnsettings.cxx b/dbaccess/source/core/api/columnsettings.cxx index a2ade21289c6..5cf277bba674 100644 --- a/dbaccess/source/core/api/columnsettings.cxx +++ b/dbaccess/source/core/api/columnsettings.cxx @@ -72,7 +72,7 @@ namespace dbaccess const sal_Int32 nMayBeVoidAttr = PropertyAttribute::MAYBEVOID | nBoundAttr; const Type& rSalInt32Type = ::getCppuType( static_cast< sal_Int32* >( NULL ) ); - const Type& rStringType = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + const Type& rStringType = ::getCppuType( static_cast< OUString* >( NULL ) ); _rPropertyContainer.registerMayBeVoidProperty( PROPERTY_ALIGN, PROPERTY_ID_ALIGN, nMayBeVoidAttr, &m_aAlignment, rSalInt32Type ); _rPropertyContainer.registerMayBeVoidProperty( PROPERTY_NUMBERFORMAT, PROPERTY_ID_NUMBERFORMAT, nMayBeVoidAttr, &m_aFormatKey, rSalInt32Type ); @@ -131,7 +131,7 @@ namespace dbaccess struct PropertyDescriptor { - ::rtl::OUString sName; + OUString sName; sal_Int32 nHandle; }; PropertyDescriptor aProps[] = diff --git a/dbaccess/source/core/api/datacolumn.cxx b/dbaccess/source/core/api/datacolumn.cxx index 0e94e91306fc..d08f59c81633 100644 --- a/dbaccess/source/core/api/datacolumn.cxx +++ b/dbaccess/source/core/api/datacolumn.cxx @@ -94,14 +94,14 @@ Any SAL_CALL ODataColumn::queryInterface( const Type & _rType ) throw (RuntimeEx } // XServiceInfo -rtl::OUString ODataColumn::getImplementationName( ) throw(RuntimeException) +OUString ODataColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.ODataColumn"); + return OUString("com.sun.star.sdb.ODataColumn"); } -Sequence< ::rtl::OUString > ODataColumn::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > ODataColumn::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 3 ); + Sequence< OUString > aSNS( 3 ); aSNS[0] = SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_RESULTCOLUMN; aSNS[2] = SERVICE_SDB_DATACOLUMN; @@ -126,7 +126,7 @@ sal_Bool ODataColumn::wasNull(void) throw( SQLException, RuntimeException ) return m_xRow->wasNull(); } -rtl::OUString ODataColumn::getString(void) throw( SQLException, RuntimeException ) +OUString ODataColumn::getString(void) throw( SQLException, RuntimeException ) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(!m_xRow.is()); @@ -343,7 +343,7 @@ void ODataColumn::updateDouble(double x) throw( SQLException, RuntimeException ) m_xRowUpdate->updateDouble(m_nPos, x); } -void ODataColumn::updateString(const rtl::OUString& x) throw( SQLException, RuntimeException ) +void ODataColumn::updateString(const OUString& x) throw( SQLException, RuntimeException ) { MutexGuard aGuard( m_aMutex ); ::connectivity::checkDisposed(!m_xRowUpdate.is()); diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx index 1c1724519079..60c52ce36320 100644 --- a/dbaccess/source/core/api/datacolumn.hxx +++ b/dbaccess/source/core/api/datacolumn.hxx @@ -57,15 +57,15 @@ namespace dbaccess virtual void SAL_CALL release() throw() { OResultColumn::release(); } // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // cppu::OComponentHelper virtual void SAL_CALL disposing(void); // ::com::sun::star::sdb::XColumn virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -94,7 +94,7 @@ namespace dbaccess virtual void SAL_CALL updateLong( sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index 522da407334a..cfdf5cff3a78 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -143,7 +143,7 @@ void ODataSettings::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefau case PROPERTY_ID_GROUP_BY: case PROPERTY_ID_FILTER: case PROPERTY_ID_ORDER: - _rDefault <<= ::rtl::OUString(); + _rDefault <<= OUString(); break; case PROPERTY_ID_FONT: _rDefault <<= ::comphelper::getDefaultFont(); diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx index df9a92a6f69e..3e27c738aa54 100644 --- a/dbaccess/source/core/api/definitioncolumn.cxx +++ b/dbaccess/source/core/api/definitioncolumn.cxx @@ -86,14 +86,14 @@ void OTableColumnDescriptor::impl_registerProperties() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptor ) // ::com::sun::star::lang::XServiceInfo -rtl::OUString OTableColumnDescriptor::getImplementationName( ) throw (RuntimeException) +OUString OTableColumnDescriptor::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumnDescriptor"); + return OUString("com.sun.star.sdb.OTableColumnDescriptor"); } -Sequence< ::rtl::OUString > OTableColumnDescriptor::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OTableColumnDescriptor::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = m_bActAsDescriptor ? SERVICE_SDBCX_COLUMNDESCRIPTOR : SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_COLUMNSETTINGS; return aSNS; @@ -135,7 +135,7 @@ void SAL_CALL OTableColumnDescriptor::setParent( const Reference< XInterface >& //============================================================ DBG_NAME(OTableColumn); -OTableColumn::OTableColumn( const ::rtl::OUString& _rName ) +OTableColumn::OTableColumn( const OUString& _rName ) :OTableColumnDescriptor( false /* do not act as descriptor */ ) { DBG_CTOR(OTableColumn,NULL); @@ -149,9 +149,9 @@ OTableColumn::~OTableColumn() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumn ) -rtl::OUString OTableColumn::getImplementationName( ) throw (RuntimeException) +OUString OTableColumn::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumn"); + return OUString("com.sun.star.sdb.OTableColumn"); } ::cppu::IPropertyArrayHelper& SAL_CALL OTableColumn::getInfoHelper() @@ -169,7 +169,7 @@ rtl::OUString OTableColumn::getImplementationName( ) throw (RuntimeException) // ========================================================================= DBG_NAME( OQueryColumn ); -OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection, const ::rtl::OUString &i_sLabel ) +OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, const Reference< XConnection >& _rxConnection, const OUString &i_sLabel ) :OTableColumnDescriptor( false /* do not act as descriptor */ ) ,m_sLabel(i_sLabel) { @@ -200,7 +200,7 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co // copy some optional properties from the parser column struct PropertyDescriptor { - ::rtl::OUString sName; + OUString sName; sal_Int32 nHandle; }; PropertyDescriptor aProps[] = @@ -240,14 +240,14 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const { // determine the composed table name, plus the column name, as indicated by the // respective properties - ::rtl::OUString sCatalog, sSchema, sTable; + OUString sCatalog, sSchema, sTable; OSL_VERIFY( getPropertyValue( PROPERTY_CATALOGNAME ) >>= sCatalog ); OSL_VERIFY( getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema ); OSL_VERIFY( getPropertyValue( PROPERTY_TABLENAME ) >>= sTable ); if ( sCatalog.isEmpty() && sSchema.isEmpty() && sTable.isEmpty() ) return NULL; - ::rtl::OUString sComposedTableName = ::dbtools::composeTableName( + OUString sComposedTableName = ::dbtools::composeTableName( _rxConnection->getMetaData(), sCatalog, sSchema, sTable, sal_False, ::dbtools::eComplete ); // retrieve the table in question @@ -259,7 +259,7 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const Reference< XColumnsSupplier > xSuppCols( xTables->getByName( sComposedTableName ), UNO_QUERY_THROW ); Reference< XNameAccess > xColumns( xSuppCols->getColumns(), UNO_QUERY_THROW ); - ::rtl::OUString sColumn; + OUString sColumn; OSL_VERIFY( getPropertyValue( PROPERTY_REALNAME ) >>= sColumn ); if ( !xColumns->hasByName( sColumn ) ) return NULL; @@ -275,9 +275,9 @@ Reference< XPropertySet > OQueryColumn::impl_determineOriginalTableColumn( const IMPLEMENT_GET_IMPLEMENTATION_ID( OQueryColumn ) -::rtl::OUString SAL_CALL OQueryColumn::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OQueryColumn::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString( "org.openoffice.comp.dbaccess.OQueryColumn" ); + return OUString( "org.openoffice.comp.dbaccess.OQueryColumn" ); } ::cppu::IPropertyArrayHelper& SAL_CALL OQueryColumn::getInfoHelper() @@ -309,7 +309,7 @@ void SAL_CALL OQueryColumn::getFastPropertyValue( Any& _rValue, sal_Int32 _nHand try { // determine original property name - ::rtl::OUString sPropName; + OUString sPropName; sal_Int16 nAttributes( 0 ); const_cast< OQueryColumn* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, &nAttributes, _nHandle ); OSL_ENSURE( !sPropName.isEmpty(), "OColumnWrapper::impl_getPropertyNameFromHandle: property not found!" ); @@ -356,9 +356,9 @@ OColumnWrapper::~OColumnWrapper() DBG_DTOR(OColumnWrapper,NULL); } -::rtl::OUString OColumnWrapper::impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const +OUString OColumnWrapper::impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const { - ::rtl::OUString sPropName; + OUString sPropName; sal_Int16 nAttributes( 0 ); const_cast< OColumnWrapper* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, &nAttributes, _nHandle ); OSL_ENSURE( !sPropName.isEmpty(), "OColumnWrapper::impl_getPropertyNameFromHandle: property not found!" ); @@ -436,14 +436,14 @@ OTableColumnDescriptorWrapper::OTableColumnDescriptorWrapper( const Reference< X IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnDescriptorWrapper ) // ::com::sun::star::lang::XServiceInfo -rtl::OUString OTableColumnDescriptorWrapper::getImplementationName( ) throw (RuntimeException) +OUString OTableColumnDescriptorWrapper::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumnDescriptorWrapper"); + return OUString("com.sun.star.sdb.OTableColumnDescriptorWrapper"); } -Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OTableColumnDescriptorWrapper::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMNDESCRIPTOR; aSNS[1] = SERVICE_SDB_COLUMNSETTINGS; return aSNS; @@ -465,19 +465,19 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa DECL_PROP0( PRECISION, sal_Int32 ); DECL_PROP0( SCALE, sal_Int32 ); DECL_PROP0( TYPE, sal_Int32 ); - DECL_PROP0( TYPENAME, ::rtl::OUString ); + DECL_PROP0( TYPENAME, OUString ); if ( nId & HAS_AUTOINCREMENT_CREATION ) { - DECL_PROP1( AUTOINCREMENTCREATION, ::rtl::OUString, MAYBEVOID ); + DECL_PROP1( AUTOINCREMENTCREATION, OUString, MAYBEVOID ); } if ( nId & HAS_DEFAULTVALUE ) { - DECL_PROP0( DEFAULTVALUE, ::rtl::OUString ); + DECL_PROP0( DEFAULTVALUE, OUString ); } if ( nId & HAS_DESCRIPTION ) { - DECL_PROP0( DESCRIPTION, ::rtl::OUString ); + DECL_PROP0( DESCRIPTION, OUString ); } if ( nId & HAS_ROWVERSION ) { @@ -485,15 +485,15 @@ Sequence< ::rtl::OUString > OTableColumnDescriptorWrapper::getSupportedServiceNa } if ( nId & HAS_CATALOGNAME ) { - DECL_PROP0( CATALOGNAME, ::rtl::OUString ); + DECL_PROP0( CATALOGNAME, OUString ); } if ( nId & HAS_SCHEMANAME ) { - DECL_PROP0( SCHEMANAME, ::rtl::OUString ); + DECL_PROP0( SCHEMANAME, OUString ); } if ( nId & HAS_TABLENAME ) { - DECL_PROP0( TABLENAME, ::rtl::OUString ); + DECL_PROP0( TABLENAME, OUString ); } END_PROPERTY_SEQUENCE() @@ -603,14 +603,14 @@ OTableColumnWrapper::~OTableColumnWrapper() IMPLEMENT_GET_IMPLEMENTATION_ID( OTableColumnWrapper ) -rtl::OUString OTableColumnWrapper::getImplementationName( ) throw (RuntimeException) +OUString OTableColumnWrapper::getImplementationName( ) throw (RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OTableColumnWrapper" ); + return OUString("com.sun.star.sdb.OTableColumnWrapper" ); } -Sequence< ::rtl::OUString > OTableColumnWrapper::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OTableColumnWrapper::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_COLUMNSETTINGS; return aSNS; diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index fa624f183cb6..f8f9680b6150 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -52,7 +52,7 @@ OPreparedStatement::OPreparedStatement(const Reference< XConnection > & _xConn, m_xAggregateAsParameters = Reference< XParameters >( m_xAggregateAsSet, UNO_QUERY_THROW ); Reference<XDatabaseMetaData> xMeta = _xConn->getMetaData(); - m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< ::rtl::OUString>(), NULL,NULL); + m_pColumns = new OColumns(*this, m_aMutex, xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),::std::vector< OUString>(), NULL,NULL); } OPreparedStatement::~OPreparedStatement() @@ -120,19 +120,19 @@ void OPreparedStatement::release() throw () } // XServiceInfo -rtl::OUString OPreparedStatement::getImplementationName( ) throw(RuntimeException) +OUString OPreparedStatement::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OPreparedStatement"); + return OUString("com.sun.star.sdb.OPreparedStatement"); } -sal_Bool OPreparedStatement::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OPreparedStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OPreparedStatement::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OPreparedStatement::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS.getArray()[0] = SERVICE_SDBC_PREPAREDSTATEMENT; aSNS.getArray()[1] = SERVICE_SDB_PREPAREDSTATMENT; return aSNS; @@ -169,7 +169,7 @@ Reference< ::com::sun::star::container::XNameAccess > OPreparedStatement::getCol for (sal_Int32 i = 0, nCount = xMetaData->getColumnCount(); i < nCount; ++i) { // retrieve the name of the column - rtl::OUString aName = xMetaData->getColumnName(i + 1); + OUString aName = xMetaData->getColumnName(i + 1); OResultColumn* pColumn = new OResultColumn(xMetaData, i + 1, xDBMeta); m_pColumns->append(aName, pColumn); } @@ -245,7 +245,7 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 s m_xAggregateAsParameters->setNull(parameterIndex, sqlType); } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); @@ -309,7 +309,7 @@ void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x m_xAggregateAsParameters->setDouble(parameterIndex, x); } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 2d10f929978d..c72f8bf40aad 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -101,7 +101,7 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition OSL_FAIL("OQueryDescriptor_Base::OQueryDescriptor_Base: caught an exception!"); } - m_xCommandDefinition->addPropertyChangeListener(::rtl::OUString(), this); + m_xCommandDefinition->addPropertyChangeListener(OUString(), this); // m_xCommandDefinition->addPropertyChangeListener(PROPERTY_NAME, this); m_xCommandPropInfo = m_xCommandDefinition->getPropertySetInfo(); } @@ -160,7 +160,7 @@ void OQuery::rebuildColumns() Reference< XResultSetMetaData > xResultSetMeta( xResMetaDataSup->getMetaData() ); if ( !xResultSetMeta.is() ) { - ::rtl::OUString sError( DBA_RES( RID_STR_STATEMENT_WITHOUT_RESULT_SET ) ); + OUString sError( DBA_RES( RID_STR_STATEMENT_WITHOUT_RESULT_SET ) ); ::dbtools::throwSQLException( sError, SQL_GENERAL_ERROR, *this ); } @@ -173,13 +173,13 @@ void OQuery::rebuildColumns() throw RuntimeException(); } - Sequence< ::rtl::OUString> aNames = xColumns->getElementNames(); - const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + Sequence< OUString> aNames = xColumns->getElementNames(); + const OUString* pIter = aNames.getConstArray(); + const OUString* pEnd = pIter + aNames.getLength(); for ( sal_Int32 i = 0;pIter != pEnd; ++pIter,++i) { Reference<XPropertySet> xSource(xColumns->getByName( *pIter ),UNO_QUERY); - ::rtl::OUString sLabel = *pIter; + OUString sLabel = *pIter; if ( xColumnDefinitions.is() && xColumnDefinitions->hasByName(*pIter) ) { Reference<XPropertySet> xCommandColumn(xColumnDefinitions->getByName( *pIter ),UNO_QUERY); @@ -260,7 +260,7 @@ void SAL_CALL OQuery::disposing( const EventObject& _rSource ) throw (RuntimeExc OSL_ENSURE(_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinition, UNO_QUERY).get(), "OQuery::disposing : where did this call come from ?"); - m_xCommandDefinition->removePropertyChangeListener(::rtl::OUString(), this); + m_xCommandDefinition->removePropertyChangeListener(OUString(), this); m_xCommandDefinition = NULL; } @@ -276,7 +276,7 @@ void SAL_CALL OQuery::disposing() MutexGuard aGuard(m_aMutex); if (m_xCommandDefinition.is()) { - m_xCommandDefinition->removePropertyChangeListener(::rtl::OUString(), this); + m_xCommandDefinition->removePropertyChangeListener(OUString(), this); m_xCommandDefinition = NULL; } disposeColumns(); @@ -287,7 +287,7 @@ void SAL_CALL OQuery::disposing() void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw (Exception) { ODataSettings::setFastPropertyValue_NoBroadcast(_nHandle, _rValue); - ::rtl::OUString sAggPropName; + OUString sAggPropName; sal_Int16 nAttr = 0; if (getInfoHelper().fillPropertyMembersByHandle(&sAggPropName,&nAttr,_nHandle) && m_xCommandPropInfo.is() && @@ -322,12 +322,12 @@ Reference< XPropertySetInfo > SAL_CALL OQuery::getPropertySetInfo( ) throw(Runt return new ::cppu::OPropertyArrayHelper(aProps); } -OColumn* OQuery::createColumn(const ::rtl::OUString& /*_rName*/) const +OColumn* OQuery::createColumn(const OUString& /*_rName*/) const { return NULL; } -void SAL_CALL OQuery::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL OQuery::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) { MutexGuard aGuard(m_aMutex); Reference<XRename> xRename(m_xCommandDefinition,UNO_QUERY); diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx index 7a95a37e902e..a0a8e781954f 100644 --- a/dbaccess/source/core/api/query.hxx +++ b/dbaccess/source/core/api/query.hxx @@ -61,7 +61,7 @@ class OQuery :public OContentHelper friend struct TRelease; public: - typedef ::std::map< ::rtl::OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap; + typedef ::std::map< OUString,OColumn*,::comphelper::UStringMixLess> TNameColumnMap; protected: // TNameColumnMap m_aColumnMap; // contains all columnnames to columns @@ -139,17 +139,17 @@ public: ::dbtools::IWarningsContainer* getWarningsContainer( ) const { return m_pWarnings; } // XRename - virtual void SAL_CALL rename( const ::rtl::OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& newName ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); protected: virtual void SAL_CALL disposing(); - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual void rebuildColumns( ); // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; private: void registerProperties(); diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx index c970878a46b0..98d6bc94bed8 100644 --- a/dbaccess/source/core/api/querycomposer.cxx +++ b/dbaccess/source/core/api/querycomposer.cxx @@ -137,35 +137,35 @@ OUString OQueryComposer::getImplementationName( ) throw(RuntimeException) return OUString("com.sun.star.sdb.dbaccess.OQueryComposer"); } -sal_Bool OQueryComposer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::supportsService" ); return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OQueryComposer::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OQueryComposer::getSupportedServiceNames( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getSupportedServiceNames" ); - Sequence< rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS[0] = SERVICE_SDB_SQLQUERYCOMPOSER; return aSNS; } // XSQLQueryComposer -::rtl::OUString SAL_CALL OQueryComposer::getQuery( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getQuery( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); Reference<XPropertySet> xProp(m_xComposer,UNO_QUERY); - ::rtl::OUString sQuery; + OUString sQuery; if ( xProp.is() ) xProp->getPropertyValue(PROPERTY_ORIGINAL) >>= sQuery; return sQuery; } -void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(SQLException, RuntimeException) +void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -177,7 +177,7 @@ void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(S m_sOrgOrder = m_xComposer->getOrder(); } -::rtl::OUString SAL_CALL OQueryComposer::getComposedQuery( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getComposedQuery( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getComposedQuery" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -187,7 +187,7 @@ void SAL_CALL OQueryComposer::setQuery( const ::rtl::OUString& command ) throw(S return m_xComposer->getQuery(); } -::rtl::OUString SAL_CALL OQueryComposer::getFilter( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getFilter( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getFilter" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -206,7 +206,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilt return m_xComposer->getStructuredFilter(); } -::rtl::OUString SAL_CALL OQueryComposer::getOrder( ) throw(RuntimeException) +OUString SAL_CALL OQueryComposer::getOrder( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getOrder" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -224,7 +224,7 @@ void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySe ::osl::MutexGuard aGuard( m_aMutex ); m_xComposerHelper->setQuery(getQuery()); - m_xComposerHelper->setFilter(::rtl::OUString()); + m_xComposerHelper->setFilter(OUString()); m_xComposerHelper->appendFilterByColumn(column, sal_True, SQLFilterOperator::EQUAL); FilterCreator aFilterCreator; @@ -241,7 +241,7 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet ::osl::MutexGuard aGuard( m_aMutex ); m_xComposerHelper->setQuery(getQuery()); - m_xComposerHelper->setOrder(::rtl::OUString()); + m_xComposerHelper->setOrder(OUString()); m_xComposerHelper->appendOrderByColumn(column,ascending); OrderCreator aOrderCreator; @@ -251,7 +251,7 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet setOrder(aOrderCreator.getComposedAndClear()); } -void SAL_CALL OQueryComposer::setFilter( const ::rtl::OUString& filter ) throw(SQLException, RuntimeException) +void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setFilter" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); @@ -268,7 +268,7 @@ void SAL_CALL OQueryComposer::setFilter( const ::rtl::OUString& filter ) throw(S m_xComposer->setFilter( aFilterCreator.getComposedAndClear() ); } -void SAL_CALL OQueryComposer::setOrder( const ::rtl::OUString& order ) throw(SQLException, RuntimeException) +void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setOrder" ); ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed); diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 984b9e8fe006..4e6d38f959b3 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -89,9 +89,9 @@ OQueryContainer::OQueryContainer( // fill my structures ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); - Sequence< ::rtl::OUString > sDefinitionNames = m_xCommandDefinitions->getElementNames(); - const ::rtl::OUString* pDefinitionName = sDefinitionNames.getConstArray(); - const ::rtl::OUString* pEnd = pDefinitionName + sDefinitionNames.getLength(); + Sequence< OUString > sDefinitionNames = m_xCommandDefinitions->getElementNames(); + const OUString* pDefinitionName = sDefinitionNames.getConstArray(); + const OUString* pEnd = pDefinitionName + sDefinitionNames.getLength(); for ( ; pDefinitionName != pEnd; ++pDefinitionName ) { rDefinitions.insert( *pDefinitionName, TContentPtr() ); @@ -152,7 +152,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet { ResettableMutexGuard aGuard(m_aMutex); if ( !m_xCommandDefinitions.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); // first clone this object's CommandDefinition part Reference< css::sdb::XQueryDefinition > xCommandDefinitionPart = css::sdb::QueryDefinition::create(m_aContext); @@ -163,7 +163,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet // create a wrapper for the object (*before* inserting into our command definition container) Reference< XContent > xNewObject( implCreateWrapper( Reference< XContent>( xCommandDefinitionPart, UNO_QUERY_THROW ) ) ); - ::rtl::OUString sNewObjectName; + OUString sNewObjectName; _rxDesc->getPropertyValue(PROPERTY_NAME) >>= sNewObjectName; try @@ -189,14 +189,14 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const Reference< XPropertySet } // XDrop -void SAL_CALL OQueryContainer::dropByName( const ::rtl::OUString& _rName ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL OQueryContainer::dropByName( const OUString& _rName ) throw(SQLException, NoSuchElementException, RuntimeException) { MutexGuard aGuard(m_aMutex); if ( !checkExistence(_rName) ) throw NoSuchElementException(_rName,*this); if ( !m_xCommandDefinitions.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); // now simply forward the remove request to the CommandDefinition container, we're a listener for the removal // and thus we do everything necessary in ::elementRemoved @@ -210,9 +210,9 @@ void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLExcepti throw IndexOutOfBoundsException(); if ( !m_xCommandDefinitions.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); - ::rtl::OUString sName; + OUString sName; Reference<XPropertySet> xProp(Reference<XIndexAccess>(m_xCommandDefinitions,UNO_QUERY)->getByIndex(_nIndex),UNO_QUERY); if ( xProp.is() ) xProp->getPropertyValue(PROPERTY_NAME) >>= sName; @@ -223,7 +223,7 @@ void SAL_CALL OQueryContainer::dropByIndex( sal_Int32 _nIndex ) throw(SQLExcepti void SAL_CALL OQueryContainer::elementInserted( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { Reference< XContent > xNewElement; - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.Accessor >>= sElementName; { MutexGuard aGuard(m_aMutex); @@ -244,7 +244,7 @@ void SAL_CALL OQueryContainer::elementInserted( const ::com::sun::star::containe void SAL_CALL OQueryContainer::elementRemoved( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException) { - ::rtl::OUString sAccessor; + OUString sAccessor; _rEvent.Accessor >>= sAccessor; { OSL_ENSURE(!sAccessor.isEmpty(), "OQueryContainer::elementRemoved : invalid name !"); @@ -259,7 +259,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const ::com::sun::star::containe { Reference< XPropertySet > xReplacedElement; Reference< XContent > xNewElement; - ::rtl::OUString sAccessor; + OUString sAccessor; _rEvent.Accessor >>= sAccessor; { @@ -277,7 +277,7 @@ void SAL_CALL OQueryContainer::elementReplaced( const ::com::sun::star::containe Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const ContainerEvent& Event ) throw (WrappedTargetException, RuntimeException) { - ::rtl::OUString sName; + OUString sName; OSL_VERIFY( Event.Accessor >>= sName ); Reference< XContent > xElement( Event.Element, UNO_QUERY_THROW ); @@ -288,7 +288,7 @@ Reference< XVeto > SAL_CALL OQueryContainer::approveInsertElement( const Contain } catch( const Exception& ) { - xReturn = new Veto( ::rtl::OUString(), ::cppu::getCaughtException() ); + xReturn = new Veto( OUString(), ::cppu::getCaughtException() ); } return xReturn; } @@ -328,12 +328,12 @@ void SAL_CALL OQueryContainer::disposing( const ::com::sun::star::lang::EventObj } } -::rtl::OUString OQueryContainer::determineContentType() const +OUString OQueryContainer::determineContentType() const { - return ::rtl::OUString( "application/vnd.org.openoffice.DatabaseQueryContainer" ); + return OUString( "application/vnd.org.openoffice.DatabaseQueryContainer" ); } -Reference< XContent > OQueryContainer::implCreateWrapper(const ::rtl::OUString& _rName) +Reference< XContent > OQueryContainer::implCreateWrapper(const OUString& _rName) { Reference< XContent > xObject(m_xCommandDefinitions->getByName(_rName),UNO_QUERY); return implCreateWrapper(xObject); @@ -361,12 +361,12 @@ Reference< XContent > OQueryContainer::implCreateWrapper(const Reference< XConte return xReturn; } -Reference< XContent > OQueryContainer::createObject( const ::rtl::OUString& _rName) +Reference< XContent > OQueryContainer::createObject( const OUString& _rName) { return implCreateWrapper(_rName); } -sal_Bool OQueryContainer::checkExistence(const ::rtl::OUString& _rName) +sal_Bool OQueryContainer::checkExistence(const OUString& _rName) { sal_Bool bRet = sal_False; if ( !m_bInPropertyChange ) @@ -398,7 +398,7 @@ sal_Int32 SAL_CALL OQueryContainer::getCount( ) throw(RuntimeException) return Reference<XIndexAccess>(m_xCommandDefinitions,UNO_QUERY)->getCount(); } -Sequence< ::rtl::OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OQueryContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 8b6db104e3c3..78f549984951 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -123,7 +123,7 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWea ,m_rMutex(_rMutex) { DBG_CTOR(OQueryDescriptor_Base,NULL); - m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< ::rtl::OUString>(), this,this); + m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< OUString>(), this,this); } OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSource,::cppu::OWeakObject& _rMySelf) @@ -131,7 +131,7 @@ OQueryDescriptor_Base::OQueryDescriptor_Base(const OQueryDescriptor_Base& _rSour ,m_rMutex(_rSource.m_rMutex) { DBG_CTOR(OQueryDescriptor_Base,NULL); - m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< ::rtl::OUString>(), this,this); + m_pColumns = new OColumns(_rMySelf, m_rMutex, sal_True,::std::vector< OUString>(), this,this); m_sCommand = _rSource.m_sCommand; m_bEscapeProcessing = _rSource.m_bEscapeProcessing; @@ -170,7 +170,7 @@ void OQueryDescriptor_Base::setColumnsOutOfDate( sal_Bool _bOutOfDate ) m_pColumns->setInitialized(); } -void OQueryDescriptor_Base::implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn ) +void OQueryDescriptor_Base::implAppendColumn( const OUString& _rName, OColumn* _pColumn ) { m_pColumns->append( _rName, _pColumn ); } @@ -212,19 +212,19 @@ Reference< XNameAccess > SAL_CALL OQueryDescriptor_Base::getColumns( ) throw (Ru return m_pColumns; } -::rtl::OUString SAL_CALL OQueryDescriptor_Base::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OQueryDescriptor_Base::getImplementationName( ) throw(RuntimeException) { - return ::rtl::OUString("com.sun.star.sdb.OQueryDescriptor"); + return OUString("com.sun.star.sdb.OQueryDescriptor"); } -sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const ::rtl::OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL OQueryDescriptor_Base::supportsService( const OUString& _rServiceName ) throw(RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OQueryDescriptor_Base::getSupportedServiceNames( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aSupported(2); + Sequence< OUString > aSupported(2); aSupported.getArray()[0] = SERVICE_SDB_DATASETTINGS; aSupported.getArray()[1] = SERVICE_SDB_QUERYDESCRIPTOR; return aSupported; @@ -240,7 +240,7 @@ void OQueryDescriptor_Base::columnAppended( const Reference< XPropertySet >& /*_ // not interested in } -void OQueryDescriptor_Base::columnDropped(const ::rtl::OUString& /*_sName*/) +void OQueryDescriptor_Base::columnDropped(const OUString& /*_sName*/) { // not interested in } @@ -264,7 +264,7 @@ void OQueryDescriptor_Base::refreshColumns() rebuildColumns(); } -OColumn* OQueryDescriptor_Base::createColumn( const ::rtl::OUString& /*_rName*/ ) const +OColumn* OQueryDescriptor_Base::createColumn( const OUString& /*_rName*/ ) const { // creating a column/descriptor for a query/descriptor does not make sense at all return NULL; diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx index 9bd081084d18..ccd51749c862 100644 --- a/dbaccess/source/core/api/querydescriptor.hxx +++ b/dbaccess/source/core/api/querydescriptor.hxx @@ -60,7 +60,7 @@ private: protected: OColumns* m_pColumns; // our column descriptions - ::rtl::OUString m_sElementName; + OUString m_sElementName; virtual ~OQueryDescriptor_Base(); void setColumnsOutOfDate( sal_Bool _bOutOfDate = sal_True ); @@ -69,7 +69,7 @@ protected: sal_Int32 getColumnCount() const { return m_pColumns ? m_pColumns->getCount() : 0; } void clearColumns( ); - void implAppendColumn( const ::rtl::OUString& _rName, OColumn* _pColumn ); + void implAppendColumn( const OUString& _rName, OColumn* _pColumn ); public: OQueryDescriptor_Base(::osl::Mutex& _rMutex,::cppu::OWeakObject& _rMySelf); @@ -86,17 +86,17 @@ public: DECLARE_IMPLEMENTATION_ID( ); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); protected: // IColumnFactory - virtual OColumn* createColumn(const ::rtl::OUString& _rName) const; + virtual OColumn* createColumn(const OUString& _rName) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createColumnDescriptor(); virtual void columnAppended( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxSourceDescriptor ); - virtual void columnDropped(const ::rtl::OUString& _sName); + virtual void columnDropped(const OUString& _sName); /** rebuild our columns set diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 8d679ec60a92..e2dd8ba86fa5 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -65,7 +65,7 @@ void OResultColumn::impl_determineIsRowVersion_nothrow() try { - ::rtl::OUString sCatalog, sSchema, sTable, sColumnName; + OUString sCatalog, sSchema, sTable, sColumnName; getPropertyValue( PROPERTY_CATALOGNAME ) >>= sCatalog; getPropertyValue( PROPERTY_SCHEMANAME ) >>= sSchema; getPropertyValue( PROPERTY_TABLENAME ) >>= sTable; @@ -120,14 +120,14 @@ Sequence< sal_Int8 > OResultColumn::getImplementationId() throw (RuntimeExceptio } // XServiceInfo -rtl::OUString OResultColumn::getImplementationName( ) throw(RuntimeException) +OUString OResultColumn::getImplementationName( ) throw(RuntimeException) { - return rtl::OUString("com.sun.star.sdb.OResultColumn"); + return OUString("com.sun.star.sdb.OResultColumn"); } -Sequence< ::rtl::OUString > OResultColumn::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OResultColumn::getSupportedServiceNames( ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBCX_COLUMN; aSNS[1] = SERVICE_SDB_RESULTCOLUMN; return aSNS; @@ -146,7 +146,7 @@ void OResultColumn::disposing() ::cppu::IPropertyArrayHelper* OResultColumn::createArrayHelper( ) const { BEGIN_PROPERTY_HELPER(21) - DECL_PROP1(CATALOGNAME, ::rtl::OUString, READONLY); + DECL_PROP1(CATALOGNAME, OUString, READONLY); DECL_PROP1(DISPLAYSIZE, sal_Int32, READONLY); DECL_PROP1_BOOL(ISAUTOINCREMENT, READONLY); DECL_PROP1_BOOL(ISCASESENSITIVE, READONLY); @@ -158,15 +158,15 @@ void OResultColumn::disposing() DECL_PROP1_BOOL(ISSEARCHABLE, READONLY); DECL_PROP1_BOOL(ISSIGNED, READONLY); DECL_PROP1_BOOL(ISWRITABLE, READONLY); - DECL_PROP1(LABEL, ::rtl::OUString, READONLY); - DECL_PROP1(NAME, ::rtl::OUString, READONLY); + DECL_PROP1(LABEL, OUString, READONLY); + DECL_PROP1(NAME, OUString, READONLY); DECL_PROP1(PRECISION, sal_Int32, READONLY); DECL_PROP1(SCALE, sal_Int32, READONLY); - DECL_PROP1(SCHEMANAME, ::rtl::OUString, READONLY); - DECL_PROP1(SERVICENAME, ::rtl::OUString, READONLY); - DECL_PROP1(TABLENAME, ::rtl::OUString, READONLY); + DECL_PROP1(SCHEMANAME, OUString, READONLY); + DECL_PROP1(SERVICENAME, OUString, READONLY); + DECL_PROP1(TABLENAME, OUString, READONLY); DECL_PROP1(TYPE, sal_Int32, READONLY); - DECL_PROP1(TYPENAME, ::rtl::OUString, READONLY); + DECL_PROP1(TYPENAME, OUString, READONLY); END_PROPERTY_HELPER(); } @@ -278,7 +278,7 @@ void OResultColumn::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const case PROPERTY_ID_SCHEMANAME: case PROPERTY_ID_CATALOGNAME: // empty string'S - rValue <<= rtl::OUString(); + rValue <<= OUString(); break; case PROPERTY_ID_ISROWVERSION: case PROPERTY_ID_ISAUTOINCREMENT: diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index 9a6d2a633045..d5fec73809cd 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -45,7 +45,7 @@ namespace dbaccess mutable ::boost::optional< sal_Bool > m_isDefinitelyWritable; mutable ::boost::optional< sal_Bool > m_isAutoIncrement; mutable ::boost::optional< sal_Int32 > m_isNullable; - mutable ::boost::optional< ::rtl::OUString > m_sColumnLabel; + mutable ::boost::optional< OUString > m_sColumnLabel; mutable ::boost::optional< sal_Int32 > m_nColumnDisplaySize; mutable ::boost::optional< sal_Int32 > m_nColumnType; mutable ::boost::optional< sal_Int32 > m_nPrecision; @@ -62,8 +62,8 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // cppu::OComponentHelper virtual void SAL_CALL disposing(void); diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index b5e3ad0c2a34..e9885fd72b77 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -62,7 +62,7 @@ OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star: RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::OResultSet" ); DBG_CTOR(OResultSet, NULL); - m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< ::rtl::OUString>(), NULL,NULL); + m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), NULL,NULL); try { @@ -185,22 +185,22 @@ void OResultSet::close(void) throw( SQLException, RuntimeException ) } // XServiceInfo -rtl::OUString OResultSet::getImplementationName( ) throw(RuntimeException) +OUString OResultSet::getImplementationName( ) throw(RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getImplementationName" ); - return rtl::OUString("com.sun.star.sdb.OResultSet"); + return OUString("com.sun.star.sdb.OResultSet"); } -sal_Bool OResultSet::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OResultSet::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::supportsService" ); return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OResultSet::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OResultSet::getSupportedServiceNames( ) throw (RuntimeException) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getSupportedServiceNames" ); - Sequence< ::rtl::OUString > aSNS( 2 ); + Sequence< OUString > aSNS( 2 ); aSNS[0] = SERVICE_SDBC_RESULTSET; aSNS[1] = SERVICE_SDB_RESULTSET; return aSNS; @@ -218,7 +218,7 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::createArrayHelper" ); BEGIN_PROPERTY_HELPER(6) - DECL_PROP1(CURSORNAME, ::rtl::OUString, READONLY); + DECL_PROP1(CURSORNAME, OUString, READONLY); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP1_BOOL(ISBOOKMARKABLE, READONLY); @@ -274,7 +274,7 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const default: { // get the property name - ::rtl::OUString aPropName; + OUString aPropName; sal_Int16 nAttributes; const_cast<OResultSet*>(this)->getInfoHelper(). fillPropertyMembersByHandle(&aPropName, &nAttributes, nHandle); @@ -314,7 +314,7 @@ Reference< XResultSetMetaData > OResultSet::getMetaData(void) throw( SQLExceptio } // ::com::sun::star::sdbc::XColumnLocate -sal_Int32 OResultSet::findColumn(const rtl::OUString& columnName) throw( SQLException, RuntimeException ) +sal_Int32 OResultSet::findColumn(const OUString& columnName) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::findColumn" ); MutexGuard aGuard(m_aMutex); @@ -371,7 +371,7 @@ Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(voi for ( sal_Int32 i = 0; i < nColCount; ++i) { // retrieve the name of the column - rtl::OUString sName = xMetaData->getColumnName(i + 1); + OUString sName = xMetaData->getColumnName(i + 1); ODataColumn* pColumn = new ODataColumn(xMetaData, m_xDelegatorRow, m_xDelegatorRowUpdate, i + 1, xDBMetaData); // don't silently assume that the name is unique - result set implementations @@ -395,16 +395,16 @@ Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(voi try { const Reference< XNameAccess > xColNames( static_cast< XNameAccess* >( m_pColumns ), UNO_SET_THROW ); - const Sequence< ::rtl::OUString > aNames( xColNames->getElementNames() ); + const Sequence< OUString > aNames( xColNames->getElementNames() ); OSL_POSTCOND( aNames.getLength() == nColCount, "OResultSet::getColumns: invalid column count!" ); - for ( const ::rtl::OUString* pName = aNames.getConstArray(); + for ( const OUString* pName = aNames.getConstArray(); pName != aNames.getConstArray() + aNames.getLength(); ++pName ) { Reference< XPropertySet > xColProps( xColNames->getByName( *pName ), UNO_QUERY_THROW ); - ::rtl::OUString sName; + OUString sName; OSL_VERIFY( xColProps->getPropertyValue( PROPERTY_NAME ) >>= sName ); OSL_POSTCOND( sName == *pName, "OResultSet::getColumns: invalid column name!" ); } @@ -429,7 +429,7 @@ sal_Bool OResultSet::wasNull(void) throw( SQLException, RuntimeException ) return m_xDelegatorRow->wasNull(); } -rtl::OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) +OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException ) { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getString" ); MutexGuard aGuard(m_aMutex); @@ -689,7 +689,7 @@ void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLExcepti m_xDelegatorRowUpdate->updateDouble(columnIndex, x); } -void OResultSet::updateString(sal_Int32 columnIndex, const rtl::OUString& x) throw( SQLException, RuntimeException ) +void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateString" ); MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx index 60d5cf5f7213..c43dc763e9b5 100644 --- a/dbaccess/source/core/api/resultset.hxx +++ b/dbaccess/source/core/api/resultset.hxx @@ -96,9 +96,9 @@ namespace dbaccess virtual void SAL_CALL release() throw(); // ::com::sun::star::lang::XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); @@ -136,14 +136,14 @@ namespace dbaccess virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const ::rtl::OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XRow virtual sal_Bool SAL_CALL wasNull( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -208,7 +208,7 @@ namespace dbaccess virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const ::rtl::OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const ::com::sun::star::uno::Sequence< sal_Int8 >& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index f15a3ce958f9..14a37fda575a 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -189,7 +189,7 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim { //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::createArrayHelper" ); BEGIN_PROPERTY_HELPER(10) - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, OUString); DECL_PROP0_BOOL(ESCAPE_PROCESSING); DECL_PROP0(FETCHDIRECTION, sal_Int32); DECL_PROP0(FETCHSIZE, sal_Int32); @@ -227,7 +227,7 @@ sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any & if ( m_xAggregateAsSet.is() ) { // get the property name - ::rtl::OUString sPropName; + OUString sPropName; getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); // now set the value @@ -266,7 +266,7 @@ void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const default: if ( m_xAggregateAsSet.is() ) { - ::rtl::OUString sPropName; + OUString sPropName; getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); m_xAggregateAsSet->setPropertyValue( sPropName, rValue ); } @@ -292,7 +292,7 @@ void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons default: if ( m_xAggregateAsSet.is() ) { - ::rtl::OUString sPropName; + OUString sPropName; const_cast< OStatementBase* >( this )->getInfoHelper().fillPropertyMembersByHandle( &sPropName, NULL, nHandle ); rValue = m_xAggregateAsSet->getPropertyValue( sPropName ); } @@ -449,28 +449,28 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OStatementBase, OStatement_IFACE ); IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OStatementBase, OStatement_IFACE ); // XServiceInfo -rtl::OUString OStatement::getImplementationName( ) throw(RuntimeException) +OUString OStatement::getImplementationName( ) throw(RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getImplementationName" ); - return rtl::OUString("com.sun.star.sdb.OStatement"); + return OUString("com.sun.star.sdb.OStatement"); } -sal_Bool OStatement::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool OStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::supportsService" ); return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } -Sequence< ::rtl::OUString > OStatement::getSupportedServiceNames( ) throw (RuntimeException) +Sequence< OUString > OStatement::getSupportedServiceNames( ) throw (RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getSupportedServiceNames" ); - Sequence< ::rtl::OUString > aSNS( 1 ); + Sequence< OUString > aSNS( 1 ); aSNS.getArray()[0] = SERVICE_SDBC_STATEMENT; return aSNS; } // XStatement -Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::executeQuery" ); MutexGuard aGuard(m_aMutex); @@ -479,7 +479,7 @@ Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) t disposeResultSet(); Reference< XResultSet > xResultSet; - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); Reference< XResultSet > xInnerResultSet = m_xAggregateStatement->executeQuery( sSQL ); Reference< XConnection > xConnection( m_xParent, UNO_QUERY_THROW ); @@ -497,7 +497,7 @@ Reference< XResultSet > OStatement::executeQuery( const rtl::OUString& _rSQL ) t return xResultSet; } -sal_Int32 OStatement::executeUpdate( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::executeUpdate" ); MutexGuard aGuard(m_aMutex); @@ -505,11 +505,11 @@ sal_Int32 OStatement::executeUpdate( const rtl::OUString& _rSQL ) throw( SQLExce disposeResultSet(); - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); return m_xAggregateStatement->executeUpdate( sSQL ); } -sal_Bool OStatement::execute( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" ); MutexGuard aGuard(m_aMutex); @@ -517,11 +517,11 @@ sal_Bool OStatement::execute( const rtl::OUString& _rSQL ) throw( SQLException, disposeResultSet(); - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); return m_xAggregateStatement->execute( sSQL ); } -void OStatement::addBatch( const rtl::OUString& _rSQL ) throw( SQLException, RuntimeException ) +void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeException ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" ); MutexGuard aGuard(m_aMutex); @@ -532,7 +532,7 @@ void OStatement::addBatch( const rtl::OUString& _rSQL ) throw( SQLException, Run if (!xMeta.is() && !xMeta->supportsBatchUpdates()) throwFunctionSequenceException(*this); - ::rtl::OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); + OUString sSQL( impl_doEscapeProcessing_nothrow( _rSQL ) ); Reference< XBatchExecution >(m_xAggregateAsSet, UNO_QUERY)->addBatch( sSQL ); } @@ -576,7 +576,7 @@ void SAL_CALL OStatement::disposing() m_xAggregateStatement.clear(); } -::rtl::OUString OStatement::impl_doEscapeProcessing_nothrow( const ::rtl::OUString& _rSQL ) const +OUString OStatement::impl_doEscapeProcessing_nothrow( const OUString& _rSQL ) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::impl_doEscapeProcessing_nothrow" ); if ( !m_bEscapeProcessing ) @@ -594,7 +594,7 @@ void SAL_CALL OStatement::disposing() // if we cannot parse it, silently accept this. The driver is probably able to cope with it then return _rSQL; - ::rtl::OUString sLowLevelSQL = m_xComposer->getQueryWithSubstitution(); + OUString sLowLevelSQL = m_xComposer->getQueryWithSubstitution(); return sLowLevelSQL; } catch( const Exception& ) diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 2bb0e7d53a7a..d1977c2fadb7 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -69,11 +69,11 @@ DBG_NAME(ODBTable) ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables ,const Reference< XConnection >& _rxConn - ,const ::rtl::OUString& _rCatalog - ,const ::rtl::OUString& _rSchema - ,const ::rtl::OUString& _rName - ,const ::rtl::OUString& _rType - ,const ::rtl::OUString& _rDesc + ,const OUString& _rCatalog + ,const OUString& _rSchema + ,const OUString& _rName + ,const OUString& _rType + ,const OUString& _rDesc ,const Reference< XNameAccess >& _xColumnDefinitions) throw(SQLException) :OTable_Base(_pTables,_rxConn,_rxConn->getMetaData().is() && _rxConn->getMetaData()->supportsMixedCaseQuotedIdentifiers(), _rName, _rType, _rDesc, _rSchema, _rCatalog ) ,m_xColumnDefinitions(_xColumnDefinitions) @@ -106,7 +106,7 @@ ODBTable::~ODBTable() IMPLEMENT_FORWARD_REFCOUNT(ODBTable,OTable_Base) -OColumn* ODBTable::createColumn(const ::rtl::OUString& _rName) const +OColumn* ODBTable::createColumn(const OUString& _rName) const { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createColumn" ); OColumn* pReturn = NULL; @@ -136,7 +136,7 @@ void ODBTable::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescr // not interested in } -void ODBTable::columnDropped(const ::rtl::OUString& _sName) +void ODBTable::columnDropped(const OUString& _sName) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::columnDropped" ); Reference<XDrop> xDrop(m_xColumnDefinitions,UNO_QUERY); @@ -311,7 +311,7 @@ Sequence< Type > SAL_CALL ODBTable::getTypes( ) throw(RuntimeException) } // XRename, -void SAL_CALL ODBTable::rename( const ::rtl::OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::rename" ); ::osl::MutexGuard aGuard(m_aMutex); @@ -325,7 +325,7 @@ void SAL_CALL ODBTable::rename( const ::rtl::OUString& _rNewName ) throw(SQLExce } // XAlterTable, -void SAL_CALL ODBTable::alterColumnByName( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::alterColumnByName" ); ::osl::MutexGuard aGuard(m_aMutex); diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 2bdfb70e9c58..a8af2bbfb0af 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -83,7 +83,7 @@ OViewContainer::~OViewContainer() // XServiceInfo IMPLEMENT_SERVICE_INFO2(OViewContainer, "com.sun.star.sdb.dbaccess.OViewContainer", SERVICE_SDBCX_CONTAINER.ascii, SERVICE_SDBCX_TABLES.ascii) -ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName) +ObjectType OViewContainer::createObject(const OUString& _rName) { ObjectType xProp; if ( m_xMasterContainer.is() && m_xMasterContainer->hasByName(_rName) ) @@ -91,7 +91,7 @@ ObjectType OViewContainer::createObject(const ::rtl::OUString& _rName) if ( !xProp.is() ) { - ::rtl::OUString sCatalog,sSchema,sTable; + OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, sCatalog, @@ -125,10 +125,10 @@ Reference< XPropertySet > OViewContainer::createDescriptor() } // XAppend -ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) +ObjectType OViewContainer::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor ) { // append the new table with a create stmt - ::rtl::OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME)); + OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME)); Reference<XAppend> xAppend(m_xMasterContainer,UNO_QUERY); Reference< XPropertySet > xProp = descriptor; @@ -142,14 +142,14 @@ ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const } else { - ::rtl::OUString sComposedName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); + OUString sComposedName = ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); if(sComposedName.isEmpty()) ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this))); - ::rtl::OUString sCommand; + OUString sCommand; descriptor->getPropertyValue(PROPERTY_COMMAND) >>= sCommand; - ::rtl::OUStringBuffer aSQL; + OUStringBuffer aSQL; aSQL.appendAscii( "CREATE VIEW " ); aSQL.append ( sComposedName ); aSQL.appendAscii( " AS " ); @@ -169,7 +169,7 @@ ObjectType OViewContainer::appendObject( const ::rtl::OUString& _rForName, const } // XDrop -void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName) +void OViewContainer::dropObject(sal_Int32 _nPos,const OUString _sElementName) { if ( !m_bInElementRemoved ) { @@ -178,7 +178,7 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN xDrop->dropByName(_sElementName); else { - ::rtl::OUString sCatalog,sSchema,sTable,sComposedName; + OUString sCatalog,sSchema,sTable,sComposedName; Reference<XPropertySet> xTable(getObject(_nPos),UNO_QUERY); if ( xTable.is() ) @@ -193,7 +193,7 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN if(sComposedName.isEmpty()) ::dbtools::throwFunctionSequenceException(static_cast<XTypeProvider*>(static_cast<OFilteredContainer*>(this))); - ::rtl::OUString aSql("DROP VIEW "); + OUString aSql("DROP VIEW "); aSql += sComposedName; Reference<XConnection> xCon = m_xConnection; OSL_ENSURE(xCon.is(),"Connection is null!"); @@ -211,16 +211,16 @@ void OViewContainer::dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementN void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); - ::rtl::OUString sName; + OUString sName; if ( ( Event.Accessor >>= sName ) && ( !m_nInAppend ) && ( !hasByName( sName ) ) ) { Reference<XPropertySet> xProp(Event.Element,UNO_QUERY); - ::rtl::OUString sType; + OUString sType; xProp->getPropertyValue(PROPERTY_TYPE) >>= sType; - if ( sType == ::rtl::OUString("VIEW") ) + if ( sType == OUString("VIEW") ) insertElement(sName,createObject(sName)); } } @@ -228,7 +228,7 @@ void SAL_CALL OViewContainer::elementInserted( const ContainerEvent& Event ) thr void SAL_CALL OViewContainer::elementRemoved( const ContainerEvent& Event ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_rMutex); - ::rtl::OUString sName; + OUString sName; if ( (Event.Accessor >>= sName) && hasByName(sName) ) { m_bInElementRemoved = true; @@ -253,10 +253,10 @@ void SAL_CALL OViewContainer::elementReplaced( const ContainerEvent& /*Event*/ ) { } -::rtl::OUString OViewContainer::getTableTypeRestriction() const +OUString OViewContainer::getTableTypeRestriction() const { // no restriction at all (other than the ones provided externally) - return ::rtl::OUString( "VIEW" ); + return OUString( "VIEW" ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |