ManageNames: move some strings to globstr

sc/inc/globstr.hrc

@@ -596,8 +596,11 @@
 #define STR_HEADER_RANGE            460
 #define STR_HEADER_SCOPE            461
 #define STR_GLOBAL_SCOPE            462
+#define STR_ERR_NAME_EXISTS         463
+#define STR_ERR_NAME_INVALID        464
 
-#define STR_COUNT                   463
+
+#define STR_COUNT                   465
 
 
 #endif

sc/source/ui/inc/namedefdlg.hrc

@@ -42,9 +42,6 @@
 #define BTN_ROWHEADER 12
 #define BTN_COLHEADER 13
 #define FL_DIV 15
-#define STR_INVALIDSYMBOL 16
-#define STR_ERR_NAME_EXISTS 17
-#define STR_ERR_NAME_INVALID 18
 #define STR_DEFAULT_INFO 19
 #define RB_RANGE 20
 #define BTN_MORE 21

sc/source/ui/inc/namedefdlg.hxx

@@ -70,8 +70,6 @@ private:
     ScDocShell* mpDocShell;
 
     ScAddress maCursorPos;
-    const String    mErrMsgInvalidSym;
-    const rtl::OUString maErrMsgModifiedFailed;
     const rtl::OUString maGlobalNameStr;
     const rtl::OUString maErrInvalidNameStr;
     const rtl::OUString maErrNameInUse;

sc/source/ui/inc/namedlg.hrc

@@ -44,17 +44,12 @@
 #define ED_ASSIGN       15
 #define RB_ASSIGN       16
 
-#define STR_INVALIDSYMBOL 23
-#define STR_MODIFYFAILED 72
-
 #define BTN_CRITERIA    31
 #define BTN_PRINTAREA   32
 #define BTN_COLHEADER   33
 #define BTN_ROWHEADER   34
 
 #define CTRL_MANAGENAMES    66
-#define STR_ERR_NAME_EXISTS 73
-#define STR_ERR_NAME_INVALID 74
 #define STR_DEFAULT_INFO    75
 #define STR_MULTI_SELECT    76
 

sc/source/ui/inc/namedlg.hxx

@@ -82,7 +82,6 @@ private:
     ScRangeManagerCtrl maNameMgrCtrl;
     ScRangeManagerTable* mpRangeManagerTable;
 
-    const rtl::OUString maErrMsgModifiedFailed;
     const rtl::OUString maGlobalNameStr;
     const rtl::OUString maErrInvalidNameStr;
     const rtl::OUString maErrNameInUse;

sc/source/ui/namedlg/namedefdlg.cxx

@@ -72,10 +72,9 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen
     mpDocShell ( pViewData->GetDocShell() ),
     maCursorPos( aCursorPos ),
 
-    mErrMsgInvalidSym( ScResId( STR_INVALIDSYMBOL ) ),
     maGlobalNameStr  ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
-    maErrInvalidNameStr( ResId::toString(ScResId(STR_ERR_NAME_INVALID))),
-    maErrNameInUse   ( ResId::toString(ScResId(STR_ERR_NAME_EXISTS))),
+    maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)),
+    maErrNameInUse   ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)),
     maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))),
     maRangeMap( aRangeMap )
 {
@@ -262,7 +261,6 @@ void ScNameDefDlg::AddPushed()
             else
             {
                 delete pNewEntry;
-                ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),ResId::toString(ScResId(STR_INVALIDSYMBOL))).Execute();
                 Selection aCurSel = Selection( 0, SELECTION_MAX );
                 maEdRange.GrabFocus();
                 maEdRange.SetSelection( aCurSel );

sc/source/ui/namedlg/namedlg.cxx

@@ -98,10 +98,9 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     //
     maNameMgrCtrl   ( this, ScResId( CTRL_MANAGENAMES ) ),
     //
-    maErrMsgModifiedFailed( ResId::toString(ScResId( STR_MODIFYFAILED ) ) ),
     maGlobalNameStr  ( ScGlobal::GetRscString(STR_GLOBAL_SCOPE) ),
