[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.1' - 2 commits - distro-configs/CPLinux.conf l10ntools/source sw/AllLangResTarget_sw.mk sw/source
Andras Timar
andras.timar at collabora.com
Tue Jan 28 07:26:54 PST 2014
distro-configs/CPLinux.conf | 1
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 -
7 files changed, 48 insertions(+), 30 deletions(-)
New commits:
commit a78cbbb8bb1ca8af078661f2c92c11c0fd7860a5
Author: Andras Timar <andras.timar at collabora.com>
Date: Tue Jan 28 16:11:47 2014 +0100
Linux: bundle dictionaries
Change-Id: Ieba7d173c74d19b72ab7d5eb6d6957ff46da9ec0
diff --git a/distro-configs/CPLinux.conf b/distro-configs/CPLinux.conf
index 0ffc50b..c902dc1 100644
--- a/distro-configs/CPLinux.conf
+++ b/distro-configs/CPLinux.conf
@@ -1,5 +1,6 @@
--with-vendor=Collabora
--with-system-dicts
+--with-myspell-dicts
--without-system-zlib
--without-system-poppler
--without-system-openssl
commit d8c0a02c6ca3a00df08c7311dc425c27426ac281
Author: Andras Timar <andras.timar at collabora.com>
Date: Mon Jan 27 22:27:24 2014 +0100
fdo#74119 fix unlocalized redline menu
Conflicts:
sw/AllLangResTarget_sw.mk
Conflicts:
l10ntools/source/localize.cxx
sw/AllLangResTarget_sw.mk
Change-Id: Ia4836a69ddd8bebe8cc21cea67be96b029388cb1
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 2062491..eed87a7 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -119,7 +119,7 @@ bool passesPositiveList(const OUString& rUrl) {
{ RTL_CONSTASCII_STRINGPARAM(
"/svx/source/unodialogs/textconversiondlgs/"
"chinese_direction_tmpl.hrc") },
- { RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/misc.hrc") },
+ { RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/redline_tmpl.hrc") },
{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/swacc_tmpl.hrc") },
{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/swmn_tmpl.hrc") },
{ RTL_CONSTASCII_STRINGPARAM("/sw/source/ui/inc/toolbox_tmpl.hrc") }
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index a1cd2c7..8ec5d1d 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
-I$(SRCDIR)/sw/source/ui/utlui \
-I$(SRCDIR)/sw/source/ui/web \
-I$(SRCDIR)/sw/source/ui/wrtsh \
+ -I$(call gb_SrsTemplateTarget_get_include_dir,sw) \
))
$(eval $(call gb_SrsTarget_add_files,sw/res,\
@@ -152,4 +153,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 cf57a95..304724e 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 645f08a..aa37171a 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_DOC_FOOTNOTE (RC_MISC_BEGIN + 13)
#define DLG_INSERT_BOOKMARK (RC_MISC_BEGIN + 17)
@@ -57,32 +56,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; };
More information about the Libreoffice-commits
mailing list