User: ihi Date: 2007-06-05 14:22:37+0000 Log: INTEGRATION: CWS bgdlremove (1.33.94); FILE MERGED 2007/05/18 09:01:37 kso 1.33.94.1: #i77419# - cleanup of ucbhelper namespaces. Issue number: Submitted by: Reviewed by:
File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FDatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FDatabaseMetaData.cxx?r1=1.33&r2=1.34 Delta lines: +11 -11 --------------------- --- FDatabaseMetaData.cxx 2006-09-17 02:32:12+0000 1.33 +++ FDatabaseMetaData.cxx 2007-06-05 14:22:34+0000 1.34 @@ -157,16 +157,16 @@ { // first get the real content for the URL INetURLObject aContentURL( _rFolderOrDoc ); - ::ucb::Content aContent1; + ::ucbhelper::Content aContent1; { - ::ucb::Content aFolderOrDoc( _rFolderOrDoc, Reference< XCommandEnvironment >() ); + ::ucbhelper::Content aFolderOrDoc( _rFolderOrDoc, Reference< XCommandEnvironment >() ); if ( aFolderOrDoc.isDocument() ) aContent1 = aFolderOrDoc; else { aContentURL = INetURLObject( _rFolderOrDoc, INetURLObject::WAS_ENCODED ); aContentURL.Append( _rDocName ); - aContent1 = ::ucb::Content( aContentURL.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment >() ); + aContent1 = ::ucbhelper::Content( aContentURL.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment >() ); } } @@ -187,10 +187,10 @@ // the second context sal_Bool bCanAccess = sal_False; - ::ucb::Content aContent2; + ::ucbhelper::Content aContent2; try { - aContent2 = ::ucb::Content( aURL2.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment >() ); + aContent2 = ::ucbhelper::Content( aURL2.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment >() ); bCanAccess = aContent2.isDocument(); } catch( const Exception& ) @@ -212,7 +212,7 @@ if ( xID1.is() && xID2.is() ) { // get a generic content provider - ::ucb::ContentBroker* pBroker = ::ucb::ContentBroker::get(); + ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get(); Reference< XContentProvider > xProvider; if ( pBroker ) xProvider = pBroker->getContentProviderInterface(); @@ -276,13 +276,13 @@ Reference < XSortedDynamicResultSetFactory > xSRSFac( m_pConnection->getDriver()->getFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.ucb.SortedDynamicResultSetFactory") ), UNO_QUERY ); - Sequence< com::sun::star::ucb::NumberedSortingInfo > aSortInfo( 1 ); - com::sun::star::ucb::NumberedSortingInfo* pInfo = aSortInfo.getArray(); + Sequence< NumberedSortingInfo > aSortInfo( 1 ); + NumberedSortingInfo* pInfo = aSortInfo.getArray(); pInfo[ 0 ].ColumnIndex = 1; pInfo[ 0 ].Ascending = sal_True; - Reference < com::sun::star::ucb::XAnyCompareFactory > xFactory; - Reference< com::sun::star::ucb::XDynamicResultSet > xDynamicResultSet; + Reference < XAnyCompareFactory > xFactory; + Reference< XDynamicResultSet > xDynamicResultSet; xDynamicResultSet = xSRSFac->createSortedDynamicResultSet( xContent, aSortInfo, xFactory ); Reference<XResultSet> xResultSet = xDynamicResultSet->getStaticResultSet(); @@ -509,7 +509,7 @@ ODatabaseMetaDataResultSet::ORows aRows; - Reference< ::com::sun::star::sdbcx::XTablesSupplier > xTabSup = m_pConnection->createCatalog(); + Reference< XTablesSupplier > xTabSup = m_pConnection->createCatalog(); if( xTabSup.is()) { Reference< XNameAccess> xNames = xTabSup->getTables(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