-    maErrInvalidNameStr( ResId::toString(ScResId(STR_ERR_NAME_INVALID))),
-    maErrNameInUse   ( ResId::toString(ScResId(STR_ERR_NAME_EXISTS))),
+    maErrInvalidNameStr( ScGlobal::GetRscString(STR_ERR_NAME_INVALID)),
+    maErrNameInUse   ( ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)),
     maStrInfoDefault ( ResId::toString(ScResId(STR_DEFAULT_INFO))),
     maStrMultiSelect ( ResId::toString(ScResId(STR_MULTI_SELECT))),
     //

sc/source/ui/src/globstr.src

@@ -1843,5 +1843,13 @@ Resource RID_GLOBSTR
     {
         Text [ en-US ] = "Document (Global)" ;
     };
+    String STR_ERR_NAME_EXISTS
+    {
+        Text [ en-US ] = "Invalid name. Already in use for the selected scope.";
+    };
+    String STR_ERR_NAME_INVALID
+    {
+        Text [ en-US ] = "Invalid name. Only use letters, numbers and underscore.";
+    };
 };
 

sc/source/ui/src/namedefdlg.src

@@ -147,23 +147,9 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
         Pos = MAP_APPFONT( 0, 95 );
         Size = MAP_APPFONT(200, 3 );
     };
-
-    String STR_INVALIDSYMBOL
-    {
-        Text [ en-US ] = "Invalid expression" ;
-    };
-    String STR_ERR_NAME_EXISTS
-    {
-        Text [ en-US ] = "Invalid name. Already in use for the selected scope.";
-    };
-    String STR_ERR_NAME_INVALID
-    {
-        Text [ en-US ] = "Invalid name. Only use letters, numbers and underscore.";
-    };
     String STR_DEFAULT_INFO
     {
         Text [en-US] = "Define the name and range or formula expression.";
-    };
-};
+    };};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sc/source/ui/src/namedlg.src

@@ -120,13 +120,13 @@ ModelessDialog RID_SCDLG_NAMES
         HelpID = "sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN";
         Border = TRUE ;
         Pos = MAP_APPFONT ( 50 , 155 ) ;
-        Size = MAP_APPFONT ( 155 , 12 ) ;
+        Size = MAP_APPFONT ( 152 , 12 ) ;
         TabStop = TRUE ;
     };
     ImageButton RB_ASSIGN
     {
         HelpID = "sc:ImageButton:RID_SCDLG_NAMES:RB_ASSIGN";
-        Pos = MAP_APPFONT ( 205 , 155 ) ;
+        Pos = MAP_APPFONT ( 202 , 155 ) ;
         Size = MAP_APPFONT ( 13 , 12 ) ;
         TabStop = TRUE ;
         QuickHelpText [ en-US ] = "Shrink" ;
@@ -176,16 +176,6 @@ ModelessDialog RID_SCDLG_NAMES
         TabStop = TRUE ;
     };
 
-    String STR_INVALIDSYMBOL
-    {
-        Text [ en-US ] = "Invalid expression" ;
-    };
-    String STR_MODIFYFAILED
-    {
-        Text [en-US ] = "Modifying range name failed" ;
-    };
-
-
     FixedText FT_INFO
     {
         Pos = MAP_APPFONT( 5, 127 );
@@ -200,14 +190,6 @@ ModelessDialog RID_SCDLG_NAMES
         Border = TRUE;
         DialogControl = TRUE;
     };
-    String STR_ERR_NAME_EXISTS
-    {
-        Text [ en-US ] = "Invalid name. Already in use for the selected scope.";
-    };
-    String STR_ERR_NAME_INVALID
-    {
-        Text [ en-US ] = "Invalid name. Only use letters, numbers and underscore and don't use names like cell addresses";
-    };
     String STR_DEFAULT_INFO
     {
         Text [en-US] = "Select cells in the document to update the range.";