Tag: cws_src680_bgdlremove User: kso Date: 2007-05-18 09:01:40+0000 Modified: dba/connectivity/source/drivers/file/FConnection.cxx dba/connectivity/source/drivers/file/FDatabaseMetaData.cxx dba/connectivity/source/drivers/calc/CTable.cxx dba/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx dba/connectivity/source/drivers/dbase/DIndex.cxx dba/connectivity/source/drivers/dbase/DTable.cxx dba/connectivity/source/drivers/evoab/LDriver.cxx dba/connectivity/source/drivers/evoab/LFolderList.cxx dba/connectivity/source/drivers/evoab/LTable.cxx dba/connectivity/source/drivers/flat/ETable.cxx
Log: #i77419# - cleanup of ucbhelper namespaces. Issue number: Submitted by: Reviewed by: File Changes: Directory: /dba/connectivity/source/drivers/file/ ================================================= File [changed]: FConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FConnection.cxx?r1=1.47&r2=1.47.60.1 Delta lines: +19 -19 --------------------- --- FConnection.cxx 2006-12-13 16:17:03+0000 1.47 +++ FConnection.cxx 2007-05-18 09:01:37+0000 1.47.60.1 @@ -4,9 +4,9 @@ * * $RCSfile: FConnection.cxx,v $ * - * $Revision: 1.47 $ + * $Revision: 1.47.60.1 $ * - * last change: $Author: kz $ $Date: 2006/12/13 16:17:03 $ + * last change: $Author: kso $ $Date: 2007/05/18 09:01:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -107,7 +107,7 @@ using namespace com::sun::star::sdbcx; using namespace com::sun::star::container; using namespace com::sun::star::ucb; -using namespace ::ucb; +using namespace ::ucbhelper; using rtl::OUString; typedef connectivity::OMetaConnection OConnection_BASE; // -------------------------------------------------------------------------------- @@ -210,10 +210,10 @@ try { - ::ucb::Content aFile; + ::ucbhelper::Content aFile; try { - aFile = ::ucb::Content(getURL(),Reference< ::com::sun::star::ucb::XCommandEnvironment >()); + aFile = ::ucbhelper::Content(getURL(),Reference< XCommandEnvironment >()); } catch(ContentCreationException& e) { @@ -229,7 +229,7 @@ { if (aFile.isFolder()) { - m_xDir = aFile.createDynamicCursor(aProps, ::ucb::INCLUDE_DOCUMENTS_ONLY ); + m_xDir = aFile.createDynamicCursor(aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ); m_xContent = aFile.get(); } else if (aFile.isDocument()) @@ -238,12 +238,12 @@ Reference<XContentIdentifier> xIdent = xParent->getIdentifier(); m_xContent = xParent; - ::ucb::Content aParent(xIdent->getContentIdentifier(),Reference< XCommandEnvironment >()); - m_xDir = aParent.createDynamicCursor(aProps, ::ucb::INCLUDE_DOCUMENTS_ONLY ); + ::ucbhelper::Content aParent(xIdent->getContentIdentifier(),Reference< XCommandEnvironment >()); + m_xDir = aParent.createDynamicCursor(aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ); } else { - OSL_ENSURE(0,"OConnection::construct: ::ucb::Content isn't a folde nor a document! How that?!"); + OSL_ENSURE(0,"OConnection::construct: ::ucbhelper::Content isn't a folde nor a document! How that?!"); throw SQLException(); } } @@ -390,12 +390,12 @@ return 0; } // -------------------------------------------------------------------------------- -Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) { return NULL; } // -------------------------------------------------------------------------------- -void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTypeMap( const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { } // -------------------------------------------------------------------------------- @@ -435,17 +435,17 @@ m_aStatements.clear(); m_bClosed = sal_True; - m_xMetaData = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData>(); + m_xMetaData = WeakReference< XDatabaseMetaData>(); m_xDir = NULL; m_xContent = NULL; // ::comphelper::disposeComponent(m_xCatalog); - m_xCatalog = ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbcx::XTablesSupplier>(); + m_xCatalog = WeakReference< XTablesSupplier>(); dispose_ChildImpl(); OConnection_BASE::disposing(); } //------------------------------------------------------------------------------ -::com::sun::star::uno::Reference< XTablesSupplier > OConnection::createCatalog() +Reference< XTablesSupplier > OConnection::createCatalog() { ::osl::MutexGuard aGuard( m_aMutex ); Reference< XTablesSupplier > xTab = m_xCatalog; @@ -457,7 +457,7 @@ return xTab; } // ----------------------------------------------------------------------------- -::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet > OConnection::getDir() const +Reference< XDynamicResultSet > OConnection::getDir() const { Reference<XDynamicResultSet> xContent; Sequence< ::rtl::OUString > aProps(1); @@ -466,8 +466,8 @@ try { Reference<XContentIdentifier> xIdent = getContent()->getIdentifier(); - ::ucb::Content aParent(xIdent->getContentIdentifier(),Reference< XCommandEnvironment >()); - xContent = aParent.createDynamicCursor(aProps, ::ucb::INCLUDE_DOCUMENTS_ONLY ); + ::ucbhelper::Content aParent(xIdent->getContentIdentifier(),Reference< XCommandEnvironment >()); + xContent = aParent.createDynamicCursor(aProps, ::ucbhelper::INCLUDE_DOCUMENTS_ONLY ); } catch(Exception&) { @@ -475,7 +475,7 @@ return xContent; } // ----------------------------------------------------------------------------- -sal_Int64 SAL_CALL OConnection::getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw (::com::sun::star::uno::RuntimeException) +sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId ) throw (RuntimeException) { return (rId.getLength() == 16 && 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) File [changed]: FDatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/file/FDatabaseMetaData.cxx?r1=1.33&r2=1.33.94.1 Delta lines: +14 -14 --------------------- --- FDatabaseMetaData.cxx 2006-09-17 02:32:12+0000 1.33 +++ FDatabaseMetaData.cxx 2007-05-18 09:01:37+0000 1.33.94.1 @@ -4,9 +4,9 @@ * * $RCSfile: FDatabaseMetaData.cxx,v $ * - * $Revision: 1.33 $ + * $Revision: 1.33.94.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 02:32:12 $ + * last change: $Author: kso $ $Date: 2007/05/18 09:01:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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(); Directory: /dba/connectivity/source/drivers/calc/ ================================================= File [changed]: CTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/calc/CTable.cxx?r1=1.29&r2=1.29.62.1 Delta lines: +6 -14 -------------------- --- CTable.cxx 2006-11-21 16:59:46+0000 1.29 +++ CTable.cxx 2007-05-18 09:01:37+0000 1.29.62.1 @@ -4,9 +4,9 @@ * * $RCSfile: CTable.cxx,v $ * - * $Revision: 1.29 $ + * $Revision: 1.29.62.1 $ * - * last change: $Author: vg $ $Date: 2006/11/21 16:59:46 $ + * last change: $Author: kso $ $Date: 2007/05/18 09:01:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -45,9 +45,9 @@ #ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_ #include <com/sun/star/sdbc/DataType.hpp> #endif -#ifndef _COM_SUN_STAR_UCB_XCONTENTACCESS_HPP_ -#include <com/sun/star/ucb/XContentAccess.hpp> -#endif +//#ifndef _COM_SUN_STAR_UCB_XCONTENTACCESS_HPP_ +//#include <com/sun/star/ucb/XContentAccess.hpp> +//#endif #ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> #endif @@ -117,15 +117,9 @@ #ifndef INCLUDED_RTL_MATH_HXX #include <rtl/math.hxx> #endif -#ifndef _UCBHELPER_CONTENT_HXX -#include <ucbhelper/content.hxx> -#endif #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif -#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX -#include <unotools/ucbstreamhelper.hxx> -#endif #ifndef _DBHELPER_DBEXCEPTION_HXX_ #include <connectivity/dbexception.hxx> #endif @@ -136,11 +130,9 @@ using namespace connectivity; using namespace connectivity::calc; using namespace connectivity::file; -using namespace ::ucb; using namespace ::cppu; using namespace ::dbtools; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; Directory: /dba/connectivity/source/drivers/dbase/ ================================================== File [changed]: DDatabaseMetaData.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx?r1=1.32&r2=1.32.94.1 Delta lines: +7 -5 ------------------- --- DDatabaseMetaData.cxx 2006-09-17 02:21:34+0000 1.32 +++ DDatabaseMetaData.cxx 2007-05-18 09:01:37+0000 1.32.94.1 @@ -4,9 +4,9 @@ * * $RCSfile: DDatabaseMetaData.cxx,v $ * - * $Revision: 1.32 $ + * $Revision: 1.32.94.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 02:21:34 $ + * last change: $Author: kso $ $Date: 2007/05/18 09:01:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -94,6 +94,8 @@ using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; +using namespace ::com::sun::star::ucb; +using namespace ::com::sun::star::lang; ODbaseDatabaseMetaData::ODbaseDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon) { @@ -371,7 +373,7 @@ aRow[4] = new ORowSetValueDecorator(getBOOL(xIndex->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISUNIQUE)))); aRow[6] = new ORowSetValueDecorator(*pBegin); - Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(xIndex,UNO_QUERY); + Reference< XUnoTunnel> xTunnel(xIndex,UNO_QUERY); if(xTunnel.is()) { ODbaseIndex* pIndex = reinterpret_cast< ODbaseIndex* >( xTunnel->getSomething(ODbaseIndex::getUnoTunnelImplementationId()) ); @@ -477,7 +479,7 @@ sal_Bool bReadOnly = sal_False; static ::rtl::OUString sReadOnly = ::rtl::OUString::createFromAscii("IsReadOnly"); - ::ucb::Content aFile(m_pConnection->getContent(),::com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >()); + ::ucbhelper::Content aFile(m_pConnection->getContent(),Reference< XCommandEnvironment >()); aFile.getPropertyValue(sReadOnly) >>= bReadOnly; return bReadOnly; File [changed]: DIndex.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DIndex.cxx?r1=1.41&r2=1.41.94.1 Delta lines: +6 -11 -------------------- --- DIndex.cxx 2006-09-17 02:22:00+0000 1.41 +++ DIndex.cxx 2007-05-18 09:01:37+0000 1.41.94.1 @@ -4,9 +4,9 @@ * * $RCSfile: DIndex.cxx,v $ * - * $Revision: 1.41 $ + * $Revision: 1.41.94.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 02:22:00 $ + * last change: $Author: kso $ $Date: 2007/05/18 09:01:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,9 +75,6 @@ #ifndef _COM_SUN_STAR_SDBC_XROW_HPP_ #include <com/sun/star/sdbc/XRow.hpp> #endif -#ifndef _UCBHELPER_CONTENT_HXX -#include <ucbhelper/content.hxx> -#endif #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif @@ -106,7 +103,6 @@ using namespace ::comphelper; // ------------------------------------------------------------------------- using namespace connectivity; -using namespace ucb; using namespace utl; using namespace ::cppu; using namespace connectivity::file; @@ -116,8 +112,7 @@ using namespace com::sun::star::sdbcx; using namespace com::sun::star::uno; using namespace com::sun::star::beans; -using namespace com::sun::star::ucb; - +using namespace com::sun::star::lang; IMPLEMENT_SERVICE_INFO(ODbaseIndex,"com.sun.star.sdbcx.driver.dbase.Index","com.sun.star.sdbcx.Index"); // ------------------------------------------------------------------------- @@ -181,7 +176,7 @@ return pId->getImplementationId(); } -// com::sun::star::lang::XUnoTunnel +// XUnoTunnel //------------------------------------------------------------------ sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) { @@ -668,7 +663,7 @@ if(xSet->last()) { - Reference< ::com::sun::star::lang::XUnoTunnel> xTunnel(xSet,UNO_QUERY); + Reference< XUnoTunnel> xTunnel(xSet,UNO_QUERY); ODbaseResultSet* pDbaseRes = NULL; if(xTunnel.is()) pDbaseRes = reinterpret_cast< ODbaseResultSet* >( xTunnel->getSomething(ODbaseResultSet::getUnoTunnelImplementationId()) ); File [changed]: DTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/dbase/DTable.cxx?r1=1.101&r2=1.101.30.1 Delta lines: +5 -5 ------------------- --- DTable.cxx 2007-01-25 11:00:44+0000 1.101 +++ DTable.cxx 2007-05-18 09:01:37+0000 1.101.30.1 @@ -4,9 +4,9 @@ * * $RCSfile: DTable.cxx,v $ * - * $Revision: 1.101 $ + * $Revision: 1.101.30.1 $ * - * last change: $Author: obo $ $Date: 2007/01/25 11:00:44 $ + * last change: $Author: kso $ $Date: 2007/05/18 09:01:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -132,7 +132,7 @@ using namespace connectivity::sdbcx; using namespace connectivity::dbase; using namespace connectivity::file; -using namespace ::ucb; +using namespace ::ucbhelper; using namespace ::utl; using namespace ::cppu; using namespace ::dbtools; @@ -1197,7 +1197,7 @@ // 89711 - 16.07.2001 - [EMAIL PROTECTED] try { - ::ucb::Content aDeleteContent( aURL.GetMainURL( INetURLObject::NO_DECODE ), Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); + ::ucbhelper::Content aDeleteContent( aURL.GetMainURL( INetURLObject::NO_DECODE ), Reference< XCommandEnvironment > () ); aDeleteContent.executeCommand( ::rtl::OUString::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) ); } catch(Exception&) Directory: /dba/connectivity/source/drivers/evoab/ ================================================== File [changed]: LDriver.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab/LDriver.cxx?r1=1.7&r2=1.7.94.1 Delta lines: +5 -8 ------------------- --- LDriver.cxx 2006-09-17 02:26:20+0000 1.7 +++ LDriver.cxx 2007-05-18 09:01:37+0000 1.7.94.1 @@ -4,9 +4,9 @@ * * $RCSfile: LDriver.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.94.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 02:26:20 $ + * last change: $Author: kso $ $Date: 2007/05/18 09:01:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -60,9 +60,6 @@ #ifndef _COMPHELPER_PROCESSFACTORY_HXX_ #include <comphelper/processfactory.hxx> #endif -#ifndef _COM_SUN_STAR_UCB_XCONTENTACCESS_HPP_ -#include <com/sun/star/ucb/XContentAccess.hpp> -#endif #ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HPP_ #include <com/sun/star/ucb/XCommandEnvironment.hpp> #endif @@ -424,11 +421,11 @@ //------------------------------------------------------------------------- sal_Bool OEvoabDriver::fileExists(const ::rtl::OUString& _rURL, sal_Bool _bIsDir) const { - ::ucb::Content aCheckExistence; + ::ucbhelper::Content aCheckExistence; sal_Bool bExists = sal_False; try { - aCheckExistence = ::ucb::Content(_rURL, Reference< XCommandEnvironment >()); + aCheckExistence = ::ucbhelper::Content(_rURL, Reference< XCommandEnvironment >()); if(_bIsDir) bExists = aCheckExistence.isFolder(); else File [changed]: LFolderList.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab/LFolderList.cxx?r1=1.11&r2=1.11.94.1 Delta lines: +3 -14 -------------------- --- LFolderList.cxx 2006-09-17 02:26:33+0000 1.11 +++ LFolderList.cxx 2007-05-18 09:01:38+0000 1.11.94.1 @@ -4,9 +4,9 @@ * * $RCSfile: LFolderList.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.11.94.1 $ * - * last change: $Author: obo $ $Date: 2006/09/17 02:26:33 $ + * last change: $Author: kso $ $Date: 2007/05/18 09:01:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,12 +48,6 @@ #ifndef _COM_SUN_STAR_SDBC_DATATYPE_HPP_ #include <com/sun/star/sdbc/DataType.hpp> #endif -#ifndef _COM_SUN_STAR_UCB_XCONTENTACCESS_HPP_ -#include <com/sun/star/ucb/XContentAccess.hpp> -#endif -#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_ -#include <com/sun/star/sdbc/XRow.hpp> -#endif #ifndef _SV_CONVERTER_HXX_ #include <svtools/converter.hxx> #endif @@ -79,9 +73,6 @@ #include <rtl/math.hxx> #endif #include <stdio.h> //sprintf -#ifndef _UCBHELPER_CONTENT_HXX -#include <ucbhelper/content.hxx> -#endif #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif @@ -123,11 +114,9 @@ using namespace connectivity; using namespace connectivity::evoab; using namespace connectivity::file; -using namespace ucb; using namespace ::cppu; using namespace utl; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; File [changed]: LTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/evoab/LTable.cxx?r1=1.15&r2=1.15.62.1 Delta lines: +4 -10 -------------------- --- LTable.cxx 2006-11-21 17:00:10+0000 1.15 +++ LTable.cxx 2007-05-18 09:01:38+0000 1.15.62.1 @@ -4,9 +4,9 @@ * * $RCSfile: LTable.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.15.62.1 $ * - * last change: $Author: vg $ $Date: 2006/11/21 17:00:10 $ + * last change: $Author: kso $ $Date: 2007/05/18 09:01:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,7 +51,7 @@ #include <com/sun/star/ucb/XContentAccess.hpp> #endif #ifndef _COM_SUN_STAR_SQLC_XROW_HPP_ -#include <com/sun/star/sdbc/XRow.hpp> +//#include <com/sun/star/sdbc/XRow.hpp> #endif #ifndef _SV_CONVERTER_HXX_ #include <svtools/converter.hxx> @@ -78,9 +78,6 @@ #include <rtl/math.hxx> #endif #include <stdio.h> //sprintf -#ifndef _UCBHELPER_CONTENT_HXX -#include <ucbhelper/content.hxx> -#endif #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif @@ -114,7 +111,6 @@ using namespace connectivity; using namespace connectivity::evoab; using namespace connectivity::file; -using namespace ucb; using namespace ::cppu; using namespace utl; using namespace ::com::sun::star::uno; @@ -406,8 +402,6 @@ if(aURL.getExtension() != rtl::OUString(m_pConnection->getExtension())) aURL.setExtension(m_pConnection->getExtension()); - // Content aContent(aURL.GetMainURL()); - String aFileName = aURL.GetMainURL(INetURLObject::NO_DECODE); m_pFileStream = createStream_simpleError( aFileName,STREAM_READWRITE | STREAM_NOCREATE | STREAM_SHARE_DENYWRITE); Directory: /dba/connectivity/source/drivers/flat/ ================================================= File [changed]: ETable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/flat/ETable.cxx?r1=1.56&r2=1.56.62.1 Delta lines: +3 -10 -------------------- --- ETable.cxx 2006-11-21 17:00:22+0000 1.56 +++ ETable.cxx 2007-05-18 09:01:38+0000 1.56.62.1 @@ -4,9 +4,9 @@ * * $RCSfile: ETable.cxx,v $ * - * $Revision: 1.56 $ + * $Revision: 1.56.62.1 $ * - * last change: $Author: vg $ $Date: 2006/11/21 17:00:22 $ + * last change: $Author: kso $ $Date: 2007/05/18 09:01:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,9 +50,6 @@ #ifndef _COM_SUN_STAR_UCB_XCONTENTACCESS_HPP_ #include <com/sun/star/ucb/XContentAccess.hpp> #endif -#ifndef _COM_SUN_STAR_SQLC_XROW_HPP_ -#include <com/sun/star/sdbc/XRow.hpp> -#endif #ifndef _SV_CONVERTER_HXX_ #include <svtools/converter.hxx> #endif @@ -78,9 +75,6 @@ #include <rtl/math.hxx> #endif #include <stdio.h> //sprintf -#ifndef _UCBHELPER_CONTENT_HXX -#include <ucbhelper/content.hxx> -#endif #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> #endif @@ -113,7 +107,6 @@ using namespace connectivity; using namespace connectivity::flat; using namespace connectivity::file; -using namespace ucb; using namespace ::cppu; using namespace utl; using namespace ::com::sun::star::uno; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
