diff options
-rwxr-xr-x | svtools/source/table/tablecontrol_impl.cxx | 2 | ||||
-rw-r--r-- | svtools/source/uno/unocontroltablemodel.cxx | 12 | ||||
-rw-r--r-- | toolkit/prj/build.lst | 2 | ||||
-rw-r--r-- | toolkit/source/controls/grid/defaultgridcolumnmodel.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/grid/defaultgriddatamodel.cxx | 8 | ||||
-rw-r--r-- | toolkit/source/controls/grid/defaultgriddatamodel.hxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/grid/gridcolumn.cxx | 3 | ||||
-rwxr-xr-x | toolkit/source/controls/grid/grideventforwarder.cxx | 4 | ||||
-rwxr-xr-x | toolkit/source/controls/grid/grideventforwarder.hxx | 4 |
9 files changed, 24 insertions, 17 deletions
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index c2f9465bfdd8..dab7df674ed2 100755 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -836,7 +836,7 @@ namespace svt { namespace table if ( m_aColumnWidths.empty() ) impl_ni_updateColumnWidths(); - OSL_ENSURE( m_aColumnWidths.size() == m_nColumnCount, "TableControl_Impl::impl_ni_updateScrollbars: inconsistency!" ); + OSL_ENSURE( m_aColumnWidths.size() == size_t( m_nColumnCount ), "TableControl_Impl::impl_ni_updateScrollbars: inconsistency!" ); const long nAllColumnsWidth = m_aColumnWidths.empty() ? 0 : m_aColumnWidths[ m_nColumnCount - 1 ].getEnd() - m_aColumnWidths[ 0 ].getStart(); diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx index 36532222dfe4..fd40501dce2d 100644 --- a/svtools/source/uno/unocontroltablemodel.cxx +++ b/svtools/source/uno/unocontroltablemodel.cxx @@ -349,7 +349,7 @@ using namespace ::com::sun::star::awt::grid; //-------------------------------------------------------------------- void UnoControlTableModel::insertColumn( ColPos const i_position, const PColumnModel& i_column ) { - ENSURE_OR_RETURN_VOID( ( i_position >= 0 ) && ( i_position <= m_pImpl->aColumns.size() ), "illegal position!" ); + ENSURE_OR_RETURN_VOID( ( i_position >= 0 ) && ( size_t( i_position ) <= m_pImpl->aColumns.size() ), "illegal position!" ); ENSURE_OR_RETURN_VOID( !!i_column, "illegal column" ); m_pImpl->aColumns.insert( m_pImpl->aColumns.begin() + i_position, i_column ); @@ -505,10 +505,10 @@ using namespace ::com::sun::star::awt::grid; //-------------------------------------------------------------------- void UnoControlTableModel::getCellContent( ColPos const i_col, RowPos const i_row, Any& o_cellContent ) { - ENSURE_OR_RETURN_VOID( ( i_row >= 0 ) && ( i_row < m_pImpl->aCellContent.size() ), + ENSURE_OR_RETURN_VOID( ( i_row >= 0 ) && ( size_t( i_row ) < m_pImpl->aCellContent.size() ), "UnoControlTableModel::getCellContent: illegal row index!" ); ::std::vector< Any >& rRowContent( m_pImpl->aCellContent[ i_row ] ); - ENSURE_OR_RETURN_VOID( ( i_col >= 0 ) && ( i_col < rRowContent.size() ), + ENSURE_OR_RETURN_VOID( ( i_col >= 0 ) && ( size_t( i_col ) < rRowContent.size() ), "UnoControlTableModel::getCellContent: illegal column index" ); o_cellContent = rRowContent[ i_col ]; } @@ -516,10 +516,10 @@ using namespace ::com::sun::star::awt::grid; //-------------------------------------------------------------------- void UnoControlTableModel::updateCellContent( RowPos const i_row, ColPos const i_col, Any const & i_cellContent ) { - ENSURE_OR_RETURN_VOID( ( i_row >= 0 ) && ( i_row < m_pImpl->aCellContent.size() ), + ENSURE_OR_RETURN_VOID( ( i_row >= 0 ) && ( size_t( i_row ) < m_pImpl->aCellContent.size() ), "UnoControlTableModel::updateCellContent: illegal row index!" ); ::std::vector< Any >& rRowContent( m_pImpl->aCellContent[ i_row ] ); - ENSURE_OR_RETURN_VOID( ( i_col >= 0 ) && ( i_col < rRowContent.size() ), + ENSURE_OR_RETURN_VOID( ( i_col >= 0 ) && ( size_t( i_col ) < rRowContent.size() ), "UnoControlTableModel::updateCellContent: illegal column index" ); rRowContent[ i_col ] = i_cellContent; @@ -545,7 +545,7 @@ using namespace ::com::sun::star::awt::grid; //-------------------------------------------------------------------- ::rtl::OUString UnoControlTableModel::getRowHeader( RowPos const i_rowPos ) const { - ENSURE_OR_RETURN( ( i_rowPos >= 0 ) && ( i_rowPos < m_pImpl->aRowHeadersTitle.size() ), + ENSURE_OR_RETURN( ( i_rowPos >= 0 ) && ( size_t( i_rowPos ) < m_pImpl->aRowHeadersTitle.size() ), "UnoControlTableModel::getRowHeader: illegal row position!", ::rtl::OUString() ); return m_pImpl->aRowHeadersTitle[ i_rowPos ]; } diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst index d7e4b24c8b02..753f25a55666 100644 --- a/toolkit/prj/build.lst +++ b/toolkit/prj/build.lst @@ -1,4 +1,4 @@ -ti toolkit : vcl NULL +ti toolkit : vcl test NULL ti toolkit usr1 - all ti_mkout NULL ti toolkit\prj get - all ti_prj NULL ti toolkit\inc nmake - all ti_inc NULL diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx index c1cafd568326..8537a03321aa 100644 --- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx +++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx @@ -77,7 +77,8 @@ namespace toolkit //------------------------------------------------------------------------------------------------------------------ DefaultGridColumnModel::DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource ) - :DefaultGridColumnModel_Base( m_aMutex ) + :cppu::BaseMutex() + ,DefaultGridColumnModel_Base( m_aMutex ) ,m_aContext( i_copySource.m_aContext ) ,m_aContainerListeners( m_aMutex ) ,m_aColumns() diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx index eb6f777c3b41..be3dd303a566 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx @@ -67,7 +67,9 @@ namespace toolkit //================================================================================================================== //------------------------------------------------------------------------------------------------------------------ DefaultGridDataModel::DefaultGridDataModel() - :m_nRowHeight(0) + :DefaultGridDataModel_Base() + ,MutexAndBroadcastHelper() + ,m_nRowHeight(0) ,m_aRowHeaders() ,m_nRowHeaderWidth(10) { @@ -75,7 +77,9 @@ namespace toolkit //------------------------------------------------------------------------------------------------------------------ DefaultGridDataModel::DefaultGridDataModel( DefaultGridDataModel const & i_copySource ) - :m_nRowHeight( i_copySource.m_nRowHeight ) + :DefaultGridDataModel_Base() + ,MutexAndBroadcastHelper() + ,m_nRowHeight( i_copySource.m_nRowHeight ) ,m_aData( i_copySource.m_aData ) ,m_aRowHeaders( i_copySource.m_aRowHeaders ) ,m_nRowHeaderWidth( i_copySource.m_nRowHeaderWidth ) diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.hxx b/toolkit/source/controls/grid/defaultgriddatamodel.hxx index 242c8ba514ab..bfb67c7fea2a 100644 --- a/toolkit/source/controls/grid/defaultgriddatamodel.hxx +++ b/toolkit/source/controls/grid/defaultgriddatamodel.hxx @@ -52,7 +52,8 @@ namespace toolkit enum broadcast_type { row_added, row_removed, data_changed}; -class DefaultGridDataModel : public ::cppu::WeakImplHelper2< XGridDataModel, XServiceInfo >, +typedef ::cppu::WeakImplHelper2< XGridDataModel, XServiceInfo > DefaultGridDataModel_Base; +class DefaultGridDataModel : public DefaultGridDataModel_Base, public MutexAndBroadcastHelper { public: diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx index 576871fc677a..d681a3101b12 100644 --- a/toolkit/source/controls/grid/gridcolumn.cxx +++ b/toolkit/source/controls/grid/gridcolumn.cxx @@ -68,7 +68,8 @@ namespace toolkit //------------------------------------------------------------------------------------------------------------------ GridColumn::GridColumn( GridColumn const & i_copySource ) - :GridColumn_Base( m_aMutex ) + :cppu::BaseMutex() + ,GridColumn_Base( m_aMutex ) ,m_aIdentifier( i_copySource.m_aIdentifier ) ,m_nIndex( i_copySource.m_nIndex ) ,m_nColumnWidth( i_copySource.m_nColumnWidth ) diff --git a/toolkit/source/controls/grid/grideventforwarder.cxx b/toolkit/source/controls/grid/grideventforwarder.cxx index 2c3d740af04e..2c99acb86959 100755 --- a/toolkit/source/controls/grid/grideventforwarder.cxx +++ b/toolkit/source/controls/grid/grideventforwarder.cxx @@ -69,13 +69,13 @@ namespace toolkit } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL GridEventForwarder::acquire() + void SAL_CALL GridEventForwarder::acquire() throw() { m_parent.acquire(); } //------------------------------------------------------------------------------------------------------------------ - void SAL_CALL GridEventForwarder::release() + void SAL_CALL GridEventForwarder::release() throw() { m_parent.release(); } diff --git a/toolkit/source/controls/grid/grideventforwarder.hxx b/toolkit/source/controls/grid/grideventforwarder.hxx index 3066ead79c94..93905b06f492 100755 --- a/toolkit/source/controls/grid/grideventforwarder.hxx +++ b/toolkit/source/controls/grid/grideventforwarder.hxx @@ -57,8 +57,8 @@ namespace toolkit public: // XInterface - virtual void SAL_CALL acquire(); - virtual void SAL_CALL release(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); // XGridDataListener virtual void SAL_CALL rowAdded( const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException); |