expand src templates

Change-Id: Id35caa8b8ed0c2f7e4d868f5c87a2a0f331cb352
2016-03-07 13:31:04 +01:00 · 2016-03-07 13:31:04 +01:00 · d795f83695
commit d795f83695
parent 24905f42b9
31 changed files with 69 additions and 103 deletions
--- 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,\
--- 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
        {
--- 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;   \
--- 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" ;
        };
    };
 };
--- 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" ;
        };
    };
 };
--- 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"
--- 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
        {
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@ -86,8 +86,7 @@ bool passesNegativeList(const OUString& rUrl) {

 bool passesPositiveList(const OUString& rUrl) {
    static const AsciiString list[] = {
-        { RTL_CONSTASCII_STRINGPARAM("/description.xml") },
-        { RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") }
+        { RTL_CONSTASCII_STRINGPARAM("/description.xml") }
    };
    return matchList(rUrl, list, SAL_N_ELEMENTS(list));
 }
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@ -24,7 +24,6 @@ $(eval $(call gb_SrsTarget_use_srstargets,reportdesign/res,\
 $(eval $(call gb_SrsTarget_set_include,reportdesign/res,\
    $$(INCLUDE) \
    -I$(SRCDIR)/reportdesign/source/core/inc \
-    -I$(call gb_SrsTemplateTarget_get_include_dir,) \
 ))

 $(eval $(call gb_SrsTarget_add_files,reportdesign/res,\
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@ -33,7 +33,6 @@ $(eval $(call gb_SrsTarget_set_include,reportdesign/rptui,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/reportdesign/source/ui/inc \
 	-I$(SRCDIR)/reportdesign/inc \
-    -I$(call gb_SrsTemplateTarget_get_include_dir,) \
 ))


--- a/reportdesign/source/ui/dlg/CondFormat.src
+++ b/reportdesign/source/ui/dlg/CondFormat.src
@ -19,7 +19,6 @@
 #include "CondFormat.hrc"
 #include "RptResId.hrc"
 #include "helpids.hrc"
-#include <svx/globlmn.hrc>
 #include "rptui_slotid.hrc"

 String STR_NUMBERED_CONDITION
--- a/reportdesign/source/ui/dlg/GroupsSorting.src
+++ b/reportdesign/source/ui/dlg/GroupsSorting.src
@ -18,7 +18,6 @@
 */
 #include "RptResId.hrc"
 #include "helpids.hrc"
-#include <svx/globlmn.hrc>
 #include <svx/svxids.hrc>

 String STR_RPT_EXPRESSION
@ -117,7 +116,9 @@ Menu RID_GROUPSROWPOPUPMENU
    {
        MenuItem
        {
-            ITEM_EDIT_DELETE
+            Identifier = SID_DELETE ;
+            Command = ".uno:Delete" ;
+            Text [ en-US ] = "~Delete" ;
        };
    };
 };
--- a/reportdesign/source/ui/dlg/Navigator.src
+++ b/reportdesign/source/ui/dlg/Navigator.src
@ -19,7 +19,6 @@
 #include "RptResId.hrc"
 #include "helpids.hrc"
 #include "rptui_slotid.hrc"
-#include <svx/globlmn.hrc>
 #include <svx/svxids.hrc>
 #include <svl/solar.hrc>

@ -119,7 +118,9 @@ Menu RID_MENU_NAVIGATOR
        };
        MenuItem
        {
-            ITEM_EDIT_DELETE
+            Identifier = SID_DELETE ;
+            Command = ".uno:Delete" ;
+            Text [ en-US ] = "~Delete" ;
        };
    };
 };
--- a/reportdesign/source/ui/dlg/PageNumber.src
+++ b/reportdesign/source/ui/dlg/PageNumber.src
@ -18,7 +18,6 @@
 */
 #include "RptResId.hrc"
 #include "helpids.hrc"
-#include <svx/globlmn.hrc>
 #include <svx/svxids.hrc>

 String STR_RPT_PN_PAGE
--- a/reportdesign/source/ui/inspection/inspection.src
+++ b/reportdesign/source/ui/inspection/inspection.src
@ -18,7 +18,6 @@
 */
 #include "RptResId.hrc"
 #include "rptui_slotid.hrc"
-#include <svx/globlmn.hrc>
 #include <svx/svxids.hrc>

 String RID_STR_PROPPAGE_DEFAULT
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@ -18,7 +18,6 @@
 */
 #include "RptResId.hrc"
 #include "rptui_slotid.hrc"
-#include <svx/globlmn.hrc>
 #include <svx/svxids.hrc>
 #include "helpids.hrc"

@ -525,15 +524,21 @@ Menu RID_MENU_REPORT
        };
        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" ;
        };
    };
 };
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.src
@ -18,7 +18,6 @@
 */

 #include "sc.hrc"
-#include <svx/globlmn.hrc>

 String SCSTR_QHELP_POSWND
 {
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@ -18,7 +18,6 @@
 */

 #include <sfx2/sfx.hrc>
-#include <svx/globlmn.hrc>
 #include "starmath.hrc"

 String RID_FONTREGULAR
--- a/starmath/source/toolbox.src
+++ b/starmath/source/toolbox.src
@ -18,7 +18,6 @@
 */

 #include <sfx2/sfx.hrc>
-#include <svx/globlmn.hrc>
 #include "starmath.hrc"

 #define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
--- 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:
--- 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:
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@ -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: */
--- 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" ;
        };
    };
 };
--- 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"
--- 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 ;
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
    -I$(SRCDIR)/sw/source/ui/utlui \
    -I$(SRCDIR)/sw/source/ui/web \
    -I$(SRCDIR)/sw/source/ui/wrtsh \
-    -I$(call gb_SrsTemplateTarget_get_include_dir,) \
    -I$(call gb_SrsTemplateTarget_get_include_dir,sw) \
 ))

--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@ -20,7 +20,6 @@
 #include <svl/style.hrc>
 #include <sfx2/sfx.hrc>
 #include <svx/dialogs.hrc>
-#include <svx/globlmn.hrc>
 #include "cmdid.h"
 #include "access.hrc"
 #include "globals.hrc"
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@ -18,7 +18,6 @@
 */

 #include <svx/dialogs.hrc>
-#include <svx/globlmn.hrc>
 #include "cmdid.h"
 #include "app.hrc"
 #include "globals.hrc"
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */
 #include <svx/svxids.hrc>
-#include <svx/globlmn.hrc>
 #include "helpid.h"
 #include "shells.hrc"
 #include "globals.hrc"
--- a/sw/source/uibase/ribbar/workctrl.src
+++ b/sw/source/uibase/ribbar/workctrl.src
@ -18,7 +18,6 @@
 */

 #include <svx/svxids.hrc>
-#include <svx/globlmn.hrc>
 #include "globals.hrc"
 #include "workctrl.hrc"
 #include "helpid.h"
--- a/sw/source/uibase/uiview/view.src
+++ b/sw/source/uibase/uiview/view.src
@ -18,7 +18,6 @@
 */

 #include <svx/svxids.hrc>
-#include <svx/globlmn.hrc>
 #include "view.hrc"
 #include "shells.hrc"
 #include "globals.hrc"