diff options
| author | Abhilash Singh <abhilash300singh@gmail.com> | 2017-01-22 14:42:15 +0530 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-01-28 00:08:47 +0000 |
| commit | 413232229cbfd9d49ce9d1cdbb6b6e2dbe83af38 (patch) | |
| tree | d53892366680bec211e7a74e2b4633b8735c06b2 /sc/source/ui/namedlg | |
| parent | 3084e8f5b12e865d565278168c27c7af15282191 (diff) | |
tdf#86214 User isn't warned entering a cell address not allowed
Refactored ScRangeData::IsNameValid
Change-Id: I74dd5830d13e48e8fe9a5180a819be4acdc9a1db
Reviewed-on: https://gerrit.libreoffice.org/33386
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
Diffstat (limited to 'sc/source/ui/namedlg')
| -rw-r--r-- | sc/source/ui/namedlg/namedefdlg.cxx | 13 | ||||
| -rw-r--r-- | sc/source/ui/namedlg/namedlg.cxx | 2 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index aa9642758f61..23a3c1a43db8 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -36,6 +36,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* p maGlobalNameStr ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ), maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)), + maErrInvalidNameCellRefStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID_CELL_REF)), maErrNameInUse ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)), maRangeMap( aRangeMap ) { @@ -150,6 +151,7 @@ bool ScNameDefDlg::IsNameValid() pRangeName = maRangeMap.find(aScope)->second; } + ScRangeData::IsNameValidType eType; m_pFtInfo->SetControlBackground(GetSettings().GetStyleSettings().GetDialogColor()); if ( aName.isEmpty() ) { @@ -157,10 +159,17 @@ bool ScNameDefDlg::IsNameValid() m_pFtInfo->SetText(maStrInfoDefault); return false; } - else if (!ScRangeData::IsNameValid( aName, mpDoc )) + else if ((eType = ScRangeData::IsNameValid( aName, mpDoc )) != ScRangeData::NAME_VALID) { m_pFtInfo->SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor()); - m_pFtInfo->SetText(maErrInvalidNameStr); + if (eType == ScRangeData::NAME_INVALID_BAD_STRING) + { + m_pFtInfo->SetText(maErrInvalidNameStr); + } + else if (eType == ScRangeData::NAME_INVALID_CELL_REF) + { + m_pFtInfo->SetText(maErrInvalidNameCellRefStr); + } m_pBtnAdd->Disable(); return false; } diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 5a7a8f9df6dc..abf1f5756258 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -278,7 +278,7 @@ bool ScNameDlg::IsNameValid() ScRangeName* pRangeName = GetRangeName( aScope ); - if (!ScRangeData::IsNameValid( aName, mpDoc )) + if (ScRangeData::IsNameValid( aName, mpDoc ) != ScRangeData::NAME_VALID) { m_pFtInfo->SetControlBackground(GetSettings().GetStyleSettings().GetHighlightColor()); m_pFtInfo->SetText(maErrInvalidNameStr); |