User: hr Date: 06/06/19 18:44:33 Modified: /dba/connectivity/source/drivers/mozab/ MResultSet.hxx
Log: INTEGRATION: CWS warnings01 (1.9.30); FILE MERGED 2006/05/23 23:34:25 sb 1.9.30.6: RESYNC: (1.10-1.11); FILE MERGED 2006/01/25 20:57:38 sb 1.9.30.5: RESYNC: (1.9-1.10); FILE MERGED 2005/12/22 12:14:44 fs 1.9.30.4: warning-free code 2005/11/21 10:07:52 fs 1.9.30.3: #i57457# warning-free code on unx* 2005/11/16 12:59:13 fs 1.9.30.2: #i57457# warning free code 2005/11/07 14:43:46 fs 1.9.30.1: #i57457# warning-free code File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MResultSet.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MResultSet.hxx?r1=1.11&r2=1.12 Delta lines: +25 -22 --------------------- --- MResultSet.hxx 31 Mar 2006 11:54:44 -0000 1.11 +++ MResultSet.hxx 20 Jun 2006 01:44:30 -0000 1.12 @@ -269,7 +269,7 @@ virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL hashBookmark( const ::com::sun::star::uno::Any& bookmark ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XDeleteRows - virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException){return 0;}; + virtual ::com::sun::star::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rows ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); protected: MQuery m_aQuery; @@ -280,7 +280,7 @@ ::std::vector<sal_Int32> m_aColMapping; // pos 0 is unused so we don't have to decrement 1 everytime ::std::vector<sal_Int32> m_aOrderbyColumnNumber; - ::std::vector<sal_Int16> m_aOrderbyAscending; + ::std::vector<TAscendingOrder> m_aOrderbyAscending; ::com::sun::star::uno::Sequence< ::rtl::OUString> m_aColumnNames; OValueRow m_aRow; OValueRow m_aParameterRow; @@ -316,7 +316,7 @@ sal_uInt32 currentRowCount(); - sal_Bool fetchRow(sal_uInt32 rowIndex,sal_Bool bForceReload=sal_False) throw( ::com::sun::star::sdbc::SQLException, + sal_Bool fetchRow(sal_Int32 rowIndex,sal_Bool bForceReload=sal_False) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); sal_Bool fetchCurrentRow() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -327,7 +327,7 @@ sal_Int32 deletedCount(); sal_Bool fillKeySet(sal_Int32 nMaxCardNumber); //When we get new rows, fill the m_pKeySet items for them sal_Int32 getRowForCardNumber(sal_Int32 nCardNum); - const ORowSetValue& getValue(sal_uInt32 rowIndex, sal_Int32 columnIndex) + const ORowSetValue& getValue(sal_Int32 rowIndex, sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -355,7 +355,7 @@ void setOrderByColumns(const ::std::vector<sal_Int32>& _aColumnOrderBy); - void setOrderByAscending(const ::std::vector<sal_Int16>& _aOrderbyAsc); + void setOrderByAscending(const ::std::vector<TAscendingOrder>& _aOrderbyAsc); inline sal_Int32 mapColumn(sal_Int32 column); @@ -378,6 +378,9 @@ if ( !m_pKeySet.isValid() ) m_pKeySet = new OKeySet(); } + + protected: + using OPropertySetHelper::getFastPropertyValue; }; inline sal_Int32 OResultSet::mapColumn(sal_Int32 column) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
