Tag: cws_src680_mingwport03 User: vg Date: 2006/10/25 05:11:40 Modified: dba/connectivity/source/drivers/ado/ATable.cxx dba/connectivity/source/drivers/ado/Aolevariant.cxx dba/connectivity/source/inc/ado/ATable.hxx dba/connectivity/source/inc/ado/Aolewrap.hxx
Log: #i53572# MinGW port File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: ATable.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/ATable.cxx?r1=1.29.44.1&r2=1.29.44.2 Delta lines: +6 -2 ------------------- --- ATable.cxx 7 Sep 2006 10:22:04 -0000 1.29.44.1 +++ ATable.cxx 25 Oct 2006 12:11:36 -0000 1.29.44.2 @@ -4,9 +4,9 @@ * * $RCSfile: ATable.cxx,v $ * - * $Revision: 1.29.44.1 $ + * $Revision: 1.29.44.2 $ * - * last change: $Author: vg $ $Date: 2006/09/07 10:22:04 $ + * last change: $Author: vg $ $Date: 2006/10/25 12:11:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -290,4 +290,8 @@ OTable_TYPEDEF::release(); } // ----------------------------------------------------------------------------- +::rtl::OUString SAL_CALL OAdoTable::getName() throw(::com::sun::star::uno::RuntimeException) +{ + return m_aTable.get_Name(); +} File [changed]: Aolevariant.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/Aolevariant.cxx?r1=1.12.60.1&r2=1.12.60.2 Delta lines: +6 -3 ------------------- --- Aolevariant.cxx 7 Sep 2006 10:22:04 -0000 1.12.60.1 +++ Aolevariant.cxx 25 Oct 2006 12:11:36 -0000 1.12.60.2 @@ -4,9 +4,9 @@ * * $RCSfile: Aolevariant.cxx,v $ * - * $Revision: 1.12.60.1 $ + * $Revision: 1.12.60.2 $ * - * last change: $Author: vg $ $Date: 2006/09/07 10:22:04 $ + * last change: $Author: vg $ $Date: 2006/10/25 12:11:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -509,7 +509,10 @@ // ----------------------------------------------------------------------------- ::rtl::OUString OLEVariant::getString() const { - return isNull() ? ::rtl::OUString() : (rtl::OUString)*this; + if(isNull()) + return ::rtl::OUString(); + else + return *this; } // ----------------------------------------------------------------------------- sal_Bool OLEVariant::getBool() const Directory: /dba/connectivity/source/inc/ado/ ============================================ File [changed]: ATable.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/ado/ATable.hxx?r1=1.10.168.1&r2=1.10.168.2 Delta lines: +3 -3 ------------------- --- ATable.hxx 7 Sep 2006 10:22:10 -0000 1.10.168.1 +++ ATable.hxx 25 Oct 2006 12:11:37 -0000 1.10.168.2 @@ -4,9 +4,9 @@ * * $RCSfile: ATable.hxx,v $ * - * $Revision: 1.10.168.1 $ + * $Revision: 1.10.168.2 $ * - * last change: $Author: vg $ $Date: 2006/09/07 10:22:10 $ + * last change: $Author: vg $ $Date: 2006/10/25 12:11:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -75,7 +75,7 @@ OAdoTable(sdbcx::OCollection* _pTables,sal_Bool _bCase,OCatalog* _pCatalog); - virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException) { return m_Name; } + virtual ::rtl::OUString SAL_CALL getName() throw(::com::sun::star::uno::RuntimeException); ::rtl::OUString getSchema() const { return m_SchemaName; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() const; // com::sun::star::lang::XUnoTunnel File [changed]: Aolewrap.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/inc/ado/Aolewrap.hxx?r1=1.10.168.1&r2=1.10.168.2 Delta lines: +11 -9 -------------------- --- Aolewrap.hxx 7 Sep 2006 10:22:10 -0000 1.10.168.1 +++ Aolewrap.hxx 25 Oct 2006 12:11:37 -0000 1.10.168.2 @@ -4,9 +4,9 @@ * * $RCSfile: Aolewrap.hxx,v $ * - * $Revision: 1.10.168.1 $ + * $Revision: 1.10.168.2 $ * - * last change: $Author: vg $ $Date: 2006/09/07 10:22:10 $ + * last change: $Author: vg $ $Date: 2006/10/25 12:11:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -157,6 +157,7 @@ template<class Ts, class T, class WrapT> class WpOLECollection : public WpOLEBase<Ts> { public: + using WpOLEBase<Ts>::pInterface; // Konstruktoren, operator= // diese rufen nur die Oberklasse WpOLECollection(Ts* pInt=NULL):WpOLEBase<Ts>(pInt){} @@ -166,12 +167,12 @@ ////////////////////////////////////////////////////////////////////// - inline void Refresh(){WpOLEBase<Ts>::pInterface->Refresh();} + inline void Refresh(){pInterface->Refresh();} inline sal_Int32 GetItemCount() const { sal_Int32 nCount = 0; - return WpOLEBase<Ts>::pInterface ? (SUCCEEDED(WpOLEBase<Ts>::pInterface->get_Count(&nCount)) ? nCount : sal_Int32(0)) : sal_Int32(0); + return pInterface ? (SUCCEEDED(pInterface->get_Count(&nCount)) ? nCount : sal_Int32(0)) : sal_Int32(0); } inline WrapT GetItem(sal_Int32 index) const @@ -179,7 +180,7 @@ OSL_ENSURE(index >= 0 && index<GetItemCount(),"Wrong index for field!"); T* pT = NULL; WrapT aRet(NULL); - if(SUCCEEDED(WpOLEBase<Ts>::pInterface->get_Item(OLEVariant(index), &pT))) + if(SUCCEEDED(pInterface->get_Item(OLEVariant(index), &pT))) aRet.setWithOutAddRef(pT); return aRet; } @@ -188,7 +189,7 @@ { T* pT = NULL; WrapT aRet(NULL); - if(SUCCEEDED(WpOLEBase<Ts>::pInterface->get_Item(index, &pT))) + if(SUCCEEDED(pInterface->get_Item(index, &pT))) aRet.setWithOutAddRef(pT); return aRet; } @@ -197,7 +198,7 @@ { WrapT aRet(NULL); T* pT = NULL; - if (FAILED(WpOLEBase<Ts>::pInterface->get_Item(OLEVariant(sStr), &pT))) + if (FAILED(pInterface->get_Item(OLEVariant(sStr), &pT))) { #if OSL_DEBUG_LEVEL > 0 ::rtl::OString sTemp("Unknown Item: "); @@ -233,6 +234,7 @@ public: // Konstruktoren, operator= // diese rufen nur die Oberklasse + using WpOLEBase<Ts>::pInterface; WpOLEAppendCollection(Ts* pInt=NULL):WpOLECollection<Ts,T,WrapT>(pInt){} WpOLEAppendCollection(const WpOLEAppendCollection& rhs){ operator=(rhs); } inline WpOLEAppendCollection& operator=(const WpOLEAppendCollection& rhs) @@ -241,12 +243,12 @@ inline sal_Bool Append(const WrapT& aWrapT) { - return SUCCEEDED(WpOLEBase<Ts>::pInterface->Append(OLEVariant((T*)aWrapT))); + return SUCCEEDED(pInterface->Append(OLEVariant((T*)aWrapT))); }; inline sal_Bool Delete(const ::rtl::OUString& sName) { - return SUCCEEDED(WpOLEBase<Ts>::pInterface->Delete(OLEVariant(sName))); + return SUCCEEDED(pInterface->Delete(OLEVariant(sName))); }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
