diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-19 10:41:02 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-19 10:41:02 +0000 |
| commit | 6841fd0d7b3bfd8407b37f5d63949ad036a387bc (patch) | |
| tree | 8e52c3b4d06603ed949518134278a9cd86f589ee /sc/source/ui/view/cellsh2.cxx | |
| parent | 5db8c073bcb101b6c5c4fb76c13f6d7f1ef02c9e (diff) | |
INTEGRATION: CWS dr6 (1.14.2); FILE MERGED
2003/07/18 13:00:16 dr 1.14.2.2: #i3653# list validation: use API constants for list type
2003/07/04 12:38:14 dr 1.14.2.1: #i3653# additions for list validation
Diffstat (limited to 'sc/source/ui/view/cellsh2.cxx')
| -rw-r--r-- | sc/source/ui/view/cellsh2.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 19a24aa93ce7..cc4292063ba4 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: cellsh2.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: nn $ $Date: 2002-10-08 13:43:10 $ + * last change: $Author: hjs $ $Date: 2003-08-19 11:41:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -948,12 +948,13 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } else { - SfxItemSet aArgSet( GetPool(), FID_VALID_MODE, FID_VALID_ERRTEXT ); + SfxItemSet aArgSet( GetPool(), ScTPValidationValue::GetRanges() ); ScValidationMode eMode = SC_VALID_ANY; ScConditionMode eOper = SC_COND_EQUAL; String aExpr1, aExpr2; BOOL bBlank = TRUE; + sal_Int16 nListType = ValidListType::UNSORTED; BOOL bShowHelp = FALSE; String aHelpTitle, aHelpText; BOOL bShowError = FALSE; @@ -985,6 +986,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aExpr1 = pOldData->GetExpression( aCursorPos, 0, nNumFmt ); aExpr2 = pOldData->GetExpression( aCursorPos, 1, nNumFmt ); bBlank = pOldData->IsIgnoreBlank(); + sal_Int16 nListType = pOldData->GetListType(); bShowHelp = pOldData->GetInput( aHelpTitle, aHelpText ); bShowError = pOldData->GetErrMsg( aErrTitle, aErrText, eErrStyle ); @@ -994,6 +996,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aArgSet.Put( SfxStringItem( FID_VALID_VALUE1, aExpr1 ) ); aArgSet.Put( SfxStringItem( FID_VALID_VALUE2, aExpr2 ) ); aArgSet.Put( SfxBoolItem( FID_VALID_BLANK, bBlank ) ); + aArgSet.Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) ); aArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, bShowHelp ) ); aArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, aHelpTitle ) ); aArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, aHelpText ) ); @@ -1019,6 +1022,8 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aExpr2 = ((const SfxStringItem*)pItem)->GetValue(); if ( pOutSet->GetItemState( FID_VALID_BLANK, TRUE, &pItem ) == SFX_ITEM_SET ) bBlank = ((const SfxBoolItem*)pItem)->GetValue(); + if ( pOutSet->GetItemState( FID_VALID_LISTTYPE, TRUE, &pItem ) == SFX_ITEM_SET ) + nListType = ((const SfxInt16Item*)pItem)->GetValue(); if ( pOutSet->GetItemState( FID_VALID_SHOWHELP, TRUE, &pItem ) == SFX_ITEM_SET ) bShowHelp = ((const SfxBoolItem*)pItem)->GetValue(); @@ -1039,6 +1044,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) USHORT nTab = GetViewData()->GetTabNo(); ScValidationData aData( eMode, eOper, aExpr1, aExpr2, pDoc, aCursorPos ); aData.SetIgnoreBlank( bBlank ); + aData.SetListType( nListType ); aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE if (!bShowHelp) |