diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-01-27 22:27:24 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-01-27 22:30:11 +0100 |
| commit | 35782f89b61c04d9aa97183ea736f4288490800c (patch) | |
| tree | 545d8c7fb0828f1cb42e169611466c66eddeb471 /sw/source/ui | |
| parent | a0c2a6357c31688683cbea0b6a0cd76cac42d5f0 (diff) | |
fdo#74119 fix unlocalized redline menu
Change-Id: Ia4836a69ddd8bebe8cc21cea67be96b029388cb1
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/app/mn.src | 2 | ||||
| -rw-r--r-- | sw/source/ui/inc/misc.hrc | 27 | ||||
| -rw-r--r-- | sw/source/ui/inc/redline_tmpl.hrc | 39 | ||||
| -rw-r--r-- | sw/source/ui/lingu/olmenu.src | 2 |
4 files changed, 41 insertions, 29 deletions
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index 7a762e9244eb..eb5ee0e10f7e 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -24,7 +24,7 @@ #include "globals.hrc" #include "helpid.h" #include "popup.hrc" -#include "misc.hrc" +#include "redline.hrc" /* --------------------- F O R M A T --------------------------------- */ #define SEPARATOR MenuItem { Separator = TRUE; } diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc index ff200908babc..95113ff989f2 100644 --- a/sw/source/ui/inc/misc.hrc +++ b/sw/source/ui/inc/misc.hrc @@ -21,7 +21,6 @@ #define _MISC_HRC #include "rcid.hrc" -#include "cmdid.h" #define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17) #define DLG_NUM_NAMES (RC_MISC_BEGIN + 18) @@ -56,32 +55,6 @@ #error Resource-Id Ueberlauf in #file, #line #endif -#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" ; \ - }; - #endif // _MISC_HRC /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/inc/redline_tmpl.hrc b/sw/source/ui/inc/redline_tmpl.hrc new file mode 100644 index 000000000000..42717089947b --- /dev/null +++ b/sw/source/ui/inc/redline_tmpl.hrc @@ -0,0 +1,39 @@ +/* -*- 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/ui/lingu/olmenu.src b/sw/source/ui/lingu/olmenu.src index 1af2d8e40cf6..293d8043c7db 100644 --- a/sw/source/ui/lingu/olmenu.src +++ b/sw/source/ui/lingu/olmenu.src @@ -20,7 +20,7 @@ #include "olmenu.hrc" #include "helpid.h" -#include "misc.hrc" +#include "redline.hrc" #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; #define SEPARATOR MenuItem { Separator = TRUE; }; |