[Libreoffice-commits] core.git: 4 commits - dbaccess/source l10ntools/source reportdesign/source svx/inc sw/AllLangResTarget_sw.mk sw/source
David Tardon
dtardon at redhat.com
Mon Mar 7 07:52:48 UTC 2016
dbaccess/source/ui/app/app.src | 20 ++++++++---
dbaccess/source/ui/browser/sbabrw.src | 3 +
dbaccess/source/ui/inc/toolbox_tmpl.hrc | 34 -------------------
dbaccess/source/ui/querydesign/query.src | 4 +-
l10ntools/source/localize.cxx | 7 ---
reportdesign/source/ui/report/report.src | 44 ++++++++++++++++++------
svx/inc/globlmn_tmpl.hrc | 55 -------------------------------
sw/AllLangResTarget_sw.mk | 4 --
sw/source/uibase/inc/redline_tmpl.hrc | 39 ---------------------
sw/source/uibase/lingu/olmenu.src | 25 +++++++++++++-
10 files changed, 78 insertions(+), 157 deletions(-)
New commits:
commit ac47ff033498a991cd8d7e70a2d0ebf308d5ca46
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 7 08:40:22 2016 +0100
drop removed templates from the list
Change-Id: I3017a5904569d9f773d3c69cb6aa27f860b8b2a8
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index 865040b..ad8e471 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -87,10 +87,6 @@ bool passesNegativeList(const OUString& rUrl) {
bool passesPositiveList(const OUString& rUrl) {
static const AsciiString list[] = {
{ RTL_CONSTASCII_STRINGPARAM(
- "/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc") },
- { RTL_CONSTASCII_STRINGPARAM(
- "/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc") },
- { RTL_CONSTASCII_STRINGPARAM(
"/dbaccess/source/ui/inc/toolbox_tmpl.hrc") },
{ RTL_CONSTASCII_STRINGPARAM("/description.xml") },
{ RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") }
commit fae56aad84e58a765503b41e9bfe87fbd290556c
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 7 08:29:11 2016 +0100
expand src templates only used in a single place
Change-Id: I0af62539f9dfe636eb242acd766559ffe1097217
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx
index e12ffc0..865040b 100644
--- a/l10ntools/source/localize.cxx
+++ b/l10ntools/source/localize.cxx
@@ -93,8 +93,7 @@ bool passesPositiveList(const OUString& rUrl) {
{ RTL_CONSTASCII_STRINGPARAM(
"/dbaccess/source/ui/inc/toolbox_tmpl.hrc") },
{ RTL_CONSTASCII_STRINGPARAM("/description.xml") },
- { RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") },
- { RTL_CONSTASCII_STRINGPARAM("/sw/source/uibase/inc/redline_tmpl.hrc") }
+ { RTL_CONSTASCII_STRINGPARAM("/svx/inc/globlmn_tmpl.hrc") }
};
return matchList(rUrl, list, SAL_N_ELEMENTS(list));
}
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index ef8d7ea..84d833d 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -120,8 +120,4 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,sw/res,\
sw/source/ui/envelp/envprt.src \
))
-$(eval $(call gb_SrsTarget_add_templates,sw/res,\
- sw/source/uibase/inc/redline_tmpl.hrc \
-))
-
# vim: set noet sw=4 ts=4:
diff --git a/sw/source/uibase/inc/redline_tmpl.hrc b/sw/source/uibase/inc/redline_tmpl.hrc
deleted file mode 100644
index 4271708..0000000
--- a/sw/source/uibase/inc/redline_tmpl.hrc
+++ /dev/null
@@ -1,39 +0,0 @@
-/* -*- 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/uibase/lingu/olmenu.src b/sw/source/uibase/lingu/olmenu.src
index e60e5ab..e5161ac 100644
--- a/sw/source/uibase/lingu/olmenu.src
+++ b/sw/source/uibase/lingu/olmenu.src
@@ -87,7 +87,30 @@ Menu MN_SPELL_POPUP
Text [ en-US ] = "Set Language for Paragraph" ;
};
SEPARATOR
- 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" ;
+ };
};
};
String STR_WORD
commit 71e1a44ba192dea67c69588d5aa547629efde327
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 7 08:27:08 2016 +0100
expand src templates only used in a single place
Change-Id: If10e2fb1448867e79df3ddc962f93b904af94b3d
diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src
index 0c2ef92..cca23a0 100644
--- a/dbaccess/source/ui/app/app.src
+++ b/dbaccess/source/ui/app/app.src
@@ -101,17 +101,23 @@ Menu RID_MENU_APP_NEW
};
MenuItem
{
- MID_DOCUMENT_CREATE_REPWIZ
+ Identifier = ID_DOCUMENT_CREATE_REPWIZ ;
+ HelpID = HID_DOCUMENT_CREATE_REPWIZ ;
+ Text [ en-US ] = "Report Wizard...";
Command = ".uno:DBNewReportAutoPilot";
};
MenuItem
{
- MID_QUERY_NEW_DESIGN
+ Identifier = ID_NEW_QUERY_DESIGN;
+ HelpId = HID_BROWSER_QUERY_CREATE_DESIGN ;
+ Text [ en-US ] = "New ~Query (Design View)" ;
Command = ".uno:DBNewQuery";
};
MenuItem
{
- MID_QUERY_NEW_SQL
+ Identifier = ID_NEW_QUERY_SQL;
+ HelpId = HID_BROWSER_QUERY_CREATE_TEXT ;
+ Text [ en-US ] = "New Query (~SQL View)" ;
Command = ".uno:DBNewQuerySql";
};
MenuItem
@@ -120,12 +126,16 @@ Menu RID_MENU_APP_NEW
};
MenuItem
{
- MID_NEW_TABLE_DESIGN
+ Identifier = ID_NEW_TABLE_DESIGN;
+ HelpId = HID_BROWSER_TABLE_CREATE_DESIGN ;
+ Text [ en-US ] = "New ~Table Design" ;
Command = ".uno:DBNewTable";
};
MenuItem
{
- MID_NEW_VIEW_DESIGN
+ Identifier = ID_NEW_VIEW_DESIGN;
+ HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ;
+ Text [ en-US ] = "New ~View Design" ;
Command = ".uno:DBNewView";
};
MenuItem
diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src
index 01888a4..b7b605e 100644
--- a/dbaccess/source/ui/browser/sbabrw.src
+++ b/dbaccess/source/ui/browser/sbabrw.src
@@ -156,7 +156,8 @@ Menu RID_MENU_REFRESH_DATA
{
MenuItem
{
- MID_SBA_QRY_REFRESH
+ Identifier = ID_BROWSER_REFRESH ;
+ Text [ en-US ] = "Refresh";
Command = ".uno:Refresh";
};
MenuItem
diff --git a/dbaccess/source/ui/inc/toolbox_tmpl.hrc b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
index 6aeaa14..679b044 100644
--- a/dbaccess/source/ui/inc/toolbox_tmpl.hrc
+++ b/dbaccess/source/ui/inc/toolbox_tmpl.hrc
@@ -19,45 +19,11 @@
#ifndef DBAUI_TOOLBOX_HRC
#define DBAUI_TOOLBOX_HRC
-#define MID_SBA_QRY_REFRESH \
- Identifier = ID_BROWSER_REFRESH ; \
- Text [ en-US ] = "Refresh"; \
-
-#define MID_NEW_VIEW_DESIGN \
- Identifier = ID_NEW_VIEW_DESIGN; \
- HelpId = HID_BROWSER_VIEW_CREATE_DESIGN ; \
- Text [ en-US ] = "New ~View Design" ; \
-
-#define MID_NEW_TABLE_DESIGN \
- Identifier = ID_NEW_TABLE_DESIGN; \
- HelpId = HID_BROWSER_TABLE_CREATE_DESIGN ; \
- Text [ en-US ] = "New ~Table Design" ;\
-
-#define MID_QUERY_NEW_DESIGN \
- Identifier = ID_NEW_QUERY_DESIGN; \
- HelpId = HID_BROWSER_QUERY_CREATE_DESIGN ; \
- Text [ en-US ] = "New ~Query (Design View)" ; \
-
-#define MID_QUERY_NEW_SQL \
- Identifier = ID_NEW_QUERY_SQL; \
- HelpId = HID_BROWSER_QUERY_CREATE_TEXT ; \
- Text [ en-US ] = "New Query (~SQL View)" ; \
-
-#define MID_DBUI_QUERY_EDIT_JOINCONNECTION \
- Identifier = ID_QUERY_EDIT_JOINCONNECTION; \
- HelpId = HID_QUERY_EDIT_JOINCONNECTION ; \
- Text [ en-US ] = "Edit..."; \
-
#define MID_COLUMN_WIDTH\
Identifier = ID_BROWSER_COLWIDTH ;\
HelpID = HID_BROWSER_COLUMNWIDTH ;\
Text [ en-US ] = "Column ~Width..." ;\
-#define MID_DOCUMENT_CREATE_REPWIZ\
- Identifier = ID_DOCUMENT_CREATE_REPWIZ ;\
- HelpID = HID_DOCUMENT_CREATE_REPWIZ ;\
- Text [ en-US ] = "Report Wizard..."; \
-
#endif // DBAUI_TOOLBOX_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/query.src b/dbaccess/source/ui/querydesign/query.src
index 2a67911..27ef7d8 100644
--- a/dbaccess/source/ui/querydesign/query.src
+++ b/dbaccess/source/ui/querydesign/query.src
@@ -34,7 +34,9 @@ Menu RID_MENU_JOINVIEW_CONNECTION
};
MenuItem
{
- MID_DBUI_QUERY_EDIT_JOINCONNECTION
+ Identifier = ID_QUERY_EDIT_JOINCONNECTION;
+ HelpId = HID_QUERY_EDIT_JOINCONNECTION ;
+ Text [ en-US ] = "Edit...";
};
};
};
commit 055fb754c6d7438d4d9e7b45ce458943a0a4793e
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 7 08:22:03 2016 +0100
expand src templates only used in a single place
Change-Id: Ic18e4c0a1617f0284b7ffcfb8859cdced4949471
diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src
index ed9bfd9..a4d1e9a 100644
--- a/reportdesign/source/ui/report/report.src
+++ b/reportdesign/source/ui/report/report.src
@@ -326,7 +326,9 @@ Menu RID_MENU_REPORT
{
MenuItem
{
- ITEM_FORMAT_FRAME_TO_TOP
+ Identifier = SID_FRAME_TO_TOP ;
+ Command = ".uno:BringToFront" ;
+ Text [ en-US ] = "~Bring to Front" ;
};
MenuItem
{
@@ -342,7 +344,9 @@ Menu RID_MENU_REPORT
};
MenuItem
{
- ITEM_FORMAT_FRAME_TO_BOTTOM
+ Identifier = SID_FRAME_TO_BOTTOM ;
+ Command = ".uno:SendToBack" ;
+ Text [ en-US ] = "~Send to Back" ;
};
MenuItem
{
@@ -350,33 +354,45 @@ Menu RID_MENU_REPORT
};
MenuItem
{
- ITEM_FORMAT_OBJECT_HEAVEN
+ Identifier = SID_OBJECT_HEAVEN ;
+ Command = ".uno:SetObjectToForeground" ;
+ Text [ en-US ] = "~To Foreground" ;
};
MenuItem
{
- ITEM_FORMAT_OBJECT_HELL
+ Identifier = SID_OBJECT_HELL ;
+ Command = ".uno:SetObjectToBackground" ;
+ Text [ en-US ] = "T~o Background" ;
};
};
};
};
MenuItem
{
- ITEM_FORMAT_OBJECT_ALIGN
+ Identifier = SID_OBJECT_ALIGN ;
+ Command = ".uno:ObjectAlign" ;
+ Text [ en-US ] = "A~lignment" ;
SubMenu = Menu
{
ItemList =
{
MenuItem
{
- ITEM_FORMAT_OBJECT_ALIGN_LEFT
+ Identifier = SID_OBJECT_ALIGN_LEFT ;
+ Command = ".uno:ObjectAlignLeft" ;
+ Text [ en-US ] = "~Left" ;
};
MenuItem
{
- ITEM_FORMAT_OBJECT_ALIGN_CENTER
+ Identifier = SID_OBJECT_ALIGN_CENTER ;
+ Command = ".uno:AlignCenter" ;
+ Text [ en-US ] = "~Centered" ;
};
MenuItem
{
- ITEM_FORMAT_OBJECT_ALIGN_RIGHT
+ Identifier = SID_OBJECT_ALIGN_RIGHT ;
+ Command = ".uno:ObjectAlignRight" ;
+ Text [ en-US ] = "~Right" ;
};
MenuItem
{
@@ -384,15 +400,21 @@ Menu RID_MENU_REPORT
};
MenuItem
{
- ITEM_FORMAT_OBJECT_ALIGN_UP
+ Identifier = SID_OBJECT_ALIGN_UP ;
+ Command = ".uno:AlignUp" ;
+ Text [ en-US ] = "~Top" ;
};
MenuItem
{
- ITEM_FORMAT_OBJECT_ALIGN_MIDDLE
+ Identifier = SID_OBJECT_ALIGN_MIDDLE ;
+ Command = ".uno:AlignMiddle" ;
+ Text [ en-US ] = "C~enter" ;
};
MenuItem
{
- ITEM_FORMAT_OBJECT_ALIGN_DOWN
+ Identifier = SID_OBJECT_ALIGN_DOWN ;
+ Command = ".uno:AlignDown" ;
+ Text [ en-US ] = "~Bottom" ;
};
};
};
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index a7aac50..85ae57d 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -38,61 +38,6 @@
Command = ".uno:Delete" ; \
Text [ en-US ] = "~Delete" ;\
-#define ITEM_FORMAT_FRAME_TO_TOP \
- Identifier = SID_FRAME_TO_TOP ; \
- Command = ".uno:BringToFront" ; \
- Text [ en-US ] = "~Bring to Front" ;\
-
-#define ITEM_FORMAT_FRAME_TO_BOTTOM \
- Identifier = SID_FRAME_TO_BOTTOM ; \
- Command = ".uno:SendToBack" ; \
- Text [ en-US ] = "~Send to Back" ;\
-
-#define ITEM_FORMAT_OBJECT_ALIGN \
- Identifier = SID_OBJECT_ALIGN ; \
- Command = ".uno:ObjectAlign" ; \
- Text [ en-US ] = "A~lignment" ;\
-
-#define ITEM_FORMAT_OBJECT_ALIGN_LEFT \
- Identifier = SID_OBJECT_ALIGN_LEFT ; \
- Command = ".uno:ObjectAlignLeft" ; \
- Text [ en-US ] = "~Left" ;\
-
-#define ITEM_FORMAT_OBJECT_ALIGN_CENTER \
- Identifier = SID_OBJECT_ALIGN_CENTER ; \
- Command = ".uno:AlignCenter" ; \
- Text [ en-US ] = "~Centered" ;\
-
-#define ITEM_FORMAT_OBJECT_ALIGN_RIGHT \
- Identifier = SID_OBJECT_ALIGN_RIGHT ; \
- Command = ".uno:ObjectAlignRight" ; \
- Text [ en-US ] = "~Right" ;\
-
-#define ITEM_FORMAT_OBJECT_ALIGN_UP \
- Identifier = SID_OBJECT_ALIGN_UP ; \
- Command = ".uno:AlignUp" ; \
- Text [ en-US ] = "~Top" ;\
-
-#define ITEM_FORMAT_OBJECT_ALIGN_MIDDLE \
- Identifier = SID_OBJECT_ALIGN_MIDDLE ; \
- Command = ".uno:AlignMiddle" ; \
- Text [ en-US ] = "C~enter" ;\
-
-#define ITEM_FORMAT_OBJECT_ALIGN_DOWN \
- Identifier = SID_OBJECT_ALIGN_DOWN ; \
- Command = ".uno:AlignDown" ; \
- Text [ en-US ] = "~Bottom" ;\
-
-#define ITEM_FORMAT_OBJECT_HEAVEN \
- Identifier = SID_OBJECT_HEAVEN ; \
- Command = ".uno:SetObjectToForeground" ; \
- Text [ en-US ] = "~To Foreground" ;\
-
-#define ITEM_FORMAT_OBJECT_HELL \
- Identifier = SID_OBJECT_HELL ; \
- Command = ".uno:SetObjectToBackground" ; \
- Text [ en-US ] = "T~o Background" ;\
-
#define ITEM_EDIT_PASTE \
Identifier = SID_PASTE ; \
Command = ".uno:Paste" ; \
More information about the Libreoffice-commits
mailing list