Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:49:40 Modified: dba/dbaccess/source/ui/browser/sbagrid.cxx
Log: RESYNC: (1.73-1.75); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: sbagrid.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/sbagrid.cxx?r1=1.73.4.3&r2=1.73.4.4 Delta lines: +26 -26 --------------------- --- sbagrid.cxx 25 Apr 2006 13:01:30 -0000 1.73.4.3 +++ sbagrid.cxx 4 Jul 2006 07:49:37 -0000 1.73.4.4 @@ -121,6 +121,9 @@ #ifndef _URLOBJ_HXX #include <tools/urlobj.hxx> #endif +#ifndef TOOLS_DIAGNOSE_EX_H +#include <tools/diagnose_ex.h> +#endif #ifndef _SFXINTITEM_HXX #include <svtools/intitem.hxx> @@ -658,7 +661,7 @@ } //--------------------------------------------------------------------------------------- -IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, NOTINTERESTEDIN ) +IMPL_LINK( SbaXGridPeer, OnDispatchEvent, void*, /*NOTINTERESTEDIN*/ ) { SbaGridControl* pGrid = static_cast< SbaGridControl* >( GetWindow() ); if ( pGrid ) // if this fails, we were disposing before arriving here @@ -784,6 +787,9 @@ pGrid->SetColWidth(nColId); } break; + + case dtUnknown: + break; } // notify any status listeners that the dialog vanished @@ -844,7 +850,7 @@ sal_Int64 SAL_CALL SbaXGridPeer::getSomething( const Sequence< sal_Int8 > & rId ) throw(::com::sun::star::uno::RuntimeException) { if( rId.getLength() == 16 && 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) - return (sal_Int64)this; + return reinterpret_cast< sal_Int64 >( this ); return FmXGridPeer::getSomething(rId); } @@ -1014,10 +1020,9 @@ if(!xField.is()) break; - ::std::vector<OTableRow*> vClipboardList; - OTableRow* pTableRow = new OTableRow(xField); + ::std::vector< ::boost::shared_ptr<OTableRow> > vClipboardList; // send it to the clipboard - vClipboardList.push_back(pTableRow); + vClipboardList.push_back(::boost::shared_ptr<OTableRow>(new OTableRow(xField))); OTableRowExchange* pData = new OTableRowExchange(vClipboardList); Reference< ::com::sun::star::datatransfer::XTransferable> xRef = pData; #if SUPD<631 @@ -1040,12 +1045,12 @@ SbaGridControl::SbaGridControl(Reference< XMultiServiceFactory > _rM, Window* pParent, FmXGridPeer* _pPeer, WinBits nBits) :FmGridControl(_rM,pParent, _pPeer, nBits) - ,m_nLastColId(-1) - ,m_nLastRowId(-1) - ,m_nCurrentActionColId(-1) ,m_pMasterListener(NULL) - ,m_bActivatingForDrop(sal_False) ,m_nAsyncDropEvent(0) + ,m_nLastColId((USHORT)-1) + ,m_nLastRowId(-1) + ,m_nCurrentActionColId((USHORT)-1) + ,m_bActivatingForDrop(sal_False) { DBG_CTOR(SbaGridControl ,NULL); } @@ -1067,9 +1072,8 @@ //--------------------------------------------------------------------------------------- CellController* SbaGridControl::GetController(long nRow, sal_uInt16 nCol) { - CellControllerRef aController; - if (m_bActivatingForDrop) - return &aController; + if ( m_bActivatingForDrop ) + return NULL; return FmGridControl::GetController(nRow, nCol); } @@ -1099,10 +1103,8 @@ { Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = ::dbtools::getNumberFormats(::dbtools::getConnection(Reference< XRowSet > (getDataSource(),UNO_QUERY)), sal_True,getServiceManager()); - Reference< XUnoTunnel > xTunnel(xSupplier,UNO_QUERY); - SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId()); - - if (!pSupplierImpl) + SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); + if ( !pSupplierImpl ) return NULL; SvNumberFormatter* pFormatter = pSupplierImpl->GetNumberFormatter(); @@ -1622,7 +1624,6 @@ case SOT_FORMATSTR_ID_DBACCESS_QUERY: // query descriptor case SOT_FORMATSTR_ID_DBACCESS_COMMAND: // SQL command return true; - break; } return false; } @@ -1683,7 +1684,7 @@ } catch (const Exception& e ) { - e; // make compiler happy + (void)e; // make compiler happy // assume RO break; } @@ -1708,8 +1709,7 @@ } catch( const Exception& e ) { - e; // make compiler happy - DBG_ERROR( "SbaGridControl::AcceptDrop: caught an exception!" ); + DBG_UNHANDLED_EXCEPTION(); } } while (sal_False); @@ -1834,7 +1834,7 @@ return xReturn; } // ----------------------------------------------------------------------------- -IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, EMPTY_ARG) +IMPL_LINK(SbaGridControl, AsynchDropEvent, void*, /*EMPTY_ARG*/) { m_nAsyncDropEvent = 0; @@ -1881,7 +1881,7 @@ return 0L; } // ------------------------------------------------------------------------- -::rtl::OUString SbaGridControl::GetAccessibleDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const +::rtl::OUString SbaGridControl::GetAccessibleObjectDescription( ::svt::AccessibleBrowseBoxObjType eObjType,sal_Int32 _nPosition) const { ::rtl::OUString sRet; if ( ::svt::BBTYPE_BROWSEBOX == eObjType ) @@ -1890,7 +1890,7 @@ sRet = String(ModuleRes(STR_DATASOURCE_GRIDCONTROL_DESC)); } else - sRet = FmGridControl::GetAccessibleDescription( eObjType,_nPosition); + sRet = FmGridControl::GetAccessibleObjectDescription( eObjType,_nPosition); return sRet; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
