User: hr Date: 06/06/19 20:32:11 Modified: /dba/dbaccess/source/ui/tabledesign/ TEditControl.cxx
Log: INTEGRATION: CWS warnings01 (1.46.6); FILE MERGED 2006/05/24 00:01:28 sb 1.46.6.3: RESYNC: (1.47-1.50); FILE MERGED 2006/04/07 20:55:55 sb 1.46.6.2: RESYNC: (1.46-1.47); FILE MERGED 2006/03/24 15:36:30 fs 1.46.6.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/ui/tabledesign/ =============================================== File [changed]: TEditControl.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/tabledesign/TEditControl.cxx?r1=1.50&r2=1.51 Delta lines: +52 -55 --------------------- --- TEditControl.cxx 4 May 2006 08:47:33 -0000 1.50 +++ TEditControl.cxx 20 Jun 2006 03:32:09 -0000 1.51 @@ -132,7 +132,7 @@ //============================================================================== // TYPEINIT1(OTableEditorCtrl, DBView); -DBG_NAME(OTableEditorCtrl); +DBG_NAME(OTableEditorCtrl) //============================================================================== @@ -232,22 +232,22 @@ //================================================================== OTableEditorCtrl::OTableEditorCtrl(Window* pWindow) :OTableRowView(pWindow) - ,m_aInvalidate(500,this) ,pNameCell(NULL) ,pTypeCell(NULL) ,pDescrCell(NULL) + ,pDescrWin(NULL) ,nIndexEvent(0) - ,nOldDataPos(-1) - ,bSaveOnMove(sal_True) ,nCutEvent(0) ,nPasteEvent(0) ,nDeleteEvent(0) ,nInsNewRowsEvent(0) ,nInvalidateTypeEvent(0) ,nEntryNotFoundEvent(0) - ,bReadOnly(sal_True) - ,pDescrWin(NULL) ,m_eChildFocus(NONE) + ,nOldDataPos(-1) + ,bSaveOnMove(sal_True) + ,bReadOnly(sal_True) + ,m_aInvalidate(500,this) { DBG_CTOR(OTableEditorCtrl,NULL); @@ -753,7 +753,7 @@ } //------------------------------------------------------------------------------ -IMPL_LINK( OTableEditorCtrl, InvalidateFieldType, void*, EMPTYTAG ) +IMPL_LINK( OTableEditorCtrl, InvalidateFieldType, void*, /*EMPTYTAG*/ ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); nInvalidateTypeEvent = 0; @@ -763,7 +763,7 @@ } //------------------------------------------------------------------------------ -IMPL_LINK( OTableEditorCtrl, EntryNotFound, void*, EMPTYTAG ) +IMPL_LINK( OTableEditorCtrl, EntryNotFound, void*, /*EMPTYTAG*/ ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); nEntryNotFoundEvent = 0; @@ -1102,7 +1102,7 @@ } } //------------------------------------------------------------------------------ -void OTableEditorCtrl::SetData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) +void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const TOTypeInfoSP& _pTypeInfo ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); ////////////////////////////////////////////////////////////////////// @@ -1121,12 +1121,12 @@ SwitchType( _pTypeInfo ); break; default: - OSL_ENSURE(sal_False, "OTableEditorCtrl::SetData: invalid column!"); + OSL_ENSURE(sal_False, "OTableEditorCtrl::SetCellData: invalid column!"); } SetControlText(nRow,nColId,_pTypeInfo.get() ? _pTypeInfo->aUIName : ::rtl::OUString()); } //------------------------------------------------------------------------------ -void OTableEditorCtrl::SetData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) +void OTableEditorCtrl::SetCellData( long nRow, sal_uInt16 nColId, const ::com::sun::star::uno::Any& _rNewData ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); ////////////////////////////////////////////////////////////////////// @@ -1148,7 +1148,7 @@ break; case FIELD_TYPE: - OSL_ENSURE(sal_False, "OTableEditorCtrl::SetData: invalid column!"); + OSL_ENSURE(sal_False, "OTableEditorCtrl::SetCellData: invalid column!"); break; case FIELD_DESCR: @@ -1177,7 +1177,7 @@ case FIELD_PROPERTY_NUMTYPE: // pFieldDescr->SetNumType( _rNewData ); - OSL_ENSURE(sal_False, "OTableEditorCtrl::SetData: invalid column!"); + OSL_ENSURE(sal_False, "OTableEditorCtrl::SetCellData: invalid column!"); break; case FIELD_PROPERTY_AUTOINC: @@ -1211,7 +1211,7 @@ } //------------------------------------------------------------------------------ -Any OTableEditorCtrl::GetData( long nRow, sal_uInt16 nColId ) +Any OTableEditorCtrl::GetCellData( long nRow, sal_uInt16 nColId ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); OFieldDescription* pFieldDescr = GetFieldDescr( nRow ); @@ -1256,7 +1256,7 @@ break; case FIELD_PROPERTY_NUMTYPE: - OSL_ENSURE(sal_False, "OTableEditorCtrl::GetData: invalid column!"); + OSL_ENSURE(sal_False, "OTableEditorCtrl::GetCellData: invalid column!"); // return pFieldDescr->GetNumType(); case FIELD_PROPERTY_AUTOINC: @@ -1285,7 +1285,7 @@ DBG_CHKTHIS(OTableEditorCtrl,NULL); ////////////////////////////////////////////////////////////////////// // Text aus Dokumentdaten holen - return ::comphelper::getString(const_cast<OTableEditorCtrl*>(this)->GetData( nRow, nColId )); + return ::comphelper::getString(const_cast<OTableEditorCtrl*>(this)->GetCellData( nRow, nColId )); } //------------------------------------------------------------------------------ @@ -1341,7 +1341,7 @@ } //------------------------------------------------------------------------------ -sal_Bool OTableEditorCtrl::IsCopyAllowed( long nRow ) +sal_Bool OTableEditorCtrl::IsCopyAllowed( long /*nRow*/ ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); sal_Bool bIsCopyAllowed = sal_False; @@ -1375,7 +1375,7 @@ } //------------------------------------------------------------------------------ -sal_Bool OTableEditorCtrl::IsPasteAllowed( long nRow ) +sal_Bool OTableEditorCtrl::IsPasteAllowed( long /*nRow*/ ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); sal_Bool bAllowed = GetView()->getController()->isAddAllowed(); @@ -1461,7 +1461,7 @@ } //------------------------------------------------------------------------------ -sal_Bool OTableEditorCtrl::IsDeleteAllowed( long nRow ) +sal_Bool OTableEditorCtrl::IsDeleteAllowed( long /*nRow*/ ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); @@ -1497,7 +1497,7 @@ } //------------------------------------------------------------------------------ -sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long nRow ) +sal_Bool OTableEditorCtrl::IsPrimaryKeyAllowed( long /*nRow*/ ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); if( !GetSelectRowCount() ) @@ -1620,8 +1620,6 @@ else { PopupMenu aContextMenu(ModuleRes(RID_TABLEDESIGNROWPOPUPMENU)); - long nSelectRowCount = GetSelectRowCount(); - sal_Bool bRowsSelected(nSelectRowCount ? sal_True : sal_False); aContextMenu.EnableItem( SID_CUT, IsCutAllowed(nRow) ); aContextMenu.EnableItem( SID_COPY, IsCopyAllowed(nRow) ); @@ -1679,7 +1677,7 @@ } //------------------------------------------------------------------------------ -IMPL_LINK( OTableEditorCtrl, DelayedCut, void*, EMPTYTAG ) +IMPL_LINK( OTableEditorCtrl, DelayedCut, void*, /*EMPTYTAG*/ ) { nCutEvent = 0; OTableRowView::cut(); @@ -1687,7 +1685,7 @@ } //------------------------------------------------------------------------------ -IMPL_LINK( OTableEditorCtrl, DelayedPaste, void*, EMPTYTAG ) +IMPL_LINK( OTableEditorCtrl, DelayedPaste, void*, /*EMPTYTAG*/ ) { nPasteEvent = 0; @@ -1717,7 +1715,7 @@ } //------------------------------------------------------------------------------ -IMPL_LINK( OTableEditorCtrl, DelayedDelete, void*, EMPTYTAG ) +IMPL_LINK( OTableEditorCtrl, DelayedDelete, void*, /*EMPTYTAG*/ ) { nDeleteEvent = 0; DeleteRows(); @@ -1725,7 +1723,7 @@ } //------------------------------------------------------------------------------ -IMPL_LINK( OTableEditorCtrl, DelayedInsNewRows, void*, EMPTYTAG ) +IMPL_LINK( OTableEditorCtrl, DelayedInsNewRows, void*, /*EMPTYTAG*/ ) { DBG_CHKTHIS(OTableEditorCtrl,NULL); nInsNewRowsEvent = 0; @@ -1898,7 +1896,6 @@ OTableRowView::DeactivateCell(bUpdate); // now we have to deactivate the field description long nRow(GetCurRow()); - sal_uInt16 nCol(GetCurColumnId()); if (pDescrWin) pDescrWin->SetReadOnly(bReadOnly || !SetDataPtr(nRow) || GetActRow()->IsReadOnly()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
