mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#74119 fix unlocalized redline menu

Browse Source 
Change-Id: Ia4836a69ddd8bebe8cc21cea67be96b029388cb1
This commit is contained in:
Andras Timar
2014-01-27 22:27:24 +01:00
parent a0c2a6357c
commit 35782f89b6
6 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
l10ntools/source/localize.cxx
View File

@@ -102,7 +102,7 @@ bool passesPositiveList(const OUString& rUrl) {
{ RTL_CONSTASCII_STRINGPARAM("/description.xml") }, { RTL_CONSTASCII_STRINGPARAM("/description.xml") },
{ RTL_CONSTASCII_STRINGPARAM("/android/sdremote/res/values/strings.xml") }, { RTL_CONSTASCII_STRINGPARAM("/android/sdremote/res/values/strings.xml") },
{ RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") }, { 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)); return matchList(rUrl, list, SAL_N_ELEMENTS(list));
} }

5
sw/AllLangResTarget_sw.mk
View File

@@ -58,6 +58,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
-I$(SRCDIR)/sw/source/ui/web \ -I$(SRCDIR)/sw/source/ui/web \
-I$(SRCDIR)/sw/source/ui/wrtsh \ -I$(SRCDIR)/sw/source/ui/wrtsh \
-I$(call gb_SrsTemplateTarget_get_include_dir,) \ -I$(call gb_SrsTemplateTarget_get_include_dir,) \
-I$(call gb_SrsTemplateTarget_get_include_dir,sw) \
)) ))
$(eval $(call gb_SrsTarget_add_files,sw/res,\ $(eval $(call gb_SrsTarget_add_files,sw/res,\
@@ -126,4 +127,8 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,sw/res,\
sw/source/ui/envelp/envprt.src \ sw/source/ui/envelp/envprt.src \
)) ))
$(eval $(call gb_SrsTarget_add_templates,sw/res,\
sw/source/ui/inc/redline_tmpl.hrc \
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

2
sw/source/ui/app/mn.src
View File

@@ -24,7 +24,7 @@
#include "globals.hrc" #include "globals.hrc"
#include "helpid.h" #include "helpid.h"
#include "popup.hrc" #include "popup.hrc"
#include "misc.hrc" #include "redline.hrc"
/* --------------------- F O R M A T --------------------------------- */ /* --------------------- F O R M A T --------------------------------- */
#define SEPARATOR MenuItem { Separator = TRUE; } #define SEPARATOR MenuItem { Separator = TRUE; }

27
sw/source/ui/inc/misc.hrc
View File

@@ -21,7 +21,6 @@
#define _MISC_HRC #define _MISC_HRC
#include "rcid.hrc" #include "rcid.hrc"
#include "cmdid.h"
#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17) #define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17)
#define DLG_NUM_NAMES (RC_MISC_BEGIN + 18) #define DLG_NUM_NAMES (RC_MISC_BEGIN + 18)
@@ -56,32 +55,6 @@
#error Resource-Id Ueberlauf in #file, #line #error Resource-Id Ueberlauf in #file, #line
#endif #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 #endif // _MISC_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

39
sw/source/ui/inc/redline_tmpl.hrc Normal file
View File

@@ -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: */

2
sw/source/ui/lingu/olmenu.src
View File

@@ -20,7 +20,7 @@
#include "olmenu.hrc" #include "olmenu.hrc"
#include "helpid.h" #include "helpid.h"
#include "misc.hrc" #include "redline.hrc"
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
#define SEPARATOR MenuItem { Separator = TRUE; }; #define SEPARATOR MenuItem { Separator = TRUE; };