Tag: cws_src680_kaddrbook User: ebischoff Date: 05/08/30 08:36:30 Modified: /dba/connectivity/source/drivers/kab/ KTable.cxx, KTable.hxx, makefile.mk
Log: Started applying Frank's remarks File Changes: Directory: /dba/connectivity/source/drivers/kab/ ================================================ File [changed]: KTable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KTable.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +4 -32 -------------------- --- KTable.cxx 29 Aug 2005 08:43:54 -0000 1.1.2.1 +++ KTable.cxx 30 Aug 2005 15:36:25 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: KTable.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: ebischoff $ $Date: 2005/08/29 08:43:54 $ + * last change: $Author: ebischoff $ $Date: 2005/08/30 15:36:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,32 +130,4 @@ m_pColumns->reFill(aVector); else m_pColumns = new KabColumns(this,m_aMutex,aVector); -} -//-------------------------------------------------------------------------- -Sequence< sal_Int8 > KabTable::getUnoTunnelImplementationId() -{ - static ::cppu::OImplementationId * pId = 0; - - if (! pId) - { - ::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() ); - if (! pId) - { - static ::cppu::OImplementationId aId; - pId = &aId; - } - } - return pId->getImplementationId(); -} - -// com::sun::star::lang::XUnoTunnel -//------------------------------------------------------------------ -sal_Int64 KabTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) -{ - return - (rId.getLength() == 16 && - 0 == rtl_compareMemory(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16) - ) ? - (sal_Int64) this : - KabTable_TYPEDEF::getSomething(rId); } File [changed]: KTable.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/KTable.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +5 -10 -------------------- --- KTable.hxx 29 Aug 2005 08:43:55 -0000 1.1.2.1 +++ KTable.hxx 30 Aug 2005 15:36:26 -0000 1.1.2.2 @@ -2,9 +2,9 @@ * * $RCSfile: KTable.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: ebischoff $ $Date: 2005/08/29 08:43:55 $ + * last change: $Author: ebischoff $ $Date: 2005/08/30 15:36:26 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,15 +96,10 @@ KabConnection* getConnection() { return m_pConnection;} - sal_Bool isReadOnly() const { return sal_False; } virtual void refreshColumns(); ::rtl::OUString getTableName() const { return m_Name; } ::rtl::OUString getSchema() const { return m_SchemaName; } - - // 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(); }; } } File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/kab/makefile.mk?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +5 -2 ------------------- --- makefile.mk 29 Aug 2005 08:43:57 -0000 1.1.2.1 +++ makefile.mk 30 Aug 2005 15:36:26 -0000 1.1.2.2 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.2.1 $ +# $Revision: 1.1.2.2 $ # -# last change: $Author: ebischoff $ $Date: 2005/08/29 08:43:57 $ +# last change: $Author: ebischoff $ $Date: 2005/08/30 15:36:26 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -92,6 +92,9 @@ $(SLO)$/KDriver.obj \ $(SLO)$/KCondition.obj +.IF "$(KDE_ROOT)"!="" +KDE_CFLAGS:=-I$(KDE_ROOT)$/include -DQT_CLEAN_NAMESPACE +.ENDIF # "$(KDE_ROOT)"!="" CFLAGS+=$(KDE_CFLAGS) SLOFILES=\ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
