diff options
Diffstat (limited to 'dbaccess/source/core')
127 files changed, 1427 insertions, 1427 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: */ diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 8266b65b2777..490497369c36 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -144,7 +144,7 @@ OComponentDefinition::~OComponentDefinition() OComponentDefinition::OComponentDefinition( const Reference< XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const Reference< XComponentContext >& _xORB ,const TContentPtr& _pImpl ,sal_Bool _bTable) @@ -168,21 +168,21 @@ OUString OComponentDefinition::getImplementationName_static( ) throw(RuntimeExc return OUString("com.sun.star.comp.dba.OComponentDefinition"); } -::rtl::OUString SAL_CALL OComponentDefinition::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OComponentDefinition::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } -Sequence< ::rtl::OUString > OComponentDefinition::getSupportedServiceNames_static( ) throw(RuntimeException) +Sequence< OUString > OComponentDefinition::getSupportedServiceNames_static( ) throw(RuntimeException) { - Sequence< ::rtl::OUString > aServices(2); - aServices.getArray()[0] = ::rtl::OUString("com.sun.star.sdb.TableDefinition"); - aServices.getArray()[1] = ::rtl::OUString("com.sun.star.ucb.Content"); + Sequence< OUString > aServices(2); + aServices.getArray()[0] = OUString("com.sun.star.sdb.TableDefinition"); + aServices.getArray()[1] = OUString("com.sun.star.ucb.Content"); return aServices; } -Sequence< ::rtl::OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OComponentDefinition::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } @@ -219,11 +219,11 @@ Reference< XPropertySetInfo > SAL_CALL OComponentDefinition::getPropertySetInfo( return xInfo; } -::rtl::OUString OComponentDefinition::determineContentType() const +OUString OComponentDefinition::determineContentType() const { return m_bTable - ? ::rtl::OUString( "application/vnd.org.openoffice.DatabaseTable" ) - : ::rtl::OUString( "application/vnd.org.openoffice.DatabaseCommandDefinition" ); + ? OUString( "application/vnd.org.openoffice.DatabaseTable" ) + : OUString( "application/vnd.org.openoffice.DatabaseCommandDefinition" ); } Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeException) @@ -233,7 +233,7 @@ Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeExcepti if ( !m_pColumns.get() ) { - ::std::vector< ::rtl::OUString> aNames; + ::std::vector< OUString> aNames; const OComponentDefinition_Impl& rDefinition( getDefinition() ); aNames.reserve( rDefinition.size() ); @@ -249,13 +249,13 @@ Reference< XNameAccess> OComponentDefinition::getColumns() throw (RuntimeExcepti return m_pColumns.get(); } -OColumn* OComponentDefinition::createColumn(const ::rtl::OUString& _rName) const +OColumn* OComponentDefinition::createColumn(const OUString& _rName) const { const OComponentDefinition_Impl& rDefinition( getDefinition() ); OComponentDefinition_Impl::const_iterator aFind = rDefinition.find( _rName ); if ( aFind != rDefinition.end() ) { - aFind->second->addPropertyChangeListener(::rtl::OUString(),m_xColumnPropertyListener.getRef()); + aFind->second->addPropertyChangeListener(OUString(),m_xColumnPropertyListener.getRef()); return new OTableColumnWrapper( aFind->second, aFind->second, true ); } OSL_FAIL( "OComponentDefinition::createColumn: is this a valid case?" ); @@ -274,7 +274,7 @@ void OComponentDefinition::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,co notifyDataSourceModified(); } -void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName) +void OComponentDefinition::columnDropped(const OUString& _sName) { getDefinition().erase( _sName ); notifyDataSourceModified(); @@ -282,7 +282,7 @@ void OComponentDefinition::columnDropped(const ::rtl::OUString& _sName) void OComponentDefinition::columnAppended( const Reference< XPropertySet >& _rxSourceDescriptor ) { - ::rtl::OUString sName; + OUString sName; _rxSourceDescriptor->getPropertyValue( PROPERTY_NAME ) >>= sName; Reference<XPropertySet> xColDesc = new OTableColumnDescriptor( true ); diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index 0f9ff09320e6..82a5518779f7 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -47,7 +47,7 @@ namespace dbaccess ,public ODataSettings_Base { public: - typedef ::std::map < ::rtl::OUString + typedef ::std::map < OUString , ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > Columns; typedef Columns::iterator iterator; @@ -57,8 +57,8 @@ namespace dbaccess Columns m_aColumns; public: - ::rtl::OUString m_sSchemaName; - ::rtl::OUString m_sCatalogName; + OUString m_sSchemaName; + OUString m_sCatalogName; public: OComponentDefinition_Impl(); @@ -69,11 +69,11 @@ namespace dbaccess inline const_iterator begin() const { return m_aColumns.begin(); } inline const_iterator end() const { return m_aColumns.end(); } - inline const_iterator find( const ::rtl::OUString& _rName ) const { return m_aColumns.find( _rName ); } + inline const_iterator find( const OUString& _rName ) const { return m_aColumns.find( _rName ); } - inline void erase( const ::rtl::OUString& _rName ) { m_aColumns.erase( _rName ); } + inline void erase( const OUString& _rName ) { m_aColumns.erase( _rName ); } - inline void insert( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) + inline void insert( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumn ) { OSL_PRECOND( m_aColumns.find( _rName ) == m_aColumns.end(), "OComponentDefinition_Impl::insert: there's already an element with this name!" ); m_aColumns.insert( Columns::value_type( _rName, _rxColumn ) ); @@ -114,7 +114,7 @@ public: OComponentDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ,const TContentPtr& _pImpl ,sal_Bool _bTable = sal_True @@ -127,11 +127,11 @@ public: DECLARE_XINTERFACE( ) // ::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); - 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 >&); @@ -148,10 +148,10 @@ public: virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // 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); virtual void notifyDataSourceModified() { OContentHelper::notifyDataSourceModified(); } protected: @@ -163,7 +163,7 @@ protected: const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; private: void registerProperties(); diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 2fbb2fa7d145..bfe39b79a14d 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -97,9 +97,9 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw return new ::ucbhelper::ContentIdentifier( aIdentifier ); } -::rtl::OUString OContentHelper::impl_getHierarchicalName( bool _includingRootContainer ) const +OUString OContentHelper::impl_getHierarchicalName( bool _includingRootContainer ) const { - ::rtl::OUStringBuffer aHierarchicalName( m_pImpl->m_aProps.aTitle ); + OUStringBuffer aHierarchicalName( m_pImpl->m_aProps.aTitle ); Reference< XInterface > xParent = m_xParentContainer; while( xParent.is() ) { @@ -108,20 +108,20 @@ Reference< XContentIdentifier > SAL_CALL OContentHelper::getIdentifier( ) throw xParent.set( xChild.is() ? xChild->getParent() : Reference< XInterface >(), UNO_QUERY ); if ( xProp.is() && xParent.is() ) { - ::rtl::OUString sName; + OUString sName; xProp->getPropertyValue( PROPERTY_NAME ) >>= sName; - ::rtl::OUString sPrevious = aHierarchicalName.makeStringAndClear(); + OUString sPrevious = aHierarchicalName.makeStringAndClear(); aHierarchicalName.append( sName + "/" + sPrevious ); } } - ::rtl::OUString sHierarchicalName( aHierarchicalName.makeStringAndClear() ); + OUString sHierarchicalName( aHierarchicalName.makeStringAndClear() ); if ( !_includingRootContainer ) sHierarchicalName = sHierarchicalName.copy( sHierarchicalName.indexOf( '/' ) + 1 ); return sHierarchicalName; } -::rtl::OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException) +OUString SAL_CALL OContentHelper::getContentType() throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -170,7 +170,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -190,7 +190,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -202,7 +202,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma OSL_FAIL( "No properties!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -232,7 +232,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma ucbhelper::cancelCommandExecution( makeAny( UnsupportedCommandException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -246,44 +246,44 @@ void SAL_CALL OContentHelper::abort( sal_Int32 /*CommandId*/ ) throw (RuntimeExc } // XPropertiesChangeNotifier -void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< ::rtl::OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) +void SAL_CALL OContentHelper::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); sal_Int32 nCount = PropertyNames.getLength(); if ( !nCount ) { // Note: An empty sequence means a listener for "all" properties. - m_aPropertyChangeListeners.addInterface(::rtl::OUString(), Listener ); + m_aPropertyChangeListeners.addInterface(OUString(), Listener ); } else { - const ::rtl::OUString* pSeq = PropertyNames.getConstArray(); + const OUString* pSeq = PropertyNames.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const ::rtl::OUString& rName = pSeq[ n ]; + const OUString& rName = pSeq[ n ]; if ( !rName.isEmpty() ) m_aPropertyChangeListeners.addInterface(rName, Listener ); } } } -void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< ::rtl::OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) +void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< OUString >& PropertyNames, const Reference< XPropertiesChangeListener >& Listener ) throw (RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); sal_Int32 nCount = PropertyNames.getLength(); if ( !nCount ) { // Note: An empty sequence means a listener for "all" properties. - m_aPropertyChangeListeners.removeInterface( ::rtl::OUString(), Listener ); + m_aPropertyChangeListeners.removeInterface( OUString(), Listener ); } else { - const ::rtl::OUString* pSeq = PropertyNames.getConstArray(); + const OUString* pSeq = PropertyNames.getConstArray(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const ::rtl::OUString& rName = pSeq[ n ]; + const OUString& rName = pSeq[ n ]; if ( !rName.isEmpty() ) m_aPropertyChangeListeners.removeInterface( rName, Listener ); } @@ -291,12 +291,12 @@ void SAL_CALL OContentHelper::removePropertiesChangeListener( const Sequence< :: } // XPropertyContainer -void SAL_CALL OContentHelper::addProperty( const ::rtl::OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) +void SAL_CALL OContentHelper::addProperty( const OUString& /*Name*/, sal_Int16 /*Attributes*/, const Any& /*DefaultValue*/ ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException) { OSL_FAIL( "OContentHelper::addProperty: not implemented!" ); } -void SAL_CALL OContentHelper::removeProperty( const ::rtl::OUString& /*Name*/ ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) +void SAL_CALL OContentHelper::removeProperty( const OUString& /*Name*/ ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException) { OSL_FAIL( "OContentHelper::removeProperty: not implemented!" ); } @@ -365,7 +365,7 @@ Sequence< Any > OContentHelper::setPropertyValues(const Sequence< PropertyValue } else if ( rValue.Name == "Title" ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { if ( aNewValue != m_pImpl->m_aProps.aTitle ) @@ -460,13 +460,13 @@ Reference< XRow > OContentHelper::getPropertyValues( const Sequence< Property >& // Append all Core Properties. xRow->appendString ( Property( "ContentType", -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND | PropertyAttribute::READONLY ), getContentType() ); xRow->appendString ( Property( "Title", -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), PropertyAttribute::BOUND ), m_pImpl->m_aProps.aTitle ); xRow->appendBoolean( @@ -495,7 +495,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent if ( nCount ) { // First, notify listeners interested in changes of every property. - OInterfaceContainerHelper* pAllPropsContainer = m_aPropertyChangeListeners.getContainer( ::rtl::OUString() ); + OInterfaceContainerHelper* pAllPropsContainer = m_aPropertyChangeListeners.getContainer( OUString() ); if ( pAllPropsContainer ) { OInterfaceIteratorHelper aIter( *pAllPropsContainer ); @@ -517,7 +517,7 @@ void OContentHelper::notifyPropertiesChange( const Sequence< PropertyChangeEvent for ( sal_Int32 n = 0; n < nCount; ++n, ++propertyChangeEvent ) { const PropertyChangeEvent& rEvent = *propertyChangeEvent; - const ::rtl::OUString& rName = rEvent.PropertyName; + const OUString& rName = rEvent.PropertyName; OInterfaceContainerHelper* pPropsContainer = m_aPropertyChangeListeners.getContainer( rName ); if ( pPropsContainer ) @@ -597,7 +597,7 @@ void SAL_CALL OContentHelper::setParent( const Reference< XInterface >& _xParent m_xParentContainer = _xParent; } -void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify ) +void OContentHelper::impl_rename_throw(const OUString& _sNewName,bool _bNotify ) { osl::ClearableGuard< osl::Mutex > aGuard(m_aMutex); if ( _sNewName.equals( m_pImpl->m_aProps.aTitle ) ) @@ -626,7 +626,7 @@ void OContentHelper::impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bN } } -void SAL_CALL OContentHelper::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL OContentHelper::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) { impl_rename_throw(newName); diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 6121644f18a8..882f7863da7c 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -116,7 +116,7 @@ DBG_NAME( DocumentStorageAccess ) class DocumentStorageAccess : public ::cppu::WeakImplHelper2< XDocumentSubStorageSupplier , XTransactionListener > { - typedef ::std::map< ::rtl::OUString, Reference< XStorage > > NamedStorages; + typedef ::std::map< OUString, Reference< XStorage > > NamedStorages; ::osl::Mutex m_aMutex; /// all sub storages which we ever gave to the outer world @@ -144,8 +144,8 @@ public: void dispose(); // XDocumentSubStorageSupplier - virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, ::sal_Int32 _nMode ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (IOException, RuntimeException); + virtual Reference< XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nMode ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (IOException, RuntimeException); // XTransactionListener virtual void SAL_CALL preCommit( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -168,7 +168,7 @@ public: private: /** opens the sub storage with the given name, in the given mode */ - Reference< XStorage > impl_openSubStorage_nothrow( const ::rtl::OUString& _rStorageName, sal_Int32 _nMode ); + Reference< XStorage > impl_openSubStorage_nothrow( const OUString& _rStorageName, sal_Int32 _nMode ); void impl_suspendCommitPropagation() { @@ -209,7 +209,7 @@ void DocumentStorageAccess::dispose() m_pModelImplementation = NULL; } -Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const ::rtl::OUString& _rStorageName, sal_Int32 _nDesiredMode ) +Reference< XStorage > DocumentStorageAccess::impl_openSubStorage_nothrow( const OUString& _rStorageName, sal_Int32 _nDesiredMode ) { OSL_ENSURE( !_rStorageName.isEmpty(),"ODatabaseModelImpl::impl_openSubStorage_nothrow: Invalid storage name!" ); @@ -309,7 +309,7 @@ bool DocumentStorageAccess::commitEmbeddedStorage( bool _bPreventRootCommits ) } -Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const ::rtl::OUString& aStorageName, ::sal_Int32 _nDesiredMode ) throw (RuntimeException) +Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( const OUString& aStorageName, ::sal_Int32 _nDesiredMode ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); NamedStorages::iterator pos = m_aExposedStorages.find( aStorageName ); @@ -322,24 +322,24 @@ Reference< XStorage > SAL_CALL DocumentStorageAccess::getDocumentSubStorage( con return pos->second; } -Sequence< ::rtl::OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames( ) throw (IOException, RuntimeException) +Sequence< OUString > SAL_CALL DocumentStorageAccess::getDocumentSubStoragesNames( ) throw (IOException, RuntimeException) { Reference< XStorage > xRootStor( m_pModelImplementation->getRootStorage() ); if ( !xRootStor.is() ) - return Sequence< ::rtl::OUString >(); + return Sequence< OUString >(); - ::std::vector< ::rtl::OUString > aNames; + ::std::vector< OUString > aNames; Reference< XNameAccess > xNames( xRootStor, UNO_QUERY_THROW ); - Sequence< ::rtl::OUString > aElementNames( xNames->getElementNames() ); + Sequence< OUString > aElementNames( xNames->getElementNames() ); for ( sal_Int32 i=0; i<aElementNames.getLength(); ++i ) { if ( xRootStor->isStorageElement( aElementNames[i] ) ) aNames.push_back( aElementNames[i] ); } return aNames.empty() - ? Sequence< ::rtl::OUString >() - : Sequence< ::rtl::OUString >( &aNames[0], aNames.size() ); + ? Sequence< OUString >() + : Sequence< OUString >( &aNames[0], aNames.size() ); } void SAL_CALL DocumentStorageAccess::preCommit( const css::lang::EventObject& /*aEvent*/ ) throw (Exception, RuntimeException) @@ -436,7 +436,7 @@ ODatabaseModelImpl::ODatabaseModelImpl( const Reference< XComponentContext >& _r } ODatabaseModelImpl::ODatabaseModelImpl( - const ::rtl::OUString& _rRegistrationName, + const OUString& _rRegistrationName, const Reference< XComponentContext >& _rxContext, ODatabaseContext& _rDBContext ) @@ -483,7 +483,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() Type* pAllowedType = aAllowedTypes.getArray(); *pAllowedType++ = ::getCppuType( static_cast< sal_Bool* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< double* >( NULL ) ); - *pAllowedType++ = ::getCppuType( static_cast< ::rtl::OUString* >( NULL ) ); + *pAllowedType++ = ::getCppuType( static_cast< OUString* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< sal_Int32* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< sal_Int16* >( NULL ) ); *pAllowedType++ = ::getCppuType( static_cast< Sequence< Any >* >( NULL ) ); @@ -503,7 +503,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() if ( !pSettings->DefaultValue.hasValue() ) { Property aProperty( - ::rtl::OUString::createFromAscii( pSettings->AsciiName ), + OUString::createFromAscii( pSettings->AsciiName ), -1, pSettings->ValueType, PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT | PropertyAttribute::MAYBEVOID @@ -513,7 +513,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() else { xContainer->addProperty( - ::rtl::OUString::createFromAscii( pSettings->AsciiName ), + OUString::createFromAscii( pSettings->AsciiName ), PropertyAttribute::BOUND | PropertyAttribute::MAYBEDEFAULT, pSettings->DefaultValue ); @@ -529,7 +529,7 @@ void ODatabaseModelImpl::impl_construct_nothrow() namespace { - ::rtl::OUString lcl_getContainerStorageName_throw( ODatabaseModelImpl::ObjectType _eType ) + OUString lcl_getContainerStorageName_throw( ODatabaseModelImpl::ObjectType _eType ) { const sal_Char* pAsciiName( NULL ); switch ( _eType ) @@ -541,7 +541,7 @@ namespace default: throw RuntimeException(); } - return ::rtl::OUString::createFromAscii( pAsciiName ); + return OUString::createFromAscii( pAsciiName ); } bool lcl_hasObjectWithMacros_throw( const ODefinitionContainer_Impl& _rObjectDefinitions, const Reference< XStorage >& _rxContainerStorage ) @@ -554,11 +554,11 @@ namespace ) { #if OSL_DEBUG_LEVEL > 0 - const ::rtl::OUString& rName( object->first ); (void)rName; + const OUString& rName( object->first ); (void)rName; #endif const TContentPtr& rDefinition( object->second ); - const ::rtl::OUString& rPersistentName( rDefinition->m_aProps.sPersistentName ); + const OUString& rPersistentName( rDefinition->m_aProps.sPersistentName ); if ( rPersistentName.isEmpty() ) { // it's a logical sub folder used to organize the real objects @@ -605,7 +605,7 @@ namespace } } -bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContainerStorage, const ::rtl::OUString& _rPersistentName ) +bool ODatabaseModelImpl::objectHasMacros( const Reference< XStorage >& _rxContainerStorage, const OUString& _rPersistentName ) { OSL_PRECOND( _rxContainerStorage.is(), "ODatabaseModelImpl::objectHasMacros: this will crash!" ); @@ -762,13 +762,13 @@ const Reference< XNumberFormatsSupplier > & ODatabaseModelImpl::getNumberFormats return m_xNumberFormatsSupplier; } -void ODatabaseModelImpl::setDocFileLocation( const ::rtl::OUString& i_rLoadedFrom ) +void ODatabaseModelImpl::setDocFileLocation( const OUString& i_rLoadedFrom ) { ENSURE_OR_THROW( !i_rLoadedFrom.isEmpty(), "invalid URL" ); m_sDocFileLocation = i_rLoadedFrom; } -void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, const Sequence< PropertyValue >& _rArgs ) +void ODatabaseModelImpl::setResource( const OUString& i_rDocumentURL, const Sequence< PropertyValue >& _rArgs ) { ENSURE_OR_THROW( !i_rDocumentURL.isEmpty(), "invalid URL" ); @@ -776,7 +776,7 @@ void ODatabaseModelImpl::setResource( const ::rtl::OUString& i_rDocumentURL, con #if OSL_DEBUG_LEVEL > 0 if ( aMediaDescriptor.has( "SalvagedFile" ) ) { - ::rtl::OUString sSalvagedFile( aMediaDescriptor.getOrDefault( "SalvagedFile", ::rtl::OUString() ) ); + OUString sSalvagedFile( aMediaDescriptor.getOrDefault( "SalvagedFile", OUString() ) ); // If SalvagedFile is an empty string, this indicates "the document is being recovered, but i_rDocumentURL already // is the real document URL, not the temporary document location" if ( sSalvagedFile.isEmpty() ) @@ -1036,40 +1036,40 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings() static const AsciiPropertyValue aKnownSettings[] = { // known JDBC settings - AsciiPropertyValue( "JavaDriverClass", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "JavaDriverClassPath", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "JavaDriverClass", makeAny( OUString() ) ), + AsciiPropertyValue( "JavaDriverClassPath", makeAny( OUString() ) ), AsciiPropertyValue( "IgnoreCurrency", makeAny( (sal_Bool)sal_False ) ), // known settings for file-based drivers - AsciiPropertyValue( "Extension", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "CharSet", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "Extension", makeAny( OUString() ) ), + AsciiPropertyValue( "CharSet", makeAny( OUString() ) ), AsciiPropertyValue( "HeaderLine", makeAny( (sal_Bool)sal_True ) ), AsciiPropertyValue( "FieldDelimiter", makeAny( OUString( "," ) ) ), AsciiPropertyValue( "StringDelimiter", makeAny( OUString( "\"" ) ) ), AsciiPropertyValue( "DecimalDelimiter", makeAny( OUString( "." ) ) ), - AsciiPropertyValue( "ThousandDelimiter", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "ThousandDelimiter", makeAny( OUString() ) ), AsciiPropertyValue( "ShowDeleted", makeAny( (sal_Bool)sal_False ) ), // known ODBC settings - AsciiPropertyValue( "SystemDriverSettings", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "SystemDriverSettings", makeAny( OUString() ) ), AsciiPropertyValue( "UseCatalog", makeAny( (sal_Bool)sal_False ) ), AsciiPropertyValue( "TypeInfoSettings", makeAny( Sequence< Any >()) ), // settings related to auto increment handling - AsciiPropertyValue( "AutoIncrementCreation", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "AutoRetrievingStatement", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "AutoIncrementCreation", makeAny( OUString() ) ), + AsciiPropertyValue( "AutoRetrievingStatement", makeAny( OUString() ) ), AsciiPropertyValue( "IsAutoRetrievingEnabled", makeAny( (sal_Bool)sal_False ) ), // known LDAP driver settings - AsciiPropertyValue( "HostName", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "HostName", makeAny( OUString() ) ), AsciiPropertyValue( "PortNumber", makeAny( (sal_Int32)389 ) ), - AsciiPropertyValue( "BaseDN", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "BaseDN", makeAny( OUString() ) ), AsciiPropertyValue( "MaxRowCount", makeAny( (sal_Int32)100 ) ), // known MySQLNative driver settings - AsciiPropertyValue( "LocalSocket", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "NamedPipe", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "LocalSocket", makeAny( OUString() ) ), + AsciiPropertyValue( "NamedPipe", makeAny( OUString() ) ), // misc known driver settings AsciiPropertyValue( "ParameterNameSubstitution", makeAny( (sal_Bool)sal_False ) ), AsciiPropertyValue( "AddIndexAppendix", makeAny( (sal_Bool)sal_True ) ), AsciiPropertyValue( "IgnoreDriverPrivileges", makeAny( (sal_Bool)sal_True ) ), - AsciiPropertyValue( "ImplicitCatalogRestriction", ::cppu::UnoType< ::rtl::OUString >::get() ), - AsciiPropertyValue( "ImplicitSchemaRestriction", ::cppu::UnoType< ::rtl::OUString >::get() ), + AsciiPropertyValue( "ImplicitCatalogRestriction", ::cppu::UnoType< OUString >::get() ), + AsciiPropertyValue( "ImplicitSchemaRestriction", ::cppu::UnoType< OUString >::get() ), AsciiPropertyValue( "PrimaryKeySupport", ::cppu::UnoType< sal_Bool >::get() ), AsciiPropertyValue( "ShowColumnDescription", makeAny( (sal_Bool)sal_False ) ), // known SDB level settings @@ -1089,15 +1089,15 @@ const AsciiPropertyValue* ODatabaseModelImpl::getDefaultDataSourceSettings() AsciiPropertyValue( "EscapeDateTime", makeAny( (sal_Bool)sal_True ) ), // known services to handle database tasks - AsciiPropertyValue( "TableAlterationServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "TableRenameServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "ViewAlterationServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "ViewAccessServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "CommandDefinitions", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "Forms", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "Reports", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "KeyAlterationServiceName", makeAny( ::rtl::OUString() ) ), - AsciiPropertyValue( "IndexAlterationServiceName", makeAny( ::rtl::OUString() ) ), + AsciiPropertyValue( "TableAlterationServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "TableRenameServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "ViewAlterationServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "ViewAccessServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "CommandDefinitions", makeAny( OUString() ) ), + AsciiPropertyValue( "Forms", makeAny( OUString() ) ), + AsciiPropertyValue( "Reports", makeAny( OUString() ) ), + AsciiPropertyValue( "KeyAlterationServiceName", makeAny( OUString() ) ), + AsciiPropertyValue( "IndexAlterationServiceName", makeAny( OUString() ) ), AsciiPropertyValue() }; @@ -1168,7 +1168,7 @@ Reference< XStorageBasedLibraryContainer > ODatabaseModelImpl::getLibraryContain catch( const Exception& ) { throw WrappedTargetRuntimeException( - ::rtl::OUString(), + OUString(), xDocument, ::cppu::getCaughtException() ); @@ -1257,12 +1257,12 @@ Reference< XStorage > ODatabaseModelImpl::impl_switchToStorage_throw( const Refe return m_xDocumentStorage.getTyped(); } -void ODatabaseModelImpl::impl_switchToLogicalURL( const ::rtl::OUString& i_rDocumentURL ) +void ODatabaseModelImpl::impl_switchToLogicalURL( const OUString& i_rDocumentURL ) { if ( i_rDocumentURL == m_sDocumentURL ) return; - const ::rtl::OUString sOldURL( m_sDocumentURL ); + const OUString sOldURL( m_sDocumentURL ); // update our name, if necessary if ( ( m_sName == m_sDocumentURL ) // our name is our old URL || ( m_sName.isEmpty() ) // we do not have a name, yet (i.e. are not registered at the database context) @@ -1293,7 +1293,7 @@ void ODatabaseModelImpl::impl_switchToLogicalURL( const ::rtl::OUString& i_rDocu } } -::rtl::OUString ODatabaseModelImpl::getObjectContainerStorageName( const ObjectType _eType ) +OUString ODatabaseModelImpl::getObjectContainerStorageName( const ObjectType _eType ) { return lcl_getContainerStorageName_throw( _eType ); } @@ -1318,7 +1318,7 @@ sal_Bool ODatabaseModelImpl::setCurrentMacroExecMode( sal_uInt16 nMacroMode ) return sal_True; } -::rtl::OUString ODatabaseModelImpl::getDocumentLocation() const +OUString ODatabaseModelImpl::getDocumentLocation() const { return getURL(); // formerly, we returned getDocFileLocation here, which is the location of the file from which we diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx index 194b6a23bd2b..49f6a10efdc6 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.hxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx @@ -199,7 +199,7 @@ private: ::comphelper::NamedValueCollection m_aMediaDescriptor; /// the URL the document was loaded from - ::rtl::OUString m_sDocFileLocation; + OUString m_sDocFileLocation; oslInterlockedCount m_refCount; @@ -220,7 +220,7 @@ private: ->m_sDocumentURL then is the URL of the document which actually had been recovered. */ - ::rtl::OUString m_sDocumentURL; + OUString m_sDocumentURL; public: OWeakConnectionArray m_aConnections; @@ -232,11 +232,11 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier; - ::rtl::OUString m_sConnectURL; - ::rtl::OUString m_sName; // transient, our creator has to tell us the title - ::rtl::OUString m_sUser; - ::rtl::OUString m_aPassword; // transient ! - ::rtl::OUString m_sFailedPassword; + OUString m_sConnectURL; + OUString m_sName; // transient, our creator has to tell us the title + OUString m_sUser; + OUString m_aPassword; // transient ! + OUString m_sFailedPassword; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; sal_Int32 m_nLoginTimeout; @@ -247,8 +247,8 @@ public: sal_Bool m_bDocumentReadOnly : 1; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyAccess > m_xSettings; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableTypeFilter; OSharedConnectionManager* m_pSharedConnectionManager; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > m_xSharedConnectionManager; @@ -282,7 +282,7 @@ public: virtual ~ODatabaseModelImpl(); ODatabaseModelImpl( - const ::rtl::OUString& _rRegistrationName, + const OUString& _rRegistrationName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxContext, ODatabaseContext& _rDBContext ); @@ -294,8 +294,8 @@ public: void dispose(); - inline ::rtl::OUString getURL() const { return m_sDocumentURL; } - inline ::rtl::OUString getDocFileLocation() const { return m_sDocFileLocation; } + inline OUString getURL() const { return m_sDocumentURL; } + inline OUString getDocFileLocation() const { return m_sDocFileLocation; } ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getStorage( @@ -312,11 +312,11 @@ public: getMediaDescriptor() const { return m_aMediaDescriptor; } void setResource( - const ::rtl::OUString& _rURL, + const OUString& _rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rArgs ); void setDocFileLocation( - const ::rtl::OUString& i_rLoadedFrom + const OUString& i_rLoadedFrom ); static ::comphelper::NamedValueCollection @@ -403,7 +403,7 @@ public: /** returns the name of the storage which is used to stored objects of the given type, if applicable */ - static ::rtl::OUString + static OUString getObjectContainerStorageName( const ObjectType _eType ); /** revokes the data source registration at the database context @@ -414,7 +414,7 @@ public: */ static bool objectHasMacros( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rPersistentName + const OUString& _rPersistentName ); /** determines which kind of embedded macros are present in the document @@ -487,7 +487,7 @@ public: // IMacroDocumentAccess overridables virtual sal_Int16 getCurrentMacroExecMode() const; virtual sal_Bool setCurrentMacroExecMode( sal_uInt16 ); - virtual ::rtl::OUString getDocumentLocation() const; + virtual OUString getDocumentLocation() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getZipStorageToSign(); virtual sal_Bool documentStorageHasMacros() const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XEmbeddedScripts > getEmbeddedDocumentScripts() const; @@ -512,7 +512,7 @@ private: URL where the doc was loaded/recovered from */ void impl_switchToLogicalURL( - const ::rtl::OUString& i_rDocumentURL + const OUString& i_rDocumentURL ); }; diff --git a/dbaccess/source/core/dataaccess/SharedConnection.cxx b/dbaccess/source/core/dataaccess/SharedConnection.cxx index e88c617bc121..242741ee5585 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.cxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.cxx @@ -56,7 +56,7 @@ Reference< XStatement > SAL_CALL OSharedConnection::createStatement( ) throw(SQ return m_xConnection->createStatement(); } -Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -64,7 +64,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareStatement( co return m_xConnection->prepareStatement(sql); } -Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -72,7 +72,7 @@ Reference< XPreparedStatement > SAL_CALL OSharedConnection::prepareCall( const : return m_xConnection->prepareCall(sql); } -::rtl::OUString SAL_CALL OSharedConnection::nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OSharedConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -130,7 +130,7 @@ sal_Bool SAL_CALL OSharedConnection::isReadOnly( ) throw(SQLException, RuntimeE return m_xConnection->isReadOnly(); } -::rtl::OUString SAL_CALL OSharedConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OSharedConnection::getCatalog( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index d81e501745bf..916c4fec8cb8 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -96,7 +96,7 @@ namespace dbaccess { throw ::com::sun::star::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,::com::sun::star::uno::Any()); } - virtual void SAL_CALL setCatalog( const ::rtl::OUString& /*catalog*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setCatalog( const OUString& /*catalog*/ ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { throw ::com::sun::star::sdbc::SQLException("This call is not allowed when sharing connections.",*this,"S10000",0,::com::sun::star::uno::Any()); } @@ -110,16 +110,16 @@ namespace dbaccess } // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); }; diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index c22fbd99c6c6..291d9e1507ba 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -90,7 +90,7 @@ OUString SAL_CALL OBookmarkContainer::getImplementationName( ) throw(RuntimeExc return OUString("com.sun.star.comp.dba.OBookmarkContainer"); } -sal_Bool SAL_CALL OBookmarkContainer::supportsService( const ::rtl::OUString& _rServiceName ) throw (RuntimeException) +sal_Bool SAL_CALL OBookmarkContainer::supportsService( const OUString& _rServiceName ) throw (RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); @@ -105,7 +105,7 @@ Sequence< OUString > SAL_CALL OBookmarkContainer::getSupportedServiceNames( ) t } // XNameContainer -void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +void SAL_CALL OBookmarkContainer::insertByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_True); @@ -117,7 +117,7 @@ void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, c throw IllegalArgumentException(); // approve the new object - ::rtl::OUString sNewLink; + OUString sNewLink; if (!(aElement >>= sNewLink)) throw IllegalArgumentException(); @@ -134,9 +134,9 @@ void SAL_CALL OBookmarkContainer::insertByName( const ::rtl::OUString& _rName, c } } -void SAL_CALL OBookmarkContainer::removeByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL OBookmarkContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { - ::rtl::OUString sOldBookmark; + OUString sOldBookmark; { MutexGuard aGuard(m_rMutex); checkValid(sal_True); @@ -166,7 +166,7 @@ void SAL_CALL OBookmarkContainer::removeByName( const ::rtl::OUString& _rName ) } // XNameReplace -void SAL_CALL OBookmarkContainer::replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL OBookmarkContainer::replaceByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { ClearableMutexGuard aGuard(m_rMutex); checkValid(sal_True); @@ -180,12 +180,12 @@ void SAL_CALL OBookmarkContainer::replaceByName( const ::rtl::OUString& _rName, throw NoSuchElementException(); // approve the new object - ::rtl::OUString sNewLink; + OUString sNewLink; if (!(aElement >>= sNewLink)) throw IllegalArgumentException(); // the old element (for the notifications) - ::rtl::OUString sOldLink = m_aBookmarks[_rName]; + OUString sOldLink = m_aBookmarks[_rName]; // do the replace implReplace(_rName, sNewLink); @@ -220,7 +220,7 @@ Type SAL_CALL OBookmarkContainer::getElementType( ) throw (RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); - return ::getCppuType( static_cast< ::rtl::OUString* >(NULL) ); + return ::getCppuType( static_cast< OUString* >(NULL) ); } sal_Bool SAL_CALL OBookmarkContainer::hasElements( ) throw (RuntimeException) @@ -257,7 +257,7 @@ Any SAL_CALL OBookmarkContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOutO return makeAny(m_aBookmarksIndexed[_nIndex]->second); } -Any SAL_CALL OBookmarkContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL OBookmarkContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); @@ -268,13 +268,13 @@ Any SAL_CALL OBookmarkContainer::getByName( const ::rtl::OUString& _rName ) thro return makeAny(m_aBookmarks[_rName]); } -Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OBookmarkContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); - Sequence< ::rtl::OUString > aNames(m_aBookmarks.size()); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames(m_aBookmarks.size()); + OUString* pNames = aNames.getArray(); ; for ( ConstMapIteratorVectorIterator aNameIter = m_aBookmarksIndexed.begin(); aNameIter != m_aBookmarksIndexed.end(); @@ -287,7 +287,7 @@ Sequence< ::rtl::OUString > SAL_CALL OBookmarkContainer::getElementNames( ) thr return aNames; } -sal_Bool SAL_CALL OBookmarkContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException) +sal_Bool SAL_CALL OBookmarkContainer::hasByName( const OUString& _rName ) throw(RuntimeException) { MutexGuard aGuard(m_rMutex); checkValid(sal_False); @@ -295,7 +295,7 @@ sal_Bool SAL_CALL OBookmarkContainer::hasByName( const ::rtl::OUString& _rName ) return checkExistence(_rName); } -void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName) +void OBookmarkContainer::implRemove(const OUString& _rName) { MutexGuard aGuard(m_rMutex); @@ -324,7 +324,7 @@ void OBookmarkContainer::implRemove(const ::rtl::OUString& _rName) m_aBookmarks.erase(aMapPos); } -void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl::OUString& _rDocumentLocation) +void OBookmarkContainer::implAppend(const OUString& _rName, const OUString& _rDocumentLocation) { MutexGuard aGuard(m_rMutex); @@ -332,7 +332,7 @@ void OBookmarkContainer::implAppend(const ::rtl::OUString& _rName, const ::rtl:: m_aBookmarksIndexed.push_back(m_aBookmarks.insert( MapString2String::value_type(_rName,_rDocumentLocation)).first); } -void OBookmarkContainer::implReplace(const ::rtl::OUString& _rName, const ::rtl::OUString& _rNewLink) +void OBookmarkContainer::implReplace(const OUString& _rName, const OUString& _rNewLink) { MutexGuard aGuard(m_rMutex); OSL_ENSURE(checkExistence(_rName), "OBookmarkContainer::implReplace : invalid name !"); diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx index 201903310a59..36a7cb40d057 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx @@ -54,7 +54,7 @@ class OBookmarkContainer :public OBookmarkContainer_Base { protected: - DECLARE_STL_USTRINGACCESS_MAP(::rtl::OUString, MapString2String); + DECLARE_STL_USTRINGACCESS_MAP(OUString, MapString2String); DECLARE_STL_VECTOR(MapString2StringIterator, MapIteratorVector); MapString2String m_aBookmarks; // the bookmarks itself @@ -87,9 +87,9 @@ public: 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::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); @@ -103,16 +103,16 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); @@ -143,22 +143,22 @@ protected: @param _rName the object name to check @return sal_True if there already exists such an object */ - inline sal_Bool checkExistence(const ::rtl::OUString& _rName); + inline sal_Bool checkExistence(const OUString& _rName); void implAppend( - const ::rtl::OUString& _rName, - const ::rtl::OUString& _rDocumentLocation + const OUString& _rName, + const OUString& _rDocumentLocation ); - void implRemove(const ::rtl::OUString& _rName); + void implRemove(const OUString& _rName); void implReplace( - const ::rtl::OUString& _rName, - const ::rtl::OUString& _rNewLink); + const OUString& _rName, + const OUString& _rNewLink); }; -inline sal_Bool OBookmarkContainer::checkExistence(const ::rtl::OUString& _rName) +inline sal_Bool OBookmarkContainer::checkExistence(const OUString& _rName) { return m_aBookmarks.find(_rName) != m_aBookmarks.end(); } diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index eb4700052c5c..8fe6ec685150 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -62,7 +62,7 @@ OCommandContainer::~OCommandContainer() IMPLEMENT_FORWARD_XINTERFACE2( OCommandContainer,ODefinitionContainer,OCommandContainer_BASE) IMPLEMENT_TYPEPROVIDER2(OCommandContainer,ODefinitionContainer,OCommandContainer_BASE); -Reference< XContent > OCommandContainer::createObject( const ::rtl::OUString& _rName) +Reference< XContent > OCommandContainer::createObject( const OUString& _rName) { const ODefinitionContainer_Impl& rDefinitions( getDefinitions() ); OSL_ENSURE( rDefinitions.find(_rName) != rDefinitions.end(), "OCommandContainer::createObject: Invalid entry in map!" ); diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx index 39ddb15c357e..cf952d78baaf 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.hxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx @@ -61,11 +61,11 @@ protected: virtual ~OCommandContainer(); // ODefinitionContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject(const OUString& _rName); protected: // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; }; } // namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index ba0016be5811..3adf40195ab0 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -72,17 +72,17 @@ void OCommandDefinition::registerProperties() &rCommandDefinition.m_aLayoutInformation, ::getCppuType(&rCommandDefinition.m_aLayoutInformation)); } -rtl::OUString OCommandDefinition::getName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getName() throw( ::com::sun::star::uno::RuntimeException ) { return getDefinition().m_aProps.aTitle; } -rtl::OUString OCommandDefinition::getCommand() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getCommand() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sCommand; } -void OCommandDefinition::setCommand(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setCommand(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_COMMAND, Any(p1) ); } @@ -97,32 +97,32 @@ void OCommandDefinition::setEscapeProcessing(sal_Bool p1) throw( ::com::sun::sta setPropertyValue(PROPERTY_ESCAPE_PROCESSING, Any(p1) ); } -rtl::OUString OCommandDefinition::getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sUpdateTableName; } -void OCommandDefinition::setUpdateTableName(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setUpdateTableName(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_UPDATE_TABLENAME, Any(p1) ); } -rtl::OUString OCommandDefinition::getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sUpdateCatalogName; } -void OCommandDefinition::setUpdateCatalogName(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setUpdateCatalogName(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_UPDATE_CATALOGNAME, Any(p1) ); } -rtl::OUString OCommandDefinition::getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ) +OUString OCommandDefinition::getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ) { return getCommandDefinition().m_sUpdateSchemaName; } -void OCommandDefinition::setUpdateSchemaName(const rtl::OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) +void OCommandDefinition::setUpdateSchemaName(const OUString& p1) throw( ::com::sun::star::uno::RuntimeException ) { setPropertyValue(PROPERTY_UPDATE_SCHEMANAME, Any(p1) ); } @@ -143,7 +143,7 @@ OCommandDefinition::~OCommandDefinition() } OCommandDefinition::OCommandDefinition( const Reference< XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const Reference< XComponentContext >& _xORB ,const TContentPtr& _pImpl) :OComponentDefinition(_rxContainer,_rElementName,_xORB,_pImpl,sal_False) @@ -162,7 +162,7 @@ OUString OCommandDefinition::getImplementationName_static( ) throw(RuntimeExcep return OUString("com.sun.star.comp.dba.OCommandDefinition"); } -::rtl::OUString SAL_CALL OCommandDefinition::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL OCommandDefinition::getImplementationName( ) throw(RuntimeException) { return getImplementationName_static(); } @@ -176,7 +176,7 @@ Sequence< OUString > OCommandDefinition::getSupportedServiceNames_static( ) thr return aServices; } -Sequence< ::rtl::OUString > SAL_CALL OCommandDefinition::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OCommandDefinition::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_static(); } @@ -186,7 +186,7 @@ Reference< XInterface > OCommandDefinition::Create(const Reference< XComponentCo return *(new OCommandDefinition( _rxContext, NULL, TContentPtr( new OCommandDefinition_Impl ) ) ); } -void SAL_CALL OCommandDefinition::rename( const ::rtl::OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL OCommandDefinition::rename( const OUString& newName ) throw (SQLException, ElementExistException, RuntimeException) { try { diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index ccc956b0c22f..b94e0c7083c0 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -75,7 +75,7 @@ public: OCommandDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContainer - ,const ::rtl::OUString& _rElementName + ,const OUString& _rElementName ,const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& ,const TContentPtr& _pImpl ); @@ -87,34 +87,34 @@ public: DECLARE_XINTERFACE( ) // ::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); // ::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 >&); // 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); // overrides to resolve ambiguity - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const com::sun::star::uno::Any& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual void SAL_CALL setPropertyValue(const OUString& p1, const com::sun::star::uno::Any& p2) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OComponentDefinition::setPropertyValue(p1, p2); } - virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) + virtual com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return OComponentDefinition::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const com::sun::star::uno::Reference<com::sun::star::beans::XVetoableChangeListener>& p2) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::removeVetoableChangeListener(p1, p2); } virtual com::sun::star::uno::Reference<com::sun::star::ucb::XContentIdentifier> SAL_CALL getIdentifier() throw( ::com::sun::star::uno::RuntimeException ) { return OComponentDefinition::getIdentifier(); } - virtual rtl::OUString SAL_CALL getContentType() throw( ::com::sun::star::uno::RuntimeException ) + virtual OUString SAL_CALL getContentType() throw( ::com::sun::star::uno::RuntimeException ) { return OComponentDefinition::getContentType(); } virtual void SAL_CALL addContentEventListener(const com::sun::star::uno::Reference<com::sun::star::ucb::XContentEventListener>& p1) throw( ::com::sun::star::uno::RuntimeException ) { OComponentDefinition::addContentEventListener(p1); } @@ -128,17 +128,17 @@ public: { OComponentDefinition::removeEventListener(p1); } // XQueryDefinition properties - virtual rtl::OUString getName() throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getCommand() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setCommand(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getName() throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getCommand() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setCommand(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); virtual sal_Bool getEscapeProcessing() throw( ::com::sun::star::uno::RuntimeException ); virtual void setEscapeProcessing(sal_Bool) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setUpdateTableName(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setUpdateCatalogName(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); - virtual rtl::OUString getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ); - virtual void setUpdateSchemaName(const rtl::OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getUpdateTableName() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setUpdateTableName(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getUpdateCatalogName() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setUpdateCatalogName(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); + virtual OUString getUpdateSchemaName() throw( ::com::sun::star::uno::RuntimeException ); + virtual void setUpdateSchemaName(const OUString&) throw( ::com::sun::star::uno::RuntimeException ); // OPropertySetHelper DECLARE_PROPERTYCONTAINER_DEFAULTS( ); diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 14534241917b..856a81d082e7 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -89,8 +89,8 @@ protected: OWeakRefArray m_aComposers; // the filter as set on the parent data link at construction of the connection - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableFilter; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTableTypeFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableFilter; + ::com::sun::star::uno::Sequence< OUString > m_aTableTypeFilter; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_aContext; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xMasterConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XConnectionTools > m_xConnectionTools; @@ -145,22 +145,22 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSQLQueryComposer > SAL_CALL createQueryComposer( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdb::XCommandPreparation - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCommand( const ::rtl::OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCommand( const OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XWarningsSupplier virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::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); // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -169,8 +169,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -180,9 +180,9 @@ public: virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XUsersSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException); @@ -193,12 +193,12 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XTableName > SAL_CALL createTableName( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XObjectNames > SAL_CALL getObjectNames( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::tools::XDataSourceMetaData > SAL_CALL getDataSourceMetaData( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const ::rtl::OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const ::rtl::OUString& command ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer > SAL_CALL getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException); // XTableUIProvider - virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const ::rtl::OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const ::rtl::OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > SAL_CALL getTableIcon( const OUString& TableName, ::sal_Int32 ColorMode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getTableEditor( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::application::XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // IRefreshListener virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed); diff --git a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx index b2f3bc4dbc6e..c34063488680 100644 --- a/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx +++ b/dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx @@ -87,9 +87,9 @@ namespace dbaccess DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); protected: ~DataAccessDescriptor(); @@ -106,22 +106,22 @@ namespace dbaccess Reference<XComponentContext> m_xContext; // </properties> - ::rtl::OUString m_sDataSourceName; - ::rtl::OUString m_sDatabaseLocation; - ::rtl::OUString m_sConnectionResource; + OUString m_sDataSourceName; + OUString m_sDatabaseLocation; + OUString m_sConnectionResource; Sequence< PropertyValue > m_aConnectionInfo; Reference< XConnection > m_xActiveConnection; - ::rtl::OUString m_sCommand; + OUString m_sCommand; sal_Int32 m_nCommandType; - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sOrder; - ::rtl::OUString m_sHavingClause; - ::rtl::OUString m_sGroupBy; + OUString m_sFilter; + OUString m_sOrder; + OUString m_sHavingClause; + OUString m_sGroupBy; sal_Bool m_bEscapeProcessing; Reference< XResultSet > m_xResultSet; Sequence< Any > m_aSelection; sal_Bool m_bBookmarkSelection; - ::rtl::OUString m_sColumnName; + OUString m_sColumnName; Reference< XPropertySet > m_xColumn; // </properties> }; @@ -184,11 +184,11 @@ namespace dbaccess return OUString( "com.sun.star.comp.dba.DataAccessDescriptor" ); } - ::sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL DataAccessDescriptor::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() ); - const ::rtl::OUString* pStart = aServices.getConstArray(); - const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength(); + Sequence< OUString > aServices( getSupportedServiceNames() ); + const OUString* pStart = aServices.getConstArray(); + const OUString* pEnd = aServices.getConstArray() + aServices.getLength(); return ::std::find( pStart, pEnd, rServiceName ) != pEnd; } @@ -227,15 +227,15 @@ namespace dbaccess { public: // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException); - virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException); + virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException); + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException); // XServiceInfo - static versions - static Sequence< ::rtl::OUString > getSupportedServiceNames_static(void) throw( RuntimeException ); - static ::rtl::OUString getImplementationName_static(void) throw( RuntimeException ); + static Sequence< OUString > getSupportedServiceNames_static(void) throw( RuntimeException ); + static OUString getImplementationName_static(void) throw( RuntimeException ); static Reference< XInterface > Create(const Reference< XComponentContext >& _rxContext); - static ::rtl::OUString getSingletonName_static(); + static OUString getSingletonName_static(); // XDataAccessDescriptorFactory virtual Reference< XPropertySet > SAL_CALL createDataAccessDescriptor( ) throw (RuntimeException); @@ -262,9 +262,9 @@ namespace dbaccess return OUString( "com.sun.star.sdb.DataAccessDescriptorFactory" ); } - Sequence< ::rtl::OUString > DataAccessDescriptorFactory::getSupportedServiceNames_static() throw( RuntimeException ) + Sequence< OUString > DataAccessDescriptorFactory::getSupportedServiceNames_static() throw( RuntimeException ) { - Sequence< ::rtl::OUString > aServices(1); + Sequence< OUString > aServices(1); aServices[0] = getSingletonName_static(); return aServices; } @@ -279,20 +279,20 @@ namespace dbaccess return *( new DataAccessDescriptorFactory( _rxContext ) ); } - ::rtl::OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName() throw (RuntimeException) + OUString SAL_CALL DataAccessDescriptorFactory::getImplementationName() throw (RuntimeException) { return getImplementationName_static(); } - ::sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) + ::sal_Bool SAL_CALL DataAccessDescriptorFactory::supportsService( const OUString& rServiceName ) throw (RuntimeException) { - Sequence< ::rtl::OUString > aServices( getSupportedServiceNames_static() ); - const ::rtl::OUString* pStart = aServices.getConstArray(); - const ::rtl::OUString* pEnd = aServices.getConstArray() + aServices.getLength(); + Sequence< OUString > aServices( getSupportedServiceNames_static() ); + const OUString* pStart = aServices.getConstArray(); + const OUString* pEnd = aServices.getConstArray() + aServices.getLength(); return ::std::find( pStart, pEnd, rServiceName ) != pEnd; } - Sequence< ::rtl::OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DataAccessDescriptorFactory::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index a01a901c12e5..bea00d3665fd 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -218,7 +218,7 @@ class ODatabaseDocument :public ModelDependentComponent // ModelDepe the instance lock to be released before doing synchronous notifications */ void impl_storeAs_throw( - const ::rtl::OUString& _rURL, + const OUString& _rURL, const ::comphelper::NamedValueCollection& _rArguments, const StoreType _eType, DocumentGuard& _rGuard @@ -297,13 +297,13 @@ public: } // 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 >&); @@ -325,8 +325,8 @@ public: virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); // XModel - virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getURL( ) throw (::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& Controller ) throw (::com::sun::star::uno::RuntimeException) ; @@ -339,17 +339,17 @@ public: // XModel2 virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration > SAL_CALL getControllers( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableViewControllerNames( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableViewControllerNames( ) throw (::com::sun::star::uno::RuntimeException) ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createDefaultViewController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createViewController( const ::rtl::OUString& ViewName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 > SAL_CALL createViewController( const OUString& ViewName, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException) ; // XStorable virtual sal_Bool SAL_CALL hasLocation( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getLocation( ) throw (::com::sun::star::uno::RuntimeException) ; virtual sal_Bool SAL_CALL isReadonly( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL store( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL storeAsURL( const ::rtl::OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL storeToURL( const ::rtl::OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL storeAsURL( const OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL storeToURL( const OUString& sURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& lArguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException) ; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -366,7 +366,7 @@ public: // XDocumentEventBroadcaster virtual void SAL_CALL addDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeDocumentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentEventListener >& _Listener ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL notifyDocumentEvent( const ::rtl::OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL notifyDocumentEvent( const OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController, const ::com::sun::star::uno::Any& _Supplement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XPrintable virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPrinter( ) throw (::com::sun::star::uno::RuntimeException) ; @@ -388,8 +388,8 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIConfigurationManager > SAL_CALL getUIConfigurationManager( ) throw (::com::sun::star::uno::RuntimeException); // XDocumentSubStorageSupplier - virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const ::rtl::OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentSubStorage( const OUString& aStorageName, sal_Int32 nMode ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDocumentSubStoragesNames( ) throw (::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); // XOfficeDatabaseDocument virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource > SAL_CALL getDataSource() throw (::com::sun::star::uno::RuntimeException); @@ -422,12 +422,12 @@ public: // css.document.XDocumentRecovery virtual ::sal_Bool SAL_CALL wasModifiedSinceLastSave() throw ( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL storeToRecoveryFile( const ::rtl::OUString& i_TargetLocation, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); - virtual void SAL_CALL recoverFromFile( const ::rtl::OUString& i_SourceLocation, const ::rtl::OUString& i_SalvagedFile, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); + virtual void SAL_CALL storeToRecoveryFile( const OUString& i_TargetLocation, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); + virtual void SAL_CALL recoverFromFile( const OUString& i_SourceLocation, const OUString& i_SalvagedFile, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_MediaDescriptor ) throw ( ::com::sun::star::uno::RuntimeException, ::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException ); // XTitle - virtual ::rtl::OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTitle( const ::rtl::OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getTitle( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setTitle( const OUString& sTitle ) throw (::com::sun::star::uno::RuntimeException); // XTitleChangeBroadcaster virtual void SAL_CALL addTitleChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitleChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException); @@ -437,7 +437,7 @@ public: virtual ::sal_Int32 SAL_CALL leaseNumber( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL releaseNumber( ::sal_Int32 nNumber ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL releaseNumberForComponent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xComponent ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getUntitledPrefix( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getUntitledPrefix( ) throw (::com::sun::star::uno::RuntimeException); /** clears the given object container @@ -456,7 +456,7 @@ public: inline void checkInitialized() const { if ( !impl_isInitialized() ) - throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), getThis() ); + throw ::com::sun::star::lang::NotInitializedException( OUString(), getThis() ); } /** checks the document is currently in the initialization phase, or already initialized. @@ -468,7 +468,7 @@ public: // fine return; - throw ::com::sun::star::lang::NotInitializedException( ::rtl::OUString(), getThis() ); + throw ::com::sun::star::lang::NotInitializedException( OUString(), getThis() ); } /** checks whether the document is currently being initialized, or already initialized, @@ -477,7 +477,7 @@ public: inline void checkNotInitialized() const { if ( impl_isInitializing() || impl_isInitialized() ) - throw ::com::sun::star::frame::DoubleInitializationException( ::rtl::OUString(), getThis() ); + throw ::com::sun::star::frame::DoubleInitializationException( OUString(), getThis() ); } private: @@ -556,7 +556,7 @@ private: */ ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > impl_createStorageFor_throw( - const ::rtl::OUString& _rURL + const OUString& _rURL ) const; /** sets our "modified" flag @@ -615,7 +615,7 @@ private: is the guard which currently protects the document instance */ sal_Bool impl_attachResource( - const ::rtl::OUString& i_rLogicalDocumentURL, + const OUString& i_rLogicalDocumentURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& i_rMediaDescriptor, DocumentGuard& _rDocGuard ); @@ -625,7 +625,7 @@ private: */ void impl_throwIOExceptionCausedBySave_throw( const ::com::sun::star::uno::Any& i_rError, - const ::rtl::OUString& i_rTargetURL + const OUString& i_rTargetURL ) const; }; diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index e7b271b24e2c..a02c2be89c31 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -84,21 +84,21 @@ namespace dbaccess ~DatabaseRegistrations(); public: - virtual ::sal_Bool SAL_CALL hasRegisteredDatabase( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException); - virtual Sequence< ::rtl::OUString > SAL_CALL getRegistrationNames() throw (RuntimeException); - virtual ::rtl::OUString SAL_CALL getDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); - virtual void SAL_CALL registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException); - virtual void SAL_CALL revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); - virtual void SAL_CALL changeDatabaseLocation( const ::rtl::OUString& Name, const ::rtl::OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); - virtual ::sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); + virtual ::sal_Bool SAL_CALL hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException); + virtual Sequence< OUString > SAL_CALL getRegistrationNames() throw (RuntimeException); + virtual OUString SAL_CALL getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); + virtual void SAL_CALL registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException); + virtual void SAL_CALL revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); + virtual void SAL_CALL changeDatabaseLocation( const OUString& Name, const OUString& NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException); + virtual ::sal_Bool SAL_CALL isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException); virtual void SAL_CALL addDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException); virtual void SAL_CALL removeDatabaseRegistrationsListener( const Reference< XDatabaseRegistrationsListener >& Listener ) throw (RuntimeException); private: ::utl::OConfigurationNode - impl_checkValidName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ); + impl_checkValidName_throw( const OUString& _rName, const bool _bMustExist ); - void impl_checkValidLocation_throw( const ::rtl::OUString& _rLocation ); + void impl_checkValidLocation_throw( const OUString& _rLocation ); /** retrieves the configuration node whose "Name" sub node has the given value @@ -117,10 +117,10 @@ namespace dbaccess However, in this case the root node is not yet committed. */ ::utl::OConfigurationNode - impl_getNodeForName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ); + impl_getNodeForName_throw( const OUString& _rName, const bool _bMustExist ); ::utl::OConfigurationNode - impl_getNodeForName_nothrow( const ::rtl::OUString& _rName ); + impl_getNodeForName_nothrow( const OUString& _rName ); private: Reference<XComponentContext> m_aContext; @@ -144,17 +144,17 @@ namespace dbaccess { } - ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_nothrow( const ::rtl::OUString& _rName ) + ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_nothrow( const OUString& _rName ) { - Sequence< ::rtl::OUString > aNames( m_aConfigurationRoot.getNodeNames() ); - for ( const ::rtl::OUString* pName = aNames.getConstArray(); + Sequence< OUString > aNames( m_aConfigurationRoot.getNodeNames() ); + for ( const OUString* pName = aNames.getConstArray(); pName != aNames.getConstArray() + aNames.getLength(); ++pName ) { ::utl::OConfigurationNode aNodeForName = m_aConfigurationRoot.openNode( *pName ); - ::rtl::OUString sTestName; + OUString sTestName; OSL_VERIFY( aNodeForName.getNodeValue( getNameNodeName() ) >>= sTestName ); if ( sTestName == _rName ) return aNodeForName; @@ -162,7 +162,7 @@ namespace dbaccess return ::utl::OConfigurationNode(); } - ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ) + ::utl::OConfigurationNode DatabaseRegistrations::impl_getNodeForName_throw( const OUString& _rName, const bool _bMustExist ) { ::utl::OConfigurationNode aNodeForName( impl_getNodeForName_nothrow( _rName ) ); @@ -177,14 +177,14 @@ namespace dbaccess if ( _bMustExist ) throw NoSuchElementException( _rName, *this ); - ::rtl::OUString sNewNodeName; + OUString sNewNodeName; { - ::rtl::OUStringBuffer aNewNodeName; + OUStringBuffer aNewNodeName; aNewNodeName.appendAscii( "org.openoffice." ); aNewNodeName.append( _rName ); // make unique - ::rtl::OUStringBuffer aReset( aNewNodeName ); + OUStringBuffer aReset( aNewNodeName ); sNewNodeName = aNewNodeName.makeStringAndClear(); sal_Int32 i=2; while ( m_aConfigurationRoot.hasByName( sNewNodeName ) ) @@ -201,45 +201,45 @@ namespace dbaccess return aNewNode; } - ::utl::OConfigurationNode DatabaseRegistrations::impl_checkValidName_throw( const ::rtl::OUString& _rName, const bool _bMustExist ) + ::utl::OConfigurationNode DatabaseRegistrations::impl_checkValidName_throw( const OUString& _rName, const bool _bMustExist ) { if ( !m_aConfigurationRoot.isValid() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); if ( _rName.isEmpty() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 1 ); + throw IllegalArgumentException( OUString(), *this, 1 ); return impl_getNodeForName_throw( _rName, _bMustExist ); } - void DatabaseRegistrations::impl_checkValidLocation_throw( const ::rtl::OUString& _rLocation ) + void DatabaseRegistrations::impl_checkValidLocation_throw( const OUString& _rLocation ) { if ( _rLocation.isEmpty() ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 2 ); + throw IllegalArgumentException( OUString(), *this, 2 ); INetURLObject aURL( _rLocation ); if ( aURL.GetProtocol() == INET_PROT_NOT_VALID ) - throw IllegalArgumentException( ::rtl::OUString(), *this, 2 ); + throw IllegalArgumentException( OUString(), *this, 2 ); } - ::sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException) + ::sal_Bool SAL_CALL DatabaseRegistrations::hasRegisteredDatabase( const OUString& _Name ) throw (IllegalArgumentException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aNodeForName = impl_getNodeForName_nothrow( _Name ); return aNodeForName.isValid(); } - Sequence< ::rtl::OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException) + Sequence< OUString > SAL_CALL DatabaseRegistrations::getRegistrationNames() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_aConfigurationRoot.isValid() ) - throw RuntimeException( ::rtl::OUString(), *this ); + throw RuntimeException( OUString(), *this ); - Sequence< ::rtl::OUString > aProgrammaticNames( m_aConfigurationRoot.getNodeNames() ); - Sequence< ::rtl::OUString > aDisplayNames( aProgrammaticNames.getLength() ); - ::rtl::OUString* pDisplayName = aDisplayNames.getArray(); + Sequence< OUString > aProgrammaticNames( m_aConfigurationRoot.getNodeNames() ); + Sequence< OUString > aDisplayNames( aProgrammaticNames.getLength() ); + OUString* pDisplayName = aDisplayNames.getArray(); - for ( const ::rtl::OUString* pName = aProgrammaticNames.getConstArray(); + for ( const OUString* pName = aProgrammaticNames.getConstArray(); pName != aProgrammaticNames.getConstArray() + aProgrammaticNames.getLength(); ++pName, ++pDisplayName ) @@ -251,20 +251,20 @@ namespace dbaccess return aDisplayNames; } - ::rtl::OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + OUString SAL_CALL DatabaseRegistrations::getDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aNodeForName = impl_checkValidName_throw( _Name, true ); - ::rtl::OUString sLocation; + OUString sLocation; OSL_VERIFY( aNodeForName.getNodeValue( getLocationNodeName() ) >>= sLocation ); sLocation = SvtPathOptions().SubstituteVariable( sLocation ); return sLocation; } - void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException) + void SAL_CALL DatabaseRegistrations::registerDatabaseLocation( const OUString& _Name, const OUString& _Location ) throw (IllegalArgumentException, ElementExistException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -277,12 +277,12 @@ namespace dbaccess m_aConfigurationRoot.commit(); // notify - DatabaseRegistrationEvent aEvent( *this, _Name, ::rtl::OUString(), _Location ); + DatabaseRegistrationEvent aEvent( *this, _Name, OUString(), _Location ); aGuard.clear(); m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::registeredDatabaseLocation, aEvent ); } - void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) + void SAL_CALL DatabaseRegistrations::revokeDatabaseLocation( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -290,24 +290,24 @@ namespace dbaccess ::utl::OConfigurationNode aNodeForName = impl_checkValidName_throw( _Name, true ); // obtain properties for notification - ::rtl::OUString sLocation; + OUString sLocation; OSL_VERIFY( aNodeForName.getNodeValue( getLocationNodeName() ) >>= sLocation ); // revoke if ( aNodeForName.isReadonly() || !m_aConfigurationRoot.removeNode( aNodeForName.getLocalName() ) ) - throw IllegalAccessException( ::rtl::OUString(), *this ); + throw IllegalAccessException( OUString(), *this ); m_aConfigurationRoot.commit(); // notify - DatabaseRegistrationEvent aEvent( *this, _Name, sLocation, ::rtl::OUString() ); + DatabaseRegistrationEvent aEvent( *this, _Name, sLocation, OUString() ); aGuard.clear(); m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::revokedDatabaseLocation, aEvent ); } - void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const ::rtl::OUString& _Name, const ::rtl::OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) + void SAL_CALL DatabaseRegistrations::changeDatabaseLocation( const OUString& _Name, const OUString& _NewLocation ) throw (IllegalArgumentException, NoSuchElementException, IllegalAccessException, RuntimeException) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -316,10 +316,10 @@ namespace dbaccess ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw( _Name, true ); if ( aDataSourceRegistration.isReadonly() ) - throw IllegalAccessException( ::rtl::OUString(), *this ); + throw IllegalAccessException( OUString(), *this ); // obtain properties for notification - ::rtl::OUString sOldLocation; + OUString sOldLocation; OSL_VERIFY( aDataSourceRegistration.getNodeValue( getLocationNodeName() ) >>= sOldLocation ); // change @@ -332,7 +332,7 @@ namespace dbaccess m_aRegistrationListeners.notifyEach( &XDatabaseRegistrationsListener::changedDatabaseLocation, aEvent ); } - ::sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const ::rtl::OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) + ::sal_Bool SAL_CALL DatabaseRegistrations::isDatabaseRegistrationReadOnly( const OUString& _Name ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); ::utl::OConfigurationNode aDataSourceRegistration = impl_checkValidName_throw( _Name, true ); diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx index 13f47d26d92f..33e241a36af0 100644 --- a/dbaccess/source/core/dataaccess/datasource.hxx +++ b/dbaccess/source/core/dataaccess/datasource.hxx @@ -107,7 +107,7 @@ public: */ static void setName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XDocumentDataSource >& _rxDocument, - const ::rtl::OUString& _rNewName, + const OUString& _rNewName, DBContextAccess ); @@ -128,13 +128,13 @@ public: 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::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 >&); @@ -169,7 +169,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connectWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XDataSource - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -180,7 +180,7 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getQueryDefinitions( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbc::XIsolatedConnection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnection( const ::rtl::OUString& user, const ::rtl::OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnection( const OUString& user, const OUString& password ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getIsolatedConnectionWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XFlushable @@ -204,14 +204,14 @@ private: manager, so it can be used as a master for a "high level" sdb connection. */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > buildLowLevelConnection( - const ::rtl::OUString& _rUid, const ::rtl::OUString& _rPwd + const OUString& _rUid, const OUString& _rPwd ); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > buildIsolatedConnection( - const rtl::OUString& user, const rtl::OUString& password + const OUString& user, const OUString& password ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const ::rtl::OUString& user, const ::rtl::OUString& password , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( const OUString& user, const OUString& password , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connectWithCompletion( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& handler , sal_Bool _bIsolated) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void clearConnections(); diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 181ac55e6c76..50ef79dc31d6 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -173,7 +173,7 @@ Sequence< OUString > SAL_CALL ODefinitionContainer::getSupportedServiceNames( ) } // XNameContainer -void SAL_CALL ODefinitionContainer::insertByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) +void SAL_CALL ODefinitionContainer::insertByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard(m_aMutex); @@ -186,7 +186,7 @@ void SAL_CALL ODefinitionContainer::insertByName( const ::rtl::OUString& _rName, notifyByName( aGuard, _rName, xNewElement, NULL, E_INSERTED, ContainerListemers ); } -void SAL_CALL ODefinitionContainer::removeByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL ODefinitionContainer::removeByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard(m_aMutex); @@ -210,7 +210,7 @@ void SAL_CALL ODefinitionContainer::removeByName( const ::rtl::OUString& _rName } // XNameReplace -void SAL_CALL ODefinitionContainer::replaceByName( const ::rtl::OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) +void SAL_CALL ODefinitionContainer::replaceByName( const OUString& _rName, const Any& aElement ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { ResettableMutexGuard aGuard(m_aMutex); @@ -267,7 +267,7 @@ namespace }; } -void ODefinitionContainer::notifyByName( ResettableMutexGuard& _rGuard, const ::rtl::OUString& _rName, +void ODefinitionContainer::notifyByName( ResettableMutexGuard& _rGuard, const OUString& _rName, const Reference< XContent >& _xNewElement, const Reference< XContent >& _xOldElement, ContainerOperation _eOperation, ListenerType _eType ) { @@ -379,14 +379,14 @@ Any SAL_CALL ODefinitionContainer::getByIndex( sal_Int32 _nIndex ) throw(IndexOu return makeAny(xProp); } -Any SAL_CALL ODefinitionContainer::getByName( const ::rtl::OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) +Any SAL_CALL ODefinitionContainer::getByName( const OUString& _rName ) throw(NoSuchElementException, WrappedTargetException, RuntimeException) { MutexGuard aGuard(m_aMutex); return makeAny( implGetByName( _rName, sal_True ) ); } -Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString& _rName, sal_Bool _bReadIfNeccessary) throw (NoSuchElementException) +Reference< XContent > ODefinitionContainer::implGetByName(const OUString& _rName, sal_Bool _bReadIfNeccessary) throw (NoSuchElementException) { Documents::iterator aMapPos = m_aDocumentMap.find(_rName); if (aMapPos == m_aDocumentMap.end()) @@ -407,12 +407,12 @@ Reference< XContent > ODefinitionContainer::implGetByName(const ::rtl::OUString& return xProp; } -Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL ODefinitionContainer::getElementNames( ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); - Sequence< ::rtl::OUString > aNames(m_aDocumentMap.size()); - ::rtl::OUString* pNames = aNames.getArray(); + Sequence< OUString > aNames(m_aDocumentMap.size()); + OUString* pNames = aNames.getArray(); Documents::iterator aEnd = m_aDocumentMap.end(); for ( Documents::iterator aNameIter = m_aDocumentMap.begin(); aNameIter != aEnd; @@ -425,7 +425,7 @@ Sequence< ::rtl::OUString > SAL_CALL ODefinitionContainer::getElementNames( ) t return aNames; } -sal_Bool SAL_CALL ODefinitionContainer::hasByName( const ::rtl::OUString& _rName ) throw(RuntimeException) +sal_Bool SAL_CALL ODefinitionContainer::hasByName( const OUString& _rName ) throw(RuntimeException) { MutexGuard aGuard(m_aMutex); @@ -450,7 +450,7 @@ void SAL_CALL ODefinitionContainer::disposing( const EventObject& _rSource ) thr } } -void ODefinitionContainer::implRemove(const ::rtl::OUString& _rName) +void ODefinitionContainer::implRemove(const OUString& _rName) { // from the object maps Documents::iterator aFind = m_aDocumentMap.find(_rName); @@ -467,7 +467,7 @@ void ODefinitionContainer::implRemove(const ::rtl::OUString& _rName) namespace { - bool lcl_ensureName( const Reference< XContent >& _rxContent, const ::rtl::OUString& _rName ) + bool lcl_ensureName( const Reference< XContent >& _rxContent, const OUString& _rName ) { if ( !_rxContent.is() ) return true; @@ -479,7 +479,7 @@ namespace Reference< XPropertySet > xProps( _rxContent, UNO_QUERY ); if ( xProps.is() ) { - ::rtl::OUString sCurrentName; + OUString sCurrentName; OSL_VERIFY( xProps->getPropertyValue( PROPERTY_NAME ) >>= sCurrentName ); if ( sCurrentName.equals( _rName ) ) return true; @@ -508,7 +508,7 @@ namespace } } -void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Reference< XContent >& _rxNewObject) +void ODefinitionContainer::implAppend(const OUString& _rName, const Reference< XContent >& _rxNewObject) { MutexGuard aGuard(m_aMutex); try @@ -551,7 +551,7 @@ void ODefinitionContainer::implAppend(const ::rtl::OUString& _rName, const Refer } } -void ODefinitionContainer::implReplace(const ::rtl::OUString& _rName, const Reference< XContent >& _rxNewObject) +void ODefinitionContainer::implReplace(const OUString& _rName, const Reference< XContent >& _rxNewObject) { OSL_ENSURE(checkExistence(_rName), "ODefinitionContainer::implReplace : invalid name !"); @@ -561,7 +561,7 @@ void ODefinitionContainer::implReplace(const ::rtl::OUString& _rName, const Refe addObjectListener(aFind->second); } -void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const Reference< XContent >& _rxObject) const +void ODefinitionContainer::approveNewObject(const OUString& _sName,const Reference< XContent >& _rxObject) const { // check the arguments if ( _sName.isEmpty() ) @@ -605,12 +605,12 @@ void ODefinitionContainer::approveNewObject(const ::rtl::OUString& _sName,const void SAL_CALL ODefinitionContainer::propertyChange( const PropertyChangeEvent& evt ) throw (RuntimeException) { ClearableMutexGuard aGuard(m_aMutex); - if( evt.PropertyName == (rtl::OUString) PROPERTY_NAME || evt.PropertyName == "Title" ) + if( evt.PropertyName == (OUString) PROPERTY_NAME || evt.PropertyName == "Title" ) { m_bInPropertyChange = sal_True; try { - ::rtl::OUString sNewName,sOldName; + OUString sNewName,sOldName; evt.OldValue >>= sOldName; evt.NewValue >>= sNewName; Reference<XContent> xContent( evt.Source, UNO_QUERY ); @@ -632,9 +632,9 @@ void SAL_CALL ODefinitionContainer::vetoableChange( const PropertyChangeEvent& a { MutexGuard aGuard(m_aMutex); - if( aEvent.PropertyName == (rtl::OUString) PROPERTY_NAME || aEvent.PropertyName == "Title" ) + if( aEvent.PropertyName == (OUString) PROPERTY_NAME || aEvent.PropertyName == "Title" ) { - ::rtl::OUString sNewName; + OUString sNewName; aEvent.NewValue >>= sNewName; if(hasByName(sNewName)) throw PropertyVetoException(); @@ -662,7 +662,7 @@ void ODefinitionContainer::removeObjectListener(const Reference< XContent >& _xN } } -sal_Bool ODefinitionContainer::checkExistence(const ::rtl::OUString& _rName) +sal_Bool ODefinitionContainer::checkExistence(const OUString& _rName) { return m_aDocumentMap.find(_rName) != m_aDocumentMap.end(); } diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index 92b2ab75ea65..fcd1bec4ccb9 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -652,7 +652,7 @@ OUString SAL_CALL ODocumentContainer::getHierarchicalName() throw (RuntimeExcept OUString SAL_CALL ODocumentContainer::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( getHierarchicalName() ); aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( i_rRelativeName ); diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index 16dcd22cf8ad..2ff2269e1180 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -67,33 +67,33 @@ public: DECLARE_SERVICE_INFO(); // XComponentLoader - virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL loadComponentFromURL( const ::rtl::OUString& URL, const ::rtl::OUString& TargetFrameName, sal_Int32 SearchFlags, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > SAL_CALL loadComponentFromURL( const OUString& URL, const OUString& TargetFrameName, sal_Int32 SearchFlags, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::lang::XMultiServiceFactory - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (::com::sun::star::uno::RuntimeException); // XCommandProcessor virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException) ; // XHierarchicalNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const ::rtl::OUString& _sName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByHierarchicalName( const ::rtl::OUString& _sName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByHierarchicalName( const OUString& _sName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByHierarchicalName( const OUString& _sName ) throw (::com::sun::star::uno::RuntimeException); // XHierarchicalNameContainer - virtual void SAL_CALL insertByHierarchicalName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByHierarchicalName( const ::rtl::OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByHierarchicalName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByHierarchicalName( const OUString& Name ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XHierarchicalName - virtual ::rtl::OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL composeHierarchicalName( const ::rtl::OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // XNameContainer - virtual void SAL_CALL removeByName( const ::rtl::OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XHierarchicalNameReplace - virtual void SAL_CALL replaceByHierarchicalName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByHierarchicalName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::beans::XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); @@ -103,13 +103,13 @@ public: virtual void SAL_CALL revert( ) throw (::com::sun::star::io::IOException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // 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); // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); // helper - ::rtl::Reference<OContentHelper> getContent(const ::rtl::OUString& _sName) const; + ::rtl::Reference<OContentHelper> getContent(const OUString& _sName) const; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > getContainerStorage() const; protected: @@ -117,11 +117,11 @@ protected: /** OContentHelper */ - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; // ODefinitionContainer virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( - const ::rtl::OUString& _rName + const OUString& _rName ); virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, ::com::sun::star::uno::Any& _rDefault ) const; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index e64ac434d2d0..a1a9b085281d 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -144,10 +144,10 @@ namespace dbaccess namespace { // -------------------------------------------------------------------- - ::rtl::OUString lcl_determineContentType_nothrow( const Reference< XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rEntityName ) + OUString lcl_determineContentType_nothrow( const Reference< XStorage >& _rxContainerStorage, + const OUString& _rEntityName ) { - ::rtl::OUString sContentType; + OUString sContentType; try { Reference< XStorage > xContainerStorage( _rxContainerStorage, UNO_QUERY_THROW ); @@ -352,27 +352,27 @@ namespace dbaccess //================================================================== class ODocumentSaveContinuation : public OInteraction< XInteractionDocumentSave > { - ::rtl::OUString m_sName; + OUString m_sName; Reference<XContent> m_xParentContainer; public: ODocumentSaveContinuation() { } inline Reference<XContent> getContent() const { return m_xParentContainer; } - inline ::rtl::OUString getName() const { return m_sName; } + inline OUString getName() const { return m_sName; } // XInteractionDocumentSave - virtual void SAL_CALL setName( const ::rtl::OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException); + virtual void SAL_CALL setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException); }; - void SAL_CALL ODocumentSaveContinuation::setName( const ::rtl::OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException) + void SAL_CALL ODocumentSaveContinuation::setName( const OUString& _sName,const Reference<XContent>& _xParent) throw(RuntimeException) { m_sName = _sName; m_xParentContainer = _xParent; } -::rtl::OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const Reference< XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rEntityName, const Reference< XComponentContext >& _rContext, +OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const Reference< XStorage >& _rxContainerStorage, + const OUString& _rEntityName, const Reference< XComponentContext >& _rContext, Sequence< sal_Int8 >& _rClassId ) { return GetDocumentServiceFromMediaType( @@ -380,10 +380,10 @@ namespace dbaccess _rContext, _rClassId ); } -::rtl::OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const ::rtl::OUString& _rMediaType, +OUString ODocumentDefinition::GetDocumentServiceFromMediaType( const OUString& _rMediaType, const Reference< XComponentContext >& _rContext, Sequence< sal_Int8 >& _rClassId ) { - ::rtl::OUString sResult; + OUString sResult; try { ::comphelper::MimeConfigurationHelper aConfigHelper( _rContext ); @@ -394,11 +394,11 @@ namespace dbaccess Reference< XNameAccess > xObjConfig = aConfigHelper.GetObjConfiguration(); if ( xObjConfig.is() ) { - Sequence< ::rtl::OUString > aClassIDs = xObjConfig->getElementNames(); + Sequence< OUString > aClassIDs = xObjConfig->getElementNames(); for ( sal_Int32 nInd = 0; nInd < aClassIDs.getLength(); nInd++ ) { Reference< XNameAccess > xObjectProps; - ::rtl::OUString aEntryDocName; + OUString aEntryDocName; if ( ( xObjConfig->getByName( aClassIDs[nInd] ) >>= xObjectProps ) && xObjectProps.is() && ( xObjectProps->getByName("ObjectDocumentServiceName") >>= aEntryDocName ) @@ -414,7 +414,7 @@ namespace dbaccess // alternative, shorter approach const Sequence< NamedValue > aProps( aConfigHelper.GetObjectPropsByMediaType( _rMediaType ) ); const ::comphelper::NamedValueCollection aMediaTypeProps( aProps ); - const ::rtl::OUString sAlternativeResult = aMediaTypeProps.getOrDefault( "ObjectDocumentServiceName", ::rtl::OUString() ); + const OUString sAlternativeResult = aMediaTypeProps.getOrDefault( "ObjectDocumentServiceName", OUString() ); OSL_ENSURE( sAlternativeResult == sResult, "ODocumentDefinition::GetDocumentServiceFromMediaType: failed, this approach is *not* equivalent (1)!" ); const Sequence< sal_Int8 > aAlternativeClassID = aMediaTypeProps.getOrDefault( "ClassID", Sequence< sal_Int8 >() ); OSL_ENSURE( aAlternativeClassID == _rClassId, "ODocumentDefinition::GetDocumentServiceFromMediaType: failed, this approach is *not* equivalent (2)!" ); @@ -534,10 +534,10 @@ void SAL_CALL ODocumentDefinition::getFastPropertyValue( Any& o_rValue, sal_Int3 { if ( i_nHandle == PROPERTY_ID_PERSISTENT_PATH ) { - ::rtl::OUString sPersistentPath; + OUString sPersistentPath; if ( !m_pImpl->m_aProps.sPersistentName.isEmpty() ) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( ODatabaseModelImpl::getObjectContainerStorageName( m_bForm ? ODatabaseModelImpl::E_FORM : ODatabaseModelImpl::E_REPORT ) ); aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( m_pImpl->m_aProps.sPersistentName ); @@ -571,7 +571,7 @@ IPropertyArrayHelper* ODocumentDefinition::createArrayHelper( ) const Sequence< Property > aManualProps( 1 ); aManualProps[0].Name = PROPERTY_PERSISTENT_PATH; aManualProps[0].Handle = PROPERTY_ID_PERSISTENT_PATH; - aManualProps[0].Type = ::getCppuType( static_cast< const ::rtl::OUString* >( NULL ) ); + aManualProps[0].Type = ::getCppuType( static_cast< const OUString* >( NULL ) ); aManualProps[0].Attributes = PropertyAttribute::READONLY; return new OPropertyArrayHelper( ::comphelper::concatSequences( aProps, aManualProps ) ); @@ -780,7 +780,7 @@ void ODocumentDefinition::impl_showOrHideComponent_throw( const bool i_bShow ) { default: case EmbedStates::LOADED: - throw embed::WrongStateException( ::rtl::OUString(), *this ); + throw embed::WrongStateException( OUString(), *this ); case EmbedStates::RUNNING: if ( !i_bShow ) @@ -919,7 +919,7 @@ Any ODocumentDefinition::onCommandOpenSomething( const Any& _rOpenArgument, cons // not supported ucbhelper::cancelCommandExecution( makeAny( UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( nOpenMode ) ) ), _rxEnvironment ); @@ -1054,14 +1054,14 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co OSL_FAIL( "Wrong argument type!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); // Unreachable } Reference< XStorage> xDest(aIni[0],UNO_QUERY); - ::rtl::OUString sPersistentName; + OUString sPersistentName; aIni[1] >>= sPersistentName; Reference< XStorage> xStorage = getContainerStorage(); @@ -1080,13 +1080,13 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co OSL_FAIL( "Wrong argument count!" ); ucbhelper::cancelCommandExecution( makeAny( IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); // Unreachable } - ::rtl::OUString sURL; + OUString sURL; aIni[0] >>= sURL; onCommandInsert( sURL, Environment ); } @@ -1152,7 +1152,7 @@ namespace try { Reference< XPropertySet > xFormProps( xForm, UNO_QUERY_THROW ); - xFormProps->setPropertyValue( PROPERTY_DATASOURCENAME, makeAny( ::rtl::OUString() ) ); + xFormProps->setPropertyValue( PROPERTY_DATASOURCENAME, makeAny( OUString() ) ); } catch( const Exception& ) { @@ -1188,7 +1188,7 @@ namespace } } -void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const Reference< XCommandEnvironment >& Environment ) +void ODocumentDefinition::onCommandInsert( const OUString& _sURL, const Reference< XCommandEnvironment >& Environment ) throw( Exception ) { osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -1198,11 +1198,11 @@ void ODocumentDefinition::onCommandInsert( const ::rtl::OUString& _sURL, const R { OSL_FAIL( "Content::onCommandInsert - property value missing!" ); - Sequence< rtl::OUString > aProps( 1 ); + Sequence< OUString > aProps( 1 ); aProps[ 0 ] = PROPERTY_URL; ucbhelper::cancelCommandExecution( makeAny( MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), Environment ); @@ -1388,13 +1388,13 @@ sal_Bool ODocumentDefinition::saveAs() try { Reference< XStorage> xStorage = getContainerStorage(); - const static ::rtl::OUString sBaseName("Obj"); + const static OUString sBaseName("Obj"); Reference<XNameAccess> xElements(xStorage,UNO_QUERY_THROW); - ::rtl::OUString sPersistentName = ::dbtools::createUniqueName(xElements,sBaseName); + OUString sPersistentName = ::dbtools::createUniqueName(xElements,sBaseName); xStorage->copyElementTo(m_pImpl->m_aProps.sPersistentName,xStorage,sPersistentName); - ::rtl::OUString sOldName = m_pImpl->m_aProps.aTitle; + OUString sOldName = m_pImpl->m_aProps.aTitle; rename(pDocuSave->getName()); updateDocumentTitle(); @@ -1498,7 +1498,7 @@ sal_Bool ODocumentDefinition::objectSupportsEmbeddedScripts() const return bAllowDocumentMacros; } -::rtl::OUString ODocumentDefinition::determineContentType() const +OUString ODocumentDefinition::determineContentType() const { return lcl_determineContentType_nothrow( getContainerStorage(), m_pImpl->m_aProps.sPersistentName ); } @@ -1614,7 +1614,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_ if ( xStorage.is() ) { Reference< XEmbeddedObjectCreator> xEmbedFactory = OOoEmbeddedObjectFactory::create(m_aContext); - ::rtl::OUString sDocumentService; + OUString sDocumentService; sal_Bool bSetSize = sal_False; sal_Int32 nEntryConnectionMode = EntryInitModes::DEFAULT_INIT; Sequence< sal_Int8 > aClassID = _aClassID; @@ -1632,7 +1632,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_ { // we seem to be a "new style" report, check if report extension is present. Reference< XContentEnumerationAccess > xEnumAccess( m_aContext->getServiceManager(), UNO_QUERY ); - const ::rtl::OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_aContext); + const OUString sReportEngineServiceName = ::dbtools::getDefaultReportEngineServiceName(m_aContext); Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(sReportEngineServiceName); if ( !xEnumDrivers.is() || !xEnumDrivers->hasMoreElements() ) { @@ -1879,7 +1879,7 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor Reference< XComponent > xComponent; try { - ::rtl::OUString sName( impl_getHierarchicalName( false ) ); + OUString sName( impl_getHierarchicalName( false ) ); sal_Int32 nObjectType = m_bForm ? DatabaseObject::FORM : DatabaseObject::REPORT; aGuard.clear(); @@ -1891,7 +1891,7 @@ Reference< XComponent > ODocumentDefinition::impl_openUI_nolck_throw( bool _bFor catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + OUString(), *this, ::cppu::getCaughtException() ); } return xComponent; } @@ -1938,7 +1938,7 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + OUString(), *this, ::cppu::getCaughtException() ); } } @@ -1955,27 +1955,27 @@ void SAL_CALL ODocumentDefinition::store( ) throw (WrappedTargetException, Runt catch( const Exception& ) { throw WrappedTargetException( - ::rtl::OUString(), *this, ::cppu::getCaughtException() ); + OUString(), *this, ::cppu::getCaughtException() ); } return bSuccess; } -::rtl::OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException) +OUString SAL_CALL ODocumentDefinition::getHierarchicalName() throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return impl_getHierarchicalName( false ); } -::rtl::OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const ::rtl::OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException) +OUString SAL_CALL ODocumentDefinition::composeHierarchicalName( const OUString& i_rRelativeName ) throw (IllegalArgumentException, NoSupportException, RuntimeException) { - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( getHierarchicalName() ); aBuffer.append( sal_Unicode( '/' ) ); aBuffer.append( i_rRelativeName ); return aBuffer.makeStringAndClear(); } -void SAL_CALL ODocumentDefinition::rename( const ::rtl::OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException) +void SAL_CALL ODocumentDefinition::rename( const OUString& _rNewName ) throw (SQLException, ElementExistException, RuntimeException) { try { @@ -2104,7 +2104,7 @@ void ODocumentDefinition::fillReportData( const Reference< XComponentContext >& void ODocumentDefinition::updateDocumentTitle() { - ::rtl::OUString sName = m_pImpl->m_aProps.aTitle; + OUString sName = m_pImpl->m_aProps.aTitle; if ( m_pImpl->m_pDataSource ) { if ( sName.isEmpty() ) @@ -2115,7 +2115,7 @@ void ODocumentDefinition::updateDocumentTitle() sName = DBACORE_RESSTRING( RID_STR_REPORT ); Reference< XUntitledNumbers > xUntitledProvider(m_pImpl->m_pDataSource->getModel_noCreate(), UNO_QUERY ); if ( xUntitledProvider.is() ) - sName += ::rtl::OUString::valueOf( xUntitledProvider->leaseNumber(getComponent()) ); + sName += OUString::valueOf( xUntitledProvider->leaseNumber(getComponent()) ); } Reference< XTitle > xDatabaseDocumentModel(m_pImpl->m_pDataSource->getModel_noCreate(),uno::UNO_QUERY); @@ -2159,7 +2159,7 @@ void ODocumentDefinition::firePropertyChange( sal_Int32 i_nHandle, const Any& i_ // ============================================================================= // NameChangeNotifier // ============================================================================= -NameChangeNotifier::NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, const ::rtl::OUString& i_rNewName, +NameChangeNotifier::NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, const OUString& i_rNewName, ::osl::ResettableMutexGuard& i_rClearForNotify ) :m_rDocumentDefinition( i_rDocumentDefinition ) ,m_aOldValue( makeAny( i_rDocumentDefinition.getCurrentName() ) ) diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index f9e6f71519eb..b3630dfb5f9f 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -121,8 +121,8 @@ public: virtual ::sal_Bool SAL_CALL close( ) throw (::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XHierarchicalName - virtual ::rtl::OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL composeHierarchicalName( const ::rtl::OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHierarchicalName( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL composeHierarchicalName( const OUString& aRelativeName ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -131,7 +131,7 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL execute( const ::com::sun::star::ucb::Command& aCommand, sal_Int32 CommandId, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw (::com::sun::star::uno::Exception, ::com::sun::star::ucb::CommandAbortedException, ::com::sun::star::uno::RuntimeException) ; // 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); // XCloseListener virtual void SAL_CALL queryClosing( const ::com::sun::star::lang::EventObject& Source, ::sal_Bool GetsOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException); @@ -173,20 +173,20 @@ public: static ::com::sun::star::uno::Sequence< sal_Int8 > getDefaultDocumentTypeClassId(); - static ::rtl::OUString GetDocumentServiceFromMediaType( - const ::rtl::OUString& _rMediaType, + static OUString GetDocumentServiceFromMediaType( + const OUString& _rMediaType, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rxContext, ::com::sun::star::uno::Sequence< sal_Int8 >& _rClassId ); - static ::rtl::OUString GetDocumentServiceFromMediaType( + static OUString GetDocumentServiceFromMediaType( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& _rxContainerStorage, - const ::rtl::OUString& _rEntityName, + const OUString& _rEntityName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & _rxContext, ::com::sun::star::uno::Sequence< sal_Int8 >& _rClassId ); struct NotifierAccess { friend class NameChangeNotifier; private: NotifierAccess() { } }; - const ::rtl::OUString& getCurrentName() const { return m_pImpl->m_aProps.aTitle; } + const OUString& getCurrentName() const { return m_pImpl->m_aProps.aTitle; } void firePropertyChange( sal_Int32 i_nHandle, const ::com::sun::star::uno::Any& i_rNewValue, @@ -251,7 +251,7 @@ private: virtual void SAL_CALL disposing(); // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; /** fills the load arguments */ @@ -339,7 +339,7 @@ private: //- commands void onCommandGetDocumentProperties( ::com::sun::star::uno::Any& _rProps ); - void onCommandInsert( const ::rtl::OUString& _sURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( ::com::sun::star::uno::Exception ); + void onCommandInsert( const OUString& _sURL, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& Environment ) throw( ::com::sun::star::uno::Exception ); void onCommandPreview( ::com::sun::star::uno::Any& _rImage ); ::com::sun::star::uno::Any onCommandOpenSomething( @@ -356,7 +356,7 @@ class NameChangeNotifier public: NameChangeNotifier( ODocumentDefinition& i_rDocumentDefinition, - const ::rtl::OUString& i_rNewName, + const OUString& i_rNewName, ::osl::ResettableMutexGuard& i_rClearForNotify ); ~NameChangeNotifier(); diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx index 063876e58439..f2d4c32f94a4 100644 --- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx +++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx @@ -80,7 +80,7 @@ namespace dbaccess namespace { static void lcl_dispatchScriptURL_throw( DocumentEventExecutor_Data& _rDocExecData, - const ::rtl::OUString& _rScriptURL, const DocumentEvent& _rTrigger ) + const OUString& _rScriptURL, const DocumentEvent& _rTrigger ) { Reference< XModel > xDocument( _rDocExecData.xDocument.get(), UNO_QUERY_THROW ); @@ -104,7 +104,7 @@ namespace dbaccess // we lock the solar mutex here. SolarMutexGuard aSolarGuard; - Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aScriptURL, ::rtl::OUString(), 0 ) ); + Reference< XDispatch > xDispatch( xDispProv->queryDispatch( aScriptURL, OUString(), 0 ) ); if ( !xDispatch.is() ) { OSL_FAIL( "lcl_dispatchScriptURL_throw: no dispatcher for the script URL!" ); @@ -171,10 +171,10 @@ namespace dbaccess const ::comphelper::NamedValueCollection aScriptDescriptor( xDocEvents->getByName( _Event.EventName ) ); - ::rtl::OUString sEventType; + OUString sEventType; bool bScriptAssigned = aScriptDescriptor.get_ensureType( "EventType", sEventType ); - ::rtl::OUString sScript; + OUString sScript; bScriptAssigned = bScriptAssigned && aScriptDescriptor.get_ensureType( "Script", sScript ); if ( !bScriptAssigned ) diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx index 651fb00ef720..18155d0a45a1 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx @@ -107,14 +107,14 @@ namespace dbaccess void onDocumentInitialized(); - void notifyDocumentEvent( const ::rtl::OUString& _EventName, const Reference< XController2 >& _ViewController, + void notifyDocumentEvent( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { impl_notifyEvent_nothrow( DocumentEvent( m_rDocument, _EventName, _ViewController, _Supplement ) ); } - void notifyDocumentEventAsync( const ::rtl::OUString& _EventName, const Reference< XController2 >& _ViewController, + void notifyDocumentEventAsync( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { impl_notifyEventAsync_nothrow( DocumentEvent( @@ -278,13 +278,13 @@ namespace dbaccess m_pImpl->removeDocumentEventListener( _Listener ); } - void DocumentEventNotifier::notifyDocumentEvent( const ::rtl::OUString& _EventName, + void DocumentEventNotifier::notifyDocumentEvent( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { m_pImpl->notifyDocumentEvent( _EventName, _ViewController, _Supplement ); } - void DocumentEventNotifier::notifyDocumentEventAsync( const ::rtl::OUString& _EventName, + void DocumentEventNotifier::notifyDocumentEventAsync( const OUString& _EventName, const Reference< XController2 >& _ViewController, const Any& _Supplement ) { m_pImpl->notifyDocumentEventAsync( _EventName, _ViewController, _Supplement ); diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx index 4b4a68537ebf..cd365ed91d24 100644 --- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx +++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx @@ -72,7 +72,7 @@ namespace dbaccess ->onDocumentInitialized has been called */ void notifyDocumentEvent( - const ::rtl::OUString& _EventName, + const OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _rxViewController = NULL, const ::com::sun::star::uno::Any& _Supplement = ::com::sun::star::uno::Any() ); @@ -85,7 +85,7 @@ namespace dbaccess the mutex is locked */ void notifyDocumentEventAsync( - const ::rtl::OUString& _EventName, + const OUString& _EventName, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController2 >& _ViewController = NULL, const ::com::sun::star::uno::Any& _Supplement = ::com::sun::star::uno::Any() ); @@ -103,7 +103,7 @@ namespace dbaccess const ::com::sun::star::uno::Any& _rSupplement = ::com::sun::star::uno::Any() ) { - notifyDocumentEvent( ::rtl::OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); + notifyDocumentEvent( OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); } /** notifies a document event to all registered listeners, asynchronously @@ -119,7 +119,7 @@ namespace dbaccess const ::com::sun::star::uno::Any& _rSupplement = ::com::sun::star::uno::Any() ) { - notifyDocumentEventAsync( ::rtl::OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); + notifyDocumentEventAsync( OUString::createFromAscii( _pAsciiEventName ), _rxViewController, _rSupplement ); } private: diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index 65f54ffa6f02..41a7e416ad37 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -117,7 +117,7 @@ namespace dbaccess const DocumentEventData* pEventData = lcl_getDocumentEventData(); while ( pEventData->pAsciiEventName ) { - ::rtl::OUString sEventName = ::rtl::OUString::createFromAscii( pEventData->pAsciiEventName ); + OUString sEventName = OUString::createFromAscii( pEventData->pAsciiEventName ); DocumentEventsData::iterator existingPos = m_pData->rEventsData.find( sEventName ); if ( existingPos == m_pData->rEventsData.end() ) m_pData->rEventsData[ sEventName ] = Sequence< PropertyValue >(); @@ -139,7 +139,7 @@ namespace dbaccess m_pData->rParent.release(); } - bool DocumentEvents::needsSynchronousNotification( const ::rtl::OUString& _rEventName ) + bool DocumentEvents::needsSynchronousNotification( const OUString& _rEventName ) { const DocumentEventData* pEventData = lcl_getDocumentEventData(); while ( pEventData->pAsciiEventName ) @@ -153,7 +153,7 @@ namespace dbaccess return false; } - void SAL_CALL DocumentEvents::replaceByName( const ::rtl::OUString& _Name, const Any& _Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) + void SAL_CALL DocumentEvents::replaceByName( const OUString& _Name, const Any& _Element ) throw (IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); @@ -170,14 +170,14 @@ namespace dbaccess ::comphelper::NamedValueCollection aCheck( aEventDescriptor ); if ( aCheck.has( "EventType" ) ) { - ::rtl::OUString sEventType = aCheck.getOrDefault( "EventType", ::rtl::OUString() ); + OUString sEventType = aCheck.getOrDefault( "EventType", OUString() ); OSL_ENSURE( !sEventType.isEmpty(), "DocumentEvents::replaceByName: doing a reset via an empty EventType is weird!" ); if ( sEventType.isEmpty() ) aEventDescriptor.realloc( 0 ); } if ( aCheck.has( "Script" ) ) { - ::rtl::OUString sScript = aCheck.getOrDefault( "Script", ::rtl::OUString() ); + OUString sScript = aCheck.getOrDefault( "Script", OUString() ); OSL_ENSURE( !sScript.isEmpty(), "DocumentEvents::replaceByName: doing a reset via an empty Script is weird!" ); if ( sScript.isEmpty() ) aEventDescriptor.realloc( 0 ); @@ -186,7 +186,7 @@ namespace dbaccess elementPos->second = aEventDescriptor; } - Any SAL_CALL DocumentEvents::getByName( const ::rtl::OUString& _Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) + Any SAL_CALL DocumentEvents::getByName( const OUString& _Name ) throw (NoSuchElementException, WrappedTargetException, RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); @@ -201,11 +201,11 @@ namespace dbaccess return aReturn; } - Sequence< ::rtl::OUString > SAL_CALL DocumentEvents::getElementNames( ) throw (RuntimeException) + Sequence< OUString > SAL_CALL DocumentEvents::getElementNames( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); - Sequence< ::rtl::OUString > aNames( m_pData->rEventsData.size() ); + Sequence< OUString > aNames( m_pData->rEventsData.size() ); ::std::transform( m_pData->rEventsData.begin(), m_pData->rEventsData.end(), @@ -215,7 +215,7 @@ namespace dbaccess return aNames; } - ::sal_Bool SAL_CALL DocumentEvents::hasByName( const ::rtl::OUString& _Name ) throw (RuntimeException) + ::sal_Bool SAL_CALL DocumentEvents::hasByName( const OUString& _Name ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_pData->rMutex ); diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx index 1ed70b454283..12bd8b8fc5f4 100644 --- a/dbaccess/source/core/dataaccess/documentevents.hxx +++ b/dbaccess/source/core/dataaccess/documentevents.hxx @@ -32,7 +32,7 @@ namespace dbaccess { - typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > + typedef ::std::map< OUString, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > DocumentEventsData; //==================================================================== @@ -50,19 +50,19 @@ namespace dbaccess DocumentEvents( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, DocumentEventsData& _rEventsData ); ~DocumentEvents(); - static bool needsSynchronousNotification( const ::rtl::OUString& _rEventName ); + static bool needsSynchronousNotification( const OUString& _rEventName ); // XInterface virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& aName, const ::com::sun::star::uno::Any& aElement ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw (::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw (::com::sun::star::uno::RuntimeException); + virtual ::sal_Bool SAL_CALL hasByName( const OUString& aName ) throw (::com::sun::star::uno::RuntimeException); // XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw (::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index cff678137762..af3587b16608 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -311,7 +311,7 @@ void SAL_CALL OInterceptor::removeStatusListener( //XInterceptorInfo -Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) +Sequence< OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) throw ( RuntimeException ) { // now implemented as update return m_aInterceptedURL; @@ -320,12 +320,12 @@ Sequence< ::rtl::OUString > SAL_CALL OInterceptor::getInterceptedURLs( ) thro // XDispatchProvider -Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,const ::rtl::OUString& TargetFrameName,sal_Int32 SearchFlags ) +Reference< XDispatch > SAL_CALL OInterceptor::queryDispatch( const URL& _URL,const OUString& TargetFrameName,sal_Int32 SearchFlags ) throw (RuntimeException) { osl::MutexGuard aGuard(m_aMutex); - const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const OUString* pIter = m_aInterceptedURL.getConstArray(); + const OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( _URL.Complete == *pIter ) @@ -349,8 +349,8 @@ Sequence< Reference< XDispatch > > SAL_CALL OInterceptor::queryDispatches( cons for(sal_Int32 i = 0; i < Requests.getLength(); ++i) { - const ::rtl::OUString* pIter = m_aInterceptedURL.getConstArray(); - const ::rtl::OUString* pEnd = pIter + m_aInterceptedURL.getLength(); + const OUString* pIter = m_aInterceptedURL.getConstArray(); + const OUString* pEnd = pIter + m_aInterceptedURL.getLength(); for(;pIter != pEnd;++pIter) { if ( Requests[i].FeatureURL.Complete == *pIter ) diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx index 6229d55d8d6f..0bacec5a7aee 100644 --- a/dbaccess/source/core/dataaccess/intercept.hxx +++ b/dbaccess/source/core/dataaccess/intercept.hxx @@ -75,7 +75,7 @@ public: ); //XInterceptorInfo - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getInterceptedURLs( ) throw ( ::com::sun::star::uno::RuntimeException @@ -86,7 +86,7 @@ public: ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& URL, - const ::rtl::OUString& TargetFrameName, + const OUString& TargetFrameName, sal_Int32 SearchFlags ) throw ( ::com::sun::star::uno::RuntimeException @@ -146,7 +146,7 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xSlaveDispatchProvider; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xMasterDispatchProvider; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aInterceptedURL; + ::com::sun::star::uno::Sequence< OUString > m_aInterceptedURL; cppu::OInterfaceContainerHelper* m_pDisposeEventListeners; PropertyChangeListenerContainer* m_pStatCL; diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index b34e981e95df..a8aee2ad40ce 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -50,7 +50,7 @@ namespace dbaccess struct ResultListEntry { - rtl::OUString aId; + OUString aId; Reference< XContentIdentifier > xId; ::rtl::Reference< OContentHelper > xContent; Reference< XRow > xRow; @@ -125,13 +125,13 @@ DataSupplier::~DataSupplier() DBG_DTOR(DataSupplier,NULL); } -rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( (size_t)nIndex < m_pImpl->m_aResults.size() ) { - rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; if ( !aId.isEmpty() ) { // Already cached. @@ -151,7 +151,7 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) m_pImpl->m_aResults[ nIndex ]->aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } Reference< XContentIdentifier > @@ -169,7 +169,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { Reference< XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( aId ); @@ -200,7 +200,7 @@ DataSupplier::queryContent( sal_uInt32 _nIndex ) try { Reference< XContent > xContent; - ::rtl::OUString sName = xId->getContentIdentifier(); + OUString sName = xId->getContentIdentifier(); sal_Int32 nIndex = sName.lastIndexOf('/') + 1; sName = sName.getToken(0,'/',nIndex); @@ -239,11 +239,11 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex ) sal_uInt32 nPos = nOldCount; // @@@ Obtain data and put it into result list... - Sequence< ::rtl::OUString> aSeq = m_pImpl->m_xContent->getElementNames(); + Sequence< OUString> aSeq = m_pImpl->m_xContent->getElementNames(); if ( nIndex < sal::static_int_cast< sal_uInt32 >( aSeq.getLength() ) ) { - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(pIter = pIter + nPos;pIter != pEnd;++pIter,++nPos) { m_pImpl->m_aResults.push_back( @@ -288,9 +288,9 @@ sal_uInt32 DataSupplier::totalCount() sal_uInt32 nOldCount = m_pImpl->m_aResults.size(); // @@@ Obtain data and put it into result list... - Sequence< ::rtl::OUString> aSeq = m_pImpl->m_xContent->getElementNames(); - const ::rtl::OUString* pIter = aSeq.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aSeq.getLength(); + Sequence< OUString> aSeq = m_pImpl->m_xContent->getElementNames(); + const OUString* pIter = aSeq.getConstArray(); + const OUString* pEnd = pIter + aSeq.getLength(); for(;pIter != pEnd;++pIter) m_pImpl->m_aResults.push_back( new ResultListEntry( m_pImpl->m_xContent->getContent(*pIter)->getContentProperties() ) ); diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx index 0274d5cc2025..d5a8b2bb770a 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx @@ -38,7 +38,7 @@ public: sal_Int32 nOpenMode ); virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index 4d0eeebc8f20..7ccdc646a0ee 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -41,7 +41,7 @@ namespace dbaccess { private: typedef ::rtl::Reference< OPropertyForward > TPropertyForward; - typedef ::std::map< ::rtl::OUString, TPropertyForward > PropertyForwardList; + typedef ::std::map< OUString, TPropertyForward > PropertyForwardList; PropertyForwardList m_aForwardList; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xSettings; // can not be weak ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainer > m_xContainer; // can not be weak @@ -62,7 +62,7 @@ namespace dbaccess virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& _rEvent ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); - void notifyElementCreated(const ::rtl::OUString& _sElementName + void notifyElementCreated(const OUString& _sElementName ,const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xElement); private: @@ -74,7 +74,7 @@ namespace dbaccess /** initializes the properties of the given object from its counterpart in our settings container */ void impl_initSettings_nothrow( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDestination ); }; diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 0c352f26ad3e..654d455022ba 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -46,13 +46,13 @@ namespace dbaccess class ODatabaseModelImpl; struct ContentProperties { - ::rtl::OUString aTitle; // Title - ::boost::optional< ::rtl::OUString > + OUString aTitle; // Title + ::boost::optional< OUString > aContentType; // ContentType (aka MediaType aka MimeType) sal_Bool bIsDocument; // IsDocument sal_Bool bIsFolder; // IsFolder sal_Bool bAsTemplate; // AsTemplate - ::rtl::OUString sPersistentName;// persistent name of the document + OUString sPersistentName;// persistent name of the document ContentProperties() :bIsDocument( sal_True ) @@ -75,8 +75,8 @@ namespace dbaccess typedef ::boost::shared_ptr<OContentHelper_Impl> TContentPtr; - typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< ::rtl::OUString, - ::rtl::OUStringHash, + typedef ::cppu::OMultiTypeInterfaceContainerHelperVar< OUString, + OUStringHash, ::comphelper::UStringEqual > PropertyChangeListenerContainer; typedef ::comphelper::OBaseMutex OContentHelper_MBASE; @@ -103,7 +103,7 @@ namespace dbaccess getProperties( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - void impl_rename_throw(const ::rtl::OUString& _sNewName,bool _bNotify = true); + void impl_rename_throw(const OUString& _sNewName,bool _bNotify = true); protected: ::cppu::OInterfaceContainerHelper m_aContentListeners; @@ -128,7 +128,7 @@ namespace dbaccess */ void notifyPropertiesChange( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyChangeEvent >& evt ) const; - ::rtl::OUString impl_getHierarchicalName( bool _includingRootContainer ) const; + OUString impl_getHierarchicalName( bool _includingRootContainer ) const; public: @@ -141,13 +141,13 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); // ::com::sun::star::lang::XServiceInfo - 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 ::rtl::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); + virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); // XContent virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier > SAL_CALL getIdentifier( ) throw (::com::sun::star::uno::RuntimeException) ; - virtual ::rtl::OUString SAL_CALL getContentType( ) throw (::com::sun::star::uno::RuntimeException) ; + virtual OUString SAL_CALL getContentType( ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL addContentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentEventListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; virtual void SAL_CALL removeContentEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentEventListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; @@ -157,12 +157,12 @@ namespace dbaccess virtual void SAL_CALL abort( sal_Int32 CommandId ) throw (::com::sun::star::uno::RuntimeException) ; // XPropertiesChangeNotifier - virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& PropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& Listener ) throw (::com::sun::star::uno::RuntimeException) ; // XPropertyContainer - virtual void SAL_CALL addProperty( const ::rtl::OUString& Name, sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL removeProperty( const ::rtl::OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, const ::com::sun::star::uno::Any& DefaultValue ) throw (::com::sun::star::beans::PropertyExistException, ::com::sun::star::beans::IllegalTypeException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) ; + virtual void SAL_CALL removeProperty( const OUString& Name ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::NotRemoveableException, ::com::sun::star::uno::RuntimeException) ; // XInitialization virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); @@ -176,7 +176,7 @@ namespace dbaccess virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // 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); inline const ContentProperties& getContentProperties() const { return m_pImpl->m_aProps; } ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > @@ -188,7 +188,7 @@ namespace dbaccess inline TContentPtr getImpl() const { return m_pImpl; } protected: - virtual ::rtl::OUString determineContentType() const = 0; + virtual OUString determineContentType() const = 0; }; } // namespace dbaccess diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 5c20906b9ee0..c22ad531f2fd 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -57,8 +57,8 @@ public: explicit DatabaseDataProvider(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); // ::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(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context); @@ -71,65 +71,65 @@ private: { TDatabaseDataProvider::release(); } // ::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::chart2::data::XDataProvider: virtual ::sal_Bool SAL_CALL createDataSourcePossible(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aArguments) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL createDataSource(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL detectArguments(const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > & xDataSource) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(const ::rtl::OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(const ::rtl::OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); + virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(const OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(const OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection() throw (::com::sun::star::uno::RuntimeException); // ::com::sun::star::chart2::data::XRangeXMLConversion: - virtual ::rtl::OUString SAL_CALL convertRangeToXML(const ::rtl::OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); - virtual ::rtl::OUString SAL_CALL convertRangeFromXML(const ::rtl::OUString & aXMLRange) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); + virtual OUString SAL_CALL convertRangeToXML(const OUString & aRangeRepresentation) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); + virtual OUString SAL_CALL convertRangeFromXML(const OUString & aXMLRange) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); // ::com::sun::star::lang::XInitialization: virtual void SAL_CALL initialize(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > & aArguments) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::uno::Exception); // ::com::sun::star::beans::XPropertySet: virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setPropertyValue(const ::rtl::OUString & aPropertyName, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const ::rtl::OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL setPropertyValue(const OUString & aPropertyName, const ::com::sun::star::uno::Any & aValue) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException); + virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(const OUString & PropertyName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL addPropertyChangeListener(const OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & xListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL removePropertyChangeListener(const OUString & aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL addVetoableChangeListener(const OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); + virtual void SAL_CALL removeVetoableChangeListener(const OUString & PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException); // ::com::sun::star::chart2::data::XDatabaseDataProvider: - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getMasterFields() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setMasterFields(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getDetailFields() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDetailFields(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCommand(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getMasterFields() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMasterFields(const ::com::sun::star::uno::Sequence< OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getDetailFields() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDetailFields(const ::com::sun::star::uno::Sequence< OUString > & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getCommand() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCommand(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getCommandType() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setCommandType(::sal_Int32 the_value) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilter(const ::rtl::OUString & the_value) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFilter() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilter(const OUString & the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getApplyFilter() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setApplyFilter( ::sal_Bool _applyfilter ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getHavingClause() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHavingClause( const ::rtl::OUString& _havingclause ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getGroupBy() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroupBy( const ::rtl::OUString& _groupby ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOrder() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOrder( const ::rtl::OUString& _order ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHavingClause() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHavingClause( const OUString& _havingclause ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getGroupBy() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroupBy( const OUString& _groupby ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getOrder() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setOrder( const OUString& _order ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL getEscapeProcessing() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setEscapeProcessing(::sal_Bool the_value) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Int32 SAL_CALL getRowLimit() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setRowLimit( ::sal_Int32 _rowlimit ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getActiveConnection() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setActiveConnection(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > & the_value) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException); - virtual ::rtl::OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setDataSourceName( const ::rtl::OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getDataSourceName() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setDataSourceName( const OUString& _datasourcename ) throw (::com::sun::star::uno::RuntimeException); // com::sun::star::sdbc::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); @@ -137,7 +137,7 @@ private: 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); @@ -182,18 +182,18 @@ private: virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); // ____ XComplexDescriptionAccess ____ - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setComplexRowDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setComplexColumnDescriptions( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setData( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions ) throw (::com::sun::star::uno::RuntimeException); // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::chart::XChartDataChangeEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException); @@ -214,11 +214,11 @@ private: void impl_fillRowSet_throw(); void impl_executeRowSet_throw(::osl::ResettableMutexGuard& _rClearForNotifies); bool impl_fillParameters_nothrow( ::osl::ResettableMutexGuard& _rClearForNotifies); - void impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const ::com::sun::star::uno::Sequence< ::rtl::OUString >& i_aColumnNames); + void impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const ::com::sun::star::uno::Sequence< OUString >& i_aColumnNames); void impl_invalidateParameter_nothrow(); - ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const; + ::com::sun::star::uno::Any impl_getNumberFormatKey_nothrow(const OUString & _sRangeRepresentation) const; - template <typename T> void set( const ::rtl::OUString& _sProperty + template <typename T> void set( const OUString& _sProperty ,const T& _Value ,T& _member) { @@ -236,7 +236,7 @@ private: ::dbtools::ParameterManager m_aParameterManager; ::dbtools::FilterManager m_aFilterManager; - ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any> m_aNumberFormats; + ::std::map< OUString, ::com::sun::star::uno::Any> m_aNumberFormats; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xActiveConnection; @@ -249,17 +249,17 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation> m_xAggregate; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xAggregateSet; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xParent; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_MasterFields; - ::com::sun::star::uno::Sequence< ::rtl::OUString > m_DetailFields; + ::com::sun::star::uno::Sequence< OUString > m_MasterFields; + ::com::sun::star::uno::Sequence< OUString > m_DetailFields; - ::rtl::OUString m_Command; - ::rtl::OUString m_DataSourceName; + OUString m_Command; + OUString m_DataSourceName; ::sal_Int32 m_CommandType; sal_Int32 m_RowLimit; - ::rtl::OUString m_Filter; - ::rtl::OUString m_HavingClause; - ::rtl::OUString m_Order; - ::rtl::OUString m_GroupBy; + OUString m_Filter; + OUString m_HavingClause; + OUString m_Order; + OUString m_GroupBy; ::sal_Bool m_EscapeProcessing; ::sal_Bool m_ApplyFilter; }; diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx index 049bdbc15103..a166cf977338 100644 --- a/dbaccess/source/core/inc/FilteredContainer.hxx +++ b/dbaccess/source/core/inc/FilteredContainer.hxx @@ -51,7 +51,7 @@ namespace dbaccess /** returns a string denoting the only type of tables allowed in this container, or an empty string if there is no such restriction */ - virtual ::rtl::OUString getTableTypeRestriction() const = 0; + virtual OUString getTableTypeRestriction() const = 0; inline virtual void addMasterContainerListener(){} inline virtual void removeMasterContainerListener(){} @@ -59,7 +59,7 @@ namespace dbaccess // ::connectivity::sdbcx::OCollection virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString getNameForObject(const ::connectivity::sdbcx::ObjectType& _xObject); + virtual OUString getNameForObject(const ::connectivity::sdbcx::ObjectType& _xObject); /** tell the container to free all elements and all additional resources.<BR> After using this method the object may be reconstructed by calling one of the <code>constrcuct</code> methods. @@ -87,7 +87,7 @@ namespace dbaccess /** retrieve a table type filter to pass to <member scope="com::sun::star::sdbc">XDatabaseMetaData::getTables</member>, according to the current data source settings */ - void getAllTableTypeFilter( ::com::sun::star::uno::Sequence< ::rtl::OUString >& /* [out] */ _rFilter ) const; + void getAllTableTypeFilter( ::com::sun::star::uno::Sequence< OUString >& /* [out] */ _rFilter ) const; public: /** ctor of the container. The parent has to support the <type scope="com::sun::star::sdbc">XConnection</type> @@ -114,8 +114,8 @@ namespace dbaccess filters given (the connection is the parent object you passed in the ctor). */ void construct( - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableTypeFilter + const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter, + const ::com::sun::star::uno::Sequence< OUString >& _rTableTypeFilter ); /** late ctor. The container will fill itself with wrapper objects for the tables returned by the given @@ -123,8 +123,8 @@ namespace dbaccess */ void construct( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxMasterContainer, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableFilter, - const ::com::sun::star::uno::Sequence< ::rtl::OUString >& _rTableTypeFilter + const ::com::sun::star::uno::Sequence< OUString >& _rTableFilter, + const ::com::sun::star::uno::Sequence< OUString >& _rTableTypeFilter ); inline sal_Bool isInitialized() const { return m_bConstructed; } diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index a8edf951da03..df40f3383931 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -43,7 +43,7 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xDest; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > m_xDestInfo; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xDestContainer; - ::rtl::OUString m_sName; + OUString m_sName; sal_Bool m_bInInsert; protected: @@ -52,8 +52,8 @@ namespace dbaccess public: OPropertyForward( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xSource, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>& _xDestContainer, - const ::rtl::OUString& _sName, - const ::std::vector< ::rtl::OUString >& _aPropertyList + const OUString& _sName, + const ::std::vector< OUString >& _aPropertyList ); // ::com::sun::star::beans::XPropertyChangeListener @@ -62,7 +62,7 @@ namespace dbaccess // ::com::sun::star::lang::XEventListener virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& _rSource ) throw (::com::sun::star::uno::RuntimeException); - inline void setName( const ::rtl::OUString& _sName ) { m_sName = _sName; } + inline void setName( const OUString& _sName ) { m_sName = _sName; } void setDefinition( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _xDest); inline ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getDefinition() const { return m_xDest; } }; diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx index b68cbc802854..314c05b18c2a 100644 --- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx +++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx @@ -83,7 +83,7 @@ namespace dbaccess ::std::vector<OPrivateColumns*> m_aColumnsCollection; // used for columns and parameters of old queries ::std::vector<OPrivateTables*> m_aTablesCollection; - ::std::vector< ::rtl::OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement + ::std::vector< OUString > m_aElementaryParts; // the filter/groupby/having/order of the elementary statement ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> m_xConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> m_xMetaData; @@ -97,15 +97,15 @@ namespace dbaccess ::std::vector<OPrivateColumns*> m_aCurrentColumns; OPrivateTables* m_pTables; // currently used tables - ::rtl::OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having - ::rtl::OUString m_sDecimalSep; - ::rtl::OUString m_sCommand; + OUString m_aPureSelectSQL; // the pure select statement, without filter/order/groupby/having + OUString m_sDecimalSep; + OUString m_sCommand; ::com::sun::star::lang::Locale m_aLocale; sal_Int32 m_nBoolCompareMode; // how to compare bool values sal_Int32 m_nCommandType; // <properties> - ::rtl::OUString m_sOrignal; + OUString m_sOrignal; // </properties> @@ -116,8 +116,8 @@ namespace dbaccess sal_Bool setComparsionPredicate(::connectivity::OSQLParseNode* pCondition, ::connectivity::OSQLParseTreeIterator& _rIterator, ::std::vector < ::com::sun::star::beans::PropertyValue > & rFilters, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const; - ::rtl::OUString getColumnName(::connectivity::OSQLParseNode* pColumnRef,::connectivity::OSQLParseTreeIterator& _rIterator) const; - ::rtl::OUString getTableAlias(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) const; + OUString getColumnName(::connectivity::OSQLParseNode* pColumnRef,::connectivity::OSQLParseTreeIterator& _rIterator) const; + OUString getTableAlias(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) const; sal_Int32 getPredicateType(::connectivity::OSQLParseNode * _pPredicate) const; // clears all Columns,Parameters and tables and insert it to their vectors void clearCurrentCollections(); @@ -128,12 +128,12 @@ namespace dbaccess @param _rIterator the iterator to use. */ - ::rtl::OUString getStatementPart( TGetParseNode& _aGetFunctor, ::connectivity::OSQLParseTreeIterator& _rIterator ); - void setQuery_Impl( const ::rtl::OUString& command ); + OUString getStatementPart( TGetParseNode& _aGetFunctor, ::connectivity::OSQLParseTreeIterator& _rIterator ); + void setQuery_Impl( const OUString& command ); void setConditionByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column , sal_Bool andCriteria - ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,::rtl::OUString>& _aSetFunctor + ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,OUString>& _aSetFunctor ,sal_Int32 filterOperator); /** getStructuredCondition returns the structured condition for the where or having clause @@ -150,8 +150,8 @@ namespace dbaccess setCurrentColumns( EColumnType _eType, const ::rtl::Reference< ::connectivity::OSQLColumns >& _rCols ); //helper methods for mem_fun_t - inline bool implSetFilter(::rtl::OUString _sFilter) { setFilter(_sFilter); return true;} - inline bool implSetHavingClause(::rtl::OUString _sFilter) { setHavingClause(_sFilter); return true;} + inline bool implSetFilter(OUString _sFilter) { setFilter(_sFilter); return true;} + inline bool implSetHavingClause(OUString _sFilter) { setHavingClause(_sFilter); return true;} /** returns the part of the seelect statement @param _ePart @@ -164,23 +164,23 @@ namespace dbaccess @return The part of the select statement. */ - ::rtl::OUString getSQLPart( SQLPart _ePart, ::connectivity::OSQLParseTreeIterator& _rIterator, sal_Bool _bWithKeyword ); + OUString getSQLPart( SQLPart _ePart, ::connectivity::OSQLParseTreeIterator& _rIterator, sal_Bool _bWithKeyword ); /** retrieves the keyword for the given SQLPart */ - ::rtl::OUString getKeyword( SQLPart _ePart ) const; + OUString getKeyword( SQLPart _ePart ) const; /** sets a single "additive" clause, means a filter/groupby/having/order clause */ - void setSingleAdditiveClause( SQLPart _ePart, const ::rtl::OUString& _rClause ); + void setSingleAdditiveClause( SQLPart _ePart, const OUString& _rClause ); /** composes a statement from m_aPureSelectSQL and the 4 usual clauses */ - ::rtl::OUString composeStatementFromParts( const ::std::vector< ::rtl::OUString >& _rParts ); + OUString composeStatementFromParts( const ::std::vector< OUString >& _rParts ); /** return the name of the column. */ - ::rtl::OUString impl_getColumnName_throw(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column); + OUString impl_getColumnName_throw(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column); protected: virtual ~OSingleSelectQueryComposer(); @@ -206,32 +206,32 @@ namespace dbaccess DECLARE_PROPERTYCONTAINER_DEFAULTS(); // ::com::sun::star::sdb::XSingleSelectQueryComposer - virtual ::rtl::OUString SAL_CALL getElementaryQuery() throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setElementaryQuery( const ::rtl::OUString& _rElementary ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilter( const ::rtl::OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getElementaryQuery() throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setElementaryQuery( const OUString& _rElementary ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilter( const OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setStructuredFilter( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendFilterByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendGroupByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setGroup( const ::rtl::OUString& group ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setHavingClause( const ::rtl::OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setGroup( const OUString& group ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setHavingClause( const OUString& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setStructuredHavingClause( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& filter ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendHavingClauseByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendOrderByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool ascending ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOrder( const ::rtl::OUString& order ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setOrder( const OUString& order ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XSingleSelectQueryAnalyzer - virtual ::rtl::OUString SAL_CALL getQuery( ) throw (::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setQuery( const ::rtl::OUString& command ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCommand( const ::rtl::OUString& command,sal_Int32 CommandType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFilter( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getQuery( ) throw (::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setQuery( const OUString& command ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setCommand( const OUString& command,sal_Int32 CommandType ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFilter( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getStructuredFilter( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getGroup( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getGroup( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getGroupColumns( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getHavingClause( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getHavingClause( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getStructuredHavingClause( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOrder( ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getOrder( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getOrderColumns( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getQueryWithSubstitution( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getQueryWithSubstitution( ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XColumnsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getColumns( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index e6b180c33c94..4e6b6b042e70 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -80,10 +80,10 @@ namespace dbaccess ::connectivity::sdbcx::OCollection* m_pTables; // 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); virtual void refreshColumns(); @@ -142,15 +142,15 @@ namespace dbaccess // XPropertySet virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XRename, - virtual void SAL_CALL rename( const ::rtl::OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XAlterTable, - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL alterColumnByIndex( sal_Int32 _nIndex, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // XNamed - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& aName ) 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); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx index c4a45a04b423..69d4f45975ce 100644 --- a/dbaccess/source/core/inc/View.hxx +++ b/dbaccess/source/core/inc/View.hxx @@ -43,9 +43,9 @@ namespace dbaccess View( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, sal_Bool _bCaseSensitive, - const ::rtl::OUString& _rCatalogName, - const ::rtl::OUString& _rSchemaName, - const ::rtl::OUString& _rName + const OUString& _rCatalogName, + const OUString& _rSchemaName, + const OUString& _rName ); // UNO @@ -53,7 +53,7 @@ namespace dbaccess DECLARE_XTYPEPROVIDER() // XAlterView - virtual void SAL_CALL alterCommand( const ::rtl::OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterCommand( const OUString& NewCommand ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: virtual ~View(); diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx index c01a58fa4f45..1e4ef26b63df 100644 --- a/dbaccess/source/core/inc/callablestatement.hxx +++ b/dbaccess/source/core/inc/callablestatement.hxx @@ -47,16 +47,16 @@ 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 ::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); // ::com::sun::star::sdbc::XOutParameters - virtual void SAL_CALL registerOutParameter( 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 registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(::com::sun::star::sdbc::SQLException, ::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/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index 1619c0429672..fb048127269f 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -74,7 +74,7 @@ namespace dbaccess protected: // <properties> - ::rtl::OUString m_sName; + OUString m_sName; // </properties> protected: @@ -99,21 +99,21 @@ namespace dbaccess virtual void SAL_CALL disposing(void); // ::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); // XNamed - virtual ::rtl::OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setName( const ::rtl::OUString& _rName ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getName( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setName( const OUString& _rName ) throw(::com::sun::star::uno::RuntimeException); virtual void fireValueChange( const ::connectivity::ORowSetValue& _rOldValue ); protected: // IPropertyContainer - virtual void registerProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType ); - virtual void registerMayBeVoidProperty( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType ); - virtual void registerPropertyNoMember( const ::rtl::OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue ); + virtual void registerProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, const ::com::sun::star::uno::Type& _rMemberType ); + virtual void registerMayBeVoidProperty( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, const ::com::sun::star::uno::Type& _rExpectedType ); + virtual void registerPropertyNoMember( const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, const void* _pInitialValue ); }; //============================================================ @@ -125,7 +125,7 @@ namespace dbaccess /** creates a OColumn object which should represent the column with a given name */ virtual OColumn* - createColumn( const ::rtl::OUString& _rName ) const = 0; + createColumn( const OUString& _rName ) const = 0; /** creates a column descriptor object. @@ -140,7 +140,7 @@ namespace dbaccess /** notifies that a column with a given name has been dropped */ - virtual void columnDropped( const ::rtl::OUString& _sName ) = 0; + virtual void columnDropped( const OUString& _sName ) = 0; protected: ~IColumnFactory() {} @@ -151,7 +151,7 @@ namespace dbaccess //= general columns map, could be used for readonly access //= no appending and dropping is supported //============================================================ - typedef ::boost::unordered_map<rtl::OUString, OColumn*, ::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap; + typedef ::boost::unordered_map<OUString, OColumn*, ::comphelper::UStringMixHash, ::comphelper::UStringMixEqual> OColumnMap; typedef ::std::vector<OColumn*> OColumnArray; class OContainerMediator; @@ -175,13 +175,13 @@ namespace dbaccess sal_Bool m_bDropColumn : 1; virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); - 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: - connectivity::sdbcx::ObjectType createBaseObject(const ::rtl::OUString& _rName) + connectivity::sdbcx::ObjectType createBaseObject(const OUString& _rName) { return OColumns_BASE::createObject(_rName); } @@ -203,7 +203,7 @@ namespace dbaccess ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, sal_Bool _bCaseSensitive, - const ::std::vector< ::rtl::OUString>& _rVector, + const ::std::vector< OUString>& _rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn = sal_False, @@ -215,7 +215,7 @@ namespace dbaccess ::osl::Mutex& _rMutex, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxDrvColumns, sal_Bool _bCaseSensitive, - const ::std::vector< ::rtl::OUString> &_rVector, + const ::std::vector< OUString> &_rVector, IColumnFactory* _pColFactory, ::connectivity::sdbcx::IRefreshableColumns* _pRefresh, sal_Bool _bAddColumn = sal_False, @@ -231,15 +231,15 @@ namespace dbaccess virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) 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::container::XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException); - void append(const ::rtl::OUString& rName, OColumn*); + void append(const OUString& rName, OColumn*); void clearColumns(); // only the name is identical to ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx index fada42c84a34..7f37e12b4e11 100644 --- a/dbaccess/source/core/inc/columnsettings.hxx +++ b/dbaccess/source/core/inc/columnsettings.hxx @@ -30,7 +30,7 @@ namespace dbaccess { public: virtual void registerProperty( - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, void* _pPointerToMember, @@ -38,7 +38,7 @@ namespace dbaccess ) = 0; virtual void registerMayBeVoidProperty( - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, ::com::sun::star::uno::Any* _pPointerToMember, @@ -46,7 +46,7 @@ namespace dbaccess ) = 0; virtual void registerPropertyNoMember( - const ::rtl::OUString& _rName, + const OUString& _rName, sal_Int32 _nHandle, sal_Int32 _nAttributes, const ::com::sun::star::uno::Type& _rType, diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx index 165148e49485..a1c2a9240a9c 100644 --- a/dbaccess/source/core/inc/commandbase.hxx +++ b/dbaccess/source/core/inc/commandbase.hxx @@ -36,11 +36,11 @@ public: // need public access // <properties> ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> m_aLayoutInformation; - ::rtl::OUString m_sCommand; + OUString m_sCommand; sal_Bool m_bEscapeProcessing; // no BitField ! so it can be used with a OPropertyStateContainer - ::rtl::OUString m_sUpdateTableName; - ::rtl::OUString m_sUpdateSchemaName; - ::rtl::OUString m_sUpdateCatalogName; + OUString m_sUpdateTableName; + OUString m_sUpdateSchemaName; + OUString m_sUpdateCatalogName; // </properties> protected: diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx index 5549a7049152..1cd475b4833b 100644 --- a/dbaccess/source/core/inc/composertools.hxx +++ b/dbaccess/source/core/inc/composertools.hxx @@ -31,7 +31,7 @@ namespace dbaccess //==================================================================== //= TokenComposer //==================================================================== - struct TokenComposer : public ::std::unary_function< ::rtl::OUString, void > + struct TokenComposer : public ::std::unary_function< OUString, void > { private: #ifdef DBG_UTIL @@ -39,10 +39,10 @@ namespace dbaccess #endif protected: - ::rtl::OUStringBuffer m_aBuffer; + OUStringBuffer m_aBuffer; public: - ::rtl::OUString getComposedAndClear() + OUString getComposedAndClear() { #ifdef DBG_UTIL m_bUsed = true; @@ -70,12 +70,12 @@ namespace dbaccess { } - void operator() (const ::rtl::OUString& lhs) + void operator() (const OUString& lhs) { append(lhs); } - void append( const ::rtl::OUString& lhs ) + void append( const OUString& lhs ) { #ifdef DBG_UTIL OSL_ENSURE( !m_bUsed, "FilterCreator::append: already used up!" ); @@ -90,7 +90,7 @@ namespace dbaccess } /// append the given part. Only to be called when both the part and our buffer so far are not empty - virtual void appendNonEmptyToNonEmpty( const ::rtl::OUString& lhs ) = 0; + virtual void appendNonEmptyToNonEmpty( const OUString& lhs ) = 0; }; //==================================================================== @@ -98,7 +98,7 @@ namespace dbaccess //==================================================================== struct FilterCreator : public TokenComposer { - virtual void appendNonEmptyToNonEmpty( const ::rtl::OUString& lhs ) + virtual void appendNonEmptyToNonEmpty( const OUString& lhs ) { m_aBuffer.insert( 0, (sal_Unicode)' ' ); m_aBuffer.insert( 0, (sal_Unicode)'(' ); @@ -113,7 +113,7 @@ namespace dbaccess //==================================================================== struct OrderCreator : public TokenComposer { - virtual void appendNonEmptyToNonEmpty( const ::rtl::OUString& lhs ) + virtual void appendNonEmptyToNonEmpty( const OUString& lhs ) { m_aBuffer.appendAscii( ", " ); m_aBuffer.append( lhs ); diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx index d3a00c956c8e..0be528513450 100644 --- a/dbaccess/source/core/inc/containerapprove.hxx +++ b/dbaccess/source/core/inc/containerapprove.hxx @@ -53,7 +53,7 @@ namespace dbaccess into the container */ virtual void SAL_CALL approveElement( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ) = 0; }; diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index 1061d79316c4..bf161ebf560d 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -40,10 +40,10 @@ class ODataSettings_Base { public: // <properties> - ::rtl::OUString m_sFilter; - ::rtl::OUString m_sHavingClause; - ::rtl::OUString m_sGroupBy; - ::rtl::OUString m_sOrder; + OUString m_sFilter; + OUString m_sHavingClause; + OUString m_sGroupBy; + OUString m_sOrder; sal_Bool m_bApplyFilter; // no BitField ! the base class needs a pointer to this member ! ::com::sun::star::awt::FontDescriptor m_aFont; ::com::sun::star::uno::Any m_aRowHeight; diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index 44d198cd431c..fef0d2c79f67 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -52,10 +52,10 @@ namespace dbaccess protected: // <properties> - rtl::OUString m_aTypeName; - rtl::OUString m_aDescription; - rtl::OUString m_aDefaultValue; - rtl::OUString m_aAutoIncrementValue; + OUString m_aTypeName; + OUString m_aDescription; + OUString m_aDefaultValue; + OUString m_aAutoIncrementValue; sal_Int32 m_nType; sal_Int32 m_nPrecision; sal_Int32 m_nScale; @@ -86,8 +86,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); // ::com::sun::star::container::XChild virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent( ) throw (::com::sun::star::uno::RuntimeException); @@ -118,13 +118,13 @@ namespace dbaccess virtual ~OTableColumn(); public: - OTableColumn(const ::rtl::OUString& _rName); + OTableColumn(const OUString& _rName); // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -142,11 +142,11 @@ namespace dbaccess ,public OQueryColumn_PBase { // <properties> - ::rtl::OUString m_sCatalogName; - ::rtl::OUString m_sSchemaName; - ::rtl::OUString m_sTableName; - ::rtl::OUString m_sRealName; - ::rtl::OUString m_sLabel; + OUString m_sCatalogName; + OUString m_sSchemaName; + OUString m_sTableName; + OUString m_sRealName; + OUString m_sLabel; // </properties> ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xOriginalTableColumn; @@ -158,14 +158,14 @@ namespace dbaccess OQueryColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxParserColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, - const ::rtl::OUString &i_sLabel + const OUString &i_sLabel ); // XTypeProvider virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (::com::sun::star::uno::RuntimeException); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); // *Property* virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); @@ -221,7 +221,7 @@ namespace dbaccess virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); protected: - ::rtl::OUString impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const; + OUString impl_getPropertyNameFromHandle( const sal_Int32 _nHandle ) const; protected: using OColumn::getFastPropertyValue; @@ -248,8 +248,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); // OIdPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const; @@ -298,8 +298,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); // OIdPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index e1ab72f9d960..6a6b3bbb416d 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -46,7 +46,7 @@ namespace dbaccess class ODefinitionContainer_Impl : public OContentHelper_Impl { public: - typedef ::std::map< ::rtl::OUString, TContentPtr > NamedDefinitions; + typedef ::std::map< OUString, TContentPtr > NamedDefinitions; typedef NamedDefinitions::iterator iterator; typedef NamedDefinitions::const_iterator const_iterator; @@ -59,13 +59,13 @@ public: inline const_iterator begin() const { return m_aDefinitions.begin(); } inline const_iterator end() const { return m_aDefinitions.end(); } - inline const_iterator find( const ::rtl::OUString& _rName ) const { return m_aDefinitions.find( _rName ); } + inline const_iterator find( const OUString& _rName ) const { return m_aDefinitions.find( _rName ); } const_iterator find( TContentPtr _pDefinition ) const; - inline void erase( const ::rtl::OUString& _rName ) { m_aDefinitions.erase( _rName ); } + inline void erase( const OUString& _rName ) { m_aDefinitions.erase( _rName ); } void erase( TContentPtr _pDefinition ); - inline void insert( const ::rtl::OUString& _rName, TContentPtr _pDefinition ) + inline void insert( const OUString& _rName, TContentPtr _pDefinition ) { m_aDefinitions.insert( NamedDefinitions::value_type( _rName, _pDefinition ) ); } @@ -165,8 +165,8 @@ public: DECLARE_TYPEPROVIDER( ); // ::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); // ::com::sun::star::container::XElementAccess virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException); @@ -180,16 +180,16 @@ public: virtual ::com::sun::star::uno::Any SAL_CALL getByIndex( sal_Int32 _nIndex ) throw(::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameContainer - virtual void SAL_CALL insertByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL removeByName( const ::rtl::OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL insertByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL removeByName( const OUString& _rName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameReplace - virtual void SAL_CALL replaceByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL replaceByName( const OUString& _rName, const ::com::sun::star::uno::Any& aElement ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XContainer virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw(::com::sun::star::uno::RuntimeException); @@ -216,7 +216,7 @@ protected: @return the newly created object or an empty reference if somthing went wrong */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( - const ::rtl::OUString& _rName) = 0; + const OUString& _rName) = 0; /** get the object specified by the given name. If desired, the object will be read if not already done so.<BR> @param _rName the object name @@ -227,14 +227,14 @@ protected: @see createObject */ virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > - implGetByName(const ::rtl::OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); + implGetByName(const OUString& _rName, sal_Bool _bCreateIfNecessary) throw (::com::sun::star::container::NoSuchElementException); /** quickly checks if there already is an element with a given name. No access to the configuration occures, i.e. if there is such an object which is not already loaded, it won't be loaded now. @param _rName the object name to check @return sal_True if there already exists such an object */ - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual sal_Bool checkExistence(const OUString& _rName); /** append a new object to the container. No plausibility checks are done, e.g. if the object is non-NULL or if the name is already used by another object or anything like this. This method is for derived classes @@ -248,7 +248,7 @@ protected: @see implRemove */ void implAppend( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject ); @@ -260,7 +260,7 @@ protected: @see implReplace @see implAppend */ - void implRemove(const ::rtl::OUString& _rName); + void implRemove(const OUString& _rName); /** remove a object in the container. No plausibility checks are done, e.g. whether or not there exists an object with the given name or the object is non-NULL. This is the responsibility of the caller.<BR> @@ -274,7 +274,7 @@ protected: @see implRemove */ void implReplace( - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxNewObject ); @@ -282,7 +282,7 @@ protected: */ void notifyByName( ::osl::ResettableMutexGuard& _rGuard, - const ::rtl::OUString& _rName, + const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _xNewElement, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& xOldElement, ContainerOperation _eOperation, @@ -310,7 +310,7 @@ private: if another error occures which prevents insertion of the object into the container */ void approveNewObject( - const ::rtl::OUString& _sName, + const OUString& _sName, const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxObject ) const; diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx index 68eff1be4637..8a2a077f1867 100644 --- a/dbaccess/source/core/inc/objectnameapproval.hxx +++ b/dbaccess/source/core/inc/objectnameapproval.hxx @@ -68,7 +68,7 @@ namespace dbaccess virtual ~ObjectNameApproval(); // IContainerApprove - virtual void SAL_CALL approveElement( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ); + virtual void SAL_CALL approveElement( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxElement ); }; diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx index 300153ce717e..06d8ac0f0a38 100644 --- a/dbaccess/source/core/inc/preparedstatement.hxx +++ b/dbaccess/source/core/inc/preparedstatement.hxx @@ -58,9 +58,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); // OComponentHelper virtual void SAL_CALL disposing(void); @@ -79,7 +79,7 @@ namespace dbaccess // ::com::sun::star::sdbc::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); @@ -87,7 +87,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); diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index 0cc4eea8ac75..2ba79a9ee57b 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -47,10 +47,10 @@ namespace dbaccess public OSubComponent, public OQueryComposer_BASE { - ::std::vector< ::rtl::OUString> m_aFilters; - ::std::vector< ::rtl::OUString> m_aOrders; - ::rtl::OUString m_sOrgFilter; - ::rtl::OUString m_sOrgOrder; + ::std::vector< OUString> m_aFilters; + ::std::vector< OUString> m_aOrders; + OUString m_sOrgFilter; + OUString m_sOrgOrder; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xComposer; ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer> m_xComposerHelper; @@ -72,20 +72,20 @@ namespace dbaccess virtual void SAL_CALL acquire() throw(); virtual void SAL_CALL release() throw(); // 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); // XSQLQueryComposer - virtual ::rtl::OUString SAL_CALL getQuery( ) throw(::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setQuery( const ::rtl::OUString& command ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getComposedQuery( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getFilter( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getQuery( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setQuery( const OUString& command ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getComposedQuery( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getFilter( ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > SAL_CALL getStructuredFilter( ) throw(::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getOrder( ) throw(::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getOrder( ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendFilterByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL appendOrderByColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& column, sal_Bool ascending ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setFilter( const ::rtl::OUString& filter ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setOrder( const ::rtl::OUString& order ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFilter( const OUString& filter ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setOrder( const OUString& order ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XTablesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException); // XColumnsSupplier diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index dbd1a735287a..ff89cb4c3688 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -91,8 +91,8 @@ namespace dbaccess }; // ODefinitionContainer - virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const ::rtl::OUString& _rName); - virtual sal_Bool checkExistence(const ::rtl::OUString& _rName); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > createObject( const OUString& _rName); + virtual sal_Bool checkExistence(const OUString& _rName); // helper virtual void SAL_CALL disposing(); @@ -140,7 +140,7 @@ namespace dbaccess virtual void SAL_CALL appendByDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XDrop - virtual void SAL_CALL dropByName( const ::rtl::OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL dropByName( const OUString& elementName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL dropByIndex( sal_Int32 index ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XElementAccess @@ -148,11 +148,11 @@ namespace dbaccess // ::com::sun::star::container::XIndexAccess virtual sal_Int32 SAL_CALL getCount( ) throw(::com::sun::star::uno::RuntimeException); // ::com::sun::star::container::XNameAccess - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw(::com::sun::star::uno::RuntimeException); protected: // OContentHelper overridables - virtual ::rtl::OUString determineContentType() const; + virtual OUString determineContentType() const; private: // helper @@ -160,7 +160,7 @@ namespace dbaccess container will be asked for the given name.<BR> The returned object is acquired once. */ - ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const ::rtl::OUString& _rName); + ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const OUString& _rName); /// create a query object wrapping a CommandDefinition. The returned object is acquired once. ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent > implCreateWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent >& _rxCommandDesc); diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx index 94b258976a78..2bbd99d823bc 100644 --- a/dbaccess/source/core/inc/sdbcoretools.hxx +++ b/dbaccess/source/core/inc/sdbcoretools.hxx @@ -38,7 +38,7 @@ namespace dbaccess /** retrieves a to-be-displayed string for a given caught exception; */ - ::rtl::OUString extractExceptionMessage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, const ::com::sun::star::uno::Any& _rError ); + OUString extractExceptionMessage( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rContext, const ::com::sun::star::uno::Any& _rError ); namespace tools { diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx index 8f5d489bab05..936ab36de93c 100644 --- a/dbaccess/source/core/inc/statement.hxx +++ b/dbaccess/source/core/inc/statement.hxx @@ -152,21 +152,21 @@ public: DECLARE_XTYPEPROVIDER() // ::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::sdbc::XStatement - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL executeUpdate( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL execute( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL getConnection( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // OComponentHelper virtual void SAL_CALL disposing(); // XBatchExecution - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL addBatch( const OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -176,7 +176,7 @@ private: /** does escape processing for the given SQL command, if the our EscapeProcessing property allows so. */ - ::rtl::OUString impl_doEscapeProcessing_nothrow( const ::rtl::OUString& _rSQL ) const; + OUString impl_doEscapeProcessing_nothrow( const OUString& _rSQL ) const; bool impl_ensureComposer_nothrow() const; }; diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 51d1d19b7f4c..ff3e179d0114 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -70,10 +70,10 @@ namespace dbaccess virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); // 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); /** creates the column collection for the table @param _rNames @@ -107,11 +107,11 @@ namespace dbaccess */ ODBTable(connectivity::sdbcx::OCollection* _pTables ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::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 ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxColumnDefinitions) throw(::com::sun::star::sdbc::SQLException); @@ -137,10 +137,10 @@ namespace dbaccess virtual void SAL_CALL getFastPropertyValue(::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; // ::com::sun::star::sdbcx::XRename, - virtual void SAL_CALL rename( const ::rtl::OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL rename( const OUString& _rNewName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException); // ::com::sun::star::sdbcx::XAlterTable, - virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL alterColumnByName( const OUString& _rName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDescriptor ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::NoSuchElementException, ::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/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index 30152ddea9ae..f11dda2612ff 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -57,13 +57,13 @@ namespace dbaccess // OFilteredContainer virtual void addMasterContainerListener(); virtual void removeMasterContainerListener(); - virtual ::rtl::OUString getTableTypeRestriction() const; + virtual OUString getTableTypeRestriction() const; // ::connectivity::sdbcx::OCollection - 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); virtual void SAL_CALL disposing(); diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx index 78c7bd137618..0f2a7a9bc5c0 100644 --- a/dbaccess/source/core/inc/veto.hxx +++ b/dbaccess/source/core/inc/veto.hxx @@ -37,13 +37,13 @@ namespace dbaccess class Veto : public Veto_Base { private: - const ::rtl::OUString m_sReason; + const OUString m_sReason; const ::com::sun::star::uno::Any m_aDetails; public: - Veto( const ::rtl::OUString& _rReason, const ::com::sun::star::uno::Any& _rDetails ); + Veto( const OUString& _rReason, const ::com::sun::star::uno::Any& _rDetails ); - virtual ::rtl::OUString SAL_CALL getReason() throw (::com::sun::star::uno::RuntimeException); + virtual OUString SAL_CALL getReason() throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL getDetails() throw (::com::sun::star::uno::RuntimeException); protected: diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index 4d53b542faa6..f91991416c09 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -74,7 +74,7 @@ namespace dbaccess protected: // OFilteredContainer overridables - virtual ::rtl::OUString getTableTypeRestriction() const; + virtual OUString getTableTypeRestriction() const; private: inline virtual void SAL_CALL acquire() throw(){ OFilteredContainer::acquire();} @@ -90,10 +90,10 @@ namespace dbaccess virtual void SAL_CALL elementReplaced( const ::com::sun::star::container::ContainerEvent& Event ) throw (::com::sun::star::uno::RuntimeException); // ::connectivity::sdbcx::OCollection - 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); using OFilteredContainer::disposing; diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index de4dfa5bc710..d707a618b157 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -110,7 +110,7 @@ void SAL_CALL OContainerMediator::elementInserted( const ContainerEvent& _rEvent ::osl::MutexGuard aGuard(m_aMutex); if ( _rEvent.Source == m_xSettings && m_xSettings.is() ) { - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.Accessor >>= sElementName; PropertyForwardList::iterator aFind = m_aForwardList.find(sElementName); if ( aFind != m_aForwardList.end() ) @@ -127,7 +127,7 @@ void SAL_CALL OContainerMediator::elementRemoved( const ContainerEvent& _rEvent Reference< XContainer > xContainer = m_xContainer; if ( _rEvent.Source == xContainer && xContainer.is() ) { - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.Accessor >>= sElementName; m_aForwardList.erase(sElementName); try @@ -148,13 +148,13 @@ void SAL_CALL OContainerMediator::elementReplaced( const ContainerEvent& _rEvent Reference< XContainer > xContainer = m_xContainer; if ( _rEvent.Source == xContainer && xContainer.is() ) { - ::rtl::OUString sElementName; + OUString sElementName; _rEvent.ReplacedElement >>= sElementName; PropertyForwardList::iterator aFind = m_aForwardList.find(sElementName); if ( aFind != m_aForwardList.end() ) { - ::rtl::OUString sNewName; + OUString sNewName; _rEvent.Accessor >>= sNewName; try { @@ -184,7 +184,7 @@ void SAL_CALL OContainerMediator::disposing( const EventObject& /*Source*/ ) thr } // ----------------------------------------------------------------------------- -void OContainerMediator::impl_initSettings_nothrow( const ::rtl::OUString& _rName, const Reference< XPropertySet >& _rxDestination ) +void OContainerMediator::impl_initSettings_nothrow( const OUString& _rName, const Reference< XPropertySet >& _rxDestination ) { try { @@ -201,7 +201,7 @@ void OContainerMediator::impl_initSettings_nothrow( const ::rtl::OUString& _rNam } // ----------------------------------------------------------------------------- -void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, const Reference< XPropertySet >& _xDest ) +void OContainerMediator::notifyElementCreated( const OUString& _sName, const Reference< XPropertySet >& _xDest ) { if ( !m_xSettings.is() ) return; @@ -215,7 +215,7 @@ void OContainerMediator::notifyElementCreated( const ::rtl::OUString& _sName, co return; } - ::std::vector< ::rtl::OUString > aPropertyList; + ::std::vector< OUString > aPropertyList; try { // initially copy from the settings object (if existent) to the newly created object diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx index e84a79df6469..5931c30b2bd6 100644 --- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx +++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx @@ -57,7 +57,7 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContex TDatabaseDataProvider(m_aMutex), ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >( context, static_cast< Implements >( - IMPLEMENTS_PROPERTY_SET), uno::Sequence< ::rtl::OUString >()), + IMPLEMENTS_PROPERTY_SET), uno::Sequence< OUString >()), m_aParameterManager( m_aMutex, context ), m_aFilterManager( uno::Reference< lang::XMultiServiceFactory >(context->getServiceManager(),uno::UNO_QUERY) ), m_xContext(context), @@ -112,13 +112,13 @@ OUString DatabaseDataProvider::getImplementationName_Static( ) throw(uno::Runti } // XServiceInfo -::rtl::OUString SAL_CALL DatabaseDataProvider::getImplementationName( ) throw(uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getImplementationName( ) throw(uno::RuntimeException) { return getImplementationName_Static(); } // ----------------------------------------------------------------------------- // ------------------------------------------------------------------------- -sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const ::rtl::OUString& _rServiceName ) throw(uno::RuntimeException) +sal_Bool SAL_CALL DatabaseDataProvider::supportsService( const OUString& _rServiceName ) throw(uno::RuntimeException) { return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0; } @@ -131,7 +131,7 @@ uno::Sequence< OUString > DatabaseDataProvider::getSupportedServiceNames_Static( return aSNS; } // ----------------------------------------------------------------------------- -uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames( ) throw(uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getSupportedServiceNames( ) throw(uno::RuntimeException) { return getSupportedServiceNames_Static(); } @@ -200,8 +200,8 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat { uno::Reference< chart::XChartDataArray> xChartData( m_xInternal, uno::UNO_QUERY_THROW ); xChartData->setData( uno::Sequence< uno::Sequence< double > >() ); - xChartData->setColumnDescriptions( uno::Sequence< ::rtl::OUString >() ); - if ( m_xInternal->hasDataByRangeRepresentation( ::rtl::OUString::valueOf( sal_Int32(0) ) ) ) + xChartData->setColumnDescriptions( uno::Sequence< OUString >() ); + if ( m_xInternal->hasDataByRangeRepresentation( OUString::valueOf( sal_Int32(0) ) ) ) m_xInternal->deleteSequence(0); } catch( const uno::Exception& ) @@ -211,8 +211,8 @@ uno::Reference< chart2::data::XDataSource > SAL_CALL DatabaseDataProvider::creat ::comphelper::NamedValueCollection aArgs( _aArguments ); const sal_Bool bHasCategories = aArgs.getOrDefault( "HasCategories", sal_True ); - uno::Sequence< ::rtl::OUString > aColumnNames = - aArgs.getOrDefault( "ColumnDescriptions", uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString > aColumnNames = + aArgs.getOrDefault( "ColumnDescriptions", uno::Sequence< OUString >() ); bool bRet = false; if ( !m_Command.isEmpty() && m_xActiveConnection.is() ) @@ -280,20 +280,20 @@ uno::Sequence< beans::PropertyValue > SAL_CALL DatabaseDataProvider::detectArgum } // ----------------------------------------------------------------------------- -::sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const ::rtl::OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException) +::sal_Bool SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentationPossible(const OUString & /*aRangeRepresentation*/) throw (uno::RuntimeException) { return sal_True; } // ----------------------------------------------------------------------------- -uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const ::rtl::OUString & _sRangeRepresentation) const +uno::Any DatabaseDataProvider::impl_getNumberFormatKey_nothrow(const OUString & _sRangeRepresentation) const { - ::std::map< ::rtl::OUString,com::sun::star::uno::Any>::const_iterator aFind = m_aNumberFormats.find(_sRangeRepresentation); + ::std::map< OUString,com::sun::star::uno::Any>::const_iterator aFind = m_aNumberFormats.find(_sRangeRepresentation); if ( aFind != m_aNumberFormats.end() ) return aFind->second; return uno::makeAny(sal_Int32(0)); } // ----------------------------------------------------------------------------- -uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const ::rtl::OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) +uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::createDataSequenceByRangeRepresentation(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) { osl::MutexGuard g(m_aMutex); uno::Reference< chart2::data::XDataSequence > xData = m_xInternal->createDataSequenceByRangeRepresentation(_sRangeRepresentation); @@ -306,19 +306,19 @@ uno::Reference< chart2::data::XDataSequence > SAL_CALL DatabaseDataProvider::cre return xData; } -uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException) +uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getComplexRowDescriptions(); } -void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setComplexRowDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setComplexRowDescriptions(aRowDescriptions); } -uno::Sequence< uno::Sequence< rtl::OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) +uno::Sequence< uno::Sequence< OUString > > SAL_CALL DatabaseDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getComplexColumnDescriptions(); } -void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< rtl::OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setComplexColumnDescriptions( const uno::Sequence< uno::Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setComplexColumnDescriptions(aColumnDescriptions); } @@ -333,22 +333,22 @@ void SAL_CALL DatabaseDataProvider::setData( const uno::Sequence< uno::Sequence< m_xComplexDescriptionAccess->setData(rDataInRows); } -void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< rtl::OUString >& aRowDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setRowDescriptions( const uno::Sequence< OUString >& aRowDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setRowDescriptions(aRowDescriptions); } -void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< rtl::OUString >& aColumnDescriptions ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setColumnDescriptions( const uno::Sequence< OUString >& aColumnDescriptions ) throw (uno::RuntimeException) { m_xComplexDescriptionAccess->setColumnDescriptions(aColumnDescriptions); } -uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getRowDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getRowDescriptions(); } -uno::Sequence< rtl::OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getColumnDescriptions() throw (uno::RuntimeException) { return m_xComplexDescriptionAccess->getColumnDescriptions(); } @@ -387,14 +387,14 @@ uno::Reference< sheet::XRangeSelection > SAL_CALL DatabaseDataProvider::getRange } // ----------------------------------------------------------------------------- // chart2::data::XRangeXMLConversion: -::rtl::OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const ::rtl::OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) +OUString SAL_CALL DatabaseDataProvider::convertRangeToXML(const OUString & _sRangeRepresentation) throw (uno::RuntimeException, lang::IllegalArgumentException) { osl::MutexGuard g(m_aMutex); return m_xRangeConversion->convertRangeToXML(_sRangeRepresentation); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const ::rtl::OUString & _sXMLRange) throw (uno::RuntimeException, lang::IllegalArgumentException) +OUString SAL_CALL DatabaseDataProvider::convertRangeFromXML(const OUString & _sXMLRange) throw (uno::RuntimeException, lang::IllegalArgumentException) { osl::MutexGuard g(m_aMutex); return m_xRangeConversion->convertRangeFromXML(_sXMLRange); @@ -408,72 +408,72 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL DatabaseDataProvider::getProp } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setPropertyValue(const ::rtl::OUString & aPropertyName, const uno::Any & aValue) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::setPropertyValue(const OUString & aPropertyName, const uno::Any & aValue) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::setPropertyValue(aPropertyName, aValue); } // ----------------------------------------------------------------------------- -uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const ::rtl::OUString & aPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +uno::Any SAL_CALL DatabaseDataProvider::getPropertyValue(const OUString & aPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { return ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::getPropertyValue(aPropertyName); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::addPropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addPropertyChangeListener(aPropertyName, xListener); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::removePropertyChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XPropertyChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removePropertyChangeListener(aPropertyName, xListener); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::addVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::addVetoableChangeListener(aPropertyName, xListener); } -void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const ::rtl::OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) +void SAL_CALL DatabaseDataProvider::removeVetoableChangeListener(const OUString & aPropertyName, const uno::Reference< beans::XVetoableChangeListener > & xListener) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::WrappedTargetException) { ::cppu::PropertySetMixin< chart2::data::XDatabaseDataProvider >::removeVetoableChangeListener(aPropertyName, xListener); } // chart2::data::XDatabaseDataProvider: -uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getMasterFields() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getMasterFields() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_MasterFields; } -void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< ::rtl::OUString > & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setMasterFields(const uno::Sequence< OUString > & the_value) throw (uno::RuntimeException) { impl_invalidateParameter_nothrow(); set(OUString("MasterFields"),the_value,m_MasterFields); } -uno::Sequence< ::rtl::OUString > SAL_CALL DatabaseDataProvider::getDetailFields() throw (uno::RuntimeException) +uno::Sequence< OUString > SAL_CALL DatabaseDataProvider::getDetailFields() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_DetailFields; } -void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< ::rtl::OUString > & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setDetailFields(const uno::Sequence< OUString > & the_value) throw (uno::RuntimeException) { set("DetailFields",the_value,m_DetailFields); } -::rtl::OUString SAL_CALL DatabaseDataProvider::getCommand() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getCommand() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_Command; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setCommand(const ::rtl::OUString & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setCommand(const OUString & the_value) throw (uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -501,14 +501,14 @@ void SAL_CALL DatabaseDataProvider::setCommandType(::sal_Int32 the_value) throw } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getFilter() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getFilter() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_aFilterManager.getFilterComponent( dbtools::FilterManager::fcPublicFilter ); } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setFilter(const ::rtl::OUString & the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setFilter(const OUString & the_value) throw (uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -532,13 +532,13 @@ void SAL_CALL DatabaseDataProvider::setApplyFilter( ::sal_Bool the_value ) throw set(PROPERTY_APPLYFILTER,the_value,m_ApplyFilter); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getHavingClause() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getHavingClause() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_HavingClause; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setHavingClause( const ::rtl::OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setHavingClause( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -547,13 +547,13 @@ void SAL_CALL DatabaseDataProvider::setHavingClause( const ::rtl::OUString& the_ set(PROPERTY_HAVING_CLAUSE,the_value,m_HavingClause); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getGroupBy() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getGroupBy() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_GroupBy; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setGroupBy( const ::rtl::OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setGroupBy( const OUString& the_value ) throw (beans::UnknownPropertyException, uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -562,13 +562,13 @@ void SAL_CALL DatabaseDataProvider::setGroupBy( const ::rtl::OUString& the_value set(PROPERTY_GROUP_BY,the_value,m_GroupBy); } // ----------------------------------------------------------------------------- -::rtl::OUString SAL_CALL DatabaseDataProvider::getOrder() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getOrder() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_Order; } // ----------------------------------------------------------------------------- -void SAL_CALL DatabaseDataProvider::setOrder( const ::rtl::OUString& the_value ) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setOrder( const OUString& the_value ) throw (uno::RuntimeException) { { osl::MutexGuard g(m_aMutex); @@ -612,13 +612,13 @@ void SAL_CALL DatabaseDataProvider::setActiveConnection(const uno::Reference< sd set(PROPERTY_ACTIVE_CONNECTION,the_value,m_xActiveConnection); } -::rtl::OUString SAL_CALL DatabaseDataProvider::getDataSourceName() throw (uno::RuntimeException) +OUString SAL_CALL DatabaseDataProvider::getDataSourceName() throw (uno::RuntimeException) { osl::MutexGuard g(m_aMutex); return m_DataSourceName; } -void SAL_CALL DatabaseDataProvider::setDataSourceName(const ::rtl::OUString& the_value) throw (uno::RuntimeException) +void SAL_CALL DatabaseDataProvider::setDataSourceName(const OUString& the_value) throw (uno::RuntimeException) { set(PROPERTY_DATASOURCENAME,the_value,m_DataSourceName); } @@ -633,7 +633,7 @@ namespace { struct ColumnDescription { - ::rtl::OUString sName; + OUString sName; sal_Int32 nResultSetPosition; sal_Int32 nDataType; @@ -643,7 +643,7 @@ namespace ,nDataType( sdbc::DataType::VARCHAR ) { } - explicit ColumnDescription( const ::rtl::OUString& i_rName ) + explicit ColumnDescription( const OUString& i_rName ) :sName( i_rName ) ,nResultSetPosition( 0 ) ,nDataType( sdbc::DataType::VARCHAR ) @@ -651,29 +651,29 @@ namespace } }; - struct CreateColumnDescription : public ::std::unary_function< ::rtl::OUString, ColumnDescription > + struct CreateColumnDescription : public ::std::unary_function< OUString, ColumnDescription > { - ColumnDescription operator()( const ::rtl::OUString& i_rName ) + ColumnDescription operator()( const OUString& i_rName ) { return ColumnDescription( i_rName ); } }; - struct SelectColumnName : public ::std::unary_function< ColumnDescription, ::rtl::OUString > + struct SelectColumnName : public ::std::unary_function< ColumnDescription, OUString > { - const ::rtl::OUString& operator()( const ColumnDescription& i_rColumn ) + const OUString& operator()( const ColumnDescription& i_rColumn ) { return i_rColumn.sName; } }; } -void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const uno::Sequence< ::rtl::OUString >& i_aColumnNames) +void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCategories,const uno::Sequence< OUString >& i_aColumnNames) { // clear the data before fill the new one uno::Reference< sdbcx::XColumnsSupplier > xColSup(m_xRowSet,uno::UNO_QUERY_THROW); uno::Reference< container::XNameAccess > xColumns( xColSup->getColumns(), uno::UNO_SET_THROW ); - const uno::Sequence< ::rtl::OUString > aRowSetColumnNames( xColumns->getElementNames() ); + const uno::Sequence< OUString > aRowSetColumnNames( xColumns->getElementNames() ); typedef ::std::vector< ColumnDescription > ColumnDescriptions; ColumnDescriptions aColumns; @@ -681,7 +681,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat if ( i_aColumnNames.getLength() ) { // some normalizations ... - uno::Sequence< ::rtl::OUString > aImposedColumnNames( i_aColumnNames ); + uno::Sequence< OUString > aImposedColumnNames( i_aColumnNames ); // strangely, there exist documents where the ColumnDescriptions end with a number of empty strings. /me // thinks they're generated when you have a chart based on a result set with n columns, but remove some @@ -709,7 +709,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat const sal_Int32 nCount = aImposedColumnNames.getLength(); for ( sal_Int32 i = 0 ; i < nCount; ++i ) { - const ::rtl::OUString sColumnName( aImposedColumnNames[i] ); + const OUString sColumnName( aImposedColumnNames[i] ); if ( !xColumns->hasByName( sColumnName ) ) continue; @@ -754,11 +754,11 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat OSL_VERIFY( xColumn->getPropertyValue( PROPERTY_TYPE ) >>= col->nDataType ); const sal_Int32 columnIndex = col - aColumns.begin(); - const ::rtl::OUString sRangeName = ::rtl::OUString::valueOf( columnIndex ); - m_aNumberFormats.insert( ::std::map< ::rtl::OUString, uno::Any >::value_type( sRangeName, aNumberFormat ) ); + const OUString sRangeName = OUString::valueOf( columnIndex ); + m_aNumberFormats.insert( ::std::map< OUString, uno::Any >::value_type( sRangeName, aNumberFormat ) ); } - ::std::vector< ::rtl::OUString > aRowLabels; + ::std::vector< OUString > aRowLabels; ::std::vector< ::std::vector< double > > aDataValues; sal_Int32 nRowCount = 0; ::connectivity::ORowSetValue aValue; @@ -803,7 +803,7 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat 4.30, 9.02, 6.20 }; for(sal_Int32 h = 0,k = 0; h < nRowCount; ++h,++k ) { - aRowLabels.push_back(::rtl::OUString::valueOf(h+1)); + aRowLabels.push_back(OUString::valueOf(h+1)); ::std::vector< double > aRow; const sal_Int32 nSize = sizeof(fDefaultData)/sizeof(fDefaultData[0]); for (size_t j = 0; j < (aColumns.size()-1); ++j,++k) @@ -817,10 +817,10 @@ void DatabaseDataProvider::impl_fillInternalDataProvider_throw(sal_Bool _bHasCat } uno::Reference< chart::XChartDataArray> xData(m_xInternal,uno::UNO_QUERY); - xData->setRowDescriptions(uno::Sequence< ::rtl::OUString >(&(*aRowLabels.begin()),aRowLabels.size())); + xData->setRowDescriptions(uno::Sequence< OUString >(&(*aRowLabels.begin()),aRowLabels.size())); const size_t nOffset = bFirstColumnIsCategory ? 1 : 0; - uno::Sequence< ::rtl::OUString > aColumnDescriptions( aColumns.size() - nOffset ); + uno::Sequence< OUString > aColumnDescriptions( aColumns.size() - nOffset ); ::std::transform( aColumns.begin() + nOffset, aColumns.end(), @@ -866,7 +866,7 @@ void SAL_CALL DatabaseDataProvider::setNull(sal_Int32 parameterIndex, sal_Int32 } //------------------------------------------------------------------------------ -void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName) throw( SQLException, RuntimeException ) +void SAL_CALL DatabaseDataProvider::setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName) throw( SQLException, RuntimeException ) { m_aParameterManager.setObjectNull(parameterIndex, sqlType, typeName); } @@ -914,7 +914,7 @@ void SAL_CALL DatabaseDataProvider::setDouble(sal_Int32 parameterIndex, double x } //------------------------------------------------------------------------------ -void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const ::rtl::OUString& x) throw( SQLException, RuntimeException ) +void SAL_CALL DatabaseDataProvider::setString(sal_Int32 parameterIndex, const OUString& x) throw( SQLException, RuntimeException ) { m_aParameterManager.setString(parameterIndex, x); } diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx index 2894a7fe73e8..09a3882f6bec 100644 --- a/dbaccess/source/core/misc/PropertyForward.cxx +++ b/dbaccess/source/core/misc/PropertyForward.cxx @@ -45,7 +45,7 @@ namespace dbaccess //------------------------------------------------------------------------ OPropertyForward::OPropertyForward( const Reference< XPropertySet>& _xSource, const Reference< XNameAccess>& _xDestContainer, - const ::rtl::OUString& _sName, const ::std::vector< ::rtl::OUString>& _aPropertyList ) + const OUString& _sName, const ::std::vector< OUString>& _aPropertyList ) :m_xSource( _xSource, UNO_SET_THROW ) ,m_xDestContainer( _xDestContainer, UNO_SET_THROW ) ,m_sName( _sName ) @@ -57,11 +57,11 @@ namespace dbaccess try { if ( _aPropertyList.empty() ) - _xSource->addPropertyChangeListener( ::rtl::OUString(), this ); + _xSource->addPropertyChangeListener( OUString(), this ); else { - ::std::vector< ::rtl::OUString >::const_iterator aIter = _aPropertyList.begin(); - ::std::vector< ::rtl::OUString >::const_iterator aEnd = _aPropertyList.end(); + ::std::vector< OUString >::const_iterator aIter = _aPropertyList.begin(); + ::std::vector< OUString >::const_iterator aEnd = _aPropertyList.end(); for (; aIter != aEnd ; ++aIter ) _xSource->addPropertyChangeListener( *aIter, this ); } @@ -85,7 +85,7 @@ namespace dbaccess ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xDestContainer.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); try { @@ -128,9 +128,9 @@ namespace dbaccess ::osl::MutexGuard aGuard(m_aMutex); if ( !m_xSource.is() ) - throw DisposedException( ::rtl::OUString(), *this ); + throw DisposedException( OUString(), *this ); - m_xSource->removePropertyChangeListener( ::rtl::OUString(), this ); + m_xSource->removePropertyChangeListener( OUString(), this ); m_xSource = NULL; m_xDestContainer = NULL; m_xDestInfo = NULL; diff --git a/dbaccess/source/core/misc/objectnameapproval.cxx b/dbaccess/source/core/misc/objectnameapproval.cxx index 6d1e59603864..0a9c241dfc62 100644 --- a/dbaccess/source/core/misc/objectnameapproval.cxx +++ b/dbaccess/source/core/misc/objectnameapproval.cxx @@ -71,7 +71,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL ObjectNameApproval::approveElement( const ::rtl::OUString& _rName, const Reference< XInterface >& /*_rxElement*/ ) + void SAL_CALL ObjectNameApproval::approveElement( const OUString& _rName, const Reference< XInterface >& /*_rxElement*/ ) { Reference< XConnection > xConnection( m_pImpl->aConnection ); if ( !xConnection.is() ) diff --git a/dbaccess/source/core/misc/sdbcoretools.cxx b/dbaccess/source/core/misc/sdbcoretools.cxx index 490f1bb5957d..1e3891fac5cd 100644 --- a/dbaccess/source/core/misc/sdbcoretools.cxx +++ b/dbaccess/source/core/misc/sdbcoretools.cxx @@ -80,9 +80,9 @@ namespace dbaccess } // ----------------------------------------------------------------------------- - ::rtl::OUString extractExceptionMessage( const Reference<XComponentContext> & _rContext, const Any& _rError ) + OUString extractExceptionMessage( const Reference<XComponentContext> & _rContext, const Any& _rError ) { - ::rtl::OUString sDisplayMessage; + OUString sDisplayMessage; try { @@ -91,7 +91,7 @@ namespace dbaccess ::rtl::Reference< ::comphelper::OInteractionRequest > pRequest( new ::comphelper::OInteractionRequest( _rError ) ); ::rtl::Reference< ::comphelper::OInteractionApprove > pApprove( new ::comphelper::OInteractionApprove ); pRequest->addContinuation( pApprove.get() ); - Optional< ::rtl::OUString > aMessage = xStringResolver->getStringFromInformationalRequest( pRequest.get() ); + Optional< OUString > aMessage = xStringResolver->getStringFromInformationalRequest( pRequest.get() ); if ( aMessage.IsPresent ) sDisplayMessage = aMessage.Value; } @@ -105,7 +105,7 @@ namespace dbaccess Exception aExcept; _rError >>= aExcept; - ::rtl::OUStringBuffer aBuffer; + OUStringBuffer aBuffer; aBuffer.append( _rError.getValueTypeName() ); aBuffer.appendAscii( ":\n" ); aBuffer.append( aExcept.Message ); diff --git a/dbaccess/source/core/misc/services.cxx b/dbaccess/source/core/misc/services.cxx index 5b42475750f1..ba98e212aedb 100644 --- a/dbaccess/source/core/misc/services.cxx +++ b/dbaccess/source/core/misc/services.cxx @@ -95,7 +95,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL dba_component_getFactory( if (pServiceManager && pImplementationName) { xRet = ::dba::DbaModule::getInstance().getComponentFactory( - ::rtl::OUString::createFromAscii( pImplementationName ) ); + OUString::createFromAscii( pImplementationName ) ); } if (xRet.is()) diff --git a/dbaccess/source/core/misc/veto.cxx b/dbaccess/source/core/misc/veto.cxx index a08e4116c0cf..732f924a2b7a 100644 --- a/dbaccess/source/core/misc/veto.cxx +++ b/dbaccess/source/core/misc/veto.cxx @@ -31,7 +31,7 @@ namespace dbaccess //= Veto //==================================================================== //-------------------------------------------------------------------- - Veto::Veto( const ::rtl::OUString& _rReason, const Any& _rDetails ) + Veto::Veto( const OUString& _rReason, const Any& _rDetails ) :m_sReason( _rReason ) ,m_aDetails( _rDetails ) { @@ -43,7 +43,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::OUString SAL_CALL Veto::getReason() throw (RuntimeException) + OUString SAL_CALL Veto::getReason() throw (RuntimeException) { return m_sReason; } diff --git a/dbaccess/source/core/recovery/dbdocrecovery.cxx b/dbaccess/source/core/recovery/dbdocrecovery.cxx index 409784feccdf..d5b605f3ff5e 100644 --- a/dbaccess/source/core/recovery/dbdocrecovery.cxx +++ b/dbaccess/source/core/recovery/dbdocrecovery.cxx @@ -82,7 +82,7 @@ namespace dbaccess namespace { // ......................................................................... - static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, ::rtl::OUStringBuffer& o_rBuffer ) + static void lcl_getPersistentRepresentation( const MapStringToCompDesc::value_type& i_rComponentDesc, OUStringBuffer& o_rBuffer ) { o_rBuffer.append( i_rComponentDesc.first ); o_rBuffer.append( sal_Unicode( '=' ) ); @@ -92,7 +92,7 @@ namespace dbaccess } // ......................................................................... - static bool lcl_extractCompDesc( const ::rtl::OUString& i_rIniLine, ::rtl::OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc ) + static bool lcl_extractCompDesc( const OUString& i_rIniLine, OUString& o_rStorName, SubComponentDescriptor& o_rCompDesc ) { const sal_Int32 nEqualSignPos = i_rIniLine.indexOf( sal_Unicode( '=' ) ); if ( nEqualSignPos < 1 ) @@ -147,7 +147,7 @@ namespace dbaccess ++stor ) { - ::rtl::OUStringBuffer aLine; + OUStringBuffer aLine; lcl_getPersistentRepresentation( *stor, aLine ); aTextOutput.writeLine( aLine.makeStringAndClear() ); @@ -157,7 +157,7 @@ namespace dbaccess } // ......................................................................... - static bool lcl_isSectionStart( const ::rtl::OUString& i_rIniLine, ::rtl::OUString& o_rSectionName ) + static bool lcl_isSectionStart( const OUString& i_rIniLine, OUString& o_rSectionName ) { const sal_Int32 nLen = i_rIniLine.getLength(); if ( ( nLen > 0 ) && ( i_rIniLine.getStr()[0] == '[' ) && ( i_rIniLine.getStr()[ nLen - 1 ] == ']' ) ) @@ -169,7 +169,7 @@ namespace dbaccess } // ......................................................................... - static void lcl_stripTrailingLineFeed( ::rtl::OUString& io_rLine ) + static void lcl_stripTrailingLineFeed( OUString& io_rLine ) { const sal_Int32 nLen = io_rLine.getLength(); if ( ( nLen > 0 ) && ( io_rLine.getStr()[ nLen - 1 ] == '\n' ) ) @@ -194,11 +194,11 @@ namespace dbaccess xTextInput->setEncoding( lcl_getMapStreamEncodingName() ); xTextInput->setInputStream( xIniStream->getInputStream() ); - ::rtl::OUString sCurrentSection; + OUString sCurrentSection; bool bCurrentSectionIsKnownToBeUnsupported = true; while ( !xTextInput->isEOF() ) { - ::rtl::OUString sLine = xTextInput->readLine(); + OUString sLine = xTextInput->readLine(); lcl_stripTrailingLineFeed( sLine ); if ( sLine.isEmpty() ) @@ -220,7 +220,7 @@ namespace dbaccess continue; } - ::rtl::OUString sStorageName; + OUString sStorageName; SubComponentDescriptor aCompDesc; if ( !lcl_extractCompDesc( sLine, sStorageName, aCompDesc ) ) continue; @@ -370,15 +370,15 @@ namespace dbaccess ++stor ) { - const ::rtl::OUString sComponentName( stor->second.sName ); + const OUString sComponentName( stor->second.sName ); if ( !xComponentsStor->hasByName( stor->first ) ) { #if OSL_DEBUG_LEVEL > 0 - ::rtl::OStringBuffer message; + OStringBuffer message; message.append( "DatabaseDocumentRecovery::recoverSubDocuments: inconsistent recovery storage: storage '" ); - message.append( ::rtl::OUStringToOString( stor->first, RTL_TEXTENCODING_ASCII_US ) ); + message.append( OUStringToOString( stor->first, RTL_TEXTENCODING_ASCII_US ) ); message.append( "' not found in '" ); - message.append( ::rtl::OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) ); + message.append( OUStringToOString( SubComponentRecovery::getComponentsStorageName( eComponentType ), RTL_TEXTENCODING_ASCII_US ) ); message.append( "', but required per map file!" ); OSL_FAIL( message.getStr() ); #endif diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx index 5fd94023f954..bd9c8b2d09c8 100644 --- a/dbaccess/source/core/recovery/settingsimport.cxx +++ b/dbaccess/source/core/recovery/settingsimport.cxx @@ -82,14 +82,14 @@ namespace dbaccess { } - void SettingsImport::characters( const ::rtl::OUString& i_rCharacters ) + void SettingsImport::characters( const OUString& i_rCharacters ) { m_aCharacters.append( i_rCharacters ); } - void SettingsImport::split( const ::rtl::OUString& i_rElementName, ::rtl::OUString& o_rNamespace, ::rtl::OUString& o_rLocalName ) + void SettingsImport::split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName ) { - o_rNamespace = ::rtl::OUString(); + o_rNamespace = OUString(); o_rLocalName = i_rElementName; const sal_Int32 nSeparatorPos = i_rElementName.indexOf( ':' ); if ( nSeparatorPos > -1 ) @@ -107,7 +107,7 @@ namespace dbaccess //= IgnoringSettingsImport //==================================================================== //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > IgnoringSettingsImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > IgnoringSettingsImport::nextState( const OUString& i_rElementName ) { (void)i_rElementName; return this; @@ -128,19 +128,19 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > OfficeSettingsImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > OfficeSettingsImport::nextState( const OUString& i_rElementName ) { // separate the namespace part from the element name - ::rtl::OUString sNamespace; - ::rtl::OUString sLocalName; + OUString sNamespace; + OUString sLocalName; split( i_rElementName, sNamespace, sLocalName ); if ( sLocalName == "config-item-set" ) return new ConfigItemSetImport( m_rSettings ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "unknown (or unsupported at this place) element name '" ); - sMessage += ::rtl::OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); + OString sMessage( "unknown (or unsupported at this place) element name '" ); + sMessage += OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); sMessage += "', ignoring"; OSL_FAIL( sMessage.getStr() ); #endif @@ -162,7 +162,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > ConfigItemImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > ConfigItemImport::nextState( const OUString& i_rElementName ) { OSL_FAIL( "ConfigItemImport::nextState: unexpected: this class is responsible for child-less items only!" ); (void)i_rElementName; @@ -174,7 +174,7 @@ namespace dbaccess { SettingsImport::endElement(); - const ::rtl::OUString sItemName( getItemName() ); + const OUString sItemName( getItemName() ); ENSURE_OR_RETURN_VOID( !sItemName.isEmpty(), "no item name -> no item value" ); Any aValue; getItemValue( aValue ); @@ -187,10 +187,10 @@ namespace dbaccess o_rValue.clear(); // the characters building up th evalue - ::rtl::OUStringBuffer aCharacters( getAccumulatedCharacters() ); - const ::rtl::OUString sValue = aCharacters.makeStringAndClear(); + OUStringBuffer aCharacters( getAccumulatedCharacters() ); + const OUString sValue = aCharacters.makeStringAndClear(); - const ::rtl::OUString& rItemType( getItemType() ); + const OUString& rItemType( getItemType() ); ENSURE_OR_RETURN_VOID( !rItemType.isEmpty(), "no item type -> no item value" ); if ( ::xmloff::token::IsXMLToken( rItemType, ::xmloff::token::XML_INT ) ) @@ -224,8 +224,8 @@ namespace dbaccess #if OSL_DEBUG_LEVEL > 0 else { - ::rtl::OString sMessage( "ConfigItemImport::getItemValue: unsupported item type '" ); - sMessage += ::rtl::OUStringToOString( rItemType, RTL_TEXTENCODING_UTF8 ); + OString sMessage( "ConfigItemImport::getItemValue: unsupported item type '" ); + sMessage += OUStringToOString( rItemType, RTL_TEXTENCODING_UTF8 ); sMessage += "', ignoring"; OSL_FAIL( sMessage.getStr() ); } @@ -247,11 +247,11 @@ namespace dbaccess } //-------------------------------------------------------------------- - ::rtl::Reference< SettingsImport > ConfigItemSetImport::nextState( const ::rtl::OUString& i_rElementName ) + ::rtl::Reference< SettingsImport > ConfigItemSetImport::nextState( const OUString& i_rElementName ) { // separate the namespace part from the element name - ::rtl::OUString sNamespace; - ::rtl::OUString sLocalName; + OUString sNamespace; + OUString sLocalName; split( i_rElementName, sNamespace, sLocalName ); if ( sLocalName == "config-item-set" ) @@ -260,8 +260,8 @@ namespace dbaccess return new ConfigItemImport( m_aChildSettings ); #if OSL_DEBUG_LEVEL > 0 - ::rtl::OString sMessage( "unknown element name '" ); - sMessage += ::rtl::OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); + OString sMessage( "unknown element name '" ); + sMessage += OUStringToOString( i_rElementName, RTL_TEXTENCODING_UTF8 ); sMessage += "', ignoring"; OSL_FAIL( sMessage.getStr() ); #endif diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx index e0daac2f929b..accad5c714b0 100644 --- a/dbaccess/source/core/recovery/settingsimport.hxx +++ b/dbaccess/source/core/recovery/settingsimport.hxx @@ -50,33 +50,33 @@ namespace dbaccess // own overriables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ) = 0; virtual void startElement( const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& i_rAttributes ); virtual void endElement(); - virtual void characters( const ::rtl::OUString& i_rCharacters ); + virtual void characters( const OUString& i_rCharacters ); protected: virtual ~SettingsImport(); protected: - static void split( const ::rtl::OUString& i_rElementName, ::rtl::OUString& o_rNamespace, ::rtl::OUString& o_rLocalName ); + static void split( const OUString& i_rElementName, OUString& o_rNamespace, OUString& o_rLocalName ); protected: - const ::rtl::OUString& getItemName() const { return m_sItemName; } - const ::rtl::OUString& getItemType() const { return m_sItemType; } - const ::rtl::OUStringBuffer& getAccumulatedCharacters() const { return m_aCharacters; } + const OUString& getItemName() const { return m_sItemName; } + const OUString& getItemType() const { return m_sItemType; } + const OUStringBuffer& getAccumulatedCharacters() const { return m_aCharacters; } private: oslInterlockedCount m_refCount; // value of the config:name attribute, if any - ::rtl::OUString m_sItemName; + OUString m_sItemName; // value of the config:type attribute, if any - ::rtl::OUString m_sItemType; + OUString m_sItemType; // accumulated characters, if any - ::rtl::OUStringBuffer m_aCharacters; + OUStringBuffer m_aCharacters; }; //==================================================================== @@ -91,7 +91,7 @@ namespace dbaccess // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); private: @@ -110,7 +110,7 @@ namespace dbaccess // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); protected: @@ -135,7 +135,7 @@ namespace dbaccess public: // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); virtual void endElement(); @@ -163,7 +163,7 @@ namespace dbaccess public: // SettingsImport overridables virtual ::rtl::Reference< SettingsImport > nextState( - const ::rtl::OUString& i_rElementName + const OUString& i_rElementName ); protected: diff --git a/dbaccess/source/core/recovery/storagestream.cxx b/dbaccess/source/core/recovery/storagestream.cxx index fec9492b22e7..bac839e28f09 100644 --- a/dbaccess/source/core/recovery/storagestream.cxx +++ b/dbaccess/source/core/recovery/storagestream.cxx @@ -52,7 +52,7 @@ namespace dbaccess //-------------------------------------------------------------------- StorageOutputStream::StorageOutputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ) :m_rContext( i_rContext ) { @@ -85,7 +85,7 @@ namespace dbaccess //-------------------------------------------------------------------- StorageInputStream::StorageInputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ) :m_rContext( i_rContext ) { diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx index 9f9fb0f013b1..8f655959d43f 100644 --- a/dbaccess/source/core/recovery/storagestream.hxx +++ b/dbaccess/source/core/recovery/storagestream.hxx @@ -41,7 +41,7 @@ namespace dbaccess StorageOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); virtual ~StorageOutputStream(); @@ -73,7 +73,7 @@ namespace dbaccess StorageInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); virtual ~StorageInputStream(); diff --git a/dbaccess/source/core/recovery/storagetextstream.cxx b/dbaccess/source/core/recovery/storagetextstream.cxx index fcce399dd92a..241e336f2652 100644 --- a/dbaccess/source/core/recovery/storagetextstream.cxx +++ b/dbaccess/source/core/recovery/storagetextstream.cxx @@ -67,9 +67,9 @@ namespace dbaccess } //-------------------------------------------------------------------------------------------------------------- - static const ::rtl::OUString& lcl_getLineFeed() + static const OUString& lcl_getLineFeed() { - static const ::rtl::OUString s_sLineFeed( sal_Unicode( '\n' ) ); + static const OUString s_sLineFeed( sal_Unicode( '\n' ) ); return s_sLineFeed; } } @@ -80,7 +80,7 @@ namespace dbaccess //------------------------------------------------------------------------------------------------------------------ StorageTextOutputStream::StorageTextOutputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ) :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName ) ,m_pData( new StorageTextOutputStream_Data ) @@ -96,7 +96,7 @@ namespace dbaccess } //------------------------------------------------------------------------------------------------------------------ - void StorageTextOutputStream::writeLine( const ::rtl::OUString& i_rLine ) + void StorageTextOutputStream::writeLine( const OUString& i_rLine ) { m_pData->xTextOutput->writeString( i_rLine ); m_pData->xTextOutput->writeString( lcl_getLineFeed() ); diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx index 37119d264afa..57c4599a05ba 100644 --- a/dbaccess/source/core/recovery/storagetextstream.hxx +++ b/dbaccess/source/core/recovery/storagetextstream.hxx @@ -39,11 +39,11 @@ namespace dbaccess StorageTextOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); ~StorageTextOutputStream(); - void writeLine( const ::rtl::OUString& i_rLine ); + void writeLine( const OUString& i_rLine ); void writeLine(); private: diff --git a/dbaccess/source/core/recovery/storagexmlstream.cxx b/dbaccess/source/core/recovery/storagexmlstream.cxx index d17593bc7a58..39a828ea589e 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.cxx +++ b/dbaccess/source/core/recovery/storagexmlstream.cxx @@ -67,7 +67,7 @@ namespace dbaccess struct StorageXMLOutputStream_Data { Reference< XDocumentHandler > xHandler; - ::std::stack< ::rtl::OUString > aElements; + ::std::stack< OUString > aElements; ::rtl::Reference< SvXMLAttributeList > xAttributes; }; @@ -77,7 +77,7 @@ namespace dbaccess //------------------------------------------------------------------------------------------------------------------ StorageXMLOutputStream::StorageXMLOutputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName ) + const OUString& i_rStreamName ) :StorageOutputStream( i_rContext, i_rParentStorage, i_rStreamName ) ,m_pData( new StorageXMLOutputStream_Data ) { @@ -105,13 +105,13 @@ namespace dbaccess } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::addAttribute( const ::rtl::OUString& i_rName, const ::rtl::OUString& i_rValue ) const + void StorageXMLOutputStream::addAttribute( const OUString& i_rName, const OUString& i_rValue ) const { m_pData->xAttributes->AddAttribute( i_rName, i_rValue ); } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::startElement( const ::rtl::OUString& i_rElementName ) const + void StorageXMLOutputStream::startElement( const OUString& i_rElementName ) const { ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); @@ -126,13 +126,13 @@ namespace dbaccess ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); ENSURE_OR_RETURN_VOID( !m_pData->aElements.empty(), "no element on the stack" ); - const ::rtl::OUString sElementName( m_pData->aElements.top() ); + const OUString sElementName( m_pData->aElements.top() ); m_pData->xHandler->endElement( sElementName ); m_pData->aElements.pop(); } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::ignorableWhitespace( const ::rtl::OUString& i_rWhitespace ) const + void StorageXMLOutputStream::ignorableWhitespace( const OUString& i_rWhitespace ) const { ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); @@ -140,7 +140,7 @@ namespace dbaccess } //------------------------------------------------------------------------------------------------------------------ - void StorageXMLOutputStream::characters( const ::rtl::OUString& i_rCharacters ) const + void StorageXMLOutputStream::characters( const OUString& i_rCharacters ) const { ENSURE_OR_RETURN_VOID( m_pData->xHandler.is(), "no document handler" ); @@ -161,7 +161,7 @@ namespace dbaccess //------------------------------------------------------------------------------------------------------------------ StorageXMLInputStream::StorageXMLInputStream( const Reference<XComponentContext>& i_rContext, const Reference< XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName ) + const OUString& i_rStreamName ) :StorageInputStream( i_rContext, i_rParentStorage, i_rStreamName ) ,m_pData( new StorageXMLInputStream_Data ) { diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx index a850b225b4fd..8fdb7305e274 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.hxx +++ b/dbaccess/source/core/recovery/storagexmlstream.hxx @@ -42,20 +42,20 @@ namespace dbaccess StorageXMLOutputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); ~StorageXMLOutputStream(); // StorageOutputStream overridables virtual void close(); - void addAttribute( const ::rtl::OUString& i_rName, const ::rtl::OUString& i_rValue ) const; + void addAttribute( const OUString& i_rName, const OUString& i_rValue ) const; - void startElement( const ::rtl::OUString& i_rElementName ) const; + void startElement( const OUString& i_rElementName ) const; void endElement() const; - void ignorableWhitespace( const ::rtl::OUString& i_rWhitespace ) const; - void characters( const ::rtl::OUString& i_rCharacters ) const; + void ignorableWhitespace( const OUString& i_rWhitespace ) const; + void characters( const OUString& i_rCharacters ) const; private: StorageXMLOutputStream(); // never implemented @@ -76,7 +76,7 @@ namespace dbaccess StorageXMLInputStream( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& i_rContext, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rParentStorage, - const ::rtl::OUString& i_rStreamName + const OUString& i_rStreamName ); ~StorageXMLInputStream(); diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.cxx b/dbaccess/source/core/recovery/subcomponentrecovery.cxx index e70acbbf6561..af11780ea5fc 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.cxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.cxx @@ -87,7 +87,7 @@ namespace dbaccess namespace { // ......................................................................... - static const ::rtl::OUString& lcl_getComponentStorageBaseName( const SubComponentType i_eType ) + static const OUString& lcl_getComponentStorageBaseName( const SubComponentType i_eType ) { static const OUString s_sFormBaseName( "form" ); static const OUString s_sReportBaseName( "report" ); @@ -109,7 +109,7 @@ namespace dbaccess } OSL_FAIL( "lcl_getComponentStorageBaseName: unimplemented case!" ); - static const ::rtl::OUString s_sFallback; + static const OUString s_sFallback; return s_sFallback; } @@ -147,7 +147,7 @@ namespace dbaccess // ......................................................................... static Reference< XCommandProcessor > lcl_getSubComponentDef_nothrow( const Reference< XDatabaseDocumentUI >& i_rAppUI, - const SubComponentType i_eType, const ::rtl::OUString& i_rName ) + const SubComponentType i_eType, const OUString& i_rName ) { Reference< XController > xController( i_rAppUI, UNO_QUERY_THROW ); ENSURE_OR_RETURN( ( i_eType == FORM ) || ( i_eType == REPORT ), "lcl_getSubComponentDef_nothrow: illegal controller", NULL ); @@ -206,19 +206,19 @@ namespace dbaccess } public: - virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue ); + virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ); virtual void AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, enum ::xmloff::token::XMLTokenEnum i_eValue ); virtual void StartElement( enum ::xmloff::token::XMLTokenEnum i_eName, const sal_Bool i_bIgnoreWhitespace ); virtual void EndElement ( const sal_Bool i_bIgnoreWhitespace ); - virtual void Characters( const ::rtl::OUString& i_rCharacters ); + virtual void Characters( const OUString& i_rCharacters ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > GetComponentContext() const; private: - ::rtl::OUString impl_prefix( const ::xmloff::token::XMLTokenEnum i_eToken ) + OUString impl_prefix( const ::xmloff::token::XMLTokenEnum i_eToken ) { - ::rtl::OUStringBuffer aQualifiedName( m_aNamespace ); + OUStringBuffer aQualifiedName( m_aNamespace ); aQualifiedName.append( sal_Unicode( ':' ) ); aQualifiedName.append( ::xmloff::token::GetXMLToken( i_eToken ) ); return aQualifiedName.makeStringAndClear(); @@ -227,11 +227,11 @@ namespace dbaccess private: const Reference<XComponentContext>& m_rContext; const StorageXMLOutputStream& m_rDelegator; - const ::rtl::OUStringBuffer m_aNamespace; + const OUStringBuffer m_aNamespace; }; //-------------------------------------------------------------------- - void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const ::rtl::OUString& i_rValue ) + void SettingsExportContext::AddAttribute( enum ::xmloff::token::XMLTokenEnum i_eName, const OUString& i_rValue ) { m_rDelegator.addAttribute( impl_prefix( i_eName ), i_rValue ); } @@ -260,7 +260,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SettingsExportContext::Characters( const ::rtl::OUString& i_rCharacters ) + void SettingsExportContext::Characters( const OUString& i_rCharacters ) { m_rDelegator.characters( i_rCharacters ); } @@ -292,11 +292,11 @@ namespace dbaccess // XDocumentHandler virtual void SAL_CALL startDocument( ) throw (SAXException, RuntimeException); virtual void SAL_CALL endDocument( ) throw (SAXException, RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (SAXException, RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (SAXException, RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (SAXException, RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const Reference< XAttributeList >& xAttribs ) throw (SAXException, RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (SAXException, RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (SAXException, RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (SAXException, RuntimeException); virtual void SAL_CALL setDocumentLocator( const Reference< XLocator >& xLocator ) throw (SAXException, RuntimeException); const ::comphelper::NamedValueCollection& getSettings() const { return m_aSettings; } @@ -317,7 +317,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::startElement( const ::rtl::OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::startElement( const OUString& i_Name, const Reference< XAttributeList >& i_Attribs ) throw (SAXException, RuntimeException) { ::rtl::Reference< SettingsImport > pNewState; @@ -349,7 +349,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::endElement( const ::rtl::OUString& i_Name ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::endElement( const OUString& i_Name ) throw (SAXException, RuntimeException) { ENSURE_OR_THROW( !m_aStates.empty(), "no active element" ); (void)i_Name; @@ -360,7 +360,7 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::characters( const ::rtl::OUString& i_Chars ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::characters( const OUString& i_Chars ) throw (SAXException, RuntimeException) { ENSURE_OR_THROW( !m_aStates.empty(), "no active element" ); @@ -369,14 +369,14 @@ namespace dbaccess } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::ignorableWhitespace( const OUString& aWhitespaces ) throw (SAXException, RuntimeException) { // ignore them - that's why they're called "ignorable" (void)aWhitespaces; } //-------------------------------------------------------------------- - void SAL_CALL SettingsDocumentHandler::processingInstruction( const ::rtl::OUString& i_Target, const ::rtl::OUString& i_Data ) throw (SAXException, RuntimeException) + void SAL_CALL SettingsDocumentHandler::processingInstruction( const OUString& i_Target, const OUString& i_Data ) throw (SAXException, RuntimeException) { OSL_FAIL( "SettingsDocumentHandler::processingInstruction: unexpected ..." ); (void)i_Target; @@ -393,7 +393,7 @@ namespace dbaccess //= SubComponentRecovery //==================================================================== //-------------------------------------------------------------------- - const ::rtl::OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType ) + const OUString SubComponentRecovery::getComponentsStorageName( const SubComponentType i_eType ) { static const OUString s_sFormsStorageName( "forms" ); static const OUString s_sReportsStorageName( "reports" ); @@ -418,7 +418,7 @@ namespace dbaccess } OSL_FAIL( "SubComponentRecovery::getComponentsStorageName: unimplemented case!" ); - static const ::rtl::OUString s_sFallback; + static const OUString s_sFallback; return s_sFallback; } @@ -431,13 +431,13 @@ namespace dbaccess return; // open the sub storage for the given kind of components - const ::rtl::OUString& rStorageName( getComponentsStorageName( m_eType ) ); + const OUString& rStorageName( getComponentsStorageName( m_eType ) ); const Reference< XStorage > xComponentsStorage( i_rRecoveryStorage->openStorageElement( rStorageName, ElementModes::READWRITE ), UNO_QUERY_THROW ); // find a free sub storage name, and create Yet Another Sub Storage - const ::rtl::OUString& rBaseName( lcl_getComponentStorageBaseName( m_eType ) ); - const ::rtl::OUString sStorName = ::dbtools::createUniqueName( xComponentsStorage.get(), rBaseName, true ); + const OUString& rBaseName( lcl_getComponentStorageBaseName( m_eType ) ); + const OUString sStorName = ::dbtools::createUniqueName( xComponentsStorage.get(), rBaseName, true ); const Reference< XStorage > xObjectStor( xComponentsStorage->openStorageElement( sStorName, ElementModes::READWRITE ), UNO_QUERY_THROW ); @@ -473,13 +473,13 @@ namespace dbaccess void SubComponentRecovery::impl_identifyComponent_throw() { // ask the controller - Pair< sal_Int32, ::rtl::OUString > aComponentIdentity = m_xDocumentUI->identifySubComponent( m_xComponent ); + Pair< sal_Int32, OUString > aComponentIdentity = m_xDocumentUI->identifySubComponent( m_xComponent ); m_eType = lcl_databaseObjectToSubComponentType( aComponentIdentity.First ); m_aCompDesc.sName = aComponentIdentity.Second; // what the controller didn't give us is the information whether this is in edit mode or not ... Reference< XModuleManager2 > xModuleManager( ModuleManager::create(m_rContext) ); - const ::rtl::OUString sModuleIdentifier = xModuleManager->identify( m_xComponent ); + const OUString sModuleIdentifier = xModuleManager->identify( m_xComponent ); switch ( m_eType ) { @@ -563,7 +563,7 @@ namespace dbaccess //-------------------------------------------------------------------- Reference< XComponent > SubComponentRecovery::impl_recoverSubDocument_throw( const Reference< XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, const bool i_bForEditing ) + const OUString& i_rComponentName, const bool i_bForEditing ) { Reference< XComponent > xSubComponent; Reference< XCommandProcessor > xDocDefinition; @@ -613,7 +613,7 @@ namespace dbaccess //-------------------------------------------------------------------- Reference< XComponent > SubComponentRecovery::impl_recoverQueryDesign_throw( const Reference< XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, const bool i_bForEditing ) + const OUString& i_rComponentName, const bool i_bForEditing ) { Reference< XComponent > xSubComponent; @@ -667,7 +667,7 @@ namespace dbaccess //-------------------------------------------------------------------- Reference< XComponent > SubComponentRecovery::recoverFromStorage( const Reference< XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, const bool i_bForEditing ) + const OUString& i_rComponentName, const bool i_bForEditing ) { Reference< XComponent > xSubComponent; switch ( m_eType ) diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx index 8e70be04efca..6c4cac5f99f1 100644 --- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx +++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx @@ -72,11 +72,11 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > recoverFromStorage( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, + const OUString& i_rComponentName, const bool i_bForEditing ); - static const ::rtl::OUString getComponentsStorageName( const SubComponentType i_eType ); + static const OUString getComponentsStorageName( const SubComponentType i_eType ); private: void impl_saveSubDocument_throw( @@ -90,14 +90,14 @@ namespace dbaccess ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > impl_recoverSubDocument_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, + const OUString& i_rComponentName, const bool i_bForEditing ); ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > impl_recoverQueryDesign_throw( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& i_rRecoveryStorage, - const ::rtl::OUString& i_rComponentName, + const OUString& i_rComponentName, const bool i_bForEditing ); diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx index 3ff36d791b0c..2682ba81a28e 100644 --- a/dbaccess/source/core/recovery/subcomponents.hxx +++ b/dbaccess/source/core/recovery/subcomponents.hxx @@ -52,7 +52,7 @@ namespace dbaccess // ------------------------------------------------------------------- struct DBACCESS_DLLPRIVATE SubComponentDescriptor { - ::rtl::OUString sName; + OUString sName; bool bForEditing; SubComponentDescriptor() @@ -61,7 +61,7 @@ namespace dbaccess { } - SubComponentDescriptor( const ::rtl::OUString& i_rName, const bool i_bForEditing ) + SubComponentDescriptor( const OUString& i_rName, const bool i_bForEditing ) :sName( i_rName ) ,bForEditing( i_bForEditing ) { @@ -69,7 +69,7 @@ namespace dbaccess }; // ------------------------------------------------------------------- - typedef ::boost::unordered_map< ::rtl::OUString, SubComponentDescriptor, ::rtl::OUStringHash > MapStringToCompDesc; + typedef ::boost::unordered_map< OUString, SubComponentDescriptor, OUStringHash > MapStringToCompDesc; typedef ::std::map< SubComponentType, MapStringToCompDesc > MapCompTypeToCompDescs; |