diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-22 07:10:38 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-23 06:25:34 +0100 |
| commit | 100052237a83ff0e0c5fb726fc6ea79f6375dfa8 (patch) | |
| tree | c38a617b90edc322e0ee589f035dc1d2c2a8a2bf /sc | |
| parent | 23da9369ae622e61b75a4cb72f60667cd4ff9fa5 (diff) | |
ManageNames: need to store the strings in variables
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/namedefdlg.hxx | 7 | ||||
| -rw-r--r-- | sc/source/ui/namedlg/namedefdlg.cxx | 15 | ||||
| -rw-r--r-- | sc/source/ui/src/namedefdlg.src | 2 |
3 files changed, 17 insertions, 7 deletions
diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index 1a25c2b34a37..594c73b8ff3d 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -68,7 +68,12 @@ private: ScDocShell* mpDocShell; ScAddress maCursorPos; - rtl::OUString maGlobalNameStr; + const String mErrMsgInvalidSym; + const rtl::OUString maErrMsgModifiedFailed; + const rtl::OUString maGlobalNameStr; + const rtl::OUString maErrInvalidNameStr; + const rtl::OUString maErrNameInUse; + const rtl::OUString maStrInfoDefault; std::map<rtl::OUString, ScRangeName*> maRangeMap; diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 209e0569960c..1fcf93e27bd2 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -42,7 +42,12 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen mpDoc( pDocShell->GetDocument() ), mpDocShell ( pDocShell ), maCursorPos( aCursorPos ), - maGlobalNameStr( ResId::toString( ScResId( STR_GLOBAL_SCOPE ) ) ), + + mErrMsgInvalidSym( ScResId( STR_INVALIDSYMBOL ) ), + maGlobalNameStr ( ResId::toString(ScResId(STR_GLOBAL_SCOPE)) ), + maErrInvalidNameStr( ResId::toString(ScResId(STR_ERR_NAME_INVALID))), + maErrNameInUse ( ResId::toString(ScResId(STR_ERR_NAME_EXISTS))), + maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))), maRangeMap( aRangeMap ) { // Initialize scope list. @@ -62,7 +67,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen maEdName.SetModifyHdl( LINK( this, ScNameDefDlg, NameModifyHdl )); maEdRange.SetGetFocusHdl( LINK( this, ScNameDefDlg, AssignGetFocusHdl ) ); - maFtInfo.SetText(ResId::toString( ScResId( STR_DEFAULT_INFO ) )); + maFtInfo.SetText(maStrInfoDefault); maBtnAdd.Disable(); // empty name is invalid @@ -96,17 +101,17 @@ bool ScNameDefDlg::IsNameValid() if (!ScRangeData::IsNameValid( aName, mpDoc )) { - maFtInfo.SetText(ResId::toString(ScResId( STR_ERR_NAME_INVALID ))); + maFtInfo.SetText(maErrInvalidNameStr); maBtnAdd.Disable(); return false; } else if (pRangeName->findByUpperName(ScGlobal::pCharClass->upper(aName))) { - maFtInfo.SetText(ResId::toString(ScResId( STR_ERR_NAME_EXISTS ))); + maFtInfo.SetText(maErrNameInUse); maBtnAdd.Disable(); return false; } - maFtInfo.SetText(ResId::toString( ScResId( STR_DEFAULT_INFO ) )); + maFtInfo.SetText(maStrInfoDefault); maBtnAdd.Enable(); return true; } diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src index 8022a4e0ab33..ac69133f8502 100644 --- a/sc/source/ui/src/namedefdlg.src +++ b/sc/source/ui/src/namedefdlg.src @@ -135,7 +135,7 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE }; String STR_ERR_NAME_INVALID { - Text [ en-US ] = "Invalid name. Only use letters, numbers and underscore and don't use names like cell addresses"; + Text [ en-US ] = "Invalid name. Only use letters, numbers and underscore."; }; String STR_DEFAULT_INFO { |