[Libreoffice-commits] core.git: bin/find-unused-defines-in-hrc-files.py filter/source l10ntools/source sc/AllLangResTarget_sc.mk sc/source uui/source
Noel Grandin
noel.grandin at collabora.co.uk
Mon Mar 20 06:55:11 UTC 2017
bin/find-unused-defines-in-hrc-files.py | 8 +++++-
filter/source/xsltdialog/xmlfilterdialogstrings.hrc | 2 -
filter/source/xsltdialog/xmlfilterdialogstrings.src | 10 -------
l10ntools/source/gRun.sh | 2 -
sc/AllLangResTarget_sc.mk | 1
sc/source/ui/dbgui/filtdlg.cxx | 1
sc/source/ui/dbgui/pfiltdlg.cxx | 1
sc/source/ui/dbgui/sfiltdlg.cxx | 1
sc/source/ui/inc/filter.hrc | 24 ------------------
sc/source/ui/src/filter.src | 26 --------------------
uui/source/ids.hrc | 1
uui/source/ids.src | 5 ---
12 files changed, 8 insertions(+), 74 deletions(-)
New commits:
commit 4307643b2fa1f2cdc2bf087ab2285a8557d61bec
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Fri Mar 17 12:35:13 2017 +0200
remove unused defines from HRC files in misc(2)
Change-Id: I6d27c03925e7756022c3e343c0873c4dd1dd90dc
Reviewed-on: https://gerrit.libreoffice.org/35324
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/bin/find-unused-defines-in-hrc-files.py b/bin/find-unused-defines-in-hrc-files.py
index 488b045340e5..5ad87d8cc3a0 100755
--- a/bin/find-unused-defines-in-hrc-files.py
+++ b/bin/find-unused-defines-in-hrc-files.py
@@ -87,6 +87,12 @@ exclusionSet = set([
"STR_VOBJ_MODE_",
"STR_COND_",
"SCSTR_CONTENT_",
+ "DATE_FUNCDESC_",
+ "DATE_FUNCNAME_",
+ "DATE_DEFFUNCNAME_",
+ "PRICING_DEFFUNCNAME_",
+ "PRICING_FUNCDESC_",
+ "PRICING_FUNCNAME_",
])
@@ -131,7 +137,7 @@ with a.stdout as txt:
# is the constant being used as an identifier by entries in .src files
if ".src:" in line2 and "HelpId = " in line2: found_reason_to_exclude = True
# is it being used as a constant in an ItemList in .src files?
- if ".src:" in line2 and ";> ;" in line2: found_reason_to_exclude = True
+ if ".src:" in line2 and (";> ;" in line2 or "; >;" in line2): found_reason_to_exclude = True
# these are used in calculations in other .hrc files
if "sw/inc/rcid.hrc:" in line2: found_reason_to_exclude = True
# calculations
diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
index 141ea6326153..66b6b3e3cf12 100644
--- a/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
+++ b/filter/source/xsltdialog/xmlfilterdialogstrings.hrc
@@ -30,8 +30,6 @@
#define STR_EXPORT_ONLY (RID_XSLT_DIALOG_START + 5)
#define STR_WARN_DELETE (RID_XSLT_DIALOG_START + 10)
-#define STR_NO_ERRORS_FOUND (RID_XSLT_DIALOG_START + 11)
-#define STR_NOT_SPECIFIED (RID_XSLT_DIALOG_START + 12)
#define STR_DEFAULT_FILTER_NAME (RID_XSLT_DIALOG_START + 13)
#define STR_DEFAULT_EXTENSION (RID_XSLT_DIALOG_START + 14)
diff --git a/filter/source/xsltdialog/xmlfilterdialogstrings.src b/filter/source/xsltdialog/xmlfilterdialogstrings.src
index af886465f1df..8e6501cd8a85 100644
--- a/filter/source/xsltdialog/xmlfilterdialogstrings.src
+++ b/filter/source/xsltdialog/xmlfilterdialogstrings.src
@@ -119,16 +119,6 @@ String STR_ERROR_IMPORT_TEMPLATE_NOT_FOUND
Text [ en-US ] = "The given import template cannot be found. Please enter a valid path.";
};
-String STR_NOT_SPECIFIED
-{
- Text [ en-US ] = "Not specified";
-};
-
-String STR_NO_ERRORS_FOUND
-{
- Text = "No errors found.";
-};
-
String STR_DEFAULT_FILTER_NAME
{
Text [ en-US ] = "New Filter";
diff --git a/l10ntools/source/gRun.sh b/l10ntools/source/gRun.sh
index cdee79787edd..15d39ceabbfa 100755
--- a/l10ntools/source/gRun.sh
+++ b/l10ntools/source/gRun.sh
@@ -338,7 +338,7 @@ ${MYCMD} --files sc/source/ui/navipi/navipi.src
${MYCMD} --base sc/source/ui/sidebar --files CellAppearancePropertyPanel.src NumberFormatPropertyPanel.src
-${MYCMD} --base sc/source/ui/src --files condformatdlg.src filter.src globstr.src iconsets.src sc.src scerrors.src scfuncs.src scstring.src scwarngs.src toolbox.src
+${MYCMD} --base sc/source/ui/src --files condformatdlg.src globstr.src iconsets.src sc.src scerrors.src scfuncs.src scstring.src scwarngs.src toolbox.src
${MYCMD} --files sc/source/ui/StatisticsDialogs/StatisticsDialogs.src
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index cd43a8cea91b..c14e169ebd52 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
sc/source/ui/src/sc.src \
sc/source/ui/src/scerrors.src \
sc/source/ui/src/scstring.src \
- sc/source/ui/src/filter.src \
sc/source/ui/cctrl/checklistmenu.src \
sc/source/ui/navipi/navipi.src \
sc/source/ui/styleui/scstyles.src \
diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx
index d4bc2523cb81..5c08244df67e 100644
--- a/sc/source/ui/dbgui/filtdlg.cxx
+++ b/sc/source/ui/dbgui/filtdlg.cxx
@@ -33,7 +33,6 @@
#include "foptmgr.hxx"
#include "globstr.hrc"
-#include "filter.hrc"
#include "filtdlg.hxx"
#include <vcl/layout.hxx>
diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 570421fb7bae..98d1d6b8debf 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -32,7 +32,6 @@
#include "typedstrdata.hxx"
#include "scres.hrc"
-#include "filter.hrc"
#include "globstr.hrc"
#include "pfiltdlg.hxx"
diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx
index 3a55213de917..9cf57d8bac89 100644
--- a/sc/source/ui/dbgui/sfiltdlg.cxx
+++ b/sc/source/ui/dbgui/sfiltdlg.cxx
@@ -32,7 +32,6 @@
#include "foptmgr.hxx"
#include "globstr.hrc"
-#include "filter.hrc"
#include "filtdlg.hxx"
#include <vcl/msgbox.hxx>
diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc
deleted file mode 100644
index 32a8ec2a1d98..000000000000
--- a/sc/source/ui/inc/filter.hrc
+++ /dev/null
@@ -1,24 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "sc.hrc"
-
-// Special filter
-#define STR_COPY_AREA_TO 5054
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src
deleted file mode 100644
index 5fcfa7b1dbf7..000000000000
--- a/sc/source/ui/src/filter.src
+++ /dev/null
@@ -1,26 +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/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "filter.hrc"
-
-String STR_COPY_AREA_TO
-{
- Text [ en-US ] = "Copy results to" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index e70c7a84300d..d345b2418cb5 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -57,7 +57,6 @@
#define STR_ALREADYOPEN_SAVE_BTN (RID_UUI_START + 52)
#define STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE (RID_UUI_START + 54)
-#define STR_WARNING_BROKENSIGNATURE_TITLE (RID_UUI_START + 55)
#define STR_ENTER_PASSWORD_TO_OPEN (RID_UUI_START + 56)
#define STR_ENTER_PASSWORD_TO_MODIFY (RID_UUI_START + 57)
#define STR_RENAME_OR_REPLACE (RID_UUI_START + 58)
diff --git a/uui/source/ids.src b/uui/source/ids.src
index b5e5f37d56f6..f775a4c8f013 100644
--- a/uui/source/ids.src
+++ b/uui/source/ids.src
@@ -31,11 +31,6 @@ String RID_SAVE_PASSWORD
Text [ en-US ] = "~Remember password";
};
-String STR_WARNING_BROKENSIGNATURE_TITLE
-{
- Text [ en-US ] = "Invalid Document Signature" ;
-};
-
String STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE
{
Text [ en-US ] = "Non-Encrypted Streams" ;
More information about the Libreoffice-commits
mailing list