diff options
| author | Niklas Nebel <nn@openoffice.org> | 2002-11-20 13:36:29 +0000 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2002-11-20 13:36:29 +0000 |
| commit | 4a8f80364b957be14effe06a0b82b3752de0bae9 (patch) | |
| tree | 5de3ec6f81a15a1adf3cf911298393ef92c237da /sc/source/ui/view/dbfunc.cxx | |
| parent | 43b6bab70c751ee0a6abbcfd233ed2263232977a (diff) | |
#83422# different error messages for protected cells and part of array formula
Diffstat (limited to 'sc/source/ui/view/dbfunc.cxx')
| -rw-r--r-- | sc/source/ui/view/dbfunc.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index c879cf054..21269482e 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dbfunc.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: er $ $Date: 2002-08-08 13:05:31 $ + * last change: $Author: nn $ $Date: 2002-11-20 14:34:34 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -83,6 +83,7 @@ #include "globstr.hrc" #include "global.hxx" #include "dbdocfun.hxx" +#include "editable.hxx" //================================================================== @@ -437,10 +438,11 @@ BOOL ScDBFunc::ImportData( const ScImportParam& rParam, BOOL bRecord ) BOOL bSuccess = FALSE; ScDocument* pDoc = GetViewData()->GetDocument(); - if ( !pDoc->IsBlockEditable( GetViewData()->GetTabNo(), rParam.nCol1,rParam.nRow1, - rParam.nCol2,rParam.nRow2 ) ) + ScEditableTester aTester( pDoc, GetViewData()->GetTabNo(), rParam.nCol1,rParam.nRow1, + rParam.nCol2,rParam.nRow2 ); + if ( !aTester.IsEditable() ) { - ErrorMessage(STR_PROTECTIONERR); + ErrorMessage(aTester.GetMessageId()); return FALSE; } |