diff options
| author | David Tardon <dtardon@redhat.com> | 2016-03-07 08:29:11 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2016-03-07 08:50:59 +0100 |
| commit | fae56aad84e58a765503b41e9bfe87fbd290556c (patch) | |
| tree | eaabd7d5e40d334c04965159b1e9e40f0869365b | |
| parent | 71e1a44ba192dea67c69588d5aa547629efde327 (diff) | |
expand src templates only used in a single place
Change-Id: I0af62539f9dfe636eb242acd766559ffe1097217
| -rw-r--r-- | l10ntools/source/localize.cxx | 3 | ||||
| -rw-r--r-- | sw/AllLangResTarget_sw.mk | 4 | ||||
| -rw-r--r-- | sw/source/uibase/inc/redline_tmpl.hrc | 39 | ||||
| -rw-r--r-- | sw/source/uibase/lingu/olmenu.src | 25 |
4 files changed, 25 insertions, 46 deletions
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index e12ffc014ee2..865040b40c43 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -93,8 +93,7 @@ bool passesPositiveList(const OUString& rUrl) { { RTL_CONSTASCII_STRINGPARAM( "/dbaccess/source/ui/inc/toolbox_tmpl.hrc") }, { RTL_CONSTASCII_STRINGPARAM("/description.xml") }, - { RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") }, - { RTL_CONSTASCII_STRINGPARAM("/sw/source/uibase/inc/redline_tmpl.hrc") } + { RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") } }; return matchList(rUrl, list, SAL_N_ELEMENTS(list)); } diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index ef8d7ea14836..84d833d92f30 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -120,8 +120,4 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,sw/res,\ sw/source/ui/envelp/envprt.src \ )) -$(eval $(call gb_SrsTarget_add_templates,sw/res,\ - sw/source/uibase/inc/redline_tmpl.hrc \ -)) - # vim: set noet sw=4 ts=4: diff --git a/sw/source/uibase/inc/redline_tmpl.hrc b/sw/source/uibase/inc/redline_tmpl.hrc deleted file mode 100644 index 42717089947b..000000000000 --- a/sw/source/uibase/inc/redline_tmpl.hrc +++ /dev/null @@ -1,39 +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/. - * - */ - -#include "cmdid.h" - -#define MN_EDIT_REDLINE \ - MenuItem \ - { \ - Identifier = FN_REDLINE_ACCEPT_DIRECT; \ - HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ; \ - Text [ en-US ] = "Accept Change" ; \ - }; \ - MenuItem \ - { \ - Identifier = FN_REDLINE_REJECT_DIRECT ; \ - HelpId = CMD_FN_REDLINE_REJECT_DIRECT ; \ - Text [ en-US ] = "Reject Change" ; \ - }; \ - MenuItem \ - { \ - Identifier = FN_REDLINE_NEXT_CHANGE; \ - HelpId = CMD_FN_REDLINE_NEXT_CHANGE ; \ - Text [ en-US ] = "Next Change" ; \ - }; \ - MenuItem \ - { \ - Identifier = FN_REDLINE_PREV_CHANGE; \ - HelpId = CMD_FN_REDLINE_PREV_CHANGE ; \ - Text [ en-US ] = "Previous Change" ; \ - }; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/lingu/olmenu.src b/sw/source/uibase/lingu/olmenu.src index e60e5ab0e013..e5161aceb33d 100644 --- a/sw/source/uibase/lingu/olmenu.src +++ b/sw/source/uibase/lingu/olmenu.src @@ -87,7 +87,30 @@ Menu MN_SPELL_POPUP Text [ en-US ] = "Set Language for Paragraph" ; }; SEPARATOR - MN_EDIT_REDLINE + MenuItem + { + Identifier = FN_REDLINE_ACCEPT_DIRECT; + HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ; + Text [ en-US ] = "Accept Change" ; + }; + MenuItem + { + Identifier = FN_REDLINE_REJECT_DIRECT ; + HelpId = CMD_FN_REDLINE_REJECT_DIRECT ; + Text [ en-US ] = "Reject Change" ; + }; + MenuItem + { + Identifier = FN_REDLINE_NEXT_CHANGE; + HelpId = CMD_FN_REDLINE_NEXT_CHANGE ; + Text [ en-US ] = "Next Change" ; + }; + MenuItem + { + Identifier = FN_REDLINE_PREV_CHANGE; + HelpId = CMD_FN_REDLINE_PREV_CHANGE ; + Text [ en-US ] = "Previous Change" ; + }; }; }; String STR_WORD |