From 71e1a44ba192dea67c69588d5aa547629efde327 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Mon, 7 Mar 2016 08:27:08 +0100
Subject: expand src templates only used in a single place

Change-Id: If10e2fb1448867e79df3ddc962f93b904af94b3d
---
 dbaccess/source/ui/app/app.src           | 20 ++++++++++++++-----
 dbaccess/source/ui/browser/sbabrw.src    |  3 ++-
 dbaccess/source/ui/inc/toolbox_tmpl.hrc  | 34 --------------------------------
 dbaccess/source/ui/querydesign/query.src |  4 +++-
 4 files changed, 20 insertions(+), 41 deletions(-)

(limited to 'dbaccess/source/ui')

diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 0c2ef92e7dd7..cca23a0f65d6 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -101,17 +101,23 @@ Menu RID_MENU_APP_NEW
         };
         MenuItem
         {
-            MID_DOCUMENT_CREATE_REPWIZ
+            Identifier = ID_DOCUMENT_CREATE_REPWIZ ;
+            HelpID = HID_DOCUMENT_CREATE_REPWIZ ;
+            Text [ en-US ] = "Report Wizard...";
             Command = ".uno:DBNewReportAutoPilot";
         };
         MenuItem
         {
-            MID_QUERY_NEW_DESIGN
+            Identifier = ID_NEW_QUERY_DESIGN;
+            HelpId = HID_BROWSER_QUERY_CREATE_DESIGN ;
+            Text [ en-US ] = "New ~Query (Design View)" ;
             Command = ".uno:DBNewQuery";
         };
         MenuItem
         {
-            MID_QUERY_NEW_SQL
+            Identifier = ID_NEW_QUERY_SQL;
+            HelpId = HID_BROWSER_QUERY_CREATE_TEXT ;
+            Text [ en-US ] = "New Query (~SQL View)" ;
             Command = ".uno:DBNewQuerySql";
         };
         MenuItem
@@ -120,12 +126,16 @@ Menu RID_MENU_APP_NEW
         };
         MenuItem
         {
-            MID_NEW_TABLE_DESIGN
+            Identifier = ID_NEW_TABLE_DESIGN;
+            HelpId = HID_BROWSER_TABLE_CREATE_DESIGN ;
+            Text [ en-US ] = "New ~Table Design" ;
             Command = ".uno:DBNewTable";
         };
         MenuItem
         {
-            MID_NEW_VIEW_DESIGN
+            Identifier = ID_NEW_VIEW_DESIGN;
+            HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ;
+            Text [ en-US ] = "New ~View Design" ;
             Command = ".uno:DBNewView";
         };
         MenuItem
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 01888a4ed425..b7b605efc522 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -156,7 +156,8 @@ Menu RID_MENU_REFRESH_DATA
     {
         MenuItem
         {
-            MID_SBA_QRY_REFRESH
+            Identifier = ID_BROWSER_REFRESH ;
+            Text [ en-US ] = "Refresh";
             Command = ".uno:Refresh";
         };
         MenuItem
diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
index 6aeaa14674dd..679b044139c9 100644
--- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
@@ -19,45 +19,11 @@
 #ifndef DBAUI_TOOLBOX_HRC
 #define DBAUI_TOOLBOX_HRC
 
-#define MID_SBA_QRY_REFRESH \
-    Identifier = ID_BROWSER_REFRESH ; \
-    Text [ en-US ] = "Refresh"; \
-
-#define MID_NEW_VIEW_DESIGN \
-    Identifier = ID_NEW_VIEW_DESIGN;    \
-    HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ; \
-    Text [ en-US ] = "New ~View Design" ; \
-
-#define MID_NEW_TABLE_DESIGN \
-    Identifier = ID_NEW_TABLE_DESIGN;   \
-    HelpId = HID_BROWSER_TABLE_CREATE_DESIGN ; \
-    Text [ en-US ] = "New ~Table Design" ;\
-
-#define MID_QUERY_NEW_DESIGN    \
-    Identifier = ID_NEW_QUERY_DESIGN;   \
-    HelpId = HID_BROWSER_QUERY_CREATE_DESIGN ; \
-    Text [ en-US ] = "New ~Query (Design View)" ; \
-
-#define MID_QUERY_NEW_SQL   \
-    Identifier = ID_NEW_QUERY_SQL;  \
-    HelpId = HID_BROWSER_QUERY_CREATE_TEXT ; \
-    Text [ en-US ] = "New Query (~SQL View)" ; \
-
-#define MID_DBUI_QUERY_EDIT_JOINCONNECTION                                    \
-    Identifier = ID_QUERY_EDIT_JOINCONNECTION;                                \
-    HelpId = HID_QUERY_EDIT_JOINCONNECTION ;                                    \
-    Text [ en-US ] = "Edit..."; \
-
 #define MID_COLUMN_WIDTH\
     Identifier = ID_BROWSER_COLWIDTH ;\
     HelpID = HID_BROWSER_COLUMNWIDTH ;\
     Text [ en-US ] = "Column ~Width..." ;\
 
-#define MID_DOCUMENT_CREATE_REPWIZ\
-    Identifier = ID_DOCUMENT_CREATE_REPWIZ ;\
-    HelpID = HID_DOCUMENT_CREATE_REPWIZ ;\
-    Text [ en-US ] = "Report Wizard...";    \
-
 #endif // DBAUI_TOOLBOX_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index 2a679117463c..27ef7d82b6aa 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -34,7 +34,9 @@ Menu RID_MENU_JOINVIEW_CONNECTION
         };
         MenuItem
         {
-            MID_DBUI_QUERY_EDIT_JOINCONNECTION
+            Identifier = ID_QUERY_EDIT_JOINCONNECTION;
+            HelpId = HID_QUERY_EDIT_JOINCONNECTION ;
+            Text [ en-US ] = "Edit...";
         };
     };
 };
-- 
cgit