expand src templates

Change-Id: Id35caa8b8ed0c2f7e4d868f5c87a2a0f331cb352

6 files changed, 18 insertions, 61 deletions

diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index bb104d6d1d83..271a06bab961 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -29,7 +29,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/res))
 
 $(eval $(call gb_SrsTarget_set_include,svx/res,\
     $$(INCLUDE) \
-    -I$(call gb_SrsTemplateTarget_get_include_dir,svx) \
     -I$(SRCDIR)/svx/source/inc \
     -I$(SRCDIR)/svx/source/dialog \
     -I$(SRCDIR)/svx/inc/ \
@@ -87,8 +86,4 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,svx/res,\
     svx/source/unodraw/unodraw.src \
 ))
 
-$(eval $(call gb_SrsTarget_add_templates,svx/res,\
-	svx/inc/globlmn_tmpl.hrc \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index c26ad8f72248..1b6dd61bcefe 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -55,6 +55,5 @@ endif
 #todo: noopt for EnhanceCustomShapesFunctionParser.cxx on Solaris Sparc and MacOSX
 #todo: -DBOOST_SPIRIT_USE_OLD_NAMESPACE only in CustomShapes ?
 #todo: -DUNICODE and -D_UNICODE on WNT for source/dialog
-#todo: globlmn.hrc
 #todo: component file
 # vim: set noet sw=4 ts=4:
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
deleted file mode 100644
index 85ae57d7c70a..000000000000
--- a/svx/inc/globlmn_tmpl.hrc
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _GLOBLMN_HRC
-#define _GLOBLMN_HRC
-
-/*------------------------------------------------------------------------
-                             Menu-IDs
-------------------------------------------------------------------------*/
-#define ITEM_EDIT_CUT \
-    Identifier = SID_CUT ; \
-    Command = ".uno:Cut" ; \
-    Text [ en-US ] = "Cu~t" ;\
-
-#define ITEM_EDIT_COPY \
-    Identifier = SID_COPY ; \
-    Command = ".uno:Copy" ; \
-    Text [ en-US ] = "~Copy" ;\
-
-#define ITEM_EDIT_DELETE \
-    Identifier = SID_DELETE ; \
-    Command = ".uno:Delete" ; \
-    Text [ en-US ] = "~Delete" ;\
-
-#define ITEM_EDIT_PASTE \
-    Identifier = SID_PASTE ; \
-    Command = ".uno:Paste" ; \
-    Text [ en-US ] = "~Paste" ; \
-
-#endif // #ifndef _GLOBLMN_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src
index 96808f9c572a..112f77f6161a 100644
--- a/svx/source/fmcomp/gridctrl.src
+++ b/svx/source/fmcomp/gridctrl.src
@@ -19,7 +19,6 @@
 
 #include "svx/fmresids.hrc"
 #include <svx/svxids.hrc>
-#include "globlmn.hrc"
 #include "fmhelp.hrc"
 #include <svx/svxcommands.h>
 
@@ -192,7 +191,9 @@ Menu RID_SVXMNU_CELL
     {
         MenuItem
         {
-            ITEM_EDIT_COPY
+            Identifier = SID_COPY ;
+            Command = ".uno:Copy" ;
+            Text [ en-US ] = "~Copy" ;
         };
     };
 };
diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src
index 82b18a368230..1d0b0ddee976 100644
--- a/svx/source/form/datanavi.src
+++ b/svx/source/form/datanavi.src
@@ -18,7 +18,6 @@
  */
 
 #include "datanavi.hrc"
-#include "globlmn.hrc"
 #include "svx/dialogs.hrc"
 #include "svx/fmresids.hrc"
 #include "fmhelp.hrc"
diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src
index 822428c14325..078e1df6a7cc 100644
--- a/svx/source/form/fmexpl.src
+++ b/svx/source/form/fmexpl.src
@@ -19,7 +19,6 @@
 
 #include <svx/svxids.hrc>
 #include "svx/fmresids.hrc"
-#include "globlmn.hrc"
 #include <svx/svxcommands.h>
 #include "fmhelp.hrc"
 
@@ -57,9 +56,21 @@ Menu RID_FMEXPLORER_POPUPMENU
             HelpId = CMD_SID_FM_CHANGECONTROLTYPE ;
             Text [ en-US ] = "Replace with";
         };
-        MenuItem { ITEM_EDIT_CUT };
-        MenuItem { ITEM_EDIT_COPY };
-        MenuItem { ITEM_EDIT_PASTE };
+        MenuItem {
+            Identifier = SID_CUT ;
+            Command = ".uno:Cut" ;
+            Text [ en-US ] = "Cu~t" ;
+        };
+        MenuItem {
+            Identifier = SID_COPY ;
+            Command = ".uno:Copy" ;
+            Text [ en-US ] = "~Copy" ;
+        };
+        MenuItem {
+            Identifier = SID_PASTE ;
+            Command = ".uno:Paste" ;
+            Text [ en-US ] = "~Paste" ;
+        };
         MenuItem
         {
             Identifier = SID_FM_DELETE ;