l10ntools/source/localize.cxx | 2 -
sw/AllLangResTarget_sw.mk | 5 ++++
sw/source/ui/app/mn.src | 2 -
sw/source/ui/inc/misc.hrc | 27 --------------------------
sw/source/ui/inc/redline_tmpl.hrc | 39 ++++++++++++++++++++++++++++++++++++++
sw/source/ui/lingu/olmenu.src | 2 -
translations | 2 -
7 files changed, 48 insertions(+), 31 deletions(-)
New commits:
commit 9c8b8bfb06e38c5afd2f8e3a633b5905f39f7ba7
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Jan 27 22:37:05 2014 +0100
Updated core
Project: translations 952ba056d60e6e59513a61d90e4c9df19fe46d8a
fdo#74119 fix unlocalized redline menu
Change-Id: I82aac1a6af3d7e27feffa90b7617365c98d8e7e8
Reviewed-on: https://gerrit.libreoffice.org/7704
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/translations b/translations
index 0c7ce23..952ba05 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0c7ce2344438228bf57a34bbaaba299c94b60c00
+Subproject commit 952ba056d60e6e59513a61d90e4c9df19fe46d8a
commit 726914b6224bce818f6d88be62482653e837ac9c
Author: Andras Timar <andras.ti...@collabora.com>
Date: Mon Jan 27 22:27:24 2014 +0100
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 5bd55b4..b8f84d1 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 f79cd4e..45a3e71 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 7a762e9..eb5ee0e 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 ff20090..95113ff 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 0000000..4271708
--- /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 1af2d8e..293d804 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; };
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
