avmedia/inc/strings.hrc | 1 -
basctl/inc/strings.hrc | 1 -
bin/find-unused-defines.py | 14 ++++++++------
cui/inc/strings.hrc | 9 ---------
dbaccess/inc/strings.hrc | 30 ------------------------------
include/sfx2/strings.hrc | 2 --
include/svx/strings.hrc | 9 ---------
include/svx/svxids.hrc | 2 +-
sd/inc/strings.hrc | 17 -----------------
sw/inc/strings.hrc | 12 ------------
10 files changed, 9 insertions(+), 88 deletions(-)
New commits:
commit e3ca594d63daa7e59cee1f9745015f582ab4e773
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat May 23 18:19:12 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 24 10:20:19 2020 +0200
remove some unused defines
Change-Id: Ibfdc84f07642db6ec8362c4d76195b4f39dc103c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94731
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/avmedia/inc/strings.hrc b/avmedia/inc/strings.hrc
index d9103dd545a1..2b1b23412ff1 100644
--- a/avmedia/inc/strings.hrc
+++ b/avmedia/inc/strings.hrc
@@ -29,7 +29,6 @@
#define AVMEDIA_STR_STOP NC_("AVMEDIA_STR_STOP", "Stop")
#define AVMEDIA_STR_LOOP NC_("AVMEDIA_STR_LOOP", "Repeat")
#define AVMEDIA_STR_MUTE NC_("AVMEDIA_STR_MUTE", "Mute")
-#define AVMEDIA_STR_ZOOM NC_("AVMEDIA_STR_ZOOM", "View")
#define AVMEDIA_STR_ZOOM_50 NC_("AVMEDIA_STR_ZOOM_50", "50%")
#define AVMEDIA_STR_ZOOM_100 NC_("AVMEDIA_STR_ZOOM_100", "100%")
#define AVMEDIA_STR_ZOOM_200 NC_("AVMEDIA_STR_ZOOM_200", "200%")
diff --git a/basctl/inc/strings.hrc b/basctl/inc/strings.hrc
index b31ddd20922d..a5a0a4660b59 100644
--- a/basctl/inc/strings.hrc
+++ b/basctl/inc/strings.hrc
@@ -103,7 +103,6 @@
#define RID_STR_RUN NC_("RID_STR_RUN", "Run")
#define RID_STR_RECORD NC_("RID_STR_RECORD", "~Save")
#define RID_BASICIDE_OBJCAT NC_("RID_BASICIDE_OBJCAT", "Object
Catalog")
-#define RID_STR_TLB_MACROS NC_("RID_STR_TLB_MACROS", "Objects
Tree")
// Property Browser Headline
----------------------------------------------------------------
#define RID_STR_BRWTITLE_PROPERTIES NC_("RID_STR_BRWTITLE_PROPERTIES",
"Properties: ")
#define RID_STR_BRWTITLE_NO_PROPERTIES
NC_("RID_STR_BRWTITLE_NO_PROPERTIES", "No Control marked")
diff --git a/bin/find-unused-defines.py b/bin/find-unused-defines.py
index ad96c0c24118..8e708c4a055d 100755
--- a/bin/find-unused-defines.py
+++ b/bin/find-unused-defines.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
# Search for unused constants in header files.
#
@@ -9,6 +9,7 @@
import subprocess
import sys
+import re
exclusionSet = set([
# List of RID constants where we compute a value using a base before
calling one of the RESSTR methods
@@ -98,19 +99,20 @@ def in_exclusion_set( a ):
return False;
# find defines, excluding the externals folder
-a = subprocess.Popen("git grep -hP '^#define\s+\w+\s+' -- \"[!e][!x][!t]*\" |
sort -u", stdout=subprocess.PIPE, shell=True)
+a = subprocess.Popen("git grep -hP '^#define\s+\w\w\w\w+\s*' --
\"[!e][!x][!t]*\" | sort -u", stdout=subprocess.PIPE, shell=True)
+name_re = re.compile("#define\s+(\w+)")
with a.stdout as txt:
for line in txt:
- idx1 = line.find("#define ")
- idx2 = line.find(" ", idx1 + 9)
- idName = line[idx1+8 : idx2].strip()
+ idName = name_re.match(line).group(1)
if idName.startswith("INCLUDED_"): continue
# the various _START and _END constants are normally unused outside of
the .hrc and .src files, and that's fine
if idName.endswith("_START"): continue
if idName.endswith("_BEGIN"): continue
if idName.endswith("_END"): continue
if idName == "RID_SVX_FIRSTFREE": continue
+ if idName == "": continue
+ if idName.startswith("__com"): continue # these are the include/header
macros for the UNO stuff
if in_exclusion_set(idName): continue
# search for the constant
b = subprocess.Popen(["git", "grep", "-w", idName],
stdout=subprocess.PIPE)
@@ -158,7 +160,7 @@ with a.stdout as txt:
if "svx/source/tbxctrls/extrusioncontrols.hrc:" in line2 and
idName.startswith("FROM_"): found_reason_to_exclude = True
# if we see more than a few lines then it's probably one of
the BASE/START/BEGIN things
cnt = cnt + 1
- if cnt > 4: found_reason_to_exclude = True
+ if cnt > 2: found_reason_to_exclude = True
if not found_reason_to_exclude:
print(idName)
# otherwise the previous line of output will be incorrectly mixed
into the below git output, because of buffering
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index c70c46d59a39..32e13138bf10 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -84,7 +84,6 @@
#define RID_SVXSTR_MYMACROS NC_("RID_SVXSTR_MYMACROS",
"My Macros")
#define RID_SVXSTR_PRODMACROS
NC_("RID_SVXSTR_PRODMACROS", "%PRODUCTNAME Macros")
#define RID_SVXSTR_NOMACRODESC
NC_("RID_SVXSTR_NOMACRODESC", "There is no description available for this
macro.")
-#define RID_SVXSTR_SELECTOR_ADD_COMMANDS
NC_("RID_SVXSTR_SELECTOR_ADD_COMMANDS", "Add Commands")
#define RID_SVXSTR_SELECTOR_RUN
NC_("RID_SVXSTR_SELECTOR_RUN", "Run")
#define RID_SVXSTR_ROW NC_("RID_SVXSTR_ROW",
"Insert Rows")
// tdf#119293 Labels depending on row/col
@@ -322,7 +321,6 @@
#define RID_SVXSTR_CHARNAME_FONT
NC_("RID_SVXSTR_CHARNAME_FONT", "Font:")
#define RID_SVXSTR_CHARNAME_STYLE
NC_("RID_SVXSTR_CHARNAME_STYLE", "Style:")
#define RID_SVXSTR_CHARNAME_TYPEFACE
NC_("RID_SVXSTR_CHARNAME_TYPEFACE", "Typeface:")
-#define RID_SVXSTR_CHARNAME_HIGHLIGHTING
NC_("RID_SVXSTR_CHARNAME_HIGHLIGHTING", "Highlight Color")
#define RID_SVXSTR_USE_REPLACE
NC_("RID_SVXSTR_USE_REPLACE", "Use replacement table")
#define RID_SVXSTR_CPTL_STT_WORD
NC_("RID_SVXSTR_CPTL_STT_WORD", "Correct TWo INitial CApitals")
#define RID_SVXSTR_CPTL_STT_SENT
NC_("RID_SVXSTR_CPTL_STT_SENT", "Capitalize first letter of every sentence")
@@ -349,13 +347,6 @@
#define RID_SVXSTR_STARTQUOTE
NC_("RID_SVXSTR_STARTQUOTE", "Start Quote")
#define RID_SVXSTR_ENDQUOTE NC_("RID_SVXSTR_ENDQUOTE",
"End Quote")
-#define RID_SVXSTR_SELECTEDPERSONA
NC_("RID_SVXSTR_SELECTEDPERSONA", "Selected Theme: ")
-#define RID_SVXSTR_SEARCHING
NC_("RID_SVXSTR_SEARCHING", "Searching, please wait...")
-#define RID_SVXSTR_SEARCHERROR
NC_("RID_SVXSTR_SEARCHERROR", "Cannot open %1, please try again later.")
-#define RID_SVXSTR_NORESULTS
NC_("RID_SVXSTR_NORESULTS", "No results found.")
-#define RID_SVXSTR_APPLYPERSONA
NC_("RID_SVXSTR_APPLYPERSONA", "Applying Theme...")
-#define RID_SVXSTR_INVALIDPERSONAURL
NC_("RID_SVXSTR_INVALIDPERSONAURL", "Please enter a valid theme address or a
search term.")
-
#define RID_SVXSTR_TABLE_PRESET_NONE
NC_("RID_SVXSTR_TABLE_PRESET_NONE", "Set No Borders")
#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER
NC_("RID_SVXSTR_TABLE_PRESET_ONLYOUTER", "Set Outer Border Only")
#define RID_SVXSTR_TABLE_PRESET_OUTERHORI
NC_("RID_SVXSTR_TABLE_PRESET_OUTERHORI", "Set Outer Border and Horizontal
Lines")
diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index 54b7353dce7c..16b1ad7b3ab5 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -1,4 +1,3 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -94,34 +93,6 @@
#define STR_INVALID_COMPOSITION_TYPE
NC_("STR_INVALID_COMPOSITION_TYPE", "Invalid composition type - need a value
from com.sun.star.sdb.tools.CompositionType.")
#define STR_INVALID_COMMAND_TYPE
NC_("STR_INVALID_COMMAND_TYPE", "Invalid command type - only TABLE and QUERY
from com.sun.star.sdb.CommandType are allowed.")
-#define STR_STATE_CLOSE_SUB_DOCS
NC_("STR_STATE_CLOSE_SUB_DOCS", "Prepare")
-#define STR_STATE_BACKUP_DBDOC
NC_("STR_STATE_BACKUP_DBDOC", "Backup Document")
-#define STR_STATE_MIGRATE NC_("STR_STATE_MIGRATE",
"Migrate")
-#define STR_STATE_SUMMARY NC_("STR_STATE_SUMMARY",
"Summary")
-// To translators: This refers to a form document inside a database document.
-#define STR_FORM NC_("STR_FORM", "Form
'$name$'")
-// To translators: This refers to a report document inside a database document.
-#define STR_REPORT NC_("STR_REPORT", "Report
'$name$'")
-#define STR_OVERALL_PROGRESS
NC_("STR_OVERALL_PROGRESS", "document $current$ of $overall$")
-#define STR_DATABASE_DOCUMENT
NC_("STR_DATABASE_DOCUMENT", "Database Document")
-#define STR_SAVED_COPY_TO NC_("STR_SAVED_COPY_TO",
"saved copy to $location$")
-#define STR_MOVED_LIBRARY NC_("STR_MOVED_LIBRARY",
"migrated $type$ library '$old$' to '$new$'")
-#define STR_LIBRARY_TYPE_AND_NAME
NC_("STR_LIBRARY_TYPE_AND_NAME", "$type$ library '$library$'")
-#define STR_MIGRATING_LIBS NC_("STR_MIGRATING_LIBS",
"migrating libraries ...")
-#define STR_OOO_BASIC NC_("STR_OOO_BASIC",
"Basic")
-#define STR_JAVA_SCRIPT NC_("STR_JAVA_SCRIPT",
"JavaScript")
-#define STR_BEAN_SHELL NC_("STR_BEAN_SHELL",
"BeanShell")
-#define STR_JAVA NC_("STR_JAVA", "Java")
-#define STR_PYTHON NC_("STR_PYTHON", "Python")
-#define STR_DIALOG NC_("STR_DIALOG", "dialog")
-#define STR_ERRORS NC_("STR_ERRORS",
"Error(s)")
-#define STR_WARNINGS NC_("STR_WARNINGS",
"Warnings")
-#define STR_EXCEPTION NC_("STR_EXCEPTION",
"caught exception:")
-#define STR_INVALID_BACKUP_LOCATION
NC_("STR_INVALID_BACKUP_LOCATION", "You need to choose a backup location other
than the document location itself.")
-#define STR_INVALID_NUMBER_ARGS
NC_("STR_INVALID_NUMBER_ARGS", "Invalid number of initialization arguments.
Expected 1.")
-#define STR_NO_DATABASE NC_("STR_NO_DATABASE", "No
database document found in the initialization arguments.")
-#define STR_NOT_READONLY NC_("STR_NOT_READONLY",
"Not applicable to read-only documents.")
-
#define STR_QUERY_UNDO_TABWINSHOW
NC_("STR_QUERY_UNDO_TABWINSHOW", "Add Table Window" )
#define STR_QUERY_UNDO_MOVETABWIN
NC_("STR_QUERY_UNDO_MOVETABWIN", "Move table window" )
#define STR_QUERY_UNDO_INSERTCONNECTION
NC_("STR_QUERY_UNDO_INSERTCONNECTION", "Insert Join" )
@@ -270,7 +241,6 @@
#define STR_DEFAULT_VALUE NC_("STR_DEFAULT_VALUE",
"~Default value" )
#define STR_HELP_BOOL_DEFAULT
NC_("STR_HELP_BOOL_DEFAULT", "Select a value that is to appear in all new
records as default.\nIf the field is not to have a default value, select the
empty string.")
#define STR_HELP_DEFAULT_VALUE
NC_("STR_HELP_DEFAULT_VALUE", "Enter a default value for this field.\n\nWhen
you later enter data in the table, this string will be used in each new record
for the field selected. It should, therefore, correspond to the cell format
that needs to be entered below." )
-#define STR_HELP_FIELD_REQUIRED
NC_("STR_HELP_FIELD_REQUIRED", "Activate this option if this field cannot
contain NULL values, i.e. the user must always enter data." )
#define STR_HELP_TEXT_LENGTH
NC_("STR_HELP_TEXT_LENGTH", "Enter the maximum text length permitted." )
#define STR_HELP_NUMERIC_TYPE
NC_("STR_HELP_NUMERIC_TYPE", "Enter the number format." )
#define STR_HELP_LENGTH NC_("STR_HELP_LENGTH",
"Determine the length data can have in this field.\n\nIf decimal fields, then
the maximum length of the number to be entered, if binary fields, then the
length of the data block.\nThe value will be corrected accordingly when it
exceeds the maximum for this database." )
diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index e7b596f26a40..0c76294bd1f5 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -57,8 +57,6 @@
#define STR_QRYTEMPL_UPDATE_BTN NC_("STR_QRYTEMPL_UPDATE_BTN",
"~Update Styles")
#define STR_QRYTEMPL_KEEP_BTN NC_("STR_QRYTEMPL_KEEP_BTN",
"~Keep Old Styles")
#define STR_ACTION_REFRESH NC_("STR_ACTION_REFRESH",
"Refresh")
-// leave ending space
-#define STR_ACTION_DEFAULT NC_("STR_ACTION_DEFAULT",
"Reset Default Template ")
#define STR_CATEGORY_NEW NC_("STR_CATEGORY_NEW", "New
Category")
#define STR_CATEGORY_DELETE NC_("STR_CATEGORY_DELETE",
"Delete Category")
#define STR_CATEGORY_SELECT NC_("STR_CATEGORY_SELECT",
"Select Category")
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 401befc1179c..fb9ed922f551 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -253,7 +253,6 @@
#define STR_UndoMergeModel
NC_("STR_UndoMergeModel", "Insert document")
#define STR_UndoNewLayer
NC_("STR_UndoNewLayer", "Insert Layer")
#define STR_UndoDelLayer
NC_("STR_UndoDelLayer", "Delete layer")
-#define STR_UndoMovLayer
NC_("STR_UndoMovLayer", "Change order of layers")
// Undo/Redo for setting object's name (#i73249#)
#define STR_UndoObjName
NC_("STR_UndoObjName", "Change object name of %1 to")
#define STR_UndoObjTitle
NC_("STR_UndoObjTitle", "Change object title of %1")
@@ -963,7 +962,6 @@
#define RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT
NC_("RID_SVXSTR_COLOR_LIBRE_YELLOW_ACCENT", "Yellow Accent")
#define RID_SVXSTR_GALLERYPROPS_GALTHEME
NC_("RID_SVXSTR_GALLERYPROPS_GALTHEME", "Gallery Theme")
-#define RID_SVXSTR_GALLERY_PREVIEW
NC_("RID_SVXSTR_GALLERY_PREVIEW", "Preview")
#define RID_SVXSTR_SUCCESSRECOV
NC_("RID_SVXSTR_SUCCESSRECOV", "Successfully recovered")
#define RID_SVXSTR_ORIGDOCRECOV
NC_("RID_SVXSTR_ORIGDOCRECOV", "Original document recovered")
#define RID_SVXSTR_RECOVFAILED
NC_("RID_SVXSTR_RECOVFAILED", "Recovery failed")
@@ -990,7 +988,6 @@
#define RID_SVXSTR_GALLERY_FILTER
NC_("RID_SVXSTR_GALLERY_FILTER", "Graphics filter")
#define RID_SVXSTR_GALLERY_NEWTHEME
NC_("RID_SVXSTR_GALLERY_NEWTHEME", "New Theme")
-#define RID_SVXSTR_GALLERY_TITLE
NC_("RID_SVXSTR_GALLERY_TITLE", "Title")
#define RID_GALLERYSTR_THEME_3D
NC_("RID_GALLERYSTR_THEME_3D", "3D Effects")
#define RID_GALLERYSTR_THEME_ANIMATIONS
NC_("RID_GALLERYSTR_THEME_ANIMATIONS", "Animations")
@@ -1099,12 +1096,6 @@
#define RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT
NC_("RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT", "Apply Fontwork Alignment")
#define RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING
NC_("RID_SVXSTR_UNDO_APPLY_FONTWORK_CHARACTER_SPACING", "Apply Fontwork
Character Spacing")
-#define RID_SVXSTR_A11Y_3D_MATERIAL_COLOR
NC_("RID_SVXSTR_A11Y_3D_MATERIAL_COLOR", "3D material color")
-#define RID_SVXSTR_A11Y_FILLSTYLE_NONE
NC_("RID_SVXSTR_A11Y_FILLSTYLE_NONE", "None")
-#define RID_SVXSTR_A11Y_FILLSTYLE_SOLID
NC_("RID_SVXSTR_A11Y_FILLSTYLE_SOLID", "Solid")
-#define RID_SVXSTR_A11Y_FILLSTYLE_HATCH
NC_("RID_SVXSTR_A11Y_FILLSTYLE_HATCH", "With hatching")
-#define RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT
NC_("RID_SVXSTR_A11Y_FILLSTYLE_GRADIENT", "Gradient")
-#define RID_SVXSTR_A11Y_FILLSTYLE_BITMAP
NC_("RID_SVXSTR_A11Y_FILLSTYLE_BITMAP", "Bitmap")
#define RID_SVXSTR_A11Y_WITH
NC_("RID_SVXSTR_A11Y_WITH", "with")
#define RID_SVXSTR_A11Y_STYLE
NC_("RID_SVXSTR_A11Y_STYLE", "Style")
#define RID_SVXSTR_A11Y_AND
NC_("RID_SVXSTR_A11Y_AND", "and")
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 6325025155b8..5b7c1f0a9b6b 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -287,7 +287,7 @@ class SvxSetItem;
#define SID_PRESENTATION ( SID_SVX_START + 157 )
#define SID_PRESENTATION_CURRENT_SLIDE ( SID_SVX_START + 158 )
#define SID_REHEARSE_TIMINGS ( SID_SVX_START + 159 )
-#define SID_NUMBERING_AND_POSITION ( SID_SVX_START + 160 )
+//
#define SID_HIDE_SLIDE ( SID_SVX_START + 161 )
#define SID_ATTR_FILL_STYLE ( SID_SVX_START + 164 )
#define SID_ATTR_FILL_COLOR ( SID_SVX_START + 165 )
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 84cfea801a70..54c6d81362a6 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -373,17 +373,12 @@
==============================================================
*/
#define SID_SD_A11Y_D_DRAWVIEW_N
NC_("SID_SD_A11Y_D_DRAWVIEW_N", "Drawing View")
-#define SID_SD_A11Y_D_DRAWVIEW_D
NC_("SID_SD_A11Y_D_DRAWVIEW_D", "This is where you create and edit drawings.")
#define SID_SD_A11Y_I_DRAWVIEW_N
NC_("SID_SD_A11Y_I_DRAWVIEW_N", "Drawing View")
-#define SID_SD_A11Y_I_DRAWVIEW_D
NC_("SID_SD_A11Y_I_DRAWVIEW_D", "This is where you create and edit slides.")
#define SID_SD_A11Y_I_OUTLINEVIEW_N
NC_("SID_SD_A11Y_I_OUTLINEVIEW_N", "Outline View")
-#define SID_SD_A11Y_I_OUTLINEVIEW_D
NC_("SID_SD_A11Y_I_OUTLINEVIEW_D", "This is where you enter or edit text in
list form.")
#define SID_SD_A11Y_I_SLIDEVIEW_N
NC_("SID_SD_A11Y_I_SLIDEVIEW_N", "Slides View")
#define SID_SD_A11Y_I_SLIDEVIEW_D
NC_("SID_SD_A11Y_I_SLIDEVIEW_D", "This is where you sort slides.")
#define SID_SD_A11Y_I_NOTESVIEW_N
NC_("SID_SD_A11Y_I_NOTESVIEW_N", "Notes View")
-#define SID_SD_A11Y_I_NOTESVIEW_D
NC_("SID_SD_A11Y_I_NOTESVIEW_D", "This is where you enter and view notes.")
#define SID_SD_A11Y_I_HANDOUTVIEW_N
NC_("SID_SD_A11Y_I_HANDOUTVIEW_N", "Handout View")
-#define SID_SD_A11Y_I_HANDOUTVIEW_D
NC_("SID_SD_A11Y_I_HANDOUTVIEW_D", "This is where you decide on the layout for
handouts.")
#define SID_SD_A11Y_P_TITLE_N
NC_("SID_SD_A11Y_P_TITLE_N", "PresentationTitle")
#define SID_SD_A11Y_P_OUTLINER_N
NC_("SID_SD_A11Y_P_OUTLINER_N", "PresentationOutliner")
#define SID_SD_A11Y_P_SUBTITLE_N
NC_("SID_SD_A11Y_P_SUBTITLE_N", "PresentationSubtitle")
@@ -391,21 +386,11 @@
#define SID_SD_A11Y_P_NOTES_N
NC_("SID_SD_A11Y_P_NOTES_N", "PresentationNotes")
#define SID_SD_A11Y_P_HANDOUT_N
NC_("SID_SD_A11Y_P_HANDOUT_N", "Handout")
#define SID_SD_A11Y_P_UNKNOWN_N
NC_("SID_SD_A11Y_P_UNKNOWN_N", "UnknownAccessiblePresentationShape")
-#define SID_SD_A11Y_P_TITLE_D
NC_("SID_SD_A11Y_P_TITLE_D", "PresentationTitleShape")
-#define SID_SD_A11Y_P_OUTLINER_D
NC_("SID_SD_A11Y_P_OUTLINER_D", "PresentationOutlinerShape")
-#define SID_SD_A11Y_P_SUBTITLE_D
NC_("SID_SD_A11Y_P_SUBTITLE_D", "PresentationSubtitleShape")
-#define SID_SD_A11Y_P_PAGE_D
NC_("SID_SD_A11Y_P_PAGE_D", "PresentationPageShape")
-#define SID_SD_A11Y_P_NOTES_D
NC_("SID_SD_A11Y_P_NOTES_D", "PresentationNotesShape")
-#define SID_SD_A11Y_P_HANDOUT_D
NC_("SID_SD_A11Y_P_HANDOUT_D", "PresentationHandoutShape")
-#define SID_SD_A11Y_P_UNKNOWN_D
NC_("SID_SD_A11Y_P_UNKNOWN_D", "Unknown accessible presentation shape")
#define SID_SD_A11Y_P_FOOTER_N
NC_("SID_SD_A11Y_P_FOOTER_N", "PresentationFooter")
#define SID_SD_A11Y_P_FOOTER_D
NC_("SID_SD_A11Y_P_FOOTER_D", "PresentationFooterShape")
#define SID_SD_A11Y_P_HEADER_N
NC_("SID_SD_A11Y_P_HEADER_N", "PresentationHeader")
-#define SID_SD_A11Y_P_HEADER_D
NC_("SID_SD_A11Y_P_HEADER_D", "PresentationHeaderShape")
#define SID_SD_A11Y_P_DATE_N
NC_("SID_SD_A11Y_P_DATE_N", "PresentationDateAndTime")
-#define SID_SD_A11Y_P_DATE_D
NC_("SID_SD_A11Y_P_DATE_D", "PresentationDateAndTimeShape")
#define SID_SD_A11Y_P_NUMBER_N
NC_("SID_SD_A11Y_P_NUMBER_N", "PresentationPageNumber")
-#define SID_SD_A11Y_P_NUMBER_D
NC_("SID_SD_A11Y_P_NUMBER_D", "PresentationPageNumberShape")
#define SID_SD_A11Y_D_PRESENTATION
NC_("SID_SD_A11Y_D_PRESENTATION", "%PRODUCTNAME Presentation")
#define SID_SD_A11Y_P_TITLE_N_STYLE
NC_("SID_SD_A11Y_P_TITLE_N_STYLE", "Title")
#define SID_SD_A11Y_P_OUTLINER_N_STYLE
NC_("SID_SD_A11Y_P_OUTLINER_N_STYLE", "Outliner")
@@ -491,8 +476,6 @@
#define STR_SAR_WRAP_FORWARD_DRAW
NC_("STR_SAR_WRAP_FORWARD_DRAW", "%PRODUCTNAME Draw has searched to the end of
the document. Do you want to continue at the beginning?")
#define STR_SAR_WRAP_BACKWARD_DRAW
NC_("STR_SAR_WRAP_BACKWARD_DRAW", "%PRODUCTNAME Draw has searched to the
beginning of the document. Do you want to continue at the end?")
-#define STR_SD_NONE NC_("STR_SD_NONE", "-
None -")
-
#define STR_ANIMATION_DIALOG_TITLE
NC_("STR_ANIMATION_DIALOG_TITLE", "Animation")
#define RID_SVXSTR_EDIT_GRAPHIC
NC_("RID_SVXSTR_EDIT_GRAPHIC", "Link")
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index dfb17c43a782..e498db376a76 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -240,10 +240,6 @@
#define STR_LOAD_HTML_DOC NC_("STR_LOAD_HTML_DOC", "Name
and Path of the HTML Document")
#define STR_JAVA_EDIT NC_("STR_JAVA_EDIT", "Edit
Script")
#define STR_BOOKMARK_DEF_NAME NC_("STR_BOOKMARK_DEF_NAME",
"Bookmark")
-#define STR_BOOKMARK_NAME NC_("STR_BOOKMARK_NAME",
"Name")
-#define STR_BOOKMARK_TEXT NC_("STR_BOOKMARK_TEXT",
"Text")
-#define STR_BOOKMARK_HIDDEN NC_("STR_BOOKMARK_HIDDEN",
"Hidden")
-#define STR_BOOKMARK_CONDITION NC_("STR_BOOKMARK_CONDITION",
"Condition")
#define STR_BOOKMARK_YES NC_("STR_BOOKMARK_YES", "Yes")
#define STR_BOOKMARK_NO NC_("STR_BOOKMARK_NO", "No")
#define STR_BOOKMARK_FORBIDDENCHARS
NC_("STR_BOOKMARK_FORBIDDENCHARS", "Forbidden characters:")
@@ -678,7 +674,6 @@
#define STR_BROKEN_LINK NC_("STR_BROKEN_LINK", "File
not found: ")
#define STR_RESOLVED NC_("STR_RESOLVED", "RESOLVED")
-#define STR_PROTECTED NC_("STR_PROTECTED",
"Protected")
#define STR_MARGIN_TOOLTIP_LEFT NC_("STR_MARGIN_TOOLTIP_LEFT",
"Left: ")
#define STR_MARGIN_TOOLTIP_RIGHT
NC_("STR_MARGIN_TOOLTIP_RIGHT", ". Right: ")
@@ -1054,8 +1049,6 @@
#define STR_COLS NC_("STR_COLS", "Columns")
#define STR_ROWS NC_("STR_ROWS", "Rows")
-#define STR_SERVICE_UNAVAILABLE NC_("STR_SERVICE_UNAVAILABLE",
"The following service is not available: ")
-
#define STR_WORDCOUNT_HINT NC_("STR_WORDCOUNT_HINT",
"Word and character count. Click to open Word Count dialog.")
#define STR_VIEWLAYOUT_ONE NC_("STR_VIEWLAYOUT_ONE",
"Single-page view")
#define STR_VIEWLAYOUT_MULTI NC_("STR_VIEWLAYOUT_MULTI",
"Multiple-page view")
@@ -1347,11 +1340,6 @@
#define STR_TBL_FORMULA NC_("STR_TBL_FORMULA", "Text
formula")
-#define STR_MENU_ZOOM NC_("STR_MENU_ZOOM", "~Zoom")
-#define STR_MENU_UP NC_("STR_MENU_UP", "~Upwards")
-#define STR_MENU_DOWN NC_("STR_MENU_DOWN",
"Do~wnwards")
-
-
#define STR_DROP_DOWN_EMPTY_LIST
NC_("STR_DROP_DOWN_EMPTY_LIST", "No Item specified")
/*--------------------------------------------------------------------
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
