ManageNames: move some strings to globstr.[sh]rc

11 files changed, 32 insertions, 34 deletions

diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 4e88a8e50ef1..39ca0b2e4fbb 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -592,7 +592,12 @@
 
 #define STR_MANAGE_NAMES            458
 
-#define STR_COUNT                   459
+#define STR_HEADER_NAME             459
+#define STR_HEADER_RANGE            460
+#define STR_HEADER_SCOPE            461
+#define STR_GLOBAL_SCOPE            462
+
+#define STR_COUNT                   463
 
 
 #endif
diff --git a/sc/source/ui/inc/namedefdlg.hrc b/sc/source/ui/inc/namedefdlg.hrc
index b7ee8ca1d9be..657795f27fd0 100644
--- a/sc/source/ui/inc/namedefdlg.hrc
+++ b/sc/source/ui/inc/namedefdlg.hrc
@@ -41,7 +41,6 @@
 #define BTN_CRITERIA 11
 #define BTN_ROWHEADER 12
 #define BTN_COLHEADER 13
-#define STR_GLOBAL_SCOPE 14
 #define FL_DIV 15
 #define STR_INVALIDSYMBOL 16
 #define STR_ERR_NAME_EXISTS 17
diff --git a/sc/source/ui/inc/namedlg.hrc b/sc/source/ui/inc/namedlg.hrc
index cc23d1fa8aea..db5c08c001fb 100644
--- a/sc/source/ui/inc/namedlg.hrc
+++ b/sc/source/ui/inc/namedlg.hrc
@@ -45,7 +45,6 @@
 #define RB_ASSIGN       16
 
 #define STR_INVALIDSYMBOL 23
-#define STR_GLOBAL_SCOPE 24
 #define STR_MODIFYFAILED 72
 
 #define BTN_CRITERIA    31
@@ -54,9 +53,6 @@
 #define BTN_ROWHEADER   34
 
 #define CTRL_MANAGENAMES    66
-#define STR_HEADER_NAME     69
-#define STR_HEADER_RANGE    70
-#define STR_HEADER_SCOPE    71
 #define STR_ERR_NAME_EXISTS 73
 #define STR_ERR_NAME_INVALID 74
 #define STR_DEFAULT_INFO    75
diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx
index c9ca2278b6ac..508ee7a2d3cd 100644
--- a/sc/source/ui/namedlg/namedefdlg.cxx
+++ b/sc/source/ui/namedlg/namedefdlg.cxx
@@ -32,6 +32,7 @@
 #include <sfx2/app.hxx>
 
 #include "document.hxx"
+#include "globstr.hrc"
 #include "globalnames.hxx"
 #include "rangenam.hxx"
 #include "reffact.hxx"
@@ -72,7 +73,7 @@ ScNameDefDlg::ScNameDefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParen
     maCursorPos( aCursorPos ),
 
     mErrMsgInvalidSym( ScResId( STR_INVALIDSYMBOL ) ),
-    maGlobalNameStr  ( ResId::toString(ScResId(STR_GLOBAL_SCOPE)) ),
+    maGlobalNameStr  ( ScGlobal::GetRscString(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))),
diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx
index ef567e57cdf5..1f2060b21e89 100644
--- a/sc/source/ui/namedlg/namedlg.cxx
+++ b/sc/source/ui/namedlg/namedlg.cxx
@@ -102,7 +102,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent,
     //
     mErrMsgInvalidSym( ScResId( STR_INVALIDSYMBOL ) ),
     maErrMsgModifiedFailed( ResId::toString(ScResId( STR_MODIFYFAILED ) ) ),
-    maGlobalNameStr  ( ResId::toString(ScResId(STR_GLOBAL_SCOPE)) ),
+    maGlobalNameStr  ( ScGlobal::GetRscString(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))),
diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx
index 538791fc251f..a72e765e536b 100644
--- a/sc/source/ui/namedlg/namemgrtable.cxx
+++ b/sc/source/ui/namedlg/namemgrtable.cxx
@@ -59,15 +59,15 @@ String createEntryString(const ScRangeNameLine& rLine)
 ScRangeManagerTable::ScRangeManagerTable( Window* pWindow, boost::ptr_map<rtl::OUString, ScRangeName>& rRangeMap ):
     SvTabListBox( pWindow, WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ),
     maHeaderBar( pWindow, WB_BUTTONSTYLE | WB_BOTTOMBORDER ),
-    maGlobalString( ResId::toString(ScResId(STR_GLOBAL_SCOPE)))
+    maGlobalString( ScGlobal::GetRscString(STR_GLOBAL_SCOPE))
 {
     Size aBoxSize( pWindow->GetOutputSizePixel() );
 
     maHeaderBar.SetPosSizePixel( Point(0, 0), Size( aBoxSize.Width(), 16 ) );
 
-    String aNameStr(ScResId(STR_HEADER_NAME));
-    String aRangeStr(ScResId(STR_HEADER_RANGE));
-    String aScopeStr(ScResId(STR_HEADER_SCOPE));
+    String aNameStr(ScGlobal::GetRscString(STR_HEADER_NAME));
+    String aRangeStr(ScGlobal::GetRscString(STR_HEADER_RANGE));
+    String aScopeStr(ScGlobal::GetRscString(STR_HEADER_SCOPE));
 
     long nTabSize = aBoxSize.Width()/3;
     maHeaderBar.InsertItem( ITEMID_NAME, aNameStr, nTabSize, HIB_LEFT| HIB_VCENTER );
diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx
index 7db6abfc1dff..9c5706142d2a 100644
--- a/sc/source/ui/namedlg/namepast.cxx
+++ b/sc/source/ui/namedlg/namepast.cxx
@@ -44,7 +44,7 @@
 
 //==================================================================
 
-ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool bInsList )
+ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool )
     : ModalDialog( pParent, ScResId( RID_SCDLG_NAMES_PASTE ) ),
     maHelpButton     ( this, ScResId( BTN_HELP ) ),
     maBtnClose       ( this, ScResId( BTN_CLOSE ) ),
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 9a1a42f060e7..5462b51c32f8 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1827,5 +1827,21 @@ Resource RID_GLOBSTR
     {
         Text [ en-US ] = "Manage Names...";
     };
+    String STR_HEADER_NAME
+    {
+        Text [en-US] = "Name";
+    };
+    String STR_HEADER_RANGE
+    {
+        Text [en-US] = "Range";
+    };
+    String STR_HEADER_SCOPE
+    {
+        Text [en-US] = "Scope";
+    };
+    String STR_GLOBAL_SCOPE
+    {
+        Text [ en-US ] = "Document (Global)" ;
+    };
 };
 
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index 722d3098b8e9..f93bab254497 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -1453,7 +1453,7 @@ ModalDialog RID_SCDLG_NAMES_PASTE
     FixedLine FL_DIV
     {
         Pos = MAP_APPFONT( 0, 132 );
-        Size = MAP_APPFONT( 228, 132 );
+        Size = MAP_APPFONT( 228, 3 );
     };
     Text [ en-US ] = "Paste Names" ;
 };
diff --git a/sc/source/ui/src/namedefdlg.src b/sc/source/ui/src/namedefdlg.src
index a700596ba489..67f7b438695f 100644
--- a/sc/source/ui/src/namedefdlg.src
+++ b/sc/source/ui/src/namedefdlg.src
@@ -148,10 +148,6 @@ ModelessDialog RID_SCDLG_NAMES_DEFINE
         Size = MAP_APPFONT(200, 3 );
     };
 
-    String STR_GLOBAL_SCOPE
-    {
-        Text [ en-US ] = "Document (Global)" ;
-    };
     String STR_INVALIDSYMBOL
     {
         Text [ en-US ] = "Invalid expression" ;
diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src
index b97ab9f54c7b..71225cace355 100644
--- a/sc/source/ui/src/namedlg.src
+++ b/sc/source/ui/src/namedlg.src
@@ -184,10 +184,7 @@ ModelessDialog RID_SCDLG_NAMES
     {
         Text [en-US ] = "Modifying range name failed" ;
     };
-    String STR_GLOBAL_SCOPE
-    {
-        Text [ en-US ] = "Document (Global)" ;
-    };
+
 
     FixedText FT_INFO
     {
@@ -203,18 +200,6 @@ ModelessDialog RID_SCDLG_NAMES
         Border = TRUE;
         DialogControl = TRUE;
     };
-    String STR_HEADER_NAME
-    {
-        Text [en-US] = "Name";
-    };
-    String STR_HEADER_RANGE
-    {
-        Text [en-US] = "Range";
-    };
-    String STR_HEADER_SCOPE
-    {
-        Text [en-US] = "Scope";
-    };
     String STR_ERR_NAME_EXISTS
     {
         Text [ en-US ] = "Invalid name. Already in use for the selected scope.";