expand src templates

Change-Id: Id35caa8b8ed0c2f7e4d868f5c87a2a0f331cb352

7 files changed, 35 insertions, 18 deletions

diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 955a7aa5d65d..5f65785a605e 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -25,7 +25,6 @@ $(eval $(call gb_SrsTarget_set_include,dbaccess/dbu,\
     $$(INCLUDE) \
     -I$(SRCDIR)/dbaccess/inc \
     -I$(SRCDIR)/dbaccess/source/ui/inc \
-    -I$(call gb_SrsTemplateTarget_get_include_dir,) \
 ))
 
 $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index b59bee50eeee..662d7020ef31 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "dbu_app.hrc"
-#include <svx/globlmn.hrc>
 #include <sfx2/cntids.hrc>
 #include "browserids.hxx"
 #include "dbaccess_helpid.hrc"
@@ -153,11 +152,15 @@ Menu RID_MENU_APP_EDIT
     {
         MenuItem
         {
-            ITEM_EDIT_COPY
+            Identifier = SID_COPY ;
+            Command = ".uno:Copy" ;
+            Text [ en-US ] = "~Copy" ;
         };
         MenuItem
         {
-            ITEM_EDIT_PASTE
+            Identifier = SID_PASTE ;
+            Command = ".uno:Paste" ;
+            Text [ en-US ] = "~Paste" ;
         };
         MenuItem
         {
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 98793aed630a..dcd75df4e356 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -19,7 +19,6 @@
 #include "dbaccess_helpid.hrc"
 #include "dbu_brw.hrc"
 #include "browserids.hxx"
-#include <svx/globlmn.hrc>
 
 String STR_QUERY_BRW_DELETE_ROWS
 {
@@ -87,7 +86,11 @@ Menu MENU_BROWSER_DEFAULTCONTEXT
         {   \
             Separator = TRUE;   \
         };  \
-        MenuItem { ITEM_EDIT_COPY       };
+        MenuItem {
+            Identifier = SID_COPY ;
+            Command = ".uno:Copy" ;
+            Text [ en-US ] = "~Copy" ;
+        };
         MenuItem    \
         {   \
             Separator = TRUE;   \
diff --git a/dbaccess/source/ui/browser/sbagrid.src b/dbaccess/source/ui/browser/sbagrid.src
index 07d236a51dc9..375e58ba797a 100644
--- a/dbaccess/source/ui/browser/sbagrid.src
+++ b/dbaccess/source/ui/browser/sbagrid.src
@@ -19,7 +19,6 @@
 #include "dbu_brw.hrc"
 #include "dbaccess_helpid.hrc"
 #include "browserids.hxx"
-#include <svx/globlmn.hrc>
 
 Menu RID_SBA_GRID_COLCTXMENU
 {
@@ -65,7 +64,9 @@ Menu RID_SBA_GRID_ROWCTXMENU
         };
         MenuItem
         {
-            ITEM_EDIT_COPY
+            Identifier = SID_COPY ;
+            Command = ".uno:Copy" ;
+            Text [ en-US ] = "~Copy" ;
         };
     };
 };
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index ea29a560a117..e675f0993150 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -18,7 +18,6 @@
  */
 #include "dbu_qry.hrc"
 #include "Query.hrc"
-#include <svx/globlmn.hrc>
 #include <sfx2/cntids.hrc>
 #include "browserids.hxx"
 #include "dbaccess_helpid.hrc"
@@ -29,7 +28,9 @@ Menu RID_MENU_JOINVIEW_CONNECTION
     {
         MenuItem
         {
-            ITEM_EDIT_DELETE
+            Identifier = SID_DELETE ;
+            Command = ".uno:Delete" ;
+            Text [ en-US ] = "~Delete" ;
         };
         MenuItem
         {
@@ -46,7 +47,9 @@ Menu RID_MENU_JOINVIEW_TABLE
     {
         MenuItem
         {
-            ITEM_EDIT_DELETE
+            Identifier = SID_DELETE ;
+            Command = ".uno:Delete" ;
+            Text [ en-US ] = "~Delete" ;
         };
      };
 };
@@ -67,7 +70,9 @@ Menu RID_QUERYCOLPOPUPMENU
         };
         MenuItem
         {
-            ITEM_EDIT_DELETE
+            Identifier = SID_DELETE ;
+            Command = ".uno:Delete" ;
+            Text [ en-US ] = "~Delete" ;
         };
     };
 };
diff --git a/dbaccess/source/ui/relationdesign/relation.src b/dbaccess/source/ui/relationdesign/relation.src
index a74275ebacf2..65087f516058 100644
--- a/dbaccess/source/ui/relationdesign/relation.src
+++ b/dbaccess/source/ui/relationdesign/relation.src
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "dbu_rel.hrc"
-#include <svx/globlmn.hrc>
 #include <sfx2/cntids.hrc>
 #include "browserids.hxx"
 #include "dbaccess_helpid.hrc"
diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src
index f4bc2a1ad15a..90a4e0cf5280 100644
--- a/dbaccess/source/ui/tabledesign/table.src
+++ b/dbaccess/source/ui/tabledesign/table.src
@@ -21,7 +21,6 @@
 #include "dbaccess_helpid.hrc"
 #include "dbaccess_slotid.hrc"
 #include "browserids.hxx"
-#include <svx/globlmn.hrc>
 
 String STR_TABLEDESIGN_DBFIELDTYPES
 {
@@ -140,19 +139,27 @@ Menu RID_TABLEDESIGNROWPOPUPMENU
     {
         MenuItem
         {
-            ITEM_EDIT_CUT
+            Identifier = SID_CUT ;
+            Command = ".uno:Cut" ;
+            Text [ en-US ] = "Cu~t" ;
         };
         MenuItem
         {
-            ITEM_EDIT_COPY
+            Identifier = SID_COPY ;
+            Command = ".uno:Copy" ;
+            Text [ en-US ] = "~Copy" ;
         };
         MenuItem
         {
-            ITEM_EDIT_PASTE
+            Identifier = SID_PASTE ;
+            Command = ".uno:Paste" ;
+            Text [ en-US ] = "~Paste" ;
         };
         MenuItem
         {
-            ITEM_EDIT_DELETE
+            Identifier = SID_DELETE ;
+            Command = ".uno:Delete" ;
+            Text [ en-US ] = "~Delete" ;
         };
         MenuItem
         {