diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-01-27 22:27:24 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-30 11:52:17 +0000 |
| commit | 726914b6224bce818f6d88be62482653e837ac9c (patch) | |
| tree | 843cd5ef02ced3b093571c4abc203cd79225a97a | |
| parent | e28dc284596619e2a5000582e4ebd1aa615ddcf8 (diff) | |
fdo#74119 fix unlocalized redline menu
Conflicts:
sw/AllLangResTarget_sw.mk
Change-Id: Ia4836a69ddd8bebe8cc21cea67be96b029388cb1
Reviewed-on: https://gerrit.libreoffice.org/7703
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | l10ntools/source/localize.cxx | 2 | ||||
| -rw-r--r-- | sw/AllLangResTarget_sw.mk | 5 | ||||
| -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 |
6 files changed, 47 insertions, 30 deletions
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index 5bd55b43d928..b8f84d14aa6d 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -104,7 +104,7 @@ bool passesPositiveList(const OUString& rUrl) { { RTL_CONSTASCII_STRINGPARAM("/description.xml") }, { RTL_CONSTASCII_STRINGPARAM("/android/sdremote/res/values/strings.xml") }, { RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") }, - { RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/misc.hrc") } + { RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/redline_tmpl.hrc") } }; return matchList(rUrl, list, SAL_N_ELEMENTS(list)); } diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk index f79cd4ee7ccf..45a3e715cca8 100644 --- a/sw/AllLangResTarget_sw.mk +++ b/sw/AllLangResTarget_sw.mk @@ -58,6 +58,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\ -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) \ )) $(eval $(call gb_SrsTarget_add_files,sw/res,\ @@ -123,4 +124,8 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\ sw/source/ui/wrtsh/wrtsh.src \ )) +$(eval $(call gb_SrsTarget_add_templates,sw/res,\ + sw/source/ui/inc/redline_tmpl.hrc \ +)) + # vim: set noet sw=4 ts=4: 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; }; |