Kaydet (Commit) f645294d authored tarafından Noel Grandin's avatar Noel Grandin

remove unused RID constants

found with the attached bin/find-unused-rid.py script

Change-Id: I1cf79caa6cafedb8bc642f394dc7e7da889d6fdf
Reviewed-on: https://gerrit.libreoffice.org/35136Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst cbb2e6b7
......@@ -30,7 +30,6 @@
#define RID_STR_ACC_ACTION_DECLINE ( RID_TK_ACC_START + 4 )
#define RID_STR_ACC_ACTION_INCBLOCK ( RID_TK_ACC_START + 5 )
#define RID_STR_ACC_ACTION_DECBLOCK ( RID_TK_ACC_START + 6 )
#define RID_STR_ACC_NAME_PREVIEW ( RID_TK_ACC_START + 7 )
#define STR_SVT_ACC_ACTION_EXPAND ( RID_TK_ACC_START + 8 )
#define STR_SVT_ACC_ACTION_COLLAPSE ( RID_TK_ACC_START + 9 )
......@@ -38,7 +37,6 @@
#define RID_STR_ACC_ACTION_CHECK ( RID_TK_ACC_START + 11 )
#define RID_STR_ACC_ACTION_UNCHECK ( RID_TK_ACC_START + 12 )
#define RID_STR_ACC_ACTION_DOUBLE_CLICK ( RID_TK_ACC_START + 13 )
#define RID_STR_ACC_SCROLLBAR_NAME_VERTICAL ( RID_TK_ACC_START + 14 )
#define RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL ( RID_TK_ACC_START + 15 )
#define RID_STR_ACC_PANEL_DESCRIPTION ( RID_TK_ACC_START + 16 )
......@@ -47,7 +45,6 @@
#define RID_STR_ACC_ROW_NUM ( RID_TK_ACC_START + 18 )
#define RID_STR_ACC_NAME_BROWSEBUTTON ( RID_TK_ACC_START + 100 )
#define RID_STR_ACC_DESC_PANELDECL_TABBAR ( RID_TK_ACC_START + 101 )
#endif // ACCESSIBILITY_HELPER_ACCESSIBLESTRINGS_HRC_
......
......@@ -74,11 +74,6 @@ String STR_SVT_ACC_LISTENTRY_SELCTED_STATE
Text [ en-US ] = "(Selected)";
};
String RID_STR_ACC_NAME_PREVIEW
{
Text [ en-US ] = "Preview";
};
String RID_STR_ACC_ACTION_CHECK
{
Text [ en-US ] = "Check";
......@@ -87,10 +82,6 @@ String RID_STR_ACC_ACTION_UNCHECK
{
Text [ en-US ] = "Uncheck";
};
String RID_STR_ACC_ACTION_DOUBLE_CLICK
{
Text [ en-US ] = "Double click";
};
String RID_STR_ACC_SCROLLBAR_NAME_VERTICAL
{
......@@ -116,9 +107,4 @@ String RID_STR_ACC_ROW_NUM
Text [ en-US ] = "Row %ROWNUMBER";
};
String RID_STR_ACC_DESC_PANELDECL_TABBAR
{
Text [ en-US ] = "Panel Deck Tab Bar";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -43,23 +43,16 @@
// free
#define RID_STR_CANNOTCLOSE ( RID_BASICIDE_START + 13 )
// free
#define RID_STR_INITIDE ( RID_BASICIDE_START + 15 )
#define RID_STR_STACKNAME ( RID_BASICIDE_START + 16 )
#define RID_STR_WATCHNAME ( RID_BASICIDE_START + 17 )
#define RID_STR_REMOVEWATCH ( RID_BASICIDE_START + 18 )
#define RID_STR_CANNOTRUNMACRO ( RID_BASICIDE_START + 19 )
#define RID_STR_OPEN ( RID_BASICIDE_START + 20 )
#define RID_STR_SAVE ( RID_BASICIDE_START + 21 )
#define RID_STR_RUNTIMEERROR ( RID_BASICIDE_START + 22 )
#define RID_STR_STDDIALOGNAME ( RID_BASICIDE_START + 24 )
#define RID_STR_STDMODULENAME ( RID_BASICIDE_START + 27 )
#define RID_STR_ALL ( RID_BASICIDE_START + 28 )
#define RID_STR_PAGE ( RID_BASICIDE_START + 30 )
#define RID_STR_BADSBXNAME ( RID_BASICIDE_START + 31 )
#define RID_STR_STDLIBNAME ( RID_BASICIDE_START + 32 )
#define RID_STR_ERROROPENSTORAGE ( RID_BASICIDE_START + 33 )
#define RID_STR_NOLIBINSTORAGE ( RID_BASICIDE_START + 34 )
#define RID_STR_SBXNAMEALLREADYUSED ( RID_BASICIDE_START + 35 )
#define RID_STR_SIGNED ( RID_BASICIDE_START + 36 )
......@@ -72,13 +65,9 @@
#define RID_STR_SEARCHNOTFOUND ( RID_BASICIDE_START + 43 )
#define RID_STR_SEARCHREPLACES ( RID_BASICIDE_START + 44 )
#define RID_STR_CANNOTCHANGENAMESTDLIB ( RID_BASICIDE_START + 45 )
#define RID_STR_CANNOTCHANGENAMEREFLIB ( RID_BASICIDE_START + 46 )
#define RID_STR_CANNOTUNLOADSTDLIB ( RID_BASICIDE_START + 47 )
#define RID_STR_GENERATESOURCE ( RID_BASICIDE_START + 48 )
#define RID_STR_REFNOTPOSSIBLE ( RID_BASICIDE_START + 49 )
#define RID_STR_FILEEXISTS ( RID_BASICIDE_START + 50 )
// free
#define RID_STR_ERROROPENLIB ( RID_BASICIDE_START + 55 )
#define RID_STR_NEWLIB ( RID_BASICIDE_START + 57 )
#define RID_STR_NEWMOD ( RID_BASICIDE_START + 58 )
#define RID_STR_NEWDLG ( RID_BASICIDE_START + 59 )
......@@ -110,17 +99,13 @@
#define RID_STR_QUERYDELLIBREF ( RID_BASICIDE_START + 86 )
#define RID_STR_QUERYDELMODULE ( RID_BASICIDE_START + 87 )
#define RID_STR_BASIC ( RID_BASICIDE_START + 88 )
#define RID_STR_DOC ( RID_BASICIDE_START + 89 )
#define RID_STR_MACRONAMEREQ ( RID_BASICIDE_START + 90 )
#define RID_STR_WILLSTOPPRG ( RID_BASICIDE_START + 91 )
#define RID_STR_STACK ( RID_BASICIDE_START + 92 )
#define RID_STR_OBJNOTFOUND ( RID_BASICIDE_START + 93 )
#define RID_STR_COULDNTREAD ( RID_BASICIDE_START + 94 )
#define RID_STR_COULDNTWRITE ( RID_BASICIDE_START + 95 )
#define RID_STR_WRONGPASSWORD ( RID_BASICIDE_START + 96 )
#define RID_STR_LINE ( RID_BASICIDE_START + 97 )
#define RID_STR_COLUMN ( RID_BASICIDE_START + 98 )
#define RID_STR_SOURCETOBIG ( RID_BASICIDE_START + 99 )
#define RID_STR_EXPORTPACKAGE ( RID_BASICIDE_START + 100 )
#define RID_STR_EXPORTBASIC ( RID_BASICIDE_START + 101 )
#define RID_STR_PACKAGE_BUNDLE ( RID_BASICIDE_START + 102 )
......
......@@ -33,26 +33,6 @@ String RID_STR_WRONGPASSWORD
{
Text [ en-US ] = "Incorrect Password" ;
};
String RID_STR_OPEN
{
Text [ en-US ] = "Load" ;
};
String RID_STR_SAVE
{
Text [ en-US ] = "Save" ;
};
String RID_STR_SOURCETOBIG
{
Text [ en-US ] = "The source text is too large and can be neither compiled nor saved.\nDelete some of the comments or transfer some methods into another module." ;
};
String RID_STR_ERROROPENSTORAGE
{
Text [ en-US ] = "Error opening file" ;
};
String RID_STR_ERROROPENLIB
{
Text [ en-US ] = "Error loading library" ;
};
String RID_STR_NOLIBINSTORAGE
{
Text [ en-US ] = "The file does not contain any BASIC libraries" ;
......@@ -101,18 +81,10 @@ String RID_STR_SBXNAMEALLREADYUSED2
{
Text [ en-US ] = "Object with same name already exists" ;
};
String RID_STR_FILEEXISTS
{
Text [ en-US ] = "The 'XX' file already exists" ;
};
String RID_STR_CANNOTRUNMACRO
{
Text [ en-US ] = "For security reasons, you cannot run this macro.\n\nFor more information, check the security settings." ;
};
String RID_STR_RUNTIMEERROR
{
Text [ en-US ] = "Runtime Error: #" ;
};
String RID_STR_SEARCHNOTFOUND
{
Text [ en-US ] = "Search key not found" ;
......@@ -137,14 +109,6 @@ String RID_STR_CANNOTCHANGENAMESTDLIB
{
Text [ en-US ] = "The name of the default library cannot be changed." ;
};
String RID_STR_CANNOTCHANGENAMEREFLIB
{
Text [ en-US ] = "The name of a referenced library cannot be changed." ;
};
String RID_STR_CANNOTUNLOADSTDLIB
{
Text [ en-US ] = "The default library cannot be deactivated" ;
};
String RID_STR_GENERATESOURCE
{
Text [ en-US ] = "Generating source" ;
......@@ -177,10 +141,6 @@ String RID_STR_QUERYDELMODULE
{
Text [ en-US ] = "Do you want to delete the XX module?" ;
};
String RID_STR_OBJNOTFOUND
{
Text [ en-US ] = "Object or method not found" ;
};
String RID_STR_BASIC
{
Text [ en-US ] = "BASIC" ;
......@@ -195,10 +155,6 @@ String RID_STR_COLUMN
// Abkuerzung fuer 'Spalte'
Text [ en-US ] = "Col" ;
};
String RID_STR_DOC
{
Text [ en-US ] = "Document" ;
};
String RID_BASICIDE_OBJECTBAR
{
Text [ en-US ] = "Macro Bar" ;
......@@ -235,22 +191,10 @@ String RID_STR_STACKNAME
{
Text [ en-US ] = "Call Stack" ;
};
String RID_STR_INITIDE
{
Text [ en-US ] = "BASIC Initialization" ;
};
String RID_STR_STDMODULENAME
{
Text [ en-US ] = "Module" ;
};
String RID_STR_STDDIALOGNAME
{
Text [ en-US ] = "Dialog" ;
};
String RID_STR_STDLIBNAME
{
Text [ en-US ] = "Library" ;
};
String RID_STR_NEWLIB
{
Text [ en-US ] = "New Library" ;
......@@ -271,10 +215,6 @@ String RID_STR_PAGE
{
Text [ en-US ] = "Page" ;
};
String RID_STR_MACRONAMEREQ
{
Text [ en-US ] = "A name must be entered." ;
};
String RID_STR_WILLSTOPPRG
{
Text [ en-US ] = "You will have to restart the program after this edit.\nContinue?" ;
......
#!/usr/bin/python
# Search for unused RID_ constants.
#
# Note that sometimes RID constants are calculated, so some careful checking of the output is necessary.
#
# Takes about 30min to run this on a fast machine.
import subprocess
import sys
exclusionSet = set([
# List of RID constants where we compute a value using a base before calling one of the RESSTR methods
# Found with: git grep -P 'RID_\w+\s*\+' -- :/ ':!*.hrc' ':!*.src' ':!*.java' ':!*.py' ':!*.xba'
"RID_SVXSTR_KEY_",
"RID_SVXITEMS_SHADOW_",
"RID_SVXITEMS_BREAK_",
"RID_SVXITEMS_FRMDIR_",
"RID_SVXITEMS_COLOR",
"RID_SVXITEMS_HORJUST_",
"RID_SVXITEMS_VERJUST_",
"RID_SVXITEMS_JUSTMETHOD_",
"RID_SVXITEMS_ADJUST_",
"RID_SVXITEMS_WEIGHT_",
"RID_SVXITEMS_UL_",
"RID_SVXITEMS_OL_",
"RID_SVXITEMS_STRIKEOUT_",
"RID_SVXITEMS_CASEMAP_",
"RID_SVXITEMS_ESCAPEMENT_",
"RID_SVXITEMS_EMPHASIS_",
"RID_SVXITEMS_RELIEF_",
"RID_SVXITEMS_FRMDIR_",
"RID_UPDATE_BUBBLE_TEXT_",
"RID_UPDATE_BUBBLE_T_TEXT_",
"RID_SVXSTR_TBLAFMT_",
"RID_BMP_CONTENT_",
"RID_DROPMODE_",
"RID_BMP_LEVEL",
"RID_SVXSTR_BULLET_DESCRIPTION",
"RID_SVXSTR_SINGLENUM_DESCRIPTION",
"RID_SVXSTR_OUTLINENUM_DESCRIPTION",
"RID_SVXSTR_RULER_",
"RID_GALLERYSTR_THEME_",
"RID_SVXITEMS_ORI_",
"RID_SVXITEMS_PAGE_NUM_",
"RID_SVXSTR_BULLET_DESCRIPTION",
"RID_SVXSTR_SINGLENUM_DESCRIPTION",
"RID_SVXSTR_OUTLINENUM_DESCRIPTION",
# doing some weird stuff in svx/source/unodraw/unoprov.cxx involving mapping of UNO api names to translated names and back again
"RID_SVXSTR_GRDT",
"RID_SVXSTR_HATCH",
"RID_SVXSTR_BMP",
"RID_SVXSTR_DASH",
"RID_SVXSTR_LEND",
"RID_SVXSTR_TRASNGR",
# other places doing calculations
"RID_SVXSTR_DEPTH",
"RID_SUBSETSTR_"
])
def startswith_one_of( a, aset ):
for f in aset:
if a.startswith(f):
return True;
return False;
a = subprocess.Popen("git grep -P '^#define\s+RID_\w+\s+' -- *.hrc | sort -u", stdout=subprocess.PIPE, shell=True)
with a.stdout as txt:
for line in txt:
idx1 = line.find("#define ")
idx2 = line.find(" ", idx1 + 9)
ridName = line[idx1+8 : idx2]
# the various _START and _END constants are normally unused outside of the .hrc and .src files, and that's fine
if ridName.endswith("_START"): continue
if ridName.endswith("_BEGIN"): continue
if ridName.endswith("_END"): continue
if ridName == "RID_GROUPS_SFXOFFSET": continue
if ridName == "RID_SVX_FIRSTFREE": continue
if startswith_one_of(ridName, exclusionSet): continue
# search for the constant
b = subprocess.Popen(["git", "grep", "-w", ridName], stdout=subprocess.PIPE)
# check if we found one in actual code
found_in_code = False
# check that the constant is not being used as an identifier by MenuItem entries in .src files
found_menu_identifier = False
# check that the constant is not being used by the property controller extension or report inspection, which use macros
# to declare constants, hiding them from a search
found_property_macros = False
with b.stdout as txt2:
for line2 in txt2:
if not line2.endswith(".hrc") and not line2.endswith(".src"): found_in_code = True
if line2.find("Identifier = ") != -1: found_menu_identifier = True
if line2.find("extensions/source/propctrlr") != -1: found_property_macros = True
if line2.find("reportdesign/source/ui/inspection/inspection.src") != -1: found_property_macros = True
if not found_in_code and not found_menu_identifier and not found_property_macros:
sys.stdout.write(ridName + '\n')
# otherwise the previous line of output will be incorrectly mixed into the below git output, because of buffering
sys.stdout.flush()
# search again, so we log the location and filename of stuff we want to remove
subprocess.call(["git", "grep", "-wn", ridName])
......@@ -52,10 +52,6 @@ String RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION
};
// Strings ---------------------------------------------------------------
String RID_SVXSTR_IMPORT_ICON_ERROR
{
Text [ en-US ] = "The files listed below could not be imported. The file format could not be interpreted." ;
};
String RID_SVXSTR_DELETE_ICON_CONFIRM //added for issue73355
{
......@@ -102,16 +98,6 @@ String RID_SVXSTR_COMMANDS
Text [ en-US ] = "Commands" ;
};
String RID_SVXSTR_COMMAND
{
Text [ en-US ] = "Command" ;
};
String RID_SVXSTR_TOOLBAR_NAME
{
Text [ en-US ] = "Toolbar Name" ;
};
String RID_SXVSTR_CONFIRM_DELETE_TOOLBAR
{
Text [ en-US ] = "There are no more commands on the toolbar. Do you want to delete the toolbar?";
......
......@@ -308,26 +308,6 @@ String RID_SVXSTR_EVENT_TITLECHANGED
Text [ en-US ] = "Document title changed" ;
};
String RID_SVXSTR_EVENT_MODECHANGED
{
Text [ en-US ] = "Document mode changed" ;
};
String RID_SVXSTR_EVENT_VISAREACHANGED
{
Text [ en-US ] = "Visible area changed" ;
};
String RID_SVXSTR_EVENT_STORAGECHANGED
{
Text [ en-US ] = "Document has got a new storage" ;
};
String RID_SVXSTR_EVENT_LAYOUT_FINISHED
{
Text [ en-US ] = "Document layout finished" ;
};
String RID_SVXSTR_EVENT_SELECTIONCHANGED
{
Text [ en-US ] = "Selection changed" ;
......
......@@ -114,11 +114,6 @@ Bitmap RID_SVXBMP_HLDOCNTP
File = "hldocntp.png";
};
Bitmap RID_SVXBMP_BROWSE
{
File = "browse.png";
};
Bitmap RID_SVXBMP_SCRIPT
{
File = "script.png";
......
......@@ -19,11 +19,6 @@
#include <cuires.hrc>
String RID_SVXSTR_PASSWD_MUST_BE_CONFIRMED
{
Text [ en-US ] = "Password must be confirmed" ;
};
String RID_SVXSTR_ONE_PASSWORD_MISMATCH
{
Text [ en-US ] = "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." ;
......
......@@ -32,10 +32,6 @@ String RID_SVXSTR_DELFAILED
{
Text [ en-US ] = "The selected object could not be deleted.";
};
String RID_SVXSTR_DELFAILEDPERM
{
Text [ en-US ] = " You do not have permission to delete this object.";
};
String RID_SVXSTR_DELFAILED_TITLE
{
Text [ en-US ] = "Error Deleting Object";
......@@ -48,10 +44,6 @@ String RID_SVXSTR_CREATEFAILEDDUP
{
Text [ en-US ] = " Object with the same name already exists.";
};
String RID_SVXSTR_CREATEFAILEDPERM
{
Text [ en-US ] = " You do not have permission to create this object.";
};
String RID_SVXSTR_CREATEFAILED_TITLE
{
Text [ en-US ] = "Error Creating Object";
......@@ -60,10 +52,6 @@ String RID_SVXSTR_RENAMEFAILED
{
Text [ en-US ] = "The object could not be renamed.";
};
String RID_SVXSTR_RENAMEFAILEDPERM
{
Text [ en-US ] = " You do not have permission to rename this object.";
};
String RID_SVXSTR_RENAMEFAILED_TITLE
{
Text [ en-US ] = "Error Renaming Object";
......@@ -103,11 +91,6 @@ String RID_SVXSTR_FRAMEWORK_ERROR_RUNNING
Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME.";
};
String RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE
{
Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER.";
};
String RID_SVXSTR_ERROR_TYPE_LABEL
{
Text [ en-US ] = "Type:";
......
......@@ -40,7 +40,6 @@
// RID_CUI_GALLERY_END (RID_SVX_START + 410)
// used in "tabpages"
#define RID_SVXSTR_READ_DATA_ERROR (RID_SVX_START + 230)
#define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969)
#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970)
#define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971)
......@@ -68,21 +67,16 @@
#define RID_SVXSTR_EDIT_GRAPHIC (RID_SVX_START + 509)
#define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163)
#define RID_SVXSTR_ASK_CHANGE_GRADIENT (RID_SVX_START + 166)
#define RID_SVXSTR_ASK_CHANGE_BITMAP (RID_SVX_START + 172)
#define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168)
#define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169)
#define RID_SVXSTR_DESC_NEW_PATTERN (RID_SVX_START + 170)
#define RID_SVXSTR_ASK_CHANGE_PATTERN (RID_SVX_START + 171)
#define RID_SVXSTR_DESC_LINESTYLE (RID_SVX_START + 174)
#define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177)
#define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232)
#define RID_SVXSTR_ASK_CHANGE_HATCH (RID_SVX_START + 235)
#define RID_SVXSTR_CHANGE (RID_SVX_START + 181)
#define RID_SVXSTR_ADD (RID_SVX_START + 182)
#define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215)
#define RID_SVXSTR_ASK_CHANGE_COLOR (RID_SVX_START + 218)
#define RID_SVXSTR_TABLE (RID_SVX_START + 220)
#define RID_SVXSTR_CONNECTOR (RID_SVX_START + 221)
#define RID_SVXSTR_DIMENSION_LINE (RID_SVX_START + 222)
......@@ -124,7 +118,6 @@
#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246)
#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
#define RID_OPTSTR_COLOR_CHART_DELETE (RID_SVX_START + 289)
#define RID_SVXPAGE_PERSONALIZATION (RID_SVX_START + 247)
#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249)
#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 324)
......@@ -172,7 +165,6 @@
#define RID_SVXBMP_TARGET (RID_SVX_START + 551)
#define RID_SVXBMP_FILEOPEN (RID_SVX_START + 552)
#define RID_SVXBMP_NEWDOC (RID_SVX_START + 553)
#define RID_SVXBMP_BROWSE (RID_SVX_START + 554)
#define RID_SVXBMP_ADRESSBOOK (RID_SVX_START + 555)
#define RID_SVXBMP_HLINETTP (RID_SVX_START + 556)
#define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557)
......@@ -242,14 +234,11 @@
#define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027)
#define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028)
#define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029)
#define RID_SVXSTR_DELFAILEDPERM (RID_SVX_START + 1030)
#define RID_SVXSTR_DELFAILED_TITLE (RID_SVX_START + 1031)
#define RID_SVXSTR_CREATEFAILED (RID_SVX_START + 1032)
#define RID_SVXSTR_CREATEFAILEDPERM (RID_SVX_START + 1033)
#define RID_SVXSTR_CREATEFAILEDDUP (RID_SVX_START + 1034)
#define RID_SVXSTR_CREATEFAILED_TITLE (RID_SVX_START + 1035)
#define RID_SVXSTR_RENAMEFAILED (RID_SVX_START + 1036)
#define RID_SVXSTR_RENAMEFAILEDPERM (RID_SVX_START + 1037)
#define RID_SVXSTR_RENAMEFAILED_TITLE (RID_SVX_START + 1038)
#define RID_SVXSTR_ERROR_TITLE (RID_SVX_START + 1100)
#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED (RID_SVX_START + 1101)
......@@ -258,13 +247,9 @@
#define RID_SVXSTR_ERROR_AT_LINE (RID_SVX_START + 1104)
#define RID_SVXSTR_EXCEPTION_AT_LINE (RID_SVX_START + 1105)
#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING (RID_SVX_START + 1106)
#define RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE (RID_SVX_START + 1107)
#define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108)
#define RID_SVXSTR_ERROR_MESSAGE_LABEL (RID_SVX_START + 1109)
// customize
#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291)
#define RID_SVXSTR_PRODUCTNAME_CONTEXTMENUS (RID_SVX_START + 1167)
#define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039)
#define RID_SVXSTR_NEW_TOOLBAR (RID_SVX_START + 1040)
......@@ -272,7 +257,6 @@
#define RID_SVXSTR_ADD_SUBMENU (RID_SVX_START + 1048)
#define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049)
#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050)
#define RID_SVXSTR_IMPORT_ICON_ERROR (RID_SVX_START + 1117)
#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355
#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355
#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355
......@@ -281,8 +265,6 @@
#define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043)
#define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044)
#define RID_SVXSTR_COMMANDS (RID_SVX_START + 1045)
#define RID_SVXSTR_COMMAND (RID_SVX_START + 1046)
#define RID_SVXSTR_TOOLBAR_NAME (RID_SVX_START + 1047)
#define RID_SVXSTR_CONFIRM_MENU_RESET (RID_SVX_START + 1115)
#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET (RID_SVX_START + 1116)
#define RID_SVXSTR_LABEL_NEW_NAME (RID_SVX_START + 1135)
......@@ -350,13 +332,9 @@
#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180)
#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181)
#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182)
#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183)
#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184)
#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185)
#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186)
#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187)
#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188)
#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189)
// For now, keep new IDs unique only within cui.
// Later, cui should perhaps get an own range of IDs.
......@@ -435,7 +413,6 @@
#define RID_SVXSTR_THES (RID_SVX_START + 1255)
#define RID_SVXSTR_GRAMMAR (RID_SVX_START + 1256)
#define RID_SVXSTR_PASSWD_MUST_BE_CONFIRMED (RID_SVX_START + 1257)
#define RID_SVXSTR_ONE_PASSWORD_MISMATCH (RID_SVX_START + 1258)
#define RID_SVXSTR_TWO_PASSWORDS_MISMATCH (RID_SVX_START + 1259)
#define RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON (RID_SVX_START + 1260)
......@@ -454,7 +431,6 @@
#define RID_SVXSTR_HANJA (RID_SVX_START + 1271)
// Search Persona Dialog
#define RID_SVXSTR_SEARCHTERM (RID_SVX_START + 1277)
#define RID_SVXSTR_SELECTEDPERSONA (RID_SVX_START + 1278)
#define RID_SVXSTR_SEARCHING (RID_SVX_START + 1279)
#define RID_SVXSTR_SEARCHERROR (RID_SVX_START + 1280)
......
......@@ -29,9 +29,4 @@ String RID_SVXSTR_DIAGRAM_ROW
Text [ en-US ] = "Data Series $(ROW)" ;
};
String RID_OPTSTR_COLOR_CHART_DELETE
{
Text [ en-US ] = "Chart Color Deletion" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -19,11 +19,6 @@
#include <cuires.hrc>
String RID_SVXSTR_SEARCHTERM
{
Text [ en-US ] = "Search term";
};
String RID_SVXSTR_SELECTEDPERSONA
{
Text [ en-US ] = "Selected Theme: ";
......
......@@ -23,10 +23,6 @@ String RID_SVXSTR_DESC_GRADIENT
{
Text [ en-US ] = "Please enter a name for the gradient:" ;
};
String RID_SVXSTR_ASK_CHANGE_GRADIENT
{
Text [ en-US ] = "The gradient was modified without saving. \nModify the selected gradient or add a new gradient." ;
};
String RID_SVXSTR_DESC_NEW_BITMAP
{
Text [ en-US ] = "Please enter a name for the bitmap:" ;
......@@ -39,14 +35,6 @@ String RID_SVXSTR_DESC_NEW_PATTERN
{
Text [ en-US ] = "Please enter a name for the pattern:" ;
};
String RID_SVXSTR_ASK_CHANGE_BITMAP
{
Text [ en-US ] = "The bitmap was modified without saving. \nModify the selected bitmap or add a new bitmap." ;
};
String RID_SVXSTR_ASK_CHANGE_PATTERN
{
Text [ en-US ] = "The pattern was modified without saving. \nModify the selected pattern or add a new pattern";
};
String RID_SVXSTR_DESC_LINESTYLE
{
Text [ en-US ] = "Please enter a name for the line style:" ;
......@@ -59,10 +47,6 @@ String RID_SVXSTR_DESC_HATCH
{
Text [ en-US ] = "Please enter a name for the hatching:" ;
};
String RID_SVXSTR_ASK_CHANGE_HATCH
{
Text [ en-US ] = "The hatching type was modified but not saved. \nModify the selected hatching type or add a new hatching type." ;
};
String RID_SVXSTR_CHANGE
{
Text [ en-US ] = "Modify" ;
......@@ -75,10 +59,6 @@ String RID_SVXSTR_DESC_COLOR
{
Text [ en-US ] = "Please enter a name for the new color:" ;
};
String RID_SVXSTR_ASK_CHANGE_COLOR
{
Text [ en-US ] = "The color was modified without saving.\nModify the selected color or add a new color." ;
};
String RID_SVXSTR_TABLE
{
Text [ en-US ] = "Table" ;
......@@ -199,10 +179,6 @@ String RID_SVXSTR_DIMENSION_LINE
{
Text [en-US ] = "Dimension line";
};
String RID_SVXSTR_READ_DATA_ERROR
{
Text [ en-US ] = "The file could not be loaded!" ;
};
String RID_SVXSTR_LOAD_ERROR
{
Text [ en-US ] = "The selected module could not be loaded.";
......
......@@ -25,10 +25,8 @@
#define RID_CORE_STRINGS_START RID_DBACCESS_START
//- String-IDs
#define RID_STR_TRIED_OPEN_TABLE ( RID_CORE_STRINGS_START + 0 )
#define RID_STR_CONNECTION_INVALID ( RID_CORE_STRINGS_START + 1 )
#define RID_STR_TABLE_IS_FILTERED ( RID_CORE_STRINGS_START + 2 )
#define RID_STR_NEED_CONFIG_WRITE_ACCESS ( RID_CORE_STRINGS_START + 3 )
#define RID_STR_COULDNOTCONNECT_NODRIVER ( RID_CORE_STRINGS_START + 4 )
#define RID_STR_COULDNOTCONNECT_UNSPECIFIED ( RID_CORE_STRINGS_START + 5 )
#define RID_STR_COULDNOTLOAD_MANAGER ( RID_CORE_STRINGS_START + 6 )
......@@ -51,11 +49,9 @@
#define RID_STR_COLUMN_NOT_VALID ( RID_CORE_STRINGS_START + 23 )
#define RID_STR_COLUMN_NOT_SEARCHABLE ( RID_CORE_STRINGS_START + 24 )
#define RID_STR_NOT_SEQUENCE_INT8 ( RID_CORE_STRINGS_START + 25 )
#define RID_STR_NOT_SUPPORTED_BY_DRIVER ( RID_CORE_STRINGS_START + 26 )
#define RID_STR_NO_TABLE_RENAME ( RID_CORE_STRINGS_START + 27 )
#define RID_STR_COLUMN_ALTER_BY_NAME ( RID_CORE_STRINGS_START + 28 )
#define RID_STR_COLUMN_ALTER_BY_INDEX ( RID_CORE_STRINGS_START + 29 )
#define RID_STR_NO_ALTER_COLUMN_DEF ( RID_CORE_STRINGS_START + 30 )
#define RID_STR_COLUMN_UNKNOWN_PROP ( RID_CORE_STRINGS_START + 31 )
#define RID_STR_FORM ( RID_CORE_STRINGS_START + 32 )
#define RID_STR_REPORT ( RID_CORE_STRINGS_START + 33 )
......
......@@ -20,11 +20,6 @@
#include "core_resource.hrc"
#include "dbamiscres.hrc"
String RID_STR_TRIED_OPEN_TABLE
{
Text [ en-US ] = "Tried to open the table $name$.";
};
String RID_STR_CONNECTION_INVALID
{
Text [ en-US ] = "No connection could be established.";
......@@ -35,11 +30,6 @@ String RID_STR_TABLE_IS_FILTERED
Text [ en-US ] = "The table $name$ already exists. It is not visible because it has been filtered out.";
};
String RID_STR_NEED_CONFIG_WRITE_ACCESS
{
Text [ en-US ] = "You have no write access to the configuration data the object is based on.";
};
String RID_STR_COULDNOTCONNECT_UNSPECIFIED
{
Text [ en-US ] = "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective.";
......@@ -140,11 +130,6 @@ String RID_STR_NO_XQUERIESSUPPLIER
Text [ en-US ] = "The interface XQueriesSupplier is not available.";
};
String RID_STR_NOT_SUPPORTED_BY_DRIVER
{
Text [ en-US ] = "The driver does not support this function.";
};
String RID_STR_NO_ABS_ZERO
{
Text [ en-US ] = "An 'absolute(0)' call is not allowed.";
......@@ -180,11 +165,6 @@ String RID_STR_NO_TABLE_RENAME
Text [ en-US ] = "The driver does not support table renaming.";
};
String RID_STR_NO_ALTER_COLUMN_DEF
{
Text [ en-US ] = "The driver does not support the modification of column descriptions.";
};
String RID_STR_COLUMN_ALTER_BY_NAME
{
Text [ en-US ] = "The driver does not support the modification of column descriptions by changing the name.";
......
......@@ -138,11 +138,6 @@ String RID_STR_VIEWS_HELP_TEXT_DESIGN
Text [ en-US ] = "Create a view by specifying the tables and field names you would like to have visible." ;
};
String RID_STR_VIEWS_HELP_TEXT_WIZARD
{
Text [ en-US ] = "Opens the view wizard" ;
};
String STR_DATABASE
{
Text [ en-US ] = "Database" ;
......
......@@ -40,7 +40,6 @@
#define RID_STR_QUERIES_HELP_TEXT RID_STR_APP_START + 17