bin/find-files-not-referenced-by-makefile.py | 12 ++++++------
cui/inc/strings.hrc | 11 -----------
sd/inc/strings.hrc | 3 ---
sw/inc/strings.hrc | 14 --------------
4 files changed, 6 insertions(+), 34 deletions(-)
New commits:
commit 441ef781301f0349512df6b4a9bfca3d50928ff9
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Jul 23 09:02:14 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Jul 23 16:25:02 2023 +0200
update script to python3
didn't find anything new
Change-Id: Ibb918ce99b552c45ebfd49280bd3b9fc2ea7bc19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154801
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/bin/find-files-not-referenced-by-makefile.py
b/bin/find-files-not-referenced-by-makefile.py
index 70232ed1c459..0b5c648bf67e 100755
--- a/bin/find-files-not-referenced-by-makefile.py
+++ b/bin/find-files-not-referenced-by-makefile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
# Look for CXX files that are not referenced by any makefile
@@ -7,7 +7,7 @@ import sys
sourceFiles = set()
-a = subprocess.Popen("git ls-files", stdout=subprocess.PIPE, shell=True)
+a = subprocess.Popen("git ls-files", stdout=subprocess.PIPE, shell=True,
encoding='utf8')
with a.stdout as txt:
for filename in txt:
if filename.find(".cxx") != -1 \
@@ -23,7 +23,7 @@ with a.stdout as txt:
and not filename.startswith("cli_ure/"):
sourceFiles.add(filename.strip())
-a = subprocess.Popen("git ls-files */*.mk", stdout=subprocess.PIPE, shell=True)
+a = subprocess.Popen("git ls-files */*.mk", stdout=subprocess.PIPE,
shell=True, encoding='utf8')
with a.stdout as txt:
for makefilename in txt:
makefilename = makefilename.strip()
@@ -47,7 +47,7 @@ with a.stdout as txt:
-print "files not listed in makefile"
-print "----------------------------"
+print("files not listed in makefile")
+print("----------------------------")
for x in sorted(sourceFiles):
- print x
+ print(x)
commit 7b4a7b6c4afad4eb07b456ca889e9166a03054f5
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Jul 23 13:02:16 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun Jul 23 16:24:48 2023 +0200
remove some unused #defines
Change-Id: I2c8168cd804ae8d1e4effa61be1d9dc902ecf9b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154805
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index 84a2c9f859a1..b88e21f39aae 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -20,26 +20,15 @@
#define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const
*>(u8##String))
-#define RID_CUISTR_KEY_CONFIG_DIR
NC_("RID_SVXSTR_KEY_CONFIG_DIR", "Configuration")
#define RID_CUISTR_KEY_WORK_PATH
NC_("RID_SVXSTR_KEY_WORK_PATH", "My Documents")
#define RID_CUISTR_KEY_GRAPHICS_PATH
NC_("RID_SVXSTR_KEY_GRAPHICS_PATH", "Images")
-#define RID_CUISTR_KEY_BITMAP_PATH
NC_("RID_SVXSTR_KEY_BITMAP_PATH", "Icons")
-#define RID_CUISTR_KEY_PALETTE_PATH
NC_("RID_SVXSTR_KEY_PALETTE_PATH", "Palettes")
#define RID_CUISTR_KEY_BACKUP_PATH
NC_("RID_SVXSTR_KEY_BACKUP_PATH", "Backups")
-#define RID_CUISTR_KEY_MODULES_PATH
NC_("RID_SVXSTR_KEY_MODULES_PATH", "Modules")
#define RID_CUISTR_KEY_TEMPLATE_PATH
NC_("RID_SVXSTR_KEY_TEMPLATE_PATH", "Templates")
#define RID_CUISTR_KEY_GLOSSARY_PATH
NC_("RID_SVXSTR_KEY_GLOSSARY_PATH", "AutoText")
#define RID_CUISTR_KEY_DICTIONARY_PATH
NC_("RID_SVXSTR_KEY_DICTIONARY_PATH", "Dictionaries")
#define RID_CUISTR_KEY_HELP_DIR
NC_("RID_SVXSTR_KEY_HELP_DIR", "Help")
#define RID_CUISTR_KEY_GALLERY_DIR
NC_("RID_SVXSTR_KEY_GALLERY_DIR", "Gallery")
-#define RID_CUISTR_KEY_STORAGE_DIR
NC_("RID_SVXSTR_KEY_STORAGE_DIR", "Message Storage")
#define RID_CUISTR_KEY_TEMP_PATH
NC_("RID_SVXSTR_KEY_TEMP_PATH", "Temporary files")
-#define RID_CUISTR_KEY_PLUGINS_PATH
NC_("RID_SVXSTR_KEY_PLUGINS_PATH", "Plug-ins")
-#define RID_CUISTR_KEY_FAVORITES_DIR
NC_("RID_SVXSTR_KEY_FAVORITES_DIR", "Folder Bookmarks")
-#define RID_CUISTR_KEY_FILTER_PATH
NC_("RID_SVXSTR_KEY_FILTER_PATH", "Filters")
-#define RID_CUISTR_KEY_ADDINS_PATH
NC_("RID_SVXSTR_KEY_ADDINS_PATH", "Add-ins")
-#define RID_CUISTR_KEY_USERCONFIG_PATH
NC_("RID_SVXSTR_KEY_USERCONFIG_PATH", "User Configuration")
-#define RID_CUISTR_KEY_USERDICTIONARY_DIR
NC_("RID_SVXSTR_KEY_USERDICTIONARY_DIR", "User-defined dictionaries")
#define RID_CUISTR_KEY_CLASSIFICATION_PATH
NC_("RID_SVXSTR_KEY_CLASSIFICATION_PATH", "Classification")
#define RID_CUISTR_KEY_AUTOCORRECT_DIR
NC_("RID_SVXSTR_KEY_AUTOCORRECT_DIR", "AutoCorrect")
#define RID_CUISTR_KEY_LINGUISTIC_DIR
NC_("RID_SVXSTR_KEY_LINGUISTIC_DIR", "Writing aids")
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index afcf1d4e3be3..a3501bfc50a1 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -29,9 +29,6 @@
#define STR_UNDO_SLIDE_PARAMS
NC_("STR_UNDO_SLIDE_PARAMS", "Slide parameter")
#define STR_UNDO_CUT NC_("STR_UNDO_CUT",
"Cut")
#define STR_UNDO_REPLACE
NC_("STR_UNDO_REPLACE", "Replace")
-#define STR_NEXT_SLIDE NC_("STR_NEXT_SLIDE",
"Next slide")
-#define STR_PREV_SLIDE NC_("STR_PREV_SLIDE",
"Previous slide")
-#define STR_MENU_SLIDE NC_("STR_MENU_SLIDE",
"Menu slide")
#define STR_UNDO_DRAGDROP
NC_("STR_UNDO_DRAGDROP", "Drag and Drop")
#define STR_INSERTGRAPHIC
NC_("STR_INSERTGRAPHIC", "Insert Image")
#define STR_UNDO_BEZCLOSE
NC_("STR_UNDO_BEZCLOSE", "Close Polygon")
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 185bc5d89661..e7ad57780104 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -409,7 +409,6 @@
#define STR_CONTENT_TYPE_SINGLE_ENDNOTE
NC_("STR_CONTENT_TYPE_SINGLE_ENDNOTE", "Endnote")
#define STR_CONTENT_FOOTNOTE NC_("STR_CONTENT_FOOTNOTE",
"Footnote")
#define STR_CONTENT_ENDNOTE NC_("STR_CONTENT_ENDNOTE",
"Endnote")
-#define STR_FOOTNOTE_ENDNOTE_SEPARATOR_TIP
NC_("STR_FOOTNOTE_ENDNOTE_SEPARATOR_TIP", "Footnotes are listed above this line
and Endnotes are listed below")
#define STR_DEFINE_NUMBERFORMAT NC_("STR_DEFINE_NUMBERFORMAT",
"Additional formats...")
#define RID_STR_SYSTEM NC_("RID_STR_SYSTEM",
"[System]")
#define STR_MULT_INTERACT_HYPH_WARN
NC_("STR_MULT_INTERACT_HYPH_WARN", "The interactive hyphenation is already
active\nin a different document")
@@ -420,7 +419,6 @@
#define STR_HIDDEN_CHANGES_DETAIL
NC_("STR_HIDDEN_CHANGES_DETAIL", "Document contains tracked changes and
recording is enabled.")
#define STR_HIDDEN_CHANGES_DETAIL2
NC_("STR_HIDDEN_CHANGES_DETAIL2", "Recording of changes is enabled.")
#define STR_HIDDEN_CHANGES_DETAIL3
NC_("STR_HIDDEN_CHANGES_DETAIL3", "Document contains tracked changes.")
-#define STR_HEADER_FOOTER NC_("STR_HEADER_FOOTER",
"Header/Footer")
#define STR_FLDREF_FOOTNOTE NC_("STR_FLDREF_FOOTNOTE",
"Footnote")
#define STR_FLDREF_ENDNOTE NC_("STR_FLDREF_ENDNOTE",
"Endnote")
@@ -1197,26 +1195,14 @@
#define STR_CONNECT_BORDER_ON NC_("STR_CONNECT_BORDER_ON",
"Merge borders")
#define STR_CONNECT_BORDER_OFF NC_("STR_CONNECT_BORDER_OFF",
"Do not merge borders")
-#define ST_TBL NC_("ST_TBL", "Table")
-#define ST_FRM NC_("ST_FRM", "Frame")
#define ST_PGE NC_("ST_PGE", "Page")
-#define ST_DRW NC_("ST_DRW", "Drawing")
#define ST_CTRL NC_("ST_CTRL", "Control")
-#define ST_REG NC_("ST_REG", "Section")
-#define ST_BKM NC_("ST_BKM", "Bookmark")
-#define ST_GRF NC_("ST_GRF", "Graphics")
-#define ST_OLE NC_("ST_OLE", "OLE object")
-#define ST_OUTL NC_("ST_OUTL", "Headings")
#define ST_SEL NC_("ST_SEL", "Selection")
-#define ST_FTN NC_("ST_FTN", "Footnote")
#define ST_MARK NC_("ST_MARK", "Reminder")
-#define ST_POSTIT NC_("ST_POSTIT", "Comment")
#define ST_SRCH_REP NC_("ST_SRCH_REP", "Repeat
search")
-#define ST_INDEX_ENTRY NC_("ST_INDEX_ENTRY", "Index
entry")
#define ST_TABLE_FORMULA NC_("ST_TABLE_FORMULA", "Table
formula")
#define ST_TABLE_FORMULA_ERROR NC_("ST_TABLE_FORMULA_ERROR",
"Wrong table formula")
#define ST_RECENCY NC_("ST_RECENCY", "Recency")
-#define ST_FIELD NC_("ST_FIELD", "Field")
#define ST_FIELD_BYTYPE NC_("ST_FIELD_BYTYPE", "Field
by type")
// Strings for the quickhelp of the View-PgUp/Down-Buttons
#define STR_IMGBTN_TBL_DOWN NC_("STR_IMGBTN_TBL_DOWN",
"Next table")
