diff options
31 files changed, 69 insertions, 103 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 { diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 31b11e940049..e9130afa5764 100644 --- 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)); } diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk index 2d2a5a1ecfba..9e7eb38c06c7 100644 --- 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,\ diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk index 742b2b106380..a02e33a56c2d 100644 --- 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,) \ )) diff --git a/reportdesign/source/ui/dlg/CondFormat.src b/reportdesign/source/ui/dlg/CondFormat.src index 529ffeeb006e..9d602e053020 100644 --- 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 diff --git a/reportdesign/source/ui/dlg/GroupsSorting.src b/reportdesign/source/ui/dlg/GroupsSorting.src index 25ead95c32fd..47c177df687f 100644 --- 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" ; }; }; }; diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index c6471f67efd6..8e9cc145a28c 100644 --- 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" ; }; }; }; diff --git a/reportdesign/source/ui/dlg/PageNumber.src b/reportdesign/source/ui/dlg/PageNumber.src index 1d932559aa3b..be120f608e77 100644 --- 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 diff --git a/reportdesign/source/ui/inspection/inspection.src b/reportdesign/source/ui/inspection/inspection.src index 715871ddee81..1876009ae230 100644 --- 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 diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index a4d1e9a7e3e5..6a88af8d3454 100644 --- 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" ; }; }; }; diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src index 6ed58900bd4a..d9c98a8fef73 100644 --- 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 { diff --git a/starmath/source/smres.src b/starmath/source/smres.src index 50872d97fda0..a0a51268acda 100644 --- 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 diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src index 65e2af930d05..4bf44fd97d51 100644 --- 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; } 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 ; diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index 84d833d92f30..ce52e5425dbd 100644 --- 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) \ )) diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src index b73d10c7b573..74c3ce18916f 100644 --- 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" diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index 42b01e401780..3bc37bbc229e 100644 --- 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" diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index 8db90320895f..d8ac163b7645 100644 --- 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" diff --git a/sw/source/uibase/ribbar/workctrl.src b/sw/source/uibase/ribbar/workctrl.src index 4c4b2a9caa33..ba22b8b24594 100644 --- 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" diff --git a/sw/source/uibase/uiview/view.src b/sw/source/uibase/uiview/view.src index 55b3640fcb4b..edb839f97cd0 100644 --- 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" |